6 files changed, 45 insertions, 24 deletions
diff --git a/audio/azr3/README b/audio/azr3/README
index ce7fbcaa19..97bc738156 100644
--- a/audio/azr3/README
+++ b/audio/azr3/README
@@ -10,8 +10,6 @@ sections respond to events on MIDI channel 1 and 2, and an optional
 keyboard split function makes the bass section listen to the lower
 keys on channel 1.
 
-This requires one of the jack varieties.
-
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing).
 This may be considered a security/stability risk. Please read
diff --git a/audio/azr3/azr3.SlackBuild b/audio/azr3/azr3.SlackBuild
index 102196de83..a2420f6c4f 100644
--- a/audio/azr3/azr3.SlackBuild
+++ b/audio/azr3/azr3.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for azr3
 
-# Written by B. Watson (yalhcru@gmail.com)
-# Copyright 2019  Johannes Schoepfer, Germany
+# Written by B. Watson (urchlay@slackware.uk)
+# Copyright 2020  Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=azr3
 VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,11 +102,20 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 # .desktop file written for this SlackBuild
 mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat << EOF > $PKG/usr/share/applications/$PRGNAM.desktop
+[Desktop Entry]
+Name=AZR-3
+Comment=Tonewheel Organ for JACK
+Exec=azr3
+Icon=azr3
+Terminal=false
+Type=Application
+Categories=AudioVideo;Audio;
+EOF
 
 # icon is a small piece gimped out of panelfx.png
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/patches/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 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
@@ -111,11 +130,23 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+cd $PKG
 if [ "${SETCAP:-yes}" = "yes" ]; then
-  echo "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$PRGNAM" >> $PKG/install/doinst.sh
-  chown root:audio $PKG/usr/bin/$PRGNAM
-  chmod 0750 $PKG/usr/bin/$PRGNAM
+  for bin in $(find . -type f -exec file '{}' + | grep " ELF .* executable, " | cut -f 1 -d : ); do
+    [ -n "$(readelf -d $bin | grep libjack.so)" ] && jackbin+=" $bin"
+  done
+  if [ -n "$jackbin" ]; then
+    for file in $jackbin; do
+      chown root:audio $PKG/$file
+      chmod 0750 $PKG/$file
+    done
+	cat <<- EOF >> $PKG/install/doinst.sh
+	if [ -x /sbin/setcap ]; then
+	  for file in$jackbin; do
+	    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep \$file
+	  done
+	fi
+	EOF
+  fi
 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/azr3/azr3.desktop b/audio/azr3/azr3.desktop
deleted file mode 100644
index 63e1e420b8..0000000000
--- a/audio/azr3/azr3.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AZR-3
-Comment=Tonewheel Organ for JACK
-Exec=azr3
-Icon=azr3
-Terminal=false
-Type=Application
-Categories=AudioVideo;Audio;
diff --git a/audio/azr3/azr3.info b/audio/azr3/azr3.info
index 40515b2408..8f208d673c 100644
--- a/audio/azr3/azr3.info
+++ b/audio/azr3/azr3.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.savannah.nongnu.org/releases/ll-plugins/azr3-jack-1.2
 MD5SUM="aa71715e5873aea724713be5970ebfbc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit"
+REQUIRES="jack"
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds@schoepfer.info"
diff --git a/audio/azr3/azr3.png b/audio/azr3/patches/azr3.png
index c9b360e255..c9b360e255 100644
--- a/audio/azr3/azr3.png
+++ b/audio/azr3/patches/azr3.png
diff --git a/audio/azr3/slack-desc b/audio/azr3/slack-desc
index 09920d7789..98967091a7 100644
--- a/audio/azr3/slack-desc
+++ b/audio/azr3/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-azr3: azr3 (tonewheel organ simulator for jack-audio-connection-kit)
+azr3: azr3 (tonewheel organ simulator for jack)
 azr3:
 azr3: azr3 is a JACK port of the free VST plugin AZR-3. It is a tonewheel
 azr3: organ with drawbars, distortion and rotating speakers. The original