3 files changed, 42 insertions, 23 deletions
diff --git a/haskell/haskell-X11-xft/README b/haskell/haskell-X11-xft/README
index 711cb15ac9..0349595763 100644
--- a/haskell/haskell-X11-xft/README
+++ b/haskell/haskell-X11-xft/README
@@ -2,5 +2,5 @@ haskell-X11-xft is haskell support for xft in X11.
 
 This requires ghc, haskell-X11, and haskell-utf8-string.
 
-After uninstalling, run this command to unregister the package from 
+After uninstalling, run this command to unregister the package from
 the ghc package database:   ghc-pkg recache
diff --git a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
index 5e678db3f5..62ad941f80 100644
--- a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
+++ b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
@@ -1,24 +1,40 @@
 #!/bin/sh
+
 # Slackware build script for X11-xft
 
-# Written by Mikko Värri (vmj@linuxbox.fi)
-# Modified by Andy Bailey (GooseYArd@gmail.com) for X11-xft
-# Public domain.
+# Copyright 2012 Mikko Värri, Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM=X11-xft
-PRGNAM=haskell-$SRCNAM
-VERSION=${VERSION:-0.3}
-BUILD=${BUILD:-2}
+PRGNAM=haskell-X11-xft
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM="$( echo $PRGNAM | 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
@@ -59,26 +75,29 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
   --prefix=/usr \
   --enable-shared \
+  --enable-library-profiling \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
-runghc Setup.lhs build
-runghc Setup.lhs haddock
-runghc Setup.lhs copy --destdir=$PKG
-runghc Setup.lhs register --gen-pkg-config
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup 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
+find $PKG -print0 | xargs -0 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 $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/haskell/haskell-X11-xft/haskell-X11-xft.info b/haskell/haskell-X11-xft/haskell-X11-xft.info
index c12d37f9b7..604837a739 100644
--- a/haskell/haskell-X11-xft/haskell-X11-xft.info
+++ b/haskell/haskell-X11-xft/haskell-X11-xft.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-X11-xft"
-VERSION="0.3"
+VERSION="0.3.1"
 HOMEPAGE="http://hackage.haskell.org/package/X11-xft"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/X11-xft/0.3/X11-xft-0.3.tar.gz"
-MD5SUM="1b4a528a2a4fe5e9de715f6758ff9015"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz"
+MD5SUM="ad885150a59f63de328e73abe5ffc79e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Andy Bailey"
-EMAIL="GooseYArd@gmail.com"
-APPROVED="Erik Hanson"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
+APPROVED="dsomero"