1 files changed, 12 insertions, 18 deletions
diff --git a/system/cpmtools/cpmtools.SlackBuild b/system/cpmtools/cpmtools.SlackBuild
index 81265004e5cb2..0a34b57dd3247 100644
--- a/system/cpmtools/cpmtools.SlackBuild
+++ b/system/cpmtools/cpmtools.SlackBuild
@@ -6,8 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201102 bkw:
+# - Updated for v2.21. Can't build older versions, sorry.
+# - Switch to freebsd distfile source, as upstream vanishes the old
+#   source immediately upon a new release.
+
 PRGNAM=cpmtools
-VERSION=${VERSION:-2.20}
+VERSION=${VERSION:-2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,11 +52,8 @@ 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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -64,19 +66,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
-# make install fails to create these. Grr.
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/man/man5 $PKG/usr/share
-
-# really old configure script, no DESTDIR support. "autoreconf -fi" fails
-# to build a new configure script, too.
-make install prefix=$PKG/usr exec_prefix=$PKG/usr MANDIR=$PKG/usr/man
-
-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
+# 'make install' fails to create this:
+mkdir -p $PKG/usr/share/diskdefs
 
-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
+make install DESTDIR=$PKG # binaries already stripped, yay!
+gzip $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README NEWS COPYING $PKG/usr/doc/$PRGNAM-$VERSION