4 files changed, 14 insertions, 13 deletions
diff --git a/libraries/xmonad-contrib/README b/libraries/xmonad-contrib/README
index 6594a4f9bf..a1f3a46184 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.
+This requires xmonad and haskell-utf8-string.
diff --git a/libraries/xmonad-contrib/doinst.sh b/libraries/xmonad-contrib/doinst.sh
index 87825cdcca..2a44817807 100644
--- a/libraries/xmonad-contrib/doinst.sh
+++ b/libraries/xmonad-contrib/doinst.sh
@@ -1,4 +1,2 @@
-chroot . sh /install/register.sh
-rm -f install/register.sh
-rmdir install 2>/dev/null
+chroot . /usr/bin/ghc-pkg recache
 
diff --git a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
index 08f2270e64..12b82cd8e0 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
+++ b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
@@ -2,20 +2,20 @@
 
 # Slackware build script for xmonad-contrib
 
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
 # Public domain.
 
 PRGNAM=xmonad-contrib
 VERSION=${VERSION:-0.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+GHC_VERSION=$(ghc --numeric-version)
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -65,7 +65,12 @@ runghc Setup.lhs configure \
 runghc Setup.lhs build
 runghc Setup.lhs haddock
 runghc Setup.lhs copy --destdir=$PKG
-runghc Setup.lhs register --gen-script
+runghc Setup.lhs register --gen-pkg-config
+
+PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
+PKGID=$( grep -E "^id: " $PRGNAM-$VERSION.conf | cut -d" " -f2 )
+mkdir -p $PKG/$PKGCONFD
+mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -77,8 +82,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 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.${PKGTYPE:-tgz}
-
diff --git a/libraries/xmonad-contrib/xmonad-contrib.info b/libraries/xmonad-contrib/xmonad-contrib.info
index d9a97b6472..a0a7f6177b 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.info
+++ b/libraries/xmonad-contrib/xmonad-contrib.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.9.1/xmona
 MD5SUM="09a6e5173878d43b9f3ddd13b3ec955b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"