3 files changed, 21 insertions, 20 deletions
diff --git a/haskell/haskell-xml/haskell-xml.SlackBuild b/haskell/haskell-xml/haskell-xml.SlackBuild
index 09d9d4c550..7fce67b7f9 100644
--- a/haskell/haskell-xml/haskell-xml.SlackBuild
+++ b/haskell/haskell-xml/haskell-xml.SlackBuild
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for xml
+# Slackware build script for haskell-xml
 
 # Written by Peter Wang <novalazy@gmail.com>
 # Copyright 2014 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-xml
-VERSION=${VERSION:-1.3.13}
+VERSION=${VERSION:-1.3.14}
 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,19 +70,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
@@ -102,8 +103,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-xml/haskell-xml.info b/haskell/haskell-xml/haskell-xml.info
index 7f5f78bf9e..7ba0597102 100644
--- a/haskell/haskell-xml/haskell-xml.info
+++ b/haskell/haskell-xml/haskell-xml.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-xml"
-VERSION="1.3.13"
-HOMEPAGE="http://hackage.haskell.org/package/xml"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xml/1.3.13/xml-1.3.13.tar.gz"
-MD5SUM="17823634f69305e8d4cc99b22934a78c"
+VERSION="1.3.14"
+HOMEPAGE="https://hackage.haskell.org/package/xml"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/xml/1.3.14/xml-1.3.14.tar.gz"
+MD5SUM="bc3d37dca61f52e4d3f547b07beb76c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-text"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="ghc"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-xml/slack-desc b/haskell/haskell-xml/slack-desc
index f5b2a7e12f..b01680ceea 100644
--- a/haskell/haskell-xml/slack-desc
+++ b/haskell/haskell-xml/slack-desc
@@ -10,7 +10,7 @@ haskell-xml: haskell-xml (XML library for Haskell)
 haskell-xml:
 haskell-xml: A simple XML library for Haskell programs.
 haskell-xml:
-haskell-xml: http://hackage.haskell.org/package/xml
+haskell-xml: https://hackage.haskell.org/package/xml
 haskell-xml:
 haskell-xml:
 haskell-xml: