summaryrefslogtreecommitdiff
path: root/haskell
diff options
context:
space:
mode:
Diffstat (limited to 'haskell')
-rw-r--r--haskell/haskell-test-framework/haskell-test-framework.SlackBuild22
-rw-r--r--haskell/haskell-test-framework/haskell-test-framework.info14
-rw-r--r--haskell/haskell-test-framework/test-framework_cabal.patch22
3 files changed, 17 insertions, 41 deletions
diff --git a/haskell/haskell-test-framework/haskell-test-framework.SlackBuild b/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
index 4b660ad168..a67b2fe657 100644
--- a/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
+++ b/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for test-framework
+# Slackware build script for haskell-test-framework
# Copyright 2015 Mikko Värri, Finland
+# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-test-framework
-VERSION=${VERSION:-0.8.1.1}
+VERSION=${VERSION:-0.8.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +34,7 @@ GHC_VERSION=$(ghc --numeric-version)
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +45,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,13 +69,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Enable "-dynamic" GHC options for the binary, not for the libs
-patch -p0 <$CWD/test-framework_cabal.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/haskell/haskell-test-framework/haskell-test-framework.info b/haskell/haskell-test-framework/haskell-test-framework.info
index 27bb8d7046..90a26607c2 100644
--- a/haskell/haskell-test-framework/haskell-test-framework.info
+++ b/haskell/haskell-test-framework/haskell-test-framework.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-test-framework"
-VERSION="0.8.1.1"
-HOMEPAGE="http://hackage.haskell.org/package/test-framework"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/test-framework/0.8.1.1/test-framework-0.8.1.1.tar.gz"
-MD5SUM="adcef18605b724c41a469d148ce99d72"
+VERSION="0.8.2.0"
+HOMEPAGE="https://hackage.haskell.org/package/test-framework"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/test-framework/0.8.2.0/test-framework-0.8.2.0.tar.gz"
+MD5SUM="a7e351ab89c8513d2e41f5179c72e985"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ghc haskell-extensible-exceptions haskell-ansi-wl-pprint haskell-hostname haskell-old-locale haskell-random haskell-regex-posix haskell-xml"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-extensible-exceptions haskell-ansi-wl-pprint haskell-hostname haskell-old-locale haskell-random haskell-regex-posix haskell-xml"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-test-framework/test-framework_cabal.patch b/haskell/haskell-test-framework/test-framework_cabal.patch
deleted file mode 100644
index 5c2036a688..0000000000
--- a/haskell/haskell-test-framework/test-framework_cabal.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- test-framework.cabal.orig 2012-05-17 17:38:22.833999961 +0300
-+++ test-framework.cabal 2012-05-17 17:41:57.088000279 +0300
-@@ -21,6 +21,10 @@
- Description: Build the tests
- Default: False
-
-+Flag Dynamic
-+ Description: Link executable dynamically
-+ Default: False
-+
-
- Library
- Exposed-Modules: Test.Framework
-@@ -102,6 +106,8 @@
- Cpp-Options: -DTEST
-
- Ghc-Options: -Wall -threaded
-+ if flag(Dynamic)
-+ Ghc-Options: -dynamic
-
- if impl(ghc)
- Cpp-Options: -DCOMPILER_GHC