diff options
| -rw-r--r-- | libraries/haskell-mtl/README | 4 | ||||
| -rw-r--r-- | libraries/haskell-mtl/doinst.sh | 4 | ||||
| -rw-r--r-- | libraries/haskell-mtl/haskell-mtl.SlackBuild | 35 | ||||
| -rw-r--r-- | libraries/haskell-mtl/haskell-mtl.info | 4 |
4 files changed, 23 insertions, 24 deletions
diff --git a/libraries/haskell-mtl/README b/libraries/haskell-mtl/README index 82e58a13ce..7ed08a35dc 100644 --- a/libraries/haskell-mtl/README +++ b/libraries/haskell-mtl/README @@ -7,5 +7,5 @@ Functional Programming, 1995. This requires ghc. -When uninstalling, run this command to unregister the package from -the ghc package database: ghc-pkg unregister mtl +After uninstalling, run this command to unregister the package from +the ghc package database: ghc-pkg recache diff --git a/libraries/haskell-mtl/doinst.sh b/libraries/haskell-mtl/doinst.sh index 4038a8fd5c..3268c238bf 100644 --- a/libraries/haskell-mtl/doinst.sh +++ b/libraries/haskell-mtl/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-mtl/haskell-mtl.SlackBuild b/libraries/haskell-mtl/haskell-mtl.SlackBuild index 876c881f25..c5085cbcf2 100644 --- a/libraries/haskell-mtl/haskell-mtl.SlackBuild +++ b/libraries/haskell-mtl/haskell-mtl.SlackBuild @@ -1,24 +1,22 @@ #!/bin/sh -# Slackware build script for haskell-mtl +# Slackware build script for mtl -# Written by Mikko Varri (vmj@linuxbox.fi) +# Written by Mikko Värri (vmj@linuxbox.fi) # Public domain. -PRGNAM=haskell-mtl +SRCNAM=mtl +PRGNAM=haskell-$SRCNAM VERSION=${VERSION:-1.1.0.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -TARNAM=mtl -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,31 +56,34 @@ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE /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 -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-mtl/haskell-mtl.info b/libraries/haskell-mtl/haskell-mtl.info index f64f62295f..7fc8e244cb 100644 --- a/libraries/haskell-mtl/haskell-mtl.info +++ b/libraries/haskell-mtl/haskell-mtl.info @@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/mtl/1.1.0.2/mtl-1.1.0.2.ta MD5SUM="1e933bb7abb38b7bb423929ba37219db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Mikko Varri" +MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="Erik Hanson" |