haskell/haskell-scientific: Updated for version 0.3.6.2.

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

3 files changed, 21 insertions, 20 deletions

diff --git a/haskell/haskell-scientific/haskell-scientific.SlackBuild b/haskell/haskell-scientific/haskell-scientific.SlackBuild
index 0a2b06dcd0..d0bea97b80 100644
--- a/haskell/haskell-scientific/haskell-scientific.SlackBuild
+++ b/haskell/haskell-scientific/haskell-scientific.SlackBuild
@@ -2,8 +2,9 @@
 
 # Slackware build script for haskell-scientific
 
-# Copyright 2015 Mikko Värri, Finland
 # Copyright 2014 Google Inc, Germany
+# 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-scientific
-VERSION=${VERSION:-0.3.4.6}
+VERSION=${VERSION:-0.3.6.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,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 640 -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 changelog $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-scientific/haskell-scientific.info b/haskell/haskell-scientific/haskell-scientific.info
index 1eb9e6202b..261a6f628f 100644
--- a/haskell/haskell-scientific/haskell-scientific.info
+++ b/haskell/haskell-scientific/haskell-scientific.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-scientific"
-VERSION="0.3.4.6"
-HOMEPAGE="http://hackage.haskell.org/package/scientific"
-DOWNLOAD="http://hackage.haskell.org/package/scientific-0.3.4.6/scientific-0.3.4.6.tar.gz"
-MD5SUM="beaffa29a79f0717729c9dc48820c149"
+VERSION="0.3.6.2"
+HOMEPAGE="https://hackage.haskell.org/package/scientific"
+DOWNLOAD="https://hackage.haskell.org/package/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz"
+MD5SUM="f4f40eec14dd8c9308d8dd478212e4b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-hashable haskell-vector"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-hashable haskell-integer-logarithms haskell-vector"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-scientific/slack-desc b/haskell/haskell-scientific/slack-desc
index aa12362ccd..c38b7ef165 100644
--- a/haskell/haskell-scientific/slack-desc
+++ b/haskell/haskell-scientific/slack-desc
@@ -16,4 +16,4 @@ haskell-scientific: point numbers. Since the textual representation of floating
 haskell-scientific: numbers use scientific notation they can be efficiently parsed to a
 haskell-scientific: Scientific number.
 haskell-scientific:
-haskell-scientific: http://hackage.haskell.org/package/scientific
+haskell-scientific: https://hackage.haskell.org/package/scientific