system/sbotools: New fork and maintainer, updated for version 3.0.

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

5 files changed, 68 insertions, 39 deletions

diff --git a/system/sbotools/README b/system/sbotools/README
index 35a965799763..9b7d03e167cf 100644
--- a/system/sbotools/README
+++ b/system/sbotools/README
@@ -1,18 +1,27 @@
 sbotools (ports-like interface to slackbuilds.org)
 
-sbotools is a set of perl scripts providing a ports-like automation
-interface to slackbuilds.org. Its features include requirement handling
-and the ability to handle 32-bit and compat32 builds on multilib
-x86_64 systems.
+sbotools is a set of Perl scripts providing a ports-like automation
+interface to slackbuilds.org. Features include dependency handling,
+using a custom git branch, generating 32-bit and compat32 builds on
+multilib systems, reverse dependency search and more.
 
-There are man pages for each of the sbo* commands, and more
-documentation, as well as online versions of the man pages, can be
-found at:
-http://pink-mist.github.io/sbotools/documentation/
+There is a man page for each included command. For 'executive
+summaries' and online man pages, see the project's home page.
 
-sbotools bundles the required Perl module Sort::Versions with it. This
-does not interfere with a copy installed from the CPAN, or from
+sbotools bundles the required Perl module Sort::Versions. This does
+not interfere with a copy installed from the CPAN or from
 slackbuilds.org.
 
-sbotools is written and maintained by d4wnr4z0r, xocel, and pink_mist;
-we can be contacted in #sbotools on freenode.
+sbotools installs a default configuration file to
+/etc/sbotools/sbotools.conf.new. sbotools.conf files from version 2.7
+are compatible, but some of the options are new. It may be convenient
+to examine the new file for added options and annotation when upgrading
+from version 2.7.
+
+sbotools is incompatible with sbotools3 (briefly on SlackBuilds.org).
+Removing sbotools3 before installing sbotools is advised.
+
+Please note that sbotools-3.x is based on an actively-maintained fork
+of the repository used for versions 1.9 through 2.7. A debt of gratitude
+is owed to the original author, Jacob Pipkin, longtime maintainer
+Andreas Guldstrand and major contributor Luke Williams.
diff --git a/system/sbotools/doinst.sh b/system/sbotools/doinst.sh
new file mode 100644
index 000000000000..0df078988a65
--- /dev/null
+++ b/system/sbotools/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sbotools/sbotools.conf.new
diff --git a/system/sbotools/sbotools.SlackBuild b/system/sbotools/sbotools.SlackBuild
index 35c7599d2fbf..b3ae18a3440d 100644
--- a/system/sbotools/sbotools.SlackBuild
+++ b/system/sbotools/sbotools.SlackBuild
@@ -1,19 +1,19 @@
 #!/bin/bash
 #
-# Slackware build script for <sbotools>
+# Slackware build script for sbotools
+#
 # Written by Jacob Pipkin <j@dawnrazor.net>
+# Altered by K. Eugene Carlson <kvngncrlsn@gmail.com>
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sbotools
-VERSION=${VERSION:-2.7}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=$PRGNAM
-
 ARCH=noarch
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -33,9 +33,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -43,8 +43,6 @@ 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 {} \;
 
-# we set INSTALLMAN3DIR=none to elide the Sort::Versions.3 man page so that we
-# don't clobber one from perl-Sort-Versions or Sort::Versions.
 ( cd SBO-Lib
 	/usr/bin/perl Makefile.PL \
 	  PREFIX=/usr \
@@ -60,16 +58,23 @@ find -L . \
 SCRIPTS="check clean config find install remove snap upgrade"
 MANS="man1 man5"
 
-mkdir -p $PKG/usr/sbin
+mkdir -p $PKG/usr/sbin \
+         $PKG/usr/share/zsh/site-functions \
+         $PKG/usr/share/bash-completion/completions
 for i in $SCRIPTS; do
-  cp sbo$i $PKG/usr/sbin/sbo$i
+  install -m 0755 sbo$i $PKG/usr/sbin
+  install -m 0644 completions/zsh/_sbo$i $PKG/usr/share/zsh/site-functions
+  install -m 0644 completions/bash/sbo$i $PKG/usr/share/bash-completion/completions/sbo$i
 done
 
 for i in $MANS; do
   mkdir -p $PKG/usr/man/$i
-  cp $i/* $PKG/usr/man/$i/
+  install -m 0644 $i/* $PKG/usr/man/$i
 done
 
+mkdir -p $PKG/etc/sbotools
+cp sbotools.conf $PKG/etc/sbotools/sbotools.conf.new
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i ; done
 
@@ -78,11 +83,12 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
-cp -a SBO-Lib/README SBO-Lib/Changes $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
+cp -a SBO-Lib/README SBO-Lib/Changes LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbotools/sbotools.info b/system/sbotools/sbotools.info
index 5b2140411242..e2ade14777ad 100644
--- a/system/sbotools/sbotools.info
+++ b/system/sbotools/sbotools.info
@@ -1,10 +1,10 @@
 PRGNAM="sbotools"
-VERSION="2.7"
-HOMEPAGE="https://pink-mist.github.io/sbotools/"
-DOWNLOAD="https://pink-mist.github.io/sbotools/downloads/sbotools-2.7.tar.gz"
-MD5SUM="ddf4b174fa29839564d7e784ff142581"
+VERSION="3.0"
+HOMEPAGE="https://pghvlaans.github.io/sbotools/"
+DOWNLOAD="https://pghvlaans.github.io/sbotools/downloads/sbotools-3.0.tar.gz"
+MD5SUM="11a00ee87396bcd993c3cd1be8299f87"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/sbotools/slack-desc b/system/sbotools/slack-desc
index bac1d912963b..ce5d8ab04acb 100644
--- a/system/sbotools/slack-desc
+++ b/system/sbotools/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 sbotools: sbotools (ports-like interface to slackbuilds.org)
 sbotools:
-sbotools: sbotools is a set of perl scripts providing a ports-like automation
-sbotools: interface to slackbuilds.org. Its features include requirement
-sbotools: handling and the ability to handle 32-bit and compat32 builds on
-sbotools: multilib x86_64 systems.
-sbotools:
-sbotools: https://pink-mist.github.io/sbotools/
-sbotools:
-sbotools:
+sbotools: sbotools is a set of Perl scripts providing a ports-like automation
+sbotools: interface to slackbuilds.org. Features include dependency handling,
+sbotools: using a custom git branch, generating 32-bit and compat32 builds on
+sbotools: multilib systems, and more.
 sbotools:
+sbotools: Homepage: https://pghvlaans.github.io/sbotools/
+sbotools: Original Author: Jacob Pipkin
+sbotools: Contributors: Luke Williams, Andreas Guldstrand
+sbotools: Maintainer: K. Eugene Carlson