summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haskell/haskell-vector/haskell-vector.SlackBuild22
-rw-r--r--haskell/haskell-vector/haskell-vector.info12
2 files changed, 19 insertions, 15 deletions
diff --git a/haskell/haskell-vector/haskell-vector.SlackBuild b/haskell/haskell-vector/haskell-vector.SlackBuild
index bcf0615e0a..acd0235b28 100644
--- a/haskell/haskell-vector/haskell-vector.SlackBuild
+++ b/haskell/haskell-vector/haskell-vector.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for vector
+# Slackware build script for haskell-vector
# 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-vector
-VERSION=${VERSION:-0.11.0.0}
+VERSION=${VERSION:-0.12.0.1}
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,10 +69,13 @@ 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 {} \;
+ \( -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 {} \;
+
+# Remove bogus upper version constraint on base
+sed -i -E 's/(base *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/haskell/haskell-vector/haskell-vector.info b/haskell/haskell-vector/haskell-vector.info
index dea1e7b206..3d19ee6d70 100644
--- a/haskell/haskell-vector/haskell-vector.info
+++ b/haskell/haskell-vector/haskell-vector.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-vector"
-VERSION="0.11.0.0"
-HOMEPAGE="http://hackage.haskell.org/package/vector"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/vector/0.11.0.0/vector-0.11.0.0.tar.gz"
-MD5SUM="a08605271abb3ed815135572a42b8524"
+VERSION="0.12.0.1"
+HOMEPAGE="https://hackage.haskell.org/package/vector"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/vector/0.12.0.1/vector-0.12.0.1.tar.gz"
+MD5SUM="82b3e15adf88250d76d91240e3c21159"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="haskell-primitive"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"