2 files changed, 41 insertions, 26 deletions
diff --git a/audio/drumkv1/drumkv1.SlackBuild b/audio/drumkv1/drumkv1.SlackBuild
index e42e448d68..1896d87a68 100644
--- a/audio/drumkv1/drumkv1.SlackBuild
+++ b/audio/drumkv1/drumkv1.SlackBuild
@@ -1,11 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for drumkv1
 
-# 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.
 
+# 20230629 bkw: update for 0.9.31
+# 20230108 bkw: update for 0.9.28
+# 20211205 bkw: update for 0.9.23
 # 20201106 bkw: update for 0.9.18
 # 20200114 bkw: update for 0.9.12
 # 20191210 bkw: update for 0.9.11, document optional liblo dep, have slack-desc
@@ -19,10 +22,13 @@
 # 20170627 bkw: update for 0.8.3
 # 20170614 bkw: update for 0.8.2, drop qt5 dep, build with qt4
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=drumkv1
-VERSION=${VERSION:-0.9.18}
+VERSION=${VERSION:-0.9.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +38,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}
@@ -65,23 +75,24 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 export PATH=/usr/lib$LIBDIRSUFFIX/qt5/bin:$PATH
 
-LDFLAGS="-Wl,-s" \
-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 DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+
+gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/fr/man1/*
 
 # I dunno what this is actually for, but as of 0.8.5 it got moved. Move
 # it back to where it belongs, for Slack 14.2.
+# 20230108 bkw: TODO: find out which is the right place. Various SBo
+# packages put .xml files in one or the other dir.
 [ -d $PKG/usr/share/metainfo ] && \
   mv $PKG/usr/share/metainfo $PKG/usr/share/appdata
 
@@ -100,13 +111,17 @@ for i in man1 fr/man1 fr.UTF-8/man1; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog* README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 LIBLO=no
 LV2=no
 ldd $PKG/usr/bin/${PRGNAM}_jack | grep -q liblo && LIBLO=yes
-[ -e $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2 ] && LV2=yes
+if [ -e $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2 ]; then
+  LV2=yes
+  # 20230629 bkw: just a nitpick, but shared libs are supposed to be +x:
+  chmod +x $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2/*.so
+fi
 
 mkdir -p $PKG/install
 sed -e "s,@LIBLO@,$LIBLO," -e "s,@LV2@,$LV2," $CWD/slack-desc \
@@ -120,4 +135,4 @@ if [ "${SETCAP:-yes}" = "yes" ]; then
 fi
 
 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
diff --git a/audio/drumkv1/drumkv1.info b/audio/drumkv1/drumkv1.info
index 7c787bab14..71e37f3ced 100644
--- a/audio/drumkv1/drumkv1.info
+++ b/audio/drumkv1/drumkv1.info
@@ -1,10 +1,10 @@
 PRGNAM="drumkv1"
-VERSION="0.9.18"
+VERSION="0.9.31"
 HOMEPAGE="https://drumkv1.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/drumkv1/drumkv1/0.9.18/drumkv1-0.9.18.tar.gz"
-MD5SUM="c09af8aee0ae2be7ecb5d6d2533bb2af"
+DOWNLOAD="https://downloads.sourceforge.net/project/drumkv1/drumkv1/0.9.31/drumkv1-0.9.31.tar.gz"
+MD5SUM="7be554faa231d3c84ce224e0e0883c52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack qt5"
+REQUIRES="jack"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"