games/ztools: Fix -current build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

3 files changed, 17 insertions, 22 deletions

diff --git a/games/ztools/README b/games/ztools/README
index 2c17e525360b..4497c3c99d4c 100644
--- a/games/ztools/README
+++ b/games/ztools/README
@@ -11,6 +11,6 @@ zrename - rename z-code story files according to their z-machine version
 zcheck and zdebugtool have been renamed, as "check" and "debugtool" are
 very generic names, likely to conflict with some other package.
 
-zcut, zdebugtool, and zrename are normally distributed separately. They're
-included in this build because they're too small to justify separate
-builds, yet too useful for a Z-Code developer to do without.
+zcut, zdebugtool, and zrename are normally distributed separately.
+They're included in this build because they're too small to justify
+separate builds, yet too useful for a Z-Code developer to do without.
diff --git a/games/ztools/ztools.SlackBuild b/games/ztools/ztools.SlackBuild
index 5ce982c46e44..88dd2f47c6d6 100644
--- a/games/ztools/ztools.SlackBuild
+++ b/games/ztools/ztools.SlackBuild
@@ -6,11 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211010 bkw: BUILD=2, fix -current build (lha => lhasa caused breakage)
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ztools
 VERSION=${VERSION:-7.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -62,19 +61,15 @@ mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
 # extract 'em all first. None of these have a top-level dir in
-# their archive. Also DebugTools was lha'ed on an Amiga, causing
-# filename weirdness (Makefile => srcMakefile, etc).
+# their archive.
 mkdir -p $PRGNAM zcut zdebugtool
 ( cd $PRGNAM && tar xvf $CWD/$PRGNAM$TARVER.tar.gz )
 ( cd zcut && unzip $CWD/zcut$ZCUTVER.zip )
-( cd zdebugtool && lha x $CWD/DebugTool_$ZDEBUGVER.lha && rename src '' src* )
+( cd zdebugtool && lha x $CWD/DebugTool_$ZDEBUGVER.lha )
 
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 BINDIR=$PKG/usr/bin
 DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
@@ -111,13 +106,13 @@ cd zcut
   ln -s zcut.1.gz $MANDIR/unmfm.1.gz
 cd ..
 
-cd zdebugtool
+cd zdebugtool/src
   patch -p1 < $PATCHDIR/zdebugtool-compilefix.diff
   make CFLAGS="$SLKCFLAGS"
   install -s -m0755 zdebugtool $BINDIR
-  # man page reconstituted from preformatted DebugTools.man
+  # man page reconstituted from preformatted DebugTool.man
   gzip -9c < $CWD/zdebugtool.1 > $MANDIR/zdebugtool.1.gz
-cd ..
+cd ../..
 
 # Also include my own modest z-code utility. It replaces the zren.exe
 # that ships with zcut.
diff --git a/games/ztools/ztools.info b/games/ztools/ztools.info
index 97115177b6f3..a41f1fe08335 100644
--- a/games/ztools/ztools.info
+++ b/games/ztools/ztools.info
@@ -1,9 +1,9 @@
 PRGNAM="ztools"
 VERSION="7.3.1"
-HOMEPAGE="http://ifarchive.org/indexes/if-archiveXinfocomXtoolsXztools.html"
-DOWNLOAD="http://ifarchive.org/if-archive/infocom/tools/ztools/ztools731.tar.gz \
-          http://www.ifarchive.org/if-archive/infocom/tools/zcut12.zip \
-          http://www.ifarchive.org/if-archive/infocom/tools/DebugTool_111.lha \
+HOMEPAGE="https://ifarchive.org/indexes/if-archiveXinfocomXtoolsXztools.html"
+DOWNLOAD="https://ifarchive.org/if-archive/infocom/tools/ztools/ztools731.tar.gz \
+          https://www.ifarchive.org/if-archive/infocom/tools/zcut12.zip \
+          https://www.ifarchive.org/if-archive/infocom/tools/DebugTool_111.lha \
           https://slackware.uk/~urchlay/src/zrename"
 MD5SUM="f5e6abb7011817e48debee828895a500 \
         c815ced0706fc6454bea18d0046c5afe \