desktop/xfce4-xmms-plugin: Updated for version 0.5.2

4 files changed, 33 insertions, 21 deletions

diff --git a/desktop/xfce4-xmms-plugin/README b/desktop/xfce4-xmms-plugin/README
index fbfd962aae..b8a6da8bbc 100644
--- a/desktop/xfce4-xmms-plugin/README
+++ b/desktop/xfce4-xmms-plugin/README
@@ -1,2 +1,2 @@
-The xfce4-xmms-plugin lets the user control the XMMS, 
-Beep, or Audacious players from the Xfce panel.
+The xfce4-xmms-plugin lets the user control the XMMS, Beep, or 
+Audacious players from the Xfce panel.
diff --git a/desktop/xfce4-xmms-plugin/slack-desc b/desktop/xfce4-xmms-plugin/slack-desc
index 7778eaf43e..523cb0a349 100644
--- a/desktop/xfce4-xmms-plugin/slack-desc
+++ b/desktop/xfce4-xmms-plugin/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-                 |-----handy-ruler------------------------------------------|
+                 |-----handy-ruler------------------------------------------------------|
 xfce4-xmms-plugin: xfce4-xmms-plugin (XMMS xfce panel plugin)
 xfce4-xmms-plugin:
-xfce4-xmms-plugin: This panel plugin lets the user control XMMS,
-xfce4-xmms-plugin: Beep or Audacious players.
+xfce4-xmms-plugin: This panel plugin lets the user control XMMS, Beep, or Audacious
+xfce4-xmms-plugin: music players from the Xfce panel.
 xfce4-xmms-plugin:
 xfce4-xmms-plugin:
 xfce4-xmms-plugin:
diff --git a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
index b028a98873..fa6e91793b 100644
--- a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
+++ b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
-# 
+ 
 # Slackware build script for xfce4-xmms-plugin 
+
 # (C) 2007 Michael Wagner <lapinours@web.de> 
 # All rights reserved.
 #
@@ -22,44 +23,53 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xfce4-xmms-plugin
-VERSION=0.5.1
+VERSION=0.5.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/xfce \
   --disable-static \
-  || exit 1
+  --build=$ARCH-slackware-linux
   
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
@@ -67,4 +77,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info
index 68fc67e3d0..39fed70785 100644
--- a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info
+++ b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.info
@@ -1,8 +1,10 @@
 PRGNAM="xfce4-xmms-plugin"
-VERSION="0.5.1"
+VERSION="0.5.2"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin"
-DOWNLOAD="http://goodies.xfce.org/_media/projects/panel-plugins/xfce4-xmms-plugin-0.5.1.tar.bz2"
-MD5SUM="e2e48ba8f2de32e4fd7ab09083458e3f"
+DOWNLOAD="http://goodies.xfce.org/releases/xfce4-xmms-plugin/xfce4-xmms-plugin-0.5.2.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="2fe5a7d79c3aeb6c62495ce5c2cfd51c"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="dsomero"