1 files changed, 40 insertions, 28 deletions
diff --git a/desktop/mh5000/mh5000.SlackBuild b/desktop/mh5000/mh5000.SlackBuild
index 85a4e30130..89c3dda173 100644
--- a/desktop/mh5000/mh5000.SlackBuild
+++ b/desktop/mh5000/mh5000.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-#
+#!/bin/bash
+
 # Slackware build script for mh5000
 #
 # Copyright 2017  Michael Heras USA
@@ -22,10 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+
+# 20220207 bkw: BUILD=2
+# - take over as maintainer.
+# - actually use the SLKCFLAGS.
+# - move the error image to /usr/share/mh5000 (/etc is a terrible idea).
+# - don't install INSTALL in doc dir.
+# - rewrite README and slack-desc. the spelling and grammar errors
+#   were just too much for me.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mh5000
 VERSION=${VERSION:-1.3.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +48,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}
@@ -63,32 +80,27 @@ 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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-make
-
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/etc/mh5000
-install -m755 mh5000 $PKG/usr/bin
-#install needed error image
-install -m755 image/opps_try_001.jpg $PKG/etc/mh5000
-# Install the manpage
-install -Dm644 mh5000.1 $PKG/usr/man/man1/mh5000.1
-
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL ChangeLog README  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20220207 bkw: permissions are terrifyingly bad!
+find . -type f -exec chmod 644 {} \+
+find . -type d -exec chmod 755 {} \+
+
+# 20220207 bkw: this doesn't belong in /etc
+sed -i 's,/etc/mh5000,/usr/share/mh5000,' img.cpp
+
+make CXX="g++ $SLKCFLAGS"
+
+mkdir -p $PKG/usr/{bin,share/$PRGNAM,man/man1}
+install -s -m0755 $PRGNAM $PKG/usr/bin
+install -m0644 image/* $PKG/usr/share/$PRGNAM
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 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