3 files changed, 28 insertions, 14 deletions
diff --git a/audio/jack-keyboard/doinst.sh b/audio/jack-keyboard/doinst.sh
index 4a25de5e6f..65c7e2eeb9 100644
--- a/audio/jack-keyboard/doinst.sh
+++ b/audio/jack-keyboard/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/audio/jack-keyboard/jack-keyboard.SlackBuild b/audio/jack-keyboard/jack-keyboard.SlackBuild
index de0c7579a1..e38c829019 100644
--- a/audio/jack-keyboard/jack-keyboard.SlackBuild
+++ b/audio/jack-keyboard/jack-keyboard.SlackBuild
@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jack-keyboard
 
-# 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.
 
+# 20211128 bkw: BUILD=2, new-style icons.
 # 20180628 bkw: update for v2.7.2.
 # 20170218 bkw: make lash optional.
 
@@ -18,10 +19,13 @@
 #   longer be used to build the old version.
 # - Add capability stuff.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jack-keyboard
 VERSION=${VERSION:-2.7.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -31,7 +35,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}
@@ -59,11 +67,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 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 {} \+
 
 case "${LASH:-auto}" in
   auto)
@@ -99,6 +104,16 @@ make install DESTDIR=$PKG
 strip $PKG/usr/bin/$PRGNAM
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size pixmaps/$PRGNAM.png $dir/$PRGNAM.png
+done
+
+rm -f $PKG/usr/share/pixmaps/*
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README* TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -116,4 +131,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/jack-keyboard/jack-keyboard.info b/audio/jack-keyboard/jack-keyboard.info
index a963622f60..3833a8ef21 100644
--- a/audio/jack-keyboard/jack-keyboard.info
+++ b/audio/jack-keyboard/jack-keyboard.info
@@ -1,10 +1,10 @@
 PRGNAM="jack-keyboard"
 VERSION="2.7.2"
 HOMEPAGE="http://jack-keyboard.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/jack-keyboard/jack-keyboard/2.7.2/jack-keyboard-2.7.2.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/jack-keyboard/jack-keyboard/2.7.2/jack-keyboard-2.7.2.tar.gz"
 MD5SUM="0d7f8a10592f242374ac028a6b1e8a15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit"
+REQUIRES="jack"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"