diff options
author | Mikko Värri <vmj@linuxbox.fi> | 2010-07-16 15:01:02 -0500 |
---|---|---|
committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-21 01:42:41 -0500 |
commit | 109b1a3e80ca11bcff787a128fc727019dd2a4ee (patch) | |
tree | 3461ec57499893ea46a0d821b19d94c6a6b0b4db | |
parent | a927b7b17697584fe79b6dd0e22419e6f7e31102 (diff) | |
download | slackbuilds-109b1a3e80ca11bcff787a128fc727019dd2a4ee.tar.gz |
libraries/haskell-digest: Updated for version 0.0.0.8. New maintainer.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r-- | libraries/haskell-digest/README | 4 | ||||
-rw-r--r-- | libraries/haskell-digest/doinst.sh | 1 | ||||
-rw-r--r-- | libraries/haskell-digest/haskell-digest.SlackBuild | 44 | ||||
-rw-r--r-- | libraries/haskell-digest/haskell-digest.info | 12 |
4 files changed, 43 insertions, 18 deletions
diff --git a/libraries/haskell-digest/README b/libraries/haskell-digest/README index c2849909cc..3d1bce3dd6 100644 --- a/libraries/haskell-digest/README +++ b/libraries/haskell-digest/README @@ -4,5 +4,5 @@ supported; they are implemented as FFI bindings to efficient code from zlib. This requires ghc. -When uninstalling, run the following command to unregister the package -from the ghc package database: ghc-pkg unregister digest +After uninstalling, run the following command to unregister the package +from the ghc package database: ghc-pkg recache diff --git a/libraries/haskell-digest/doinst.sh b/libraries/haskell-digest/doinst.sh new file mode 100644 index 0000000000..3268c238bf --- /dev/null +++ b/libraries/haskell-digest/doinst.sh @@ -0,0 +1 @@ +chroot . /usr/bin/ghc-pkg recache diff --git a/libraries/haskell-digest/haskell-digest.SlackBuild b/libraries/haskell-digest/haskell-digest.SlackBuild index 5653007913..d7fbb82c82 100644 --- a/libraries/haskell-digest/haskell-digest.SlackBuild +++ b/libraries/haskell-digest/haskell-digest.SlackBuild @@ -1,28 +1,45 @@ #!/bin/sh -# Slackware build script for haskell-digest +# Slackware build script for digest # Written by Peter Wang <novalazy@gmail.com> +# Modified by Mikko Värri <vmj@linuxbox.fi> +# Public domain. -PRGNAM=haskell-digest SRCNAM=digest -VERSION=${VERSION:-0.0.0.7} -ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +PRGNAM=haskell-$SRCNAM +VERSION=${VERSION:-0.0.0.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2) +GHC_VERSION=$(ghc --numeric-version) + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "x86_64" ]; then +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" else + SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e # Exit on most errors @@ -39,6 +56,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ runghc Setup.hs configure \ --prefix=/usr \ --enable-shared \ @@ -49,15 +68,20 @@ runghc Setup.hs configure \ runghc Setup.hs build runghc Setup.hs haddock runghc Setup.hs copy --destdir=$PKG -runghc Setup.hs register --gen-script +runghc Setup.hs 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE $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 register.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/haskell-digest/haskell-digest.info b/libraries/haskell-digest/haskell-digest.info index 2cc5e32e43..383787d302 100644 --- a/libraries/haskell-digest/haskell-digest.info +++ b/libraries/haskell-digest/haskell-digest.info @@ -1,10 +1,10 @@ PRGNAM="haskell-digest" -VERSION="0.0.0.7" +VERSION="0.0.0.8" HOMEPAGE="http://hackage.haskell.org/package/digest" -DOWNLOAD="http://hackage.haskell.org/packages/archive/digest/0.0.0.7/digest-0.0.0.7.tar.gz" -MD5SUM="e4a038c5beed98e1d8138fcaf6a0e525" +DOWNLOAD="http://hackage.haskell.org/packages/archive/digest/0.0.0.8/digest-0.0.0.8.tar.gz" +MD5SUM="3a730a6439b14fb7a30bcd03c9e3f4ff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Peter Wang" -EMAIL="novalazy@gmail.com" -APPROVED="rworkman" +MAINTAINER="Mikko Värri" +EMAIL="vmj@linuxbox.fi" +APPROVED="Erik Hanson" |