From b948d2e0dca39689abff4aa56c34fb1410ae84f0 Mon Sep 17 00:00:00 2001 From: Gene Carlson Date: Fri, 22 Nov 2024 09:31:52 +0900 Subject: [PATCH 1/3] system/sbotools3: Removed (renamed to sbotools). --- system/sbotools3/README | 21 ------ system/sbotools3/doinst.sh | 14 ---- system/sbotools3/sbotools3.SlackBuild | 94 --------------------------- system/sbotools3/sbotools3.info | 10 --- system/sbotools3/slack-desc | 19 ------ 5 files changed, 158 deletions(-) delete mode 100644 system/sbotools3/README delete mode 100644 system/sbotools3/doinst.sh delete mode 100644 system/sbotools3/sbotools3.SlackBuild delete mode 100644 system/sbotools3/sbotools3.info delete mode 100644 system/sbotools3/slack-desc diff --git a/system/sbotools3/README b/system/sbotools3/README deleted file mode 100644 index 36df4e7fca6..00000000000 --- a/system/sbotools3/README +++ /dev/null @@ -1,21 +0,0 @@ -sbotools3 (ports-like interface to slackbuilds.org) - -sbotools3 is the continuation of sbotools. It 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, and more. - -There is a man page for each included command. For 'executive -summaries' and online man pages, see the project's home page. - -sbotools3 bundles the required Perl module Sort::Versions. This does -not interfere with a copy installed from the CPAN or from -slackbuilds.org. - -sbotools3 installs a default configuration file to -/etc/sbotools/sbotools.conf.new. Existing sbotools.conf files from -sbotools are compatible, but sbotools users may want to examine -the new file for added options and annotation. - -sbotools3 conflicts with sbotools. Uninstalling sbotools before -installing sbotools3 is recommended. diff --git a/system/sbotools3/doinst.sh b/system/sbotools3/doinst.sh deleted file mode 100644 index 0df078988a6..00000000000 --- a/system/sbotools3/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ -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/sbotools3/sbotools3.SlackBuild b/system/sbotools3/sbotools3.SlackBuild deleted file mode 100644 index 59e06a5295e..00000000000 --- a/system/sbotools3/sbotools3.SlackBuild +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -# -# Slackware build script for sbotools3 -# -# Written by Jacob Pipkin -# Altered by K. Eugene Carlson -# Licensed under the WTFPL - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sbotools3 -VERSION=${VERSION:-1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -( cd SBO3-Lib - /usr/bin/perl Makefile.PL \ - PREFIX=/usr \ - INSTALLDIRS=site \ - INSTALLVENDORMAN1DIR=/usr/man/man1 \ - INSTALLVENDORMAN3DIR=/usr/man/man3 \ - INSTALLMAN3DIR=none - make - make test - make install DESTDIR=$PKG -) - -SCRIPTS="check clean config find install remove snap upgrade" -MANS="man1 man5" - -mkdir -p $PKG/usr/sbin \ - $PKG/usr/share/zsh/site-functions \ - $PKG/usr/share/bash-completion/completions -for i in $SCRIPTS; do - 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 - 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 - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -find $PKG -depth -type d -empty -delete || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/SBO3-Lib -cp -a SBO3-Lib/README SBO3-Lib/Changes $PKG/usr/doc/$PRGNAM-$VERSION/SBO3-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/sbotools3/sbotools3.info b/system/sbotools3/sbotools3.info deleted file mode 100644 index 212bf4b7075..00000000000 --- a/system/sbotools3/sbotools3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sbotools3" -VERSION="1.1" -HOMEPAGE="https://pghvlaans.github.io/sbotools3/" -DOWNLOAD="https://pghvlaans.github.io/sbotools3/downloads/sbotools3-1.1.tar.gz" -MD5SUM="f98cb7133ea399826f679c9caf8711d2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/system/sbotools3/slack-desc b/system/sbotools3/slack-desc deleted file mode 100644 index 36c985fb8d0..00000000000 --- a/system/sbotools3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sbotools3: sbotools3 (ports-like interface to slackbuilds.org) -sbotools3: -sbotools3: sbotools3 is the continuation of sbotools. It is a set of Perl scripts -sbotools3: providing a ports-like automation interface to slackbuilds.org. -sbotools3: Features include dependency handling, using a custom git branch, -sbotools3: generating 32-bit and compat32 builds on multilib systems, and more. -sbotools3: -sbotools3: Homepage: https://pghvlaans.github.io/sbotools3/ -sbotools3: Original Author: Jacob Pipkin -sbotools3: Contributors: Luke Williams, Andreas Guldstrand -sbotools3: Maintainer: K. Eugene Carlson From 223a81f20cafbe2524a6afefc4e54f6beb40ba7d Mon Sep 17 00:00:00 2001 From: Gene Carlson Date: Fri, 22 Nov 2024 09:33:18 +0900 Subject: [PATCH 2/3] system/sbotools: New fork and maintainer, updated for version 3.0. --- system/sbotools/README | 33 ++++++++++++++++++----------- system/sbotools/doinst.sh | 14 ++++++++++++ system/sbotools/sbotools.SlackBuild | 32 ++++++++++++++++------------ system/sbotools/sbotools.info | 12 +++++------ system/sbotools/slack-desc | 16 +++++++------- 5 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 system/sbotools/doinst.sh diff --git a/system/sbotools/README b/system/sbotools/README index 35a96579976..9b7d03e167c 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 00000000000..0df078988a6 --- /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 35c7599d2fb..b3ae18a3440 100644 --- a/system/sbotools/sbotools.SlackBuild +++ b/system/sbotools/sbotools.SlackBuild @@ -1,19 +1,19 @@ #!/bin/bash # -# Slackware build script for +# Slackware build script for sbotools +# # Written by Jacob Pipkin +# Altered by K. Eugene Carlson # Licensed under the WTFPL 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 5b214041124..e2ade14777a 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 bac1d912963..ce5d8ab04ac 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 From fa49ea25f4d19073313c3268144cb9fdc39063b4 Mon Sep 17 00:00:00 2001 From: Gene Carlson Date: Fri, 22 Nov 2024 13:28:49 +0900 Subject: [PATCH 3/3] system/sbotools: Adjust README. --- system/sbotools/README | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/sbotools/README b/system/sbotools/README index 9b7d03e167c..bdcc87944b8 100644 --- a/system/sbotools/README +++ b/system/sbotools/README @@ -18,8 +18,9 @@ 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. +sbotools is incompatible with sbotools3 (which was 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