4 files changed, 35 insertions, 16 deletions
diff --git a/haskell/haskell-citeproc-hs/README b/haskell/haskell-citeproc-hs/README
index ab672e8f40..1c690aae2c 100644
--- a/haskell/haskell-citeproc-hs/README
+++ b/haskell/haskell-citeproc-hs/README
@@ -5,5 +5,5 @@ Citation Style Language (CSL).
 This requires ghc, haskell-mtl, haskell-json, haskell-utf8-string,
 haskell-xml, haskell-syb, haskell-parsec and haskell-pandoc-types.
 
-When uninstalling, run the following command to unregister the package
-from the ghc package database:   ghc-pkg recache
+After uninstalling, run this command to unregister the package from
+the ghc package database:   ghc-pkg recache
diff --git a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild
index 65ac4e34dc..5eccd8f360 100644
--- a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild
+++ b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild
@@ -3,10 +3,28 @@
 # Slackware build script for citeproc-hs
 
 # Written by Peter Wang (novalazy@gmail.com)
-# 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.
 
 PRGNAM=haskell-citeproc-hs
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,24 +76,25 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --enable-shared \
+  --enable-library-profiling \
   --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 \
+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
diff --git a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info
index 4b4fa58b77..1f00e9666b 100644
--- a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info
+++ b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-citeproc-hs"
-VERSION="0.3.3"
+VERSION="0.3.4"
 HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/citeproc-hs/0.3.3/citeproc-hs-0.3.3.tar.gz"
-MD5SUM="d199abb2bfd9a4b24189b4bbb3178554"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/citeproc-hs/0.3.4/citeproc-hs-0.3.4.tar.gz"
+MD5SUM="3891e64c624454721c7da17b12cd2158"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Peter Wang"
-EMAIL="novalazy@gmail.com"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
 APPROVED="dsomero"
diff --git a/haskell/haskell-citeproc-hs/slack-desc b/haskell/haskell-citeproc-hs/slack-desc
index b79f1dda1f..6e07e940e9 100644
--- a/haskell/haskell-citeproc-hs/slack-desc
+++ b/haskell/haskell-citeproc-hs/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-		   |-----handy-ruler------------------------------------------------------|
+                   |-----handy-ruler------------------------------------------------------|
 haskell-citeproc-hs: haskell-citeproc-hs (implementation of the Citation Style Language)
 haskell-citeproc-hs:
 haskell-citeproc-hs: citeproc-hs is a Haskell library for rendering bibliographic