summaryrefslogtreecommitdiff
path: root/haskell/haskell-texmath
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/haskell-texmath')
-rw-r--r--haskell/haskell-texmath/README2
-rw-r--r--haskell/haskell-texmath/haskell-texmath.SlackBuild15
-rw-r--r--haskell/haskell-texmath/haskell-texmath.info6
-rw-r--r--haskell/haskell-texmath/texmath-utf8.patch28
4 files changed, 12 insertions, 39 deletions
diff --git a/haskell/haskell-texmath/README b/haskell/haskell-texmath/README
index 2ea3bf86a3..98b844cf94 100644
--- a/haskell/haskell-texmath/README
+++ b/haskell/haskell-texmath/README
@@ -2,7 +2,7 @@ This is a library for Haskell programs, providing functions to convert LaTeX
math formulas to presentation MathML. It supports basic LaTeX and AMS
extensions, but not macros.
-This requires ghc, haskell-parsec and haskell-xml.
+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
diff --git a/haskell/haskell-texmath/haskell-texmath.SlackBuild b/haskell/haskell-texmath/haskell-texmath.SlackBuild
index cf3d1299c7..953ae667b8 100644
--- a/haskell/haskell-texmath/haskell-texmath.SlackBuild
+++ b/haskell/haskell-texmath/haskell-texmath.SlackBuild
@@ -5,12 +5,13 @@
# Written by Peter Wang <novalazy@gmail.com>
# Public domain.
-SRCNAM=texmath
-PRGNAM=haskell-$SRCNAM
-VERSION=${VERSION:-0.3.0.1}
+PRGNAM=haskell-texmath
+VERSION=${VERSION:-0.5.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
+
GHC_VERSION=$(ghc --numeric-version)
if [ -z "$ARCH" ]; then
@@ -40,7 +41,7 @@ else
LIBDIRSUFFIX=""
fi
-set -e # Exit on most errors
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -55,9 +56,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Remove false dependency on utf8-string (only for a sample CGI script).
-patch -p1 < $CWD/texmath-utf8.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup.hs configure \
@@ -80,6 +78,9 @@ 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
+
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
diff --git a/haskell/haskell-texmath/haskell-texmath.info b/haskell/haskell-texmath/haskell-texmath.info
index a4e4ec8ec3..9162a1f5bd 100644
--- a/haskell/haskell-texmath/haskell-texmath.info
+++ b/haskell/haskell-texmath/haskell-texmath.info
@@ -1,8 +1,8 @@
PRGNAM="haskell-texmath"
-VERSION="0.3.0.1"
+VERSION="0.5.0.1"
HOMEPAGE="http://hackage.haskell.org/package/texmath"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/texmath/0.3.0.1/texmath-0.3.0.1.tar.gz"
-MD5SUM="f2ec771aaae9e678bf9106fe161efb85"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/texmath/0.5.0.1/texmath-0.5.0.1.tar.gz"
+MD5SUM="a678251586117a3153be03fe7d039cb5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Peter Wang"
diff --git a/haskell/haskell-texmath/texmath-utf8.patch b/haskell/haskell-texmath/texmath-utf8.patch
deleted file mode 100644
index ab5fcf2bf0..0000000000
--- a/haskell/haskell-texmath/texmath-utf8.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: John MacFarlane <jgm@berkeley.edu>
-Date: Thu, 22 Jul 2010 19:11:14 -0700
-Subject: [PATCH] Put utf8-string dependency in right place.
-
----
- texmath.cabal | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/texmath.cabal b/texmath.cabal
-index f14d7dc..ad83d05 100644
---- a/texmath.cabal
-+++ b/texmath.cabal
-@@ -77,11 +77,10 @@ Executable testTeXMathML
-
- Executable texmath-cgi
- Main-is: cgi/texmath-cgi.hs
-- Build-depends: utf8-string
- Ghc-Options: -Wall -fno-warn-unused-do-bind
- Ghc-Prof-Options: -auto-all
- if flag(cgi)
- Buildable: True
-- Build-depends: cgi, json
-+ Build-depends: cgi, json, utf8-string
- else
- Buildable: False
---
-1.7.1
-