3 files changed, 49 insertions, 43 deletions
diff --git a/multimedia/xmms-crossfade/README b/multimedia/xmms-crossfade/README
index 3272c8660c..d91aea033f 100644
--- a/multimedia/xmms-crossfade/README
+++ b/multimedia/xmms-crossfade/README
@@ -5,34 +5,36 @@ smoothly crossfade inbetween.
 
 Features:
  
-    * Crossfading
-      Crossfade between two songs, i.e. fade out the end of the current song 
-      while fading in the beginning of the next for a smooth transition. Length 
-      and volume of the fadings can be adjusted separately for fading in and 
-      out.
-    
-    * Fadein/Fadeout
-      Smoothly fadein/fadeout at the beginning or end of playback.
-
-    * Continuous output
-      Keeps the audio device opened when switching from one song to the next. 
-      When used with the Gap-Killer, this allows for seamless playback of whole 
-      albums without any audible interruption between the tracks.
-
-    * Gap-Killer
-      Removes the short gaps of silence at the beginning and/or end of mp3 
-      files. These gaps are caused by some mp3-encoders.
-
-    * Automatic detection of live albums
-      Automatically detects live albums and pre-mixed tracks which already are 
-      crossfaded. For those tracks, crossfading can be disabled automatically.
-
-    * High quality
-      XMMS-crossfade can take special care to avoid the clicks some 
-      soundcards produce when suddenly being stopped. Also, it can improve 
-      quality when seeking within a song.
-
-    * Secondary effect plugin:
-      XMMS-crossfade allows you to select a second effect plugin. This is 
-      usefull for example when using the volume normalizing plugin together 
-      with the icecast plugin.
+* Crossfading
+  Crossfade between two songs, i.e. fade out the end of the current
+  song while fading in the beginning of the next for a smooth
+  transition. Length and volume of the fadings can be adjusted
+  separately for fading in and out.
+
+* Fadein/Fadeout
+  Smoothly fadein/fadeout at the beginning or end of playback.
+
+* Continuous output
+  Keeps the audio device opened when switching from one song to
+  the next.  When used with the Gap-Killer, this allows for seamless
+  playback of whole albums without any audible interruption between
+  the tracks.
+
+* Gap-Killer
+  Removes the short gaps of silence at the beginning and/or end of mp3
+  files. These gaps are caused by some mp3-encoders.
+
+* Automatic detection of live albums
+  Automatically detects live albums and pre-mixed tracks which already
+  are crossfaded. For those tracks, crossfading can be disabled
+  automatically.
+
+* High quality
+  XMMS-crossfade can take special care to avoid the clicks some
+  soundcards produce when suddenly being stopped. Also, it can improve
+  quality when seeking within a song.
+
+* Secondary effect plugin:
+  XMMS-crossfade allows you to select a second effect plugin. This is
+  useful for example when using the volume normalizing plugin together
+  with the icecast plugin.
diff --git a/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild b/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
index 4dc4e8e6b9..bc7fae0883 100644
--- a/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
+++ b/multimedia/xmms-crossfade/xmms-crossfade.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xmms-crossfade
 
 # Written by Luis Henrique <email removed>
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -17,10 +17,13 @@
 # XMMS don't seem to matter: I can't get it to segfault in the ways
 # described. If anyone does have segfaults, please let me know.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xmms-crossfade
 VERSION=${VERSION:-0.3.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +33,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}
@@ -60,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 {} \+
 
 LDFLAGS="-Wl,-s" \
 CFLAGS="$SLKCFLAGS -fgnu89-inline" \
@@ -95,4 +99,4 @@ 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/multimedia/xmms-crossfade/xmms-crossfade.info b/multimedia/xmms-crossfade/xmms-crossfade.info
index 1b82ba026b..132507b588 100644
--- a/multimedia/xmms-crossfade/xmms-crossfade.info
+++ b/multimedia/xmms-crossfade/xmms-crossfade.info
@@ -1,10 +1,10 @@
 PRGNAM="xmms-crossfade"
 VERSION="0.3.14"
-HOMEPAGE="http://www.eisenlohr.org/xmms-crossfade"
-DOWNLOAD="http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-0.3.14.tar.gz"
+HOMEPAGE="https://www.eisenlohr.org/xmms-crossfade"
+DOWNLOAD="https://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-0.3.14.tar.gz"
 MD5SUM="026c52544c7f3193d384288c9f8296aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"