diff options
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/haskell-parsec/README | 4 | ||||
-rw-r--r-- | libraries/haskell-parsec/doinst.sh | 4 | ||||
-rw-r--r-- | libraries/haskell-parsec/haskell-parsec.SlackBuild | 35 | ||||
-rw-r--r-- | libraries/haskell-parsec/haskell-parsec.info | 10 |
4 files changed, 25 insertions, 28 deletions
diff --git a/libraries/haskell-parsec/README b/libraries/haskell-parsec/README index c015fd061c..41da17b45c 100644 --- a/libraries/haskell-parsec/README +++ b/libraries/haskell-parsec/README @@ -8,5 +8,5 @@ it is also parametric in the input stream type. This requires ghc and haskell-mtl. -When uninstalling, run this command to unregister the package from the ghc -package database: ghc-pkg unregister parsec +After uninstalling, run this command to unregister the package from the ghc +package database: ghc-pkg recache diff --git a/libraries/haskell-parsec/doinst.sh b/libraries/haskell-parsec/doinst.sh index 4038a8fd5c..3268c238bf 100644 --- a/libraries/haskell-parsec/doinst.sh +++ b/libraries/haskell-parsec/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-parsec/haskell-parsec.SlackBuild b/libraries/haskell-parsec/haskell-parsec.SlackBuild index 6c311e1514..196478cc71 100644 --- a/libraries/haskell-parsec/haskell-parsec.SlackBuild +++ b/libraries/haskell-parsec/haskell-parsec.SlackBuild @@ -1,24 +1,22 @@ #!/bin/sh -# Slackware build script for haskell-parsec +# Slackware build script for parsec -# Written by Mikko Varri (vmj@linuxbox.fi) +# Written by Mikko Värri (vmj@linuxbox.fi) # Public domain. -PRGNAM=haskell-parsec -VERSION=${VERSION:-3.0.1} +SRCNAM=parsec +PRGNAM=haskell-$SRCNAM +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -TARNAM=parsec -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 @@ -28,8 +26,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -JOBS=${JOBS:-3} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -49,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 \) \ @@ -60,18 +56,23 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ runghc Setup.hs configure \ --prefix=/usr \ --enable-shared \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libsubdir=ghc-${GHC_VERSION}/$TARNAM-$VERSION \ + --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-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 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -83,8 +84,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-parsec/haskell-parsec.info b/libraries/haskell-parsec/haskell-parsec.info index 0f2ac686b6..2ec8cefe1c 100644 --- a/libraries/haskell-parsec/haskell-parsec.info +++ b/libraries/haskell-parsec/haskell-parsec.info @@ -1,10 +1,10 @@ PRGNAM="haskell-parsec" -VERSION="3.0.1" +VERSION="3.1.0" HOMEPAGE="http://hackage.haskell.org/package/parsec" -DOWNLOAD="http://hackage.haskell.org/packages/archive/parsec/3.0.1/parsec-3.0.1.tar.gz" -MD5SUM="6b1ac06edfe73e23238333a6319e09e8" +DOWNLOAD="http://hackage.haskell.org/packages/archive/parsec/3.1.0/parsec-3.1.0.tar.gz" +MD5SUM="310bf233dcf8ec678c427b1198700b53" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Mikko Varri" +MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="Erik Hanson" |