1 files changed, 23 insertions, 18 deletions
diff --git a/development/xtruss/xtruss.SlackBuild b/development/xtruss/xtruss.SlackBuild
index f3ed5bd231..ec340a3f36 100644
--- a/development/xtruss/xtruss.SlackBuild
+++ b/development/xtruss/xtruss.SlackBuild
@@ -7,8 +7,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20210907 bkw:
-# - update for v20210225.2addd50
+# 20230103 bkw: update for v20211025.c25bf48. can't build older versions
+# as upstream has switched to cmake.
+
+# 20210907 bkw: update for v20210225.2addd50
 
 # 20201102 bkw:
 # - update for v20200918.a94a153
@@ -18,7 +20,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xtruss
-VERSION=${VERSION:-20210225.2addd50}
+VERSION=${VERSION:-20211025.c25bf48}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -40,6 +42,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Note: upstream default adds -O3 after our flags :(
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -66,21 +69,23 @@ chown -R root:root .
 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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man?/*.?
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# 20230103 bkw: to avoid having halibut as a dependency, use a
+# prebuilt man page.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# in case halibut actually is installed (nothing in /usr/share but man/)
+rm -rf $PKG/usr/share
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION