diff options
| -rw-r--r-- | haskell/haskell-dataenc/haskell-dataenc.SlackBuild | 21 | ||||
| -rw-r--r-- | haskell/haskell-dataenc/haskell-dataenc.info | 8 | ||||
| -rw-r--r-- | haskell/haskell-dataenc/slack-desc | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/haskell/haskell-dataenc/haskell-dataenc.SlackBuild b/haskell/haskell-dataenc/haskell-dataenc.SlackBuild index 5fc2100aa2be..48e227f26f8e 100644 --- a/haskell/haskell-dataenc/haskell-dataenc.SlackBuild +++ b/haskell/haskell-dataenc/haskell-dataenc.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for dataenc +# Slackware build script for haskell-dataenc # 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 @@ -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,13 +69,13 @@ 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 {} \; -# Taken from Arch's update-build-deps-ghc-7.10.1.patch -sed -i -e 's/base >= 3.0.0 \&\& < 4.8/base >= 3.0.0 \&\& < 4.9/' dataenc.cabal +# Remove bogus upper version constraint on base +sed -i -E 's/(base *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/haskell/haskell-dataenc/haskell-dataenc.info b/haskell/haskell-dataenc/haskell-dataenc.info index 2f81b7c163f3..ddde2b32b822 100644 --- a/haskell/haskell-dataenc/haskell-dataenc.info +++ b/haskell/haskell-dataenc/haskell-dataenc.info @@ -1,10 +1,10 @@ PRGNAM="haskell-dataenc" VERSION="0.14.0.7" -HOMEPAGE="http://hackage.haskell.org/package/dataenc" -DOWNLOAD="http://hackage.haskell.org/packages/archive/dataenc/0.14.0.7/dataenc-0.14.0.7.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/dataenc" +DOWNLOAD="https://hackage.haskell.org/packages/archive/dataenc/0.14.0.7/dataenc-0.14.0.7.tar.gz" MD5SUM="28491649dbeafb9512b4ea187cc6fddf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ghc" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/haskell/haskell-dataenc/slack-desc b/haskell/haskell-dataenc/slack-desc index 4fadc384cd88..0e3a3c74d828 100644 --- a/haskell/haskell-dataenc/slack-desc +++ b/haskell/haskell-dataenc/slack-desc @@ -12,7 +12,7 @@ haskell-dataenc: Data encoding library currently providing Base16, Base32, Base3 haskell-dataenc: Base64, Base64Url, Base85, Python string escaping, Quoted-Printable, haskell-dataenc: URL encoding, uuencode, xxencode, and yEncoding. haskell-dataenc: -haskell-dataenc: http://hackage.haskell.org/package/dataenc +haskell-dataenc: https://hackage.haskell.org/package/dataenc haskell-dataenc: haskell-dataenc: haskell-dataenc: |