2 files changed, 30 insertions, 23 deletions
diff --git a/audio/a2jmidid/README b/audio/a2jmidid/README
index 8c20991b22..7405b92086 100644
--- a/audio/a2jmidid/README
+++ b/audio/a2jmidid/README
@@ -1,10 +1,14 @@
 This project aims to ease the usage of legacy, non JACK enabled
-applications, in a JACK MIDI enabled system, when using jack2.
+applications, in a JACK MIDI enabled system, when using jack2 or
+jack-audio-connection kit.
 
-Typical usecase is e.g. to connect bristol/azr3 with qtractor/seq24.
+Typical usecase is to e.g. connect a software synth like
+bristol/azr3 with qtractor/seq24, or even connect midi hardware
+with jack applications.
+The jack-audio-connection kit already contains parts of the
+a2jmidid code.
 
-Note: The latest jack-audio-connection-kit release contains a2jmidid
-functionality by itself.
+This requires one of the jack varieties.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/a2jmidid/a2jmidid.SlackBuild b/audio/a2jmidid/a2jmidid.SlackBuild
index 47c531a305..24a7240ee0 100644
--- a/audio/a2jmidid/a2jmidid.SlackBuild
+++ b/audio/a2jmidid/a2jmidid.SlackBuild
@@ -43,24 +43,30 @@ 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 {} \;
+ \( -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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-meson \
-  --prefix=/usr \
-  build
-ninja -C build
-DESTDIR=$PKG meson install -C build
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# move man pages to correct location
-mv $PKG/usr/share/man $PKG/usr/
 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
 
@@ -73,17 +79,14 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Only add capability stuff if not disabled:
 if [ "${SETCAP:-yes}" = "yes" ]; then
-  # set realtime capabilities 
   for i in \
     a2j_control j2amidi_bridge a2jmidi_bridge a2j a2jmidid
-  do 
+  do
     echo "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$i" >> $PKG/install/doinst.sh
+    chown root:audio $PKG/usr/bin/$i
+    chmod 0750 $PKG/usr/bin/$i
   done
-  # Only allow execution by audio group
-  chown root:audio $PKG/usr/bin/*
-  chmod 0750 $PKG/usr/bin/*
 fi
 
 cd $PKG