1 files changed, 21 insertions, 19 deletions
diff --git a/libraries/haskell-haskeline/haskell-haskeline.SlackBuild b/libraries/haskell-haskeline/haskell-haskeline.SlackBuild
index b6074c83a6..5947bd48bf 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}