4 files changed, 26 insertions, 18 deletions
diff --git a/audio/xmms-jack/README b/audio/xmms-jack/README
index eb97c75af9..37c94c77b4 100644
--- a/audio/xmms-jack/README
+++ b/audio/xmms-jack/README
@@ -1,3 +1,7 @@
-xmms-jack (xmms output plugin for jack-audio-connection-kit)
+xmms-jack (xmms output plugin for jack)
 
 Allows XMMS to send audio to the JACK server.
+
+To enable: After installing, start xmms and press control-P for
+Preferences. On the Audio I/O tab, under Output Plugin, select "jack
+Driver".
diff --git a/audio/xmms-jack/slack-desc b/audio/xmms-jack/slack-desc
index 8f896c7fca..6f93dad63c 100644
--- a/audio/xmms-jack/slack-desc
+++ b/audio/xmms-jack/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-xmms-jack: xmms-jack (xmms output plugin for jack-audio-connection-kit)
+xmms-jack: xmms-jack (xmms output plugin for jack)
 xmms-jack:
 xmms-jack: Allows XMMS to send audio to the JACK server.
 xmms-jack:
diff --git a/audio/xmms-jack/xmms-jack.SlackBuild b/audio/xmms-jack/xmms-jack.SlackBuild
index 5725a84cf9..3d32df0cd6 100644
--- a/audio/xmms-jack/xmms-jack.SlackBuild
+++ b/audio/xmms-jack/xmms-jack.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xmms-jack
 
-# 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.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xmms-jack
 VERSION=${VERSION:-0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,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}
@@ -44,14 +51,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz?viasf=1
 cd $PRGNAM
 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 640 -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 {} \+
 
 # namespace conflict with newer libjack
 sed -i 's,jack_free,jack_buf_free,g' jack.c
@@ -73,12 +78,11 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README ChangeLog NEWS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/xmms-jack/xmms-jack.info b/audio/xmms-jack/xmms-jack.info
index 380380a7c8..033e94f3ab 100644
--- a/audio/xmms-jack/xmms-jack.info
+++ b/audio/xmms-jack/xmms-jack.info
@@ -1,10 +1,10 @@
 PRGNAM="xmms-jack"
 VERSION="0.19"
-HOMEPAGE="http://xmms.org/plugins.php?details=41"
-DOWNLOAD="http://downloads.sourceforge.net/project/xmms-jack/xmms-jack/xmms-jack-0.19/xmms-jack-0.19.tar.gz"
+HOMEPAGE="https://xmms-jack.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/xmms-jack/xmms-jack/xmms-jack-0.19/xmms-jack-0.19.tar.gz?viasf=1"
 MD5SUM="3e3ed2e3ca4a4ca558b43e1b8e3a83d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit"
+REQUIRES="jack"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"