haskell/haskell-json: Updated for version 0.9.2.

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

3 files changed, 20 insertions, 19 deletions

diff --git a/haskell/haskell-json/haskell-json.SlackBuild b/haskell/haskell-json/haskell-json.SlackBuild
index cc1870b994ad..693f5170cddf 100644
--- a/haskell/haskell-json/haskell-json.SlackBuild
+++ b/haskell/haskell-json/haskell-json.SlackBuild
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for json
+# Slackware build script for haskell-json
 
 # Written by Peter Wang (novalazy@gmail.com)
 # 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
@@ -24,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haskell-json
-VERSION=${VERSION:-0.9.1}
+VERSION=${VERSION:-0.9.2}
 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,10 +70,10 @@ 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 {} \;
 
 # Force generic for haskell-citeproc-hs.
 CFLAGS="$SLKCFLAGS" \
@@ -83,8 +84,8 @@ runghc Setup configure \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --enable-shared \
   --enable-library-profiling \
-  -f generic \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --flags="generic"
 
 runghc Setup build
 runghc Setup haddock
diff --git a/haskell/haskell-json/haskell-json.info b/haskell/haskell-json/haskell-json.info
index de2c83abdcad..7eceb237f8ef 100644
--- a/haskell/haskell-json/haskell-json.info
+++ b/haskell/haskell-json/haskell-json.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-json"
-VERSION="0.9.1"
-HOMEPAGE="http://hackage.haskell.org/package/json"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/json/0.9.1/json-0.9.1.tar.gz"
-MD5SUM="39f878c351120c7d8bd1d634eee26cbb"
+VERSION="0.9.2"
+HOMEPAGE="https://hackage.haskell.org/package/json"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/json/0.9.2/json-0.9.2.tar.gz"
+MD5SUM="6c0c1a90563a2d3d1bf96ba5478effc9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-text haskell-mtl haskell-syb"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-syb"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-json/slack-desc b/haskell/haskell-json/slack-desc
index 357cfed73207..d2726c0977d4 100644
--- a/haskell/haskell-json/slack-desc
+++ b/haskell/haskell-json/slack-desc
@@ -11,7 +11,7 @@ haskell-json:
 haskell-json: This library provides a parser and pretty printer for converting
 haskell-json: between Haskell values and JSON.
 haskell-json:
-haskell-json: Homepage: http://hackage.haskell.org/package/json
+haskell-json: Homepage: https://hackage.haskell.org/package/json
 haskell-json:
 haskell-json:
 haskell-json: