haskell/haskell-X11: Updated for version 1.9.

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

4 files changed, 22 insertions, 21 deletions

diff --git a/haskell/haskell-X11/README b/haskell/haskell-X11/README
index ae0f08ae0d548..bbeb40ddfe576 100644
--- a/haskell/haskell-X11/README
+++ b/haskell/haskell-X11/README
@@ -1,7 +1,7 @@
 A Haskell binding to the X11 graphics library.  The binding is a
 direct translation of the C binding; for documentation of these calls,
 refer to The Xlib Programming Manual, available online at
-http://tronche.com/gui/x/xlib/.
+https://tronche.com/gui/x/xlib/.
 
 After uninstalling, run this command to unregister the package from
 the ghc package database:   ghc-pkg recache
diff --git a/haskell/haskell-X11/haskell-X11.SlackBuild b/haskell/haskell-X11/haskell-X11.SlackBuild
index d250a2e70f7b6..eb767b271ffec 100644
--- a/haskell/haskell-X11/haskell-X11.SlackBuild
+++ b/haskell/haskell-X11/haskell-X11.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for X11
+# Slackware build script for haskell-X11
 
 # 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-X11
-VERSION=${VERSION:-1.6.1.2}
+VERSION=${VERSION:-1.9}
 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
@@ -98,8 +99,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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-X11/haskell-X11.info b/haskell/haskell-X11/haskell-X11.info
index 04dc6c5b06f83..6e74f9567a877 100644
--- a/haskell/haskell-X11/haskell-X11.info
+++ b/haskell/haskell-X11/haskell-X11.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-X11"
-VERSION="1.6.1.2"
-HOMEPAGE="http://hackage.haskell.org/package/X11"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/X11/1.6.1.2/X11-1.6.1.2.tar.gz"
-MD5SUM="d7c94a65ce4b140e97cce835e8682ac3"
+VERSION="1.9"
+HOMEPAGE="https://hackage.haskell.org/package/X11"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/X11/1.9/X11-1.9.tar.gz"
+MD5SUM="6af9e7cc7691204df50e53e3e808281d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="haskell-data-default"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-X11/slack-desc b/haskell/haskell-X11/slack-desc
index 7fe5b56d708fc..441dedd4a9902 100644
--- a/haskell/haskell-X11/slack-desc
+++ b/haskell/haskell-X11/slack-desc
@@ -10,9 +10,9 @@ haskell-X11: haskell-X11 (A Haskell binding to the X11 graphics library)
 haskell-X11:
 haskell-X11: The binding is a direct translation of the C binding; for
 haskell-X11: documentation of these calls, refer to The Xlib Programming Manual,
-haskell-X11: available online at http://tronche.com/gui/x/xlib/.
+haskell-X11: available online at https://tronche.com/gui/x/xlib/.
 haskell-X11:
-haskell-X11: http://hackage.haskell.org/package/X11
+haskell-X11: https://hackage.haskell.org/package/X11
 haskell-X11:
 haskell-X11:
 haskell-X11: