3 files changed, 28 insertions, 14 deletions
diff --git a/desktop/xfce4-volstatus-icon/slack-desc b/desktop/xfce4-volstatus-icon/slack-desc
index 29d1941def0b6..714a23658208e 100644
--- a/desktop/xfce4-volstatus-icon/slack-desc
+++ b/desktop/xfce4-volstatus-icon/slack-desc
@@ -7,13 +7,13 @@
 
                     |-----handy-ruler------------------------------------------------------|
 xfce4-volstatus-icon: xfce4-volstatus-icon (Volume Status Icon for Xfce)
-xfce4-volstatus-icon: 
+xfce4-volstatus-icon:
 xfce4-volstatus-icon: This is a program that sits around and does nothing 
 xfce4-volstatus-icon: until a removable volume is inserted, and then it 
 xfce4-volstatus-icon: becomes an icon in the systray, which allows you to
 xfce4-volstatus-icon: easily (and safely) unmount/eject the volume.
-xfce4-volstatus-icon: 
-xfce4-volstatus-icon: 
-xfce4-volstatus-icon: 
-xfce4-volstatus-icon: 
-xfce4-volstatus-icon: 
+xfce4-volstatus-icon:
+xfce4-volstatus-icon:
+xfce4-volstatus-icon:
+xfce4-volstatus-icon:
+xfce4-volstatus-icon:
diff --git a/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.SlackBuild b/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.SlackBuild
index 5294ced29e307..c2961b0680f89 100644
--- a/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.SlackBuild
+++ b/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-volstatus-icon 
 
-# Copyright 2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2007-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,8 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 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
@@ -45,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -58,24 +63,31 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc/xfce \
   --enable-static=no \
-  --enable-debug=no
+  --enable-debug=no \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+    $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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.info b/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.info
index ffdca7c47fc5c..cff35e14df5e5 100644
--- a/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.info
+++ b/desktop/xfce4-volstatus-icon/xfce4-volstatus-icon.info
@@ -2,7 +2,9 @@ PRGNAM="xfce4-volstatus-icon"
 VERSION="0.1.0"
 HOMEPAGE="http://goodies.xfce.org/"
 DOWNLOAD="http://goodies.xfce.org/releases/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="b7848ebda5ce86810bd6dc27b915e192"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Erik Hanson"