haskell/haskell-HUnit: Updated for version 1.6.0.0.

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

3 files changed, 25 insertions, 23 deletions

diff --git a/haskell/haskell-HUnit/haskell-HUnit.SlackBuild b/haskell/haskell-HUnit/haskell-HUnit.SlackBuild
index aecaf6973394..cbdff184f9dd 100644
--- a/haskell/haskell-HUnit/haskell-HUnit.SlackBuild
+++ b/haskell/haskell-HUnit/haskell-HUnit.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for HUnit
+# Slackware build script for haskell-HUnit
 
 # 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,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haskell-HUnit
-VERSION=${VERSION:-1.3.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.6.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
@@ -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,20 +69,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 \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --enable-shared \
   --enable-library-profiling \
   --enable-executable-dynamic \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
 runghc Setup build
@@ -101,13 +102,14 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   CHANGELOG.md LICENSE README.md examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
+
 # $PKG/usr/share is full of duplicates
-rm -rf $PKG/usr/share
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+####rm -rf $PKG/usr/share
+####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-HUnit/haskell-HUnit.info b/haskell/haskell-HUnit/haskell-HUnit.info
index 8da54eab965b..0aa71de9d0d1 100644
--- a/haskell/haskell-HUnit/haskell-HUnit.info
+++ b/haskell/haskell-HUnit/haskell-HUnit.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-HUnit"
-VERSION="1.3.1.1"
-HOMEPAGE="http://hackage.haskell.org/package/HUnit"
-DOWNLOAD="http://hackage.haskell.org/package/HUnit-1.3.1.1/HUnit-1.3.1.1.tar.gz"
-MD5SUM="1a73c6723345efecae8f3bfcbc45e5aa"
+VERSION="1.6.0.0"
+HOMEPAGE="https://hackage.haskell.org/package/HUnit"
+DOWNLOAD="https://hackage.haskell.org/package/HUnit-1.6.0.0/HUnit-1.6.0.0.tar.gz"
+MD5SUM="4c7fbdab4e57eef5776640a3f97d10ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ghc"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-call-stack"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-HUnit/slack-desc b/haskell/haskell-HUnit/slack-desc
index bdc52d2f3053..da46db261487 100644
--- a/haskell/haskell-HUnit/slack-desc
+++ b/haskell/haskell-HUnit/slack-desc
@@ -11,7 +11,7 @@ haskell-HUnit:
 haskell-HUnit: HUnit is a unit testing framework for Haskell, inspired by the JUnit
 haskell-HUnit: tool for Java.
 haskell-HUnit:
-haskell-HUnit: http://hackage.haskell.org/package/HUnit
+haskell-HUnit: https://hackage.haskell.org/package/HUnit
 haskell-HUnit:
 haskell-HUnit:
 haskell-HUnit: