1 files changed, 37 insertions, 15 deletions
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index de14e35b3e..6d81523689 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=xmonad
-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,22 +44,47 @@ 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 \
+  --flags="-threaded -dynamic"
 
-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
+
+# Move the example config file
+mv $PKG/usr/share/$PRGNAM-$VERSION/man $PKG/usr/doc/$PRGNAM-$VERSION/man
+rmdir $PKG/usr/share/$PRGNAM-$VERSION
+rmdir $PKG/usr/share
+
+# Copy the man page
+mkdir -p $PKG/usr/man/man1
+cp man/xmonad.1 $PKG/usr/man/man1/xmonad.1
+chmod 644 $PKG/usr/man/man1/xmonad.1
+chown root.root $PKG/usr/man/man1/xmonad.1
+
+# Add X startup script
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.xmonad > $PKG/etc/X11/xinit/xinitrc.xmonad
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.xmonad
 
 ( 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
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
+cp -a CONFIG README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -64,11 +92,5 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 mv register.sh $PKG/install/register.sh
 
-# Add X startup script
-mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.xmonad > $PKG/etc/X11/xinit/xinitrc.xmonad
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.xmonad
-
 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}