diff --git a/haskell/haskell-resourcet/haskell-resourcet.SlackBuild b/haskell/haskell-resourcet/haskell-resourcet.SlackBuild index 86d9dabf19..89c05ec9d8 100644 --- a/haskell/haskell-resourcet/haskell-resourcet.SlackBuild +++ b/haskell/haskell-resourcet/haskell-resourcet.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for resourcet +# Slackware build script for haskell-resourcet # 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-resourcet -VERSION=${VERSION:-1.1.7.4} +VERSION=${VERSION:-1.2.2} 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" @@ -71,7 +72,7 @@ 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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/haskell/haskell-resourcet/haskell-resourcet.info b/haskell/haskell-resourcet/haskell-resourcet.info index ecdce45980..dc2e77bce3 100644 --- a/haskell/haskell-resourcet/haskell-resourcet.info +++ b/haskell/haskell-resourcet/haskell-resourcet.info @@ -1,10 +1,10 @@ PRGNAM="haskell-resourcet" -VERSION="1.1.7.4" -HOMEPAGE="http://hackage.haskell.org/package/resourcet" -DOWNLOAD="http://hackage.haskell.org/packages/archive/resourcet/1.1.7.4/resourcet-1.1.7.4.tar.gz" -MD5SUM="fb8a08c6f88c4605b31bbab10e3ce475" +VERSION="1.2.2" +HOMEPAGE="https://hackage.haskell.org/package/resourcet" +DOWNLOAD="https://hackage.haskell.org/packages/archive/resourcet/1.2.2/resourcet-1.2.2.tar.gz" +MD5SUM="98943b21aa913e37b53a415dc8fee1a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ghc haskell-exceptions haskell-lifted-base haskell-mmorph haskell-monad-control haskell-mtl haskell-transformers-base haskell-transformers-compat" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +REQUIRES="haskell-exceptions haskell-lifted-base haskell-mmorph haskell-monad-control haskell-primitive haskell-transformers-base haskell-transformers-compat haskell-unliftio-core" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com"