4 files changed, 41 insertions, 22 deletions
diff --git a/haskell/haskell-texmath/README b/haskell/haskell-texmath/README
index 98b844cf94..cf5333ab1d 100644
--- a/haskell/haskell-texmath/README
+++ b/haskell/haskell-texmath/README
@@ -4,5 +4,5 @@ extensions, but not macros.
 
 This requires ghc, haskell-parsec, haskell-syb and haskell-xml.
 
-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-texmath/haskell-texmath.SlackBuild b/haskell/haskell-texmath/haskell-texmath.SlackBuild
index 953ae667b8..35a3f5be56 100644
--- a/haskell/haskell-texmath/haskell-texmath.SlackBuild
+++ b/haskell/haskell-texmath/haskell-texmath.SlackBuild
@@ -3,10 +3,28 @@
 # Slackware build script for texmath
 
 # 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-texmath
-VERSION=${VERSION:-0.5.0.1}
+VERSION=${VERSION:-0.6.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,17 +76,18 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.hs configure \
-   --prefix=/usr \
-   --enable-shared \
-   --libdir=/usr/lib$LIBDIRSUFFIX \
-   --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-pkg-config
+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 build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
 
 # Remove test data.
 rm -r $PKG/usr/share
@@ -78,7 +97,7 @@ 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-texmath/haskell-texmath.info b/haskell/haskell-texmath/haskell-texmath.info
index 9162a1f5bd..b6350454c1 100644
--- a/haskell/haskell-texmath/haskell-texmath.info
+++ b/haskell/haskell-texmath/haskell-texmath.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-texmath"
-VERSION="0.5.0.1"
+VERSION="0.6.0.6"
 HOMEPAGE="http://hackage.haskell.org/package/texmath"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/texmath/0.5.0.1/texmath-0.5.0.1.tar.gz"
-MD5SUM="a678251586117a3153be03fe7d039cb5"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/texmath/0.6.0.6/texmath-0.6.0.6.tar.gz"
+MD5SUM="05c9582a941b050859b80e97fb9b690d"
 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-texmath/slack-desc b/haskell/haskell-texmath/slack-desc
index ccfd1d3913..a996773bd3 100644
--- a/haskell/haskell-texmath/slack-desc
+++ b/haskell/haskell-texmath/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-texmath: haskell-texmath (Conversion of LaTeX math formulas to MathML)
 haskell-texmath:
 haskell-texmath: This is a library for Haskell programs, providing functions to