diff --git a/haskell/haskell-network-uri/haskell-network-uri.SlackBuild b/haskell/haskell-network-uri/haskell-network-uri.SlackBuild index ebd9dd7579..bfebdbb635 100644 --- a/haskell/haskell-network-uri/haskell-network-uri.SlackBuild +++ b/haskell/haskell-network-uri/haskell-network-uri.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for network-uri +# Slackware build script for haskell-network-uri # 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" @@ -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" \ @@ -101,8 +102,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-network-uri/haskell-network-uri.info b/haskell/haskell-network-uri/haskell-network-uri.info index 7248643da2..48ff01f980 100644 --- a/haskell/haskell-network-uri/haskell-network-uri.info +++ b/haskell/haskell-network-uri/haskell-network-uri.info @@ -1,10 +1,10 @@ PRGNAM="haskell-network-uri" VERSION="2.6.1.0" -HOMEPAGE="http://hackage.haskell.org/package/network-uri" -DOWNLOAD="http://hackage.haskell.org/package/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/network-uri" +DOWNLOAD="https://hackage.haskell.org/package/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz" MD5SUM="c6ed1e8314a9b1674a3d118d9019a229" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="haskell-parsec" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +REQUIRES="ghc" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com"