diff options
| -rw-r--r-- | haskell/haskell-deepseq-generics/haskell-deepseq-generics.SlackBuild | 20 | ||||
| -rw-r--r-- | haskell/haskell-deepseq-generics/haskell-deepseq-generics.info | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/haskell/haskell-deepseq-generics/haskell-deepseq-generics.SlackBuild b/haskell/haskell-deepseq-generics/haskell-deepseq-generics.SlackBuild index 9a260a5597..3665be8575 100644 --- a/haskell/haskell-deepseq-generics/haskell-deepseq-generics.SlackBuild +++ b/haskell/haskell-deepseq-generics/haskell-deepseq-generics.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for deepseq-generics +# Slackware build script for haskell-deepseq-generics # 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-deepseq-generics -VERSION=${VERSION:-0.1.1.2} +VERSION=${VERSION:-0.2.0.0} 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" @@ -73,9 +74,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# http://hackage.haskell.org/package/deepseq-generics-0.1.1.2/revisions/ -sed -i -e 's/ghc-prim >= 0.2 \&\& < 0.4/ghc-prim >= 0.2 \&\& < 0.5/' \ - deepseq-generics.cabal +# Remove bogus upper version constraint on base +sed -i -E 's/(base *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -101,12 +101,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a changelog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a changelog.md 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-deepseq-generics/haskell-deepseq-generics.info b/haskell/haskell-deepseq-generics/haskell-deepseq-generics.info index e1e9eec6ca..12c21394cc 100644 --- a/haskell/haskell-deepseq-generics/haskell-deepseq-generics.info +++ b/haskell/haskell-deepseq-generics/haskell-deepseq-generics.info @@ -1,10 +1,10 @@ PRGNAM="haskell-deepseq-generics" -VERSION="0.1.1.2" -HOMEPAGE="http://hackage.haskell.org/package/deepseq-generics" -DOWNLOAD="http://hackage.haskell.org/package/deepseq-generics-0.1.1.2/deepseq-generics-0.1.1.2.tar.gz" -MD5SUM="42a13139891be6a7bf0c88923daf51ed" +VERSION="0.2.0.0" +HOMEPAGE="https://hackage.haskell.org/package/deepseq-generics" +DOWNLOAD="https://hackage.haskell.org/package/deepseq-generics-0.2.0.0/deepseq-generics-0.2.0.0.tar.gz" +MD5SUM="7bb94923c52024f642c85f4dab9a9b79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ghc" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" |