libraries/haskell-xhtml: Build bump, various changes.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 22 insertions, 23 deletions

diff --git a/libraries/haskell-xhtml/README b/libraries/haskell-xhtml/README
index 0f542cd90f68..d1f1881f4821 100644
--- a/libraries/haskell-xhtml/README
+++ b/libraries/haskell-xhtml/README
@@ -5,5 +5,5 @@ the Strict, Transitional and Frameset variants.
 
 This requires ghc.
 
-When uninstalling, run this command to unregister the package from the ghc
-package database:   ghc-pkg unregister xhtml
+After uninstalling, run this command to unregister the package from the ghc
+package database:   ghc-pkg recache
diff --git a/libraries/haskell-xhtml/doinst.sh b/libraries/haskell-xhtml/doinst.sh
index 4038a8fd5c9d..3268c238bf73 100644
--- a/libraries/haskell-xhtml/doinst.sh
+++ b/libraries/haskell-xhtml/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-xhtml/haskell-xhtml.SlackBuild b/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
index 30f586279d97..b16ed39ccaeb 100644
--- a/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
+++ b/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
@@ -1,24 +1,22 @@
 #!/bin/sh
 
-# Slackware build script for haskell-xhtml
+# Slackware build script for xhtml
 
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
 # Public domain.
 
-PRGNAM=haskell-xhtml
+SRCNAM=xhtml
+PRGNAM=haskell-$SRCNAM
 VERSION=${VERSION:-3000.2.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-TARNAM=xhtml
-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,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
@@ -81,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-xhtml/haskell-xhtml.info b/libraries/haskell-xhtml/haskell-xhtml.info
index 7c1301390460..71b636e5d172 100644
--- a/libraries/haskell-xhtml/haskell-xhtml.info
+++ b/libraries/haskell-xhtml/haskell-xhtml.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/xhtml/3000.2.0.1/xhtml-300
 MD5SUM="9e3e7d9c66618c5e29716f90e54363c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"