diff --git a/haskell/haskell-byteable/haskell-byteable.SlackBuild b/haskell/haskell-byteable/haskell-byteable.SlackBuild index beb4bbc008..b5df40d296 100644 --- a/haskell/haskell-byteable/haskell-byteable.SlackBuild +++ b/haskell/haskell-byteable/haskell-byteable.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for byteable +# Slackware build script for haskell-byteable # 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,7 +102,7 @@ cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Remove duplicate README.md in usr/share/$ARCH-linux-ghc-$GHC_VERSION/$SRCNAM-$VERSION -rm -rfv $PKG/usr/share +####rm -rfv $PKG/usr/share mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/haskell/haskell-byteable/haskell-byteable.info b/haskell/haskell-byteable/haskell-byteable.info index 7c2fee6cdb..f70d730f86 100644 --- a/haskell/haskell-byteable/haskell-byteable.info +++ b/haskell/haskell-byteable/haskell-byteable.info @@ -1,10 +1,10 @@ PRGNAM="haskell-byteable" VERSION="0.1.1" -HOMEPAGE="http://hackage.haskell.org/package/byteable" -DOWNLOAD="http://hackage.haskell.org/packages/archive/byteable/0.1.1/byteable-0.1.1.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/byteable" +DOWNLOAD="https://hackage.haskell.org/packages/archive/byteable/0.1.1/byteable-0.1.1.tar.gz" MD5SUM="ebe2d61954382fcfe3be483951d8a77b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ghc" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com"