haskell/haskell-network: Updated for version 2.6.3.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 22 insertions, 23 deletions

diff --git a/haskell/haskell-network/haskell-network.SlackBuild b/haskell/haskell-network/haskell-network.SlackBuild
index 5febeb56dfba..edf067eda491 100644
--- a/haskell/haskell-network/haskell-network.SlackBuild
+++ b/haskell/haskell-network/haskell-network.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for network
+# Slackware build script for haskell-network
 
 # 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-network
-VERSION=${VERSION:-2.6.2.1}
+VERSION=${VERSION:-2.6.3.5}
 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,19 +69,19 @@ 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 runghc Setup configure \
   --prefix=/usr \
-  --enable-shared \
-  --enable-library-profiling \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
+  --enable-shared \
+  --enable-library-profiling \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
 runghc Setup build
@@ -97,14 +98,12 @@ 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 \
-  CHANGELOG.md LICENSE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/haskell/haskell-network/haskell-network.info b/haskell/haskell-network/haskell-network.info
index bb1532bbf217..d162aea2c4ed 100644
--- a/haskell/haskell-network/haskell-network.info
+++ b/haskell/haskell-network/haskell-network.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-network"
-VERSION="2.6.2.1"
-HOMEPAGE="http://hackage.haskell.org/package/network"
-DOWNLOAD="http://hackage.haskell.org/package/network-2.6.2.1/network-2.6.2.1.tar.gz"
-MD5SUM="c58ab6f46a20a755970bec73f7bd4612"
+VERSION="2.6.3.5"
+HOMEPAGE="https://hackage.haskell.org/package/network"
+DOWNLOAD="https://hackage.haskell.org/package/network-2.6.3.5/network-2.6.3.5.tar.gz"
+MD5SUM="10d4776f709218eb46a8258567be0b59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-parsec"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="ghc"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-network/slack-desc b/haskell/haskell-network/slack-desc
index 0de0db30c01b..409addd1b98c 100644
--- a/haskell/haskell-network/slack-desc
+++ b/haskell/haskell-network/slack-desc
@@ -11,7 +11,7 @@ haskell-network:
 haskell-network: Provides high level and low level interfaces for network client and
 haskell-network: server programming in Haskell.  Also URI interface is included.
 haskell-network:
-haskell-network: http://hackage.haskell.org/package/network
+haskell-network: https://hackage.haskell.org/package/network
 haskell-network:
 haskell-network:
 haskell-network: