3 files changed, 32 insertions, 19 deletions
diff --git a/desktop/xfce4-diskperf-plugin/slack-desc b/desktop/xfce4-diskperf-plugin/slack-desc
index 19470d7692bed..76c62ae96a59e 100644
--- a/desktop/xfce4-diskperf-plugin/slack-desc
+++ b/desktop/xfce4-diskperf-plugin/slack-desc
@@ -7,13 +7,13 @@
 
                      |-----handy-ruler------------------------------------------------------|
 xfce4-diskperf-plugin: xfce4-diskperf-plugin (diskperf plugin for the Xfce panel)
-xfce4-diskperf-plugin: 
+xfce4-diskperf-plugin:
 xfce4-diskperf-plugin: The diskperf plugin displays instant disk/partition
 xfce4-diskperf-plugin: performance (bytes transferred per second).
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
-xfce4-diskperf-plugin: 
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
+xfce4-diskperf-plugin:
diff --git a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
index 19e0a13a1038f..60fb2ecfbd1cc 100644
--- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
+++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-diskperf-plugin
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xfce4-diskperf-plugin
-VERSION=2.1.0
+VERSION=2.2.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -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
@@ -58,25 +63,31 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/xfce \
   --enable-shared=yes \
   --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 \
-  $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
 
 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-diskperf-plugin/xfce4-diskperf-plugin.info b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info
index 4c924308d00df..36fee5153c842 100644
--- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info
+++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.info
@@ -1,8 +1,10 @@
 PRGNAM="xfce4-diskperf-plugin"
-VERSION="2.1.0"
+VERSION="2.2.0"
 HOMEPAGE="http://goodies.xfce.org/"
-DOWNLOAD="http://goodies.xfce.org/releases/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.1.0.tar.bz2"
-MD5SUM="fc74a0c7d2b9486cdb704a072cd72b83"
+DOWNLOAD="http://goodies.xfce.org/releases/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="e970158fcac5b58bdc1539bc84d7b5ec"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Erik Hanson"