summaryrefslogtreecommitdiffstats
path: root/haskell/haskell-conduit
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/haskell-conduit')
-rw-r--r--haskell/haskell-conduit/haskell-conduit.SlackBuild15
-rw-r--r--haskell/haskell-conduit/haskell-conduit.info14
2 files changed, 15 insertions, 14 deletions
diff --git a/haskell/haskell-conduit/haskell-conduit.SlackBuild b/haskell/haskell-conduit/haskell-conduit.SlackBuild
index cb94c878f9..da7e8834ee 100644
--- a/haskell/haskell-conduit/haskell-conduit.SlackBuild
+++ b/haskell/haskell-conduit/haskell-conduit.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for conduit
+# Slackware build script for haskell-conduit
# 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-conduit
-VERSION=${VERSION:-1.2.3.1}
+VERSION=${VERSION:-1.3.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"
@@ -71,7 +72,7 @@ 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -97,7 +98,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md changelog.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md ChangeLog.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/haskell/haskell-conduit/haskell-conduit.info b/haskell/haskell-conduit/haskell-conduit.info
index 3075ca1604..2e4f0bbbd2 100644
--- a/haskell/haskell-conduit/haskell-conduit.info
+++ b/haskell/haskell-conduit/haskell-conduit.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-conduit"
-VERSION="1.2.3.1"
-HOMEPAGE="http://hackage.haskell.org/package/conduit"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/conduit/1.2.3.1/conduit-1.2.3.1.tar.gz"
-MD5SUM="69c9588f3989b1871413cf47c640d1bc"
+VERSION="1.3.1"
+HOMEPAGE="https://hackage.haskell.org/package/conduit"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/conduit/1.3.1/conduit-1.3.1.tar.gz"
+MD5SUM="f9c687f6ee67d9f903f165367f505204"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-exceptions haskell-lifted-base haskell-mmorph haskell-mtl haskell-resourcet haskell-transformers-base haskell-void"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-exceptions haskell-lifted-base haskell-mmorph haskell-mono-traversable haskell-resourcet haskell-transformers-base haskell-vector haskell-void"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"