summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Mikko Värri <vmj@linuxbox.fi>2012-01-10 14:29:57 -0200
committer Erik Hanson <erik@slackbuilds.org>2012-01-13 14:43:34 -0600
commit08832cae2363e8e0d2ec8e34e0a5ac093afdf1a2 (patch)
tree2bfeb408fb90c0830b79ae13b0fefa6770507651
parentd394e9302c2d88d8889e5a3442f3fb85c9902052 (diff)
downloadslackbuilds-08832cae2363e8e0d2ec8e34e0a5ac093afdf1a2.tar.gz
slackbuilds-08832cae2363e8e0d2ec8e34e0a5ac093afdf1a2.tar.xz
haskell/haskell-GLUT: Updated for version 2.2.2.1.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
-rw-r--r--haskell/haskell-GLUT/haskell-GLUT.SlackBuild16
-rw-r--r--haskell/haskell-GLUT/haskell-GLUT.info8
2 files changed, 12 insertions, 12 deletions
diff --git a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
index 9de304b5b7..eb6ec6a26e 100644
--- a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
+++ b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for GLUT
-# 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=haskell-GLUT
-VERSION=${VERSION:-2.2.2.0}
+VERSION=${VERSION:-2.2.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -75,24 +75,24 @@ find . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.hs configure \
+runghc Setup configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
--enable-shared \
--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
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/haskell/haskell-GLUT/haskell-GLUT.info b/haskell/haskell-GLUT/haskell-GLUT.info
index c2fff5d32a..241e196dec 100644
--- a/haskell/haskell-GLUT/haskell-GLUT.info
+++ b/haskell/haskell-GLUT/haskell-GLUT.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-GLUT"
-VERSION="2.2.2.0"
+VERSION="2.2.2.1"
HOMEPAGE="http://hackage.haskell.org/package/GLUT"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/GLUT/2.2.2.0/GLUT-2.2.2.0.tar.gz"
-MD5SUM="e11912f50b76950b0d9e27d25127e391"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/GLUT/2.2.2.1/GLUT-2.2.2.1.tar.gz"
+MD5SUM="51f14d99096dbcb047b2e3339faaadd3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="rworkman,Niels Horn"