4 files changed, 18 insertions, 11 deletions
diff --git a/audio/gimmix/README b/audio/gimmix/README
index 0799befad3bdb..3fee3e58a4412 100644
--- a/audio/gimmix/README
+++ b/audio/gimmix/README
@@ -2,8 +2,7 @@ Gimmix is a graphical music player daemon (MPD) client written in C
 using GTK+2. It's very simple and easy to use, yet offers many features 
 to make your audio experience a pleasant one.
 
-libmpd and libnxml are required to build this application; both are
-available at SlackBuilds.org.
+This requires libmpd and libnxml.
 
 NOTE : Please edit the SlackBuild file if you do not want the cover
 and lyrics plugins.
diff --git a/audio/gimmix/gimmix.SlackBuild b/audio/gimmix/gimmix.SlackBuild
index 6e7ac01afacc4..c134c6763028b 100644
--- a/audio/gimmix/gimmix.SlackBuild
+++ b/audio/gimmix/gimmix.SlackBuild
@@ -16,10 +16,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
@@ -43,6 +46,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -56,8 +60,10 @@ 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 || true
-  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 || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -66,8 +72,9 @@ make install DESTDIR=$PKG
 )
 
 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
@@ -75,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/audio/gimmix/gimmix.info b/audio/gimmix/gimmix.info
index a05f5a9866456..032877122b68f 100644
--- a/audio/gimmix/gimmix.info
+++ b/audio/gimmix/gimmix.info
@@ -3,6 +3,8 @@ VERSION="0.5.3"
 HOMEPAGE="http://gimmix.berlios.de/"
 DOWNLOAD="http://download.berlios.de/gimmix/gimmix-0.5.3.tar.bz2"
 MD5SUM="3b190ef8e56f8887595d2dc0eeffe3cc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Kristaps Esterlins"
 EMAIL="esterlins@gmail.com"
 APPROVED="rworkman"
diff --git a/audio/gimmix/slack-desc b/audio/gimmix/slack-desc
index 487f0ed843778..4410594823e31 100644
--- a/audio/gimmix/slack-desc
+++ b/audio/gimmix/slack-desc
@@ -7,14 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 gimmix: gimmix (graphical frontend to music player daemon [mpd])
-gimmix: 
+gimmix:
 gimmix: Gimmix is a graphical music player daemon (MPD) client written 
 gimmix:	in C using GTK+2. It's very simple and easy to use, yet offers 
 gimmix:	many features to make your audio experience a pleasant one. 
-gimmix: 
-gimmix: 
 gimmix:
 gimmix:
 gimmix:
 gimmix:
-
+gimmix:
+gimmix: