1 files changed, 24 insertions, 11 deletions
diff --git a/development/dhex/dhex.SlackBuild b/development/dhex/dhex.SlackBuild
index 7eacb8a664..4715fa8149 100644
--- a/development/dhex/dhex.SlackBuild
+++ b/development/dhex/dhex.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dhex
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210829 bkw: BUILD=2, fix typos in docs/src, fix grammar in docs.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dhex
-VERSION=${VERSION:-0.68}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.69}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -47,11 +56,15 @@ 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20210829 bkw: patch borrowed from Debian, with thanks.
+patch -p1 < $CWD/010_fix-typos.patch
+
+# 20210829 bkw: the above patch doesn't address the weird grammar
+# in the man pages (use of "being" as a noise-word). So:
+sed -i 's,\(is\|are\) *being,\1,g' $PRGNAM.1 *.5
 
 sed -i -e 's,-O3,'"$SLKCFLAGS"',' -e 's,share/man,man,' Makefile
 make LDFLAGS="-L/usr/lib$LIBDIRSUFFIX"
@@ -70,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE