summaryrefslogtreecommitdiff
path: root/desktop/xmonad/xmonad.SlackBuild
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2012-02-12 00:42:41 -0600
committerNiels Horn <niels.horn@slackbuilds.org>2012-02-18 09:12:28 -0200
commitc29c4ce85e1a566f4f7715cc9aa6dc2093f9a940 (patch)
treedc2f5627bb7e7b82777798a022192277ddaaab6d /desktop/xmonad/xmonad.SlackBuild
parenta28ae558d91ab165dfd34677a99938963d6813a5 (diff)
downloadslackbuilds-c29c4ce85e1a566f4f7715cc9aa6dc2093f9a940.tar.gz
desktop/xmonad: Updated for version 0.10.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/xmonad/xmonad.SlackBuild')
-rw-r--r--desktop/xmonad/xmonad.SlackBuild26
1 files changed, 15 insertions, 11 deletions
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index eb8070a51b..fb0bb01d0b 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xmonad
-# Copyright 2011 Mikko Värri, Finland
+# Copyright 2012 Mikko Värri, Finland
# 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=xmonad
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -76,18 +76,18 @@ patch -p0 <$CWD/xmonad_cabal.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --libsubdir=ghc-${GHC_VERSION}/$PRGNAM-$VERSION \
--enable-shared \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
--flags="threaded dynamic"
-runghc Setup.lhs build
-# Known bug that docs of 0.9.2 do not build on GHC7
-#runghc Setup.lhs haddock
-runghc Setup.lhs copy --destdir=$PKG
-runghc Setup.lhs register --gen-pkg-config
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
PKGID=$( grep -E "^id: " $PRGNAM-$VERSION.conf | cut -d" " -f2 )
@@ -110,7 +110,11 @@ mkdir -p $PKG/etc/X11/xinit
cat $CWD/xinitrc.xmonad > $PKG/etc/X11/xinit/xinitrc.xmonad
chmod 0755 $PKG/etc/X11/xinit/xinitrc.xmonad
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+# Add KDM registration file
+mkdir -p $PKG/usr/share/apps/kdm/sessions
+cp $CWD/xmonad.desktop $PKG/usr/share/apps/kdm/sessions/xmonad.desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -120,8 +124,8 @@ cp -a CONFIG README $PKG/usr/doc/$PRGNAM-$VERSION
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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}