From 072e32c5c4339645ed5e43b2dab39b28225f854b Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Fri, 26 Oct 2018 11:01:53 +0100
Subject: [PATCH] haskell/haskell-zlib: Updated for version 0.6.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 haskell/haskell-zlib/haskell-zlib.SlackBuild | 33 ++++++++++----------
 haskell/haskell-zlib/haskell-zlib.info       | 12 +++----
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/haskell/haskell-zlib/haskell-zlib.SlackBuild b/haskell/haskell-zlib/haskell-zlib.SlackBuild
index 83672f9b48..d24f53f185 100644
--- a/haskell/haskell-zlib/haskell-zlib.SlackBuild
+++ b/haskell/haskell-zlib/haskell-zlib.SlackBuild
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for zlib
+# Slackware build script for haskell-zlib
 
 # Copyright 2010 Peter Wang
 # 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
@@ -24,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haskell-zlib
-VERSION=${VERSION:-0.5.4.2}
+VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,7 +35,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
@@ -45,8 +46,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"
@@ -69,20 +70,20 @@ 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 \
-   --docdir=/usr/doc/$PRGNAM-$VERSION
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --libsubdir=ghc-$GHC_VERSION/$SRCNAM-$VERSION \
+  --enable-shared \
+  --enable-library-profiling \
+  --docdir=/usr/doc/$PRGNAM-$VERSION
 
 runghc Setup build
 runghc Setup haddock
@@ -99,8 +100,8 @@ cp -a LICENSE $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-zlib/haskell-zlib.info b/haskell/haskell-zlib/haskell-zlib.info
index 55250b4742..1d8b6d201a 100644
--- a/haskell/haskell-zlib/haskell-zlib.info
+++ b/haskell/haskell-zlib/haskell-zlib.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-zlib"
-VERSION="0.5.4.2"
-HOMEPAGE="http://hackage.haskell.org/package/zlib"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/zlib/0.5.4.2/zlib-0.5.4.2.tar.gz"
-MD5SUM="79f01f01f859b0ef68d5787756d181c1"
+VERSION="0.6.2"
+HOMEPAGE="https://hackage.haskell.org/package/zlib"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/zlib/0.6.2/zlib-0.6.2.tar.gz"
+MD5SUM="ae34ddfa03cbedd9c94b54c12f116b08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ghc"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"