From a0bd7f592dbd4ce7911739f3837ad06d2adfd34b Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Fri, 26 Oct 2018 11:01:09 +0100
Subject: haskell/haskell-tf-random: Updated for version 0.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 haskell/haskell-tf-random/haskell-tf-random.SlackBuild | 18 ++++++++----------
 haskell/haskell-tf-random/haskell-tf-random.info       |  8 ++++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/haskell/haskell-tf-random/haskell-tf-random.SlackBuild b/haskell/haskell-tf-random/haskell-tf-random.SlackBuild
index 255654a83b..202d2e51cc 100644
--- a/haskell/haskell-tf-random/haskell-tf-random.SlackBuild
+++ b/haskell/haskell-tf-random/haskell-tf-random.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for tf-random
+# Slackware build script for haskell-tf-random
 
 # 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
@@ -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" \
@@ -84,7 +85,6 @@ runghc Setup configure \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
 runghc Setup build
-#runghc Setup haddock
 runghc Setup copy --destdir=$PKG
 runghc Setup register --gen-pkg-config
 
@@ -97,14 +97,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 LICENSE* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog 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-tf-random/haskell-tf-random.info b/haskell/haskell-tf-random/haskell-tf-random.info
index 7b43483a1d..8618fe7672 100644
--- a/haskell/haskell-tf-random/haskell-tf-random.info
+++ b/haskell/haskell-tf-random/haskell-tf-random.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-tf-random"
 VERSION="0.5"
-HOMEPAGE="http://hackage.haskell.org/package/tf-random"
-DOWNLOAD="http://hackage.haskell.org/package/tf-random-0.5/tf-random-0.5.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/tf-random"
+DOWNLOAD="https://hackage.haskell.org/package/tf-random-0.5/tf-random-0.5.tar.gz"
 MD5SUM="569f8acb14d09227f136a53ffd84b7b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="haskell-primitive haskell-random"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
-- 
cgit v1.2.3