4 files changed, 44 insertions, 19 deletions
diff --git a/libraries/haskell-zip-archive/README b/libraries/haskell-zip-archive/README
index c883d84caf6de..5f19f9a5f9f95 100644
--- a/libraries/haskell-zip-archive/README
+++ b/libraries/haskell-zip-archive/README
@@ -2,7 +2,7 @@ This is a library for Haskell programs. It provides functions for
 creating, modifying, and extracting files from zip archives. 
 
 This requires ghc, haskell-binary, haskell-mtl, haskell-digest, 
-and haskell-zlib.
+haskell-zlib, and haskell-utf8-string.
 
-When uninstalling, run the following command to unregister the package
-from the ghc package database: ghc-pkg unregister zip-archive
+After uninstalling, run the following command to unregister the package
+from the ghc package database: ghc-pkg recache
diff --git a/libraries/haskell-zip-archive/doinst.sh b/libraries/haskell-zip-archive/doinst.sh
new file mode 100644
index 0000000000000..3268c238bf735
--- /dev/null
+++ b/libraries/haskell-zip-archive/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/ghc-pkg recache
diff --git a/libraries/haskell-zip-archive/haskell-zip-archive.SlackBuild b/libraries/haskell-zip-archive/haskell-zip-archive.SlackBuild
index 0825010142051..b0afdf1692ed0 100644
--- a/libraries/haskell-zip-archive/haskell-zip-archive.SlackBuild
+++ b/libraries/haskell-zip-archive/haskell-zip-archive.SlackBuild
@@ -1,28 +1,45 @@
 #!/bin/sh
 
-# Slackware build script for haskell-zip-archive
+# Slackware build script for zip-archive
 
 # Written by Peter Wang <novalazy@gmail.com>
+# Modified by Mikko Värri <vmj@linuxbox.fi>
+# Public domain.
 
-PRGNAM=haskell-zip-archive
 SRCNAM=zip-archive
-VERSION=${VERSION:-0.1.1.4}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+PRGNAM=haskell-$SRCNAM
+VERSION=${VERSION:-0.1.1.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2)
+GHC_VERSION=$(ghc --numeric-version)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-fi 
+fi
 
 set -e # Exit on most errors
 
@@ -39,6 +56,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 runghc Setup.lhs configure \
    --prefix=/usr \
    --enable-shared \
@@ -49,15 +68,20 @@ runghc Setup.lhs configure \
 runghc Setup.lhs build
 runghc Setup.lhs haddock
 runghc Setup.lhs copy --destdir=$PKG
-runghc Setup.lhs register --gen-script
+runghc Setup.lhs 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING 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
-cat register.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/haskell-zip-archive/haskell-zip-archive.info b/libraries/haskell-zip-archive/haskell-zip-archive.info
index 9a00c979ed3d8..40ff8c9c63ff1 100644
--- a/libraries/haskell-zip-archive/haskell-zip-archive.info
+++ b/libraries/haskell-zip-archive/haskell-zip-archive.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-zip-archive"
-VERSION="0.1.1.4"
+VERSION="0.1.1.6"
 HOMEPAGE="http://hackage.haskell.org/package/zip-archive"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/zip-archive/0.1.1.4/zip-archive-0.1.1.4.tar.gz"
-MD5SUM="39909776afb7e63c65fd1b9739f91866"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/zip-archive/0.1.1.6/zip-archive-0.1.1.6.tar.gz"
+MD5SUM="4806077be79ecb5486306432ee93e38d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Peter Wang"
-EMAIL="novalazy@gmail.com"
-APPROVED="rworkman"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
+APPROVED="Erik Hanson"