haskell/haskell-html: Updated for version 1.0.1.2.

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

3 files changed, 18 insertions, 17 deletions

diff --git a/haskell/haskell-html/haskell-html.SlackBuild b/haskell/haskell-html/haskell-html.SlackBuild
index 8da6df3ea0312..a32c5bd609aca 100644
--- a/haskell/haskell-html/haskell-html.SlackBuild
+++ b/haskell/haskell-html/haskell-html.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for html
+# Slackware build script for haskell-html
 
 # Copyright 2012 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 @@
 
 PRGNAM=haskell-html
 VERSION=${VERSION:-1.0.1.2}
-BUILD=${BUILD:-4}
+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,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
@@ -101,8 +102,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-html/haskell-html.info b/haskell/haskell-html/haskell-html.info
index e63b3014ccbf0..8d702e947c958 100644
--- a/haskell/haskell-html/haskell-html.info
+++ b/haskell/haskell-html/haskell-html.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-html"
 VERSION="1.0.1.2"
-HOMEPAGE="http://hackage.haskell.org/package/html"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/html/1.0.1.2/html-1.0.1.2.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/html"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/html/1.0.1.2/html-1.0.1.2.tar.gz"
 MD5SUM="2a7de5a2af9a2f80d39825d6a95ee445"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ghc"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-html/slack-desc b/haskell/haskell-html/slack-desc
index cc00f4adbf7f4..908fc01759bea 100644
--- a/haskell/haskell-html/slack-desc
+++ b/haskell/haskell-html/slack-desc
@@ -11,7 +11,7 @@ haskell-html:
 haskell-html: This package contains a combinator library for constructing HTML
 haskell-html: documents.
 haskell-html:
-haskell-html: http://hackage.haskell.org/package/html
+haskell-html: https://hackage.haskell.org/package/html
 haskell-html:
 haskell-html:
 haskell-html: