system/mkslack: Updated for version 5.3.0.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 32 insertions, 276 deletions

diff --git a/system/mkslack/ChangeLog.txt b/system/mkslack/ChangeLog.txt
deleted file mode 100644
index 365b4d14d9..0000000000
--- a/system/mkslack/ChangeLog.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-Mon 01 Aug 2016 20:22:51 BST
-Version 5.1
-Do not rename python and perl packages.
-Sat 30 Jul 2016 03:27:00 BST
-Version 5.0
-Fix documentation
-Thu 28 Jul 2016 02:25:54 BST
-Version 4.9
-Updated templates for i586
-Mon 04 May 2015 05:48:43 BST
-Version 4.8
-Remove some debugging code
-Sat 11 Apr 2015 23:18:49 BST
-Version 4.7
-Add autotools as the first option.
-Wed 24 Dec 2014 09:32:31 GMT
-Update various build templates and revised documentation line.
-Mon 07 Apr 2014 10:12:35 BST
-Add waf template.
-+--------------------------+
-Tue 31 Dec 2013 03:02:59 GMT
-Info file: Remove APPROVED. Add REQUIRES.
-+--------------------------+
-Mon 30 Dec 2013 11:22:07 GMT
-Bugfix for missing manpage lines in autotools template.
-+--------------------------+
-Fri 22 Nov 2013 08:49:14 GMT
-Updated SlackBuild templates
-+--------------------------+
-Sun 30 Oct 2011 00:25:05 BST
-Added --infodir to autotools template
-+--------------------------+
-Tue 25 Oct 2011 19:25:35 BST
-Version 4.0
-Minor edit of mkslack.conf
-Added a chmod +x of SlackBuild
-+--------------------------+
-Sun 24 Apr 2011 17:30:38 BST
-Version 4.0
-Hmm where did 3.9 go?
-Fixed a problem with repeating additions to doinst.sh
-Removed annoying ... from slack-desc
-+--------------------------+
-Tue 08 Feb 2011 22:29:23 GMT
-Version 3.8
-Added support to auto-add year into slackbuilds.
-+--------------------------+
-Sun Jan 16 18:55:57 GMT 2011
-Version 3.7
-Added ruby support.
-+--------------------------+
-Tue 09 Nov 2010 12:07:36 PM GMT
-Version 3.6
-Bugfix for docmuentation
-+--------------------------+
-Tue 21 Sep 2010 18:45:16 BST
-Version 3.5
-Added 'doc' as an option for documentation
-+--------------------------+
-Mon 20 Sep 2010 08:28:24 BSTTue 07 Sep 2010 15:24:53 BST
-Version 3.4
-Changed .desktop and mimetype grep to case-insensitive.
-Added stock doinst.sh to templates for convenience.
-+--------------------------+
-Version 3.3 finalised
-+--------------------------+
-Thu 12 Aug 2010 06:35:28 BST
-Version 3.3rc8
-Small code improvements
-+--------------------------+
-Sat 31 Jul 2010 20:59:50 BST
-Version 3.3rc6
-Small bugfix for $PKG with python/perl packages.
-+--------------------------+
-Thu 01 Jul 2010 03:14:02 BST
-Version 3.3rc5
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 19:39:47 BST
-Version 3.3rc4
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 17:28:31 BST
-Version 3.3rc3
-Cleaned up message for usr/share/man pages found.
-+--------------------------+
-Wed 30 Jun 2010 09:54:37 BST
-Version 3.3rc2
-Reverted back to not needing an underscore for TAG.
-+--------------------------+
-Wed 30 Jun 2010 09:07:19 BST
-Version 3.3rc1
-Incorporated slakmagik's nice, new code.
--r is now -b (for build)
-A new -V for version check.
-With -b you get the choice of having a failed build fixed and
-rebuilt. Mostly for manpage/info errors. A new config option
-ERRORACTION to do this, which can be PROMPT, AUTO or EXIT.
-Now config file errors are reported back.
-Now TAG _must_ have a preceding underscore, which keeps it in
-line with slackbuilds.
-+--------------------------+
-Sun 27 Jun 2010 16:28:32 BST
-Version 3.1
-Fixed ARCH bug.
-Now puts appname into first line of slack-desc.
-+--------------------------+
-Wed 23 Jun 2010 23:59:14 BST
-Version 3.0
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 19:47:26 BST
-Version 2.9
-Code improvements.
-+--------------------------+
-Tue 22 Jun 2010 19:47:05 BST
-Version 2.8
-???
-+--------------------------+
-Tue 22 Jun 2010 17:48:34 BST
-Version 2.7
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 09:30:00 BST
-Version 2.6
-Upgraded to new perl template.
-+--------------------------+
-Mon 21 Jun 2010 01:12:41 BST
-Version 2.6
-Fixed python support.
-+--------------------------+
-Sun 20 Jun 2010 02:35:23 BST
-Version 2.5
-Improved backups. Added KEEPBACKUPS option to conf.
-+--------------------------+
-Sun 20 Jun 2010 01:20:39 BST
-Version 2.4
-Fixed slack-desc.
-+--------------------------+
-Sun 20 Jun 2010 00:44:02 BST
-Version 2.3
-Code improvements.
-+--------------------------+
-Sun 20 Jun 2010 00:12:41 BST
-Version 2.2
-Improved support for perl modules.
-+--------------------------+
-Fri 18 Jun 2010 01:07:52 BST
-Version 2.1
-Added some support for ./autogen.sh or autoreconf in configure
-is missing. YMMV on this.
-+--------------------------+
-Thu 17 Jun 2010 22:29:57 BST
-Version 2.0
-Added function to check for latest version.
-+--------------------------+
-Sun 13 Jun 2010 21:51:29 BST
-Version 1.9
-Fixed tag error
-+--------------------------+
-Sun 13 Jun 2010 19:20:55 BST
-Version 1.8
-Various code improvements
-+--------------------------+
-Sun 13 Jun 2010 10:24:38 BST
-Version 1.7
-Fixed _tag bug in package name.
-+--------------------------+
-Thu 10 Jun 2010 21:48:12 BST
-Version 1.6
-Updated for all templates on slackbuilds.org
-It _should_ detect the correct template to use.
-YMMV ;-)
-+--------------------------+
-Mon 31 May 2010 01:52:00 BST
-Version 1.5
-Minor bugfix.
-+--------------------------+
-Sat 29 May 2010 12:35:08 BST
-Version 1.4
-Updated SlackBuild template to the latest on slackbuilds.org
-+--------------------------+
diff --git a/system/mkslack/README b/system/mkslack/README
index 2899a7efdf..e30ce3d17c 100644
--- a/system/mkslack/README
+++ b/system/mkslack/README
@@ -1,70 +1,6 @@
-mkslack - a SlackBuild generator script
+mkslack - a SlackBuild generator
 
-This slackbuild generator uses templates stored in
-/usr/share/mkslack/templates and a config file
-/etc/mkslack/mkslack.conf which you must edit for name, email, tag and
-a few options.
-
-
-Idea for use:
-
-The initial slackbuild and info file are built by this script, and
-when a test build/install is done and working, the files should be
-tweaked by hand. Especially don't forget to fill in the rest of the
-details in the .info. One thing to point out is that mkslack will
-overwrite these files if run again unless you set KEEPBACKUPS="YES"
-in the conf (default).
-
-This is only a starter kit! You ARE expected to edit the created
-files by hand afterwards to remove unnecesary parts and add extra
-options!
-
-
-Syntax:
+mkslack generates SlackBuild scripts and supporting files using the
+standard SBo templates found at https://slackbuilds.org/templates/
 
 mkslack [options] archive
-
-Options:
--h --help               Usage.
--b --build              Run SlackBuild after creation. Got root?
--i --install            Install the package after running.
--l --list               Pipe archive contents to /usr/bin/most and exit.
--v --version            Version of mkslack.
--V --ckver              Check for new version.
-
-With no option set, mkslack will generate the SlackBuild and other
-files, print out a small message, and then quit.
-
-
-Config options:
-
-NAME, EMAIL as they should appear in .SlackBuild and .info TAG should
-be your custom tag and defaults to _SBo KEEPBACKUPS="YES|NO" up to 5
-backups of .SlackBuild and other files are kept. The higher the
-number, the older they are.  ERRORACTION="PROMPT|AUTO|EXIT" what to
-do on build errors. Using AUTO or answering 'y' to the prompt will
-have the slackbuild adjusted for man and info pages and then rebuilt.
-Waf scripts don't exit on a '1' return code so it scans the end of
-the to see if there is an unrecognised configure option (the most
-frequent error with waf).
-
-
-CLI Options:
-
-The documents list in top level of source tree can be adjusted by
-command:
-DOCS="SomeFile" mkslack archive
-This will add 'SomeFile' to the list. You can also edit the DOCS list
-in this script. Any that it doesn't find will be removed from the
-list.
-
-Build can be specified by:
-BUILD=2 mkslack archive
-Otherwise it defaults to 1.
-
-ARCH can be specified by:
-ARCH=xxx mkslack archive
-It defaults to whatever is set in the system, or what the SlackBuild
-finds or sets.
-
-TAG can also be specified.
diff --git a/system/mkslack/mkslack.SlackBuild b/system/mkslack/mkslack.SlackBuild
index 1a76a876f4..1f216ff64e 100644
--- a/system/mkslack/mkslack.SlackBuild
+++ b/system/mkslack/mkslack.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for mkslack
 
-# Copyright 2010 David Woodfall <dave@slackbuilds.org>,
-# Modifications copyright slakmagik <slakmagik@gmail.com>
+# Copyright 2010-20 Dave Woodfall <dave@slackbuilds.org>,
+#                   slakmagik <slakmagik@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mkslack
-VERSION=${VERSION:-5.2}
+VERSION=${VERSION:-5.3.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,12 +38,13 @@ README=$PKG/usr/doc/$PRGNAM-$VERSION/README
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/bin $PKG/usr/share/mkslack/templates $PKG/etc/mkslack \
-  $PKG/usr/man/man1 $OUTPUT
+mkdir -p $TMP $OUTPUT \
+  $PKG/usr/share/mkslack/templates
+
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,30 +52,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i -e "s/@VERSION@/$VERSION/" mkslack.1
 gzip mkslack.1
-install -m 644 mkslack.1.gz $PKG/usr/man/man1
-install -m 755 mkslack $PKG/usr/bin
-install -m 644 template* $PKG/usr/share/mkslack/templates
-install -m 644 *SlackBuild $PKG/usr/share/mkslack/templates
-install -m 644 mkslack.conf.new $PKG/etc/mkslack
+install -m 644 -D mkslack.1.gz $PKG/usr/man/man1/mkslack.1.gz
+install -m 755 -D mkslack $PKG/usr/bin/mkslack
+install -m 644 -D mkslack.conf.new $PKG/etc/mkslack/mkslack.conf.new
+install -m 644 templates/* $PKG/usr/share/mkslack/templates
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a original-templates $PKG/usr/doc/$PRGNAM-$VERSION
+
 # generate the README from some introductory text and a dump of the manual
 cat << EOF > $README
 mkslack - a SlackBuild generator script
-Copyright 2010 David Woodfall, modification by slakmagik
+Copyright 2010-2020 Dave Woodfall, modification by slakmagik
 mkslack is licensed under a "one-clause BSD/Slackware" license.
 See the script for the full text.
-Homepage: http://tty1.uk/slackbuilds/noversion/mkslack/
+Homepage: http://tty1.uk/slackbuilds/noversion/mkslack
 EOF
-man ./mkslack.1.gz | col -b | expand | cat -s | sed '
+man ./mkslack.1.gz | col -b | expand | fmt -72 | cat -s | sed "
     1d
     s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
     /^$/N;/MKSLACK(1)$/D
-    ' >> $README
+    " >> $README
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/ChangeLog.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/mkslack/mkslack.info b/system/mkslack/mkslack.info
index a204e9218d..aa0d1d5b5d 100644
--- a/system/mkslack/mkslack.info
+++ b/system/mkslack/mkslack.info
@@ -1,10 +1,10 @@
 PRGNAM="mkslack"
-VERSION="5.2"
-HOMEPAGE="http://tty1.uk/slackbuilds/noversion/mkslack"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mkslack-5.2.tar.gz"
-MD5SUM="1866d9b32bee61a5bdfca52230e2a6f0"
+VERSION="5.3.0"
+HOMEPAGE="http://tty1.uk/slackbuilds/mkslack"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/mkslack/snapshot/mkslack-5.3.0.tar.gz"
+MD5SUM="d58dff15c9621d2c2d6aacd6eec42372"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
diff --git a/system/mkslack/slack-desc b/system/mkslack/slack-desc
index b02ac1b0af..f96062efc2 100644
--- a/system/mkslack/slack-desc
+++ b/system/mkslack/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
@@ -16,4 +16,4 @@ mkslack:
 mkslack: The config file /etc/mkslack/mkslack.conf should be customised with
 mkslack: your name, email etc. before use.
 mkslack:
-mkslack: http://tty1.uk/slackbuilds/noversion/mkslack
+mkslack: