4 files changed, 26 insertions, 17 deletions
diff --git a/libraries/xmonad-contrib/README b/libraries/xmonad-contrib/README
index 8d2fabd986..6594a4f9bf 100644
--- a/libraries/xmonad-contrib/README
+++ b/libraries/xmonad-contrib/README
@@ -5,4 +5,4 @@ hooks, configurations, scripts, and other extensions to xmonad.
 
 The 'scripts' directory is copied to xmonad-contrib doc directory.
 
-This requires xmonad from SlackBuilds.org.
+This requires xmonad.
diff --git a/libraries/xmonad-contrib/slack-desc b/libraries/xmonad-contrib/slack-desc
index 53cf89111f..d24e7a7332 100644
--- a/libraries/xmonad-contrib/slack-desc
+++ b/libraries/xmonad-contrib/slack-desc
@@ -5,14 +5,14 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-              |-----handy-ruler-----------------------------------------------|
+              |-----handy-ruler------------------------------------------------------|
 xmonad-contrib: xmonad-contrib (3rd party extensions for xmonad)
 xmonad-contrib: 
-xmonad-contrib: The xmonad-contrib library collects third party tiling 
-xmonad-contrib: algorithms, hooks, configurations, scripts, and other 
-xmonad-contrib: extensions to xmonad.
+xmonad-contrib: The xmonad-contrib library collects third party tiling algorithms,
+xmonad-contrib: hooks, configurations, scripts, and other extensions to xmonad.
+xmonad-contrib: 
+xmonad-contrib: The 'scripts' directory is copied to xmonad-contrib doc directory.
 xmonad-contrib: 
-xmonad-contrib: The 'scripts' directory is copied to xmonad-contrib docdir.
 xmonad-contrib: 
 xmonad-contrib: 
 xmonad-contrib: 
diff --git a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
index 7e2e69ee06..86920a3ecc 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
+++ b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=xmonad-contrib
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.9.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,10 +18,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
@@ -41,19 +44,22 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runhaskell Setup.lhs configure \
+runghc Setup.lhs configure \
   --prefix=/usr \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared
 
-runhaskell Setup.lhs build
-runhaskell Setup.lhs copy --destdir=$PKG
-runhaskell Setup.lhs register --gen-script
+runghc Setup.lhs build
+runghc Setup.lhs haddock
+runghc Setup.lhs copy --destdir=$PKG
+runghc Setup.lhs register --gen-script
 
 ( 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
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -66,4 +72,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 mv register.sh $PKG/install/register.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/libraries/xmonad-contrib/xmonad-contrib.info b/libraries/xmonad-contrib/xmonad-contrib.info
index 34a62f0c38..d9a97b6472 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.info
+++ b/libraries/xmonad-contrib/xmonad-contrib.info
@@ -1,8 +1,10 @@
 PRGNAM="xmonad-contrib"
-VERSION="0.8.1"
+VERSION="0.9.1"
 HOMEPAGE="http://www.xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.8.1/xmonad-contrib-0.8.1.tar.gz"
-MD5SUM="03f74fda270aca759407787da73e50d9"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.9.1/xmonad-contrib-0.9.1.tar.gz"
+MD5SUM="09a6e5173878d43b9f3ddd13b3ec955b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Mikko Varri"
 EMAIL="vmj@linuxbox.fi"
 APPROVED="rworkman"