4 files changed, 28 insertions, 27 deletions
diff --git a/development/muon/README b/development/muon/README
index 0972d2a13b787..61a65834059b3 100644
--- a/development/muon/README
+++ b/development/muon/README
@@ -1,3 +1,6 @@
-muon is an implementation of the meson build system in c99 with
-minimal dependencies.
+muon (implementation of the meson build system)
 
+muon is an implementation of the meson build system in c99 with
+minimal dependencies. It isn't quite a drop-in replacement for the
+standard meson command; specifically, it doesn't support the
+"meson .." syntax used in most SlackBuild scripts.
diff --git a/development/muon/muon.SlackBuild b/development/muon/muon.SlackBuild
index d9a9813fcff94..4c913fb6a3a91 100644
--- a/development/muon/muon.SlackBuild
+++ b/development/muon/muon.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for muon
 
 # Copyright 2023 Charadon US
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230829 bkw: BUILD=2
+# - take over maintenance.
+# - add a couple *.md files to the doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=muon
 VERSION=${VERSION:-0.2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +43,6 @@ case "$( uname -m )" in
 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
@@ -70,14 +72,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
+
+# There isn't a URL that gives the same filename with or without
+# content-disposition...
 tar xvf $CWD/$VERSION.tar.gz || 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 {} +
 
 mkdir build
 cd build
@@ -105,17 +108,12 @@ cd build
   DESTDIR=$PKG $NINJA install
 cd ..
 
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
+gzip -9 $PKG/usr/man/man*/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a *.md LICENSES/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/muon/muon.info b/development/muon/muon.info
index b7380c1d39d2e..3b4fc8c7afd11 100644
--- a/development/muon/muon.info
+++ b/development/muon/muon.info
@@ -6,5 +6,5 @@ MD5SUM="979c60b157018a34bb552dea830bb67e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pkgconf scdoc"
-MAINTAINER="Charadon"
-EMAIL="dev@iotib.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/development/muon/slack-desc b/development/muon/slack-desc
index f60271aeeca5e..6ddf0ed4ad159 100644
--- a/development/muon/slack-desc
+++ b/development/muon/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-muon: muon (Implementation of the meson build system in c99)
+muon: muon (implementation of the meson build system)
 muon:
 muon: muon is an implementation of the meson build system in c99 with
-muon: minimal dependencies.
-muon:
-muon:
+muon: minimal dependencies. It isn't quite a drop-in replacement for the
+muon: standard meson command; specifically, it doesn't support the
+muon: "meson .." syntax used in most SlackBuild scripts.
 muon:
 muon:
 muon: