aboutsummaryrefslogtreecommitdiff
path: root/haskell/haskell-X11
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/haskell-X11')
-rw-r--r--haskell/haskell-X11/haskell-X11.SlackBuild18
-rw-r--r--haskell/haskell-X11/haskell-X11.info8
2 files changed, 13 insertions, 13 deletions
diff --git a/haskell/haskell-X11/haskell-X11.SlackBuild b/haskell/haskell-X11/haskell-X11.SlackBuild
index 7c7d12a28f89f..1650fd1f9550c 100644
--- a/haskell/haskell-X11/haskell-X11.SlackBuild
+++ b/haskell/haskell-X11/haskell-X11.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for X11
-# 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,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-X11
-VERSION=${VERSION:-1.5.0.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.5.0.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
@@ -75,24 +75,24 @@ find . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.hs configure \
+runghc Setup configure \
--prefix=/usr \
--enable-shared \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
--docdir=/usr/doc/$PRGNAM-$VERSION
-runghc Setup.hs build
-runghc Setup.hs haddock
-runghc Setup.hs copy --destdir=$PKG
-runghc Setup.hs 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: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
mkdir -p $PKG/$PKGCONFD
mv $SRCNAM-$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
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/haskell/haskell-X11/haskell-X11.info b/haskell/haskell-X11/haskell-X11.info
index e4fcc8604aa2d..366f6966fba07 100644
--- a/haskell/haskell-X11/haskell-X11.info
+++ b/haskell/haskell-X11/haskell-X11.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-X11"
-VERSION="1.5.0.0"
+VERSION="1.5.0.1"
HOMEPAGE="http://hackage.haskell.org/package/X11"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/X11/1.5.0.0/X11-1.5.0.0.tar.gz"
-MD5SUM="ec6670f5ce1812206903c8a0fd9df04c"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/X11/1.5.0.1/X11-1.5.0.1.tar.gz"
+MD5SUM="7d69b204f773a0335828ced0e1e069f2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"