diff options
author | Mikko Värri <vmj@linuxbox.fi> | 2010-07-16 14:28:12 -0500 |
---|---|---|
committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-21 01:42:41 -0500 |
commit | 5736c69358d37f58af72b5685775e216f4252e64 (patch) | |
tree | f8ac002078951bc6da4a9fd57f95f44cb91ad5e0 /libraries | |
parent | 826fc68050f7764fc1bf85ca81e6da779da49b56 (diff) |
libraries/haskell-haskeline: Updated for version 0.6.2.2.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/haskell-haskeline/README | 6 | ||||
-rw-r--r-- | libraries/haskell-haskeline/doinst.sh | 4 | ||||
-rw-r--r-- | libraries/haskell-haskeline/haskell-haskeline.SlackBuild | 40 | ||||
-rw-r--r-- | libraries/haskell-haskeline/haskell-haskeline.info | 10 |
4 files changed, 30 insertions, 30 deletions
diff --git a/libraries/haskell-haskeline/README b/libraries/haskell-haskeline/README index 3af5af2ad2923..8536a330d57d5 100644 --- a/libraries/haskell-haskeline/README +++ b/libraries/haskell-haskeline/README @@ -4,7 +4,7 @@ Haskeline provides a user interface for line input in command-line programs. This library is similar in purpose to readline, but since it is written in Haskell, it is (hopefully) more easily used in other Haskell programs. -This requires ghc, haskell-mtl, and haskell-terminfo. +This requires ghc, haskell-mtl, haskell-terminfo, and haskell-utf8-string. -When uninstalling, run this command to unregister the package from the ghc -package database: ghc-pkg unregister haskeline +After uninstalling, run this command to unregister the package from the ghc +package database: ghc-pkg recache diff --git a/libraries/haskell-haskeline/doinst.sh b/libraries/haskell-haskeline/doinst.sh index 4038a8fd5c9da..3268c238bf735 100644 --- a/libraries/haskell-haskeline/doinst.sh +++ b/libraries/haskell-haskeline/doinst.sh @@ -1,3 +1 @@ -chroot . sh /install/register.sh -rm -f install/register.sh -rmdir install 2>/dev/null +chroot . /usr/bin/ghc-pkg recache diff --git a/libraries/haskell-haskeline/haskell-haskeline.SlackBuild b/libraries/haskell-haskeline/haskell-haskeline.SlackBuild index b6074c83a6342..5947bd48bff25 100644 --- a/libraries/haskell-haskeline/haskell-haskeline.SlackBuild +++ b/libraries/haskell-haskeline/haskell-haskeline.SlackBuild @@ -1,24 +1,22 @@ #!/bin/sh -# Slackware build script for haskell-haskeline +# Slackware build script for haskeline -# Written by Mikko Varri (vmj@linuxbox.fi) +# Written by Mikko Värri (vmj@linuxbox.fi) # Public domain. -PRGNAM=haskell-haskeline -VERSION=${VERSION:-0.6.2.1} +SRCNAM=haskeline +PRGNAM=haskell-$SRCNAM +VERSION=${VERSION:-0.6.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -TARNAM=haskeline -GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2) +GHC_VERSION=$(ghc --numeric-version) -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -47,9 +45,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $TARNAM-$VERSION -tar xvf $CWD/$TARNAM-$VERSION.tar.gz -cd $TARNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -58,19 +56,24 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKFLAGS" \ -runhaskell Setup.hs configure \ +CXXFLAGS="$SLKCFLAGS" \ +runghc Setup.hs configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libsubdir=ghc-${GHC_VERSION}/$TARNAM-$VERSION \ + --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ --enable-shared \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --flags="terminfo" -runhaskell Setup.hs build -runhaskell Setup.hs haddock -runhaskell Setup.hs copy --destdir=$PKG -runhaskell Setup.hs register --gen-script +runghc Setup.hs build +runghc Setup.hs haddock +runghc Setup.hs copy --destdir=$PKG +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 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -82,7 +85,6 @@ 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 -mv $TMP/$TARNAM-$VERSION/register.sh $PKG/install/register.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/haskell-haskeline/haskell-haskeline.info b/libraries/haskell-haskeline/haskell-haskeline.info index 43b730dc07fe6..c126f074e67a6 100644 --- a/libraries/haskell-haskeline/haskell-haskeline.info +++ b/libraries/haskell-haskeline/haskell-haskeline.info @@ -1,10 +1,10 @@ PRGNAM="haskell-haskeline" -VERSION="0.6.2.1" +VERSION="0.6.2.2" HOMEPAGE="http://hackage.haskell.org/package/haskeline" -DOWNLOAD="http://hackage.haskell.org/packages/archive/haskeline/0.6.2.1/haskeline-0.6.2.1.tar.gz" -MD5SUM="31608a6da4a1e73cd78e3b028062b7b4" +DOWNLOAD="http://hackage.haskell.org/packages/archive/haskeline/0.6.2.2/haskeline-0.6.2.2.tar.gz" +MD5SUM="c23a8ffbcff7cb42f0ee6ca6946285bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Mikko Varri" +MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="Erik Hanson" |