aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2012-02-12 00:43:20 -0600
committerNiels Horn <niels.horn@slackbuilds.org>2012-02-18 09:12:28 -0200
commit468f62393275fa1f23951ba10790fe89be554a70 (patch)
tree7a385a998b0ae58d932f180e6b78d26cbb14be0a
parentc29c4ce85e1a566f4f7715cc9aa6dc2093f9a940 (diff)
libraries/xmonad-contrib: Updated for version 0.10.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--libraries/xmonad-contrib/xmonad-contrib.SlackBuild21
-rw-r--r--libraries/xmonad-contrib/xmonad-contrib.info8
2 files changed, 15 insertions, 14 deletions
diff --git a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
index d23a5f94ffc26..3212629e3e02c 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
+++ b/libraries/xmonad-contrib/xmonad-contrib.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmonad-contrib
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,23 +73,24 @@ find . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-shared
+ --libsubdir=ghc-${GHC_VERSION}/$PRGNAM-$VERSION \
+ --enable-shared \
+ --docdir=/usr/doc/$PRGNAM-$VERSION
-runghc Setup.lhs build
-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 )
mkdir -p $PKG/$PKGCONFD
mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -97,8 +98,8 @@ cp -a scripts $PKG/usr/doc/$PRGNAM-$VERSION/scripts
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}
diff --git a/libraries/xmonad-contrib/xmonad-contrib.info b/libraries/xmonad-contrib/xmonad-contrib.info
index 59d62fa56164e..0aa6629174028 100644
--- a/libraries/xmonad-contrib/xmonad-contrib.info
+++ b/libraries/xmonad-contrib/xmonad-contrib.info
@@ -1,10 +1,10 @@
PRGNAM="xmonad-contrib"
-VERSION="0.9.2"
+VERSION="0.10"
HOMEPAGE="http://www.xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.9.2/xmonad-contrib-0.9.2.tar.gz"
-MD5SUM="616cbc632bbde5cd4cdb643ee47e74d2"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.10/xmonad-contrib-0.10.tar.gz"
+MD5SUM="9a4353a94ec0ea3a9c4700757ef5ae81"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="dsomero"
+APPROVED="rworkman"