diff options
| -rw-r--r-- | haskell/haskell-cgi/cgi.cabal.patch | 16 | ||||
| -rw-r--r-- | haskell/haskell-cgi/haskell-cgi.SlackBuild | 24 | ||||
| -rw-r--r-- | haskell/haskell-cgi/haskell-cgi.info | 14 | ||||
| -rw-r--r-- | haskell/haskell-cgi/slack-desc | 2 |
4 files changed, 38 insertions, 18 deletions
diff --git a/haskell/haskell-cgi/cgi.cabal.patch b/haskell/haskell-cgi/cgi.cabal.patch new file mode 100644 index 0000000000..25d991d606 --- /dev/null +++ b/haskell/haskell-cgi/cgi.cabal.patch @@ -0,0 +1,16 @@ +--- cgi.cabal.orig 2018-10-26 15:34:31.976186187 +0100 ++++ cgi.cabal 2018-10-26 15:37:42.631190528 +0100 +@@ -44,11 +44,11 @@ + + Build-depends: + parsec >= 2.0 && < 3.2, +- exceptions < 0.9, ++ exceptions, + xhtml >= 3000.0.0 && < 3000.3, + bytestring < 0.11, + base >= 4.5 && < 5, +- time >= 1.5 && < 1.7, ++ time >= 1.5, + containers < 0.6, + multipart >= 0.1.2 && < 0.2 + If flag(network-uri) diff --git a/haskell/haskell-cgi/haskell-cgi.SlackBuild b/haskell/haskell-cgi/haskell-cgi.SlackBuild index 146f11d4ac..83102b778e 100644 --- a/haskell/haskell-cgi/haskell-cgi.SlackBuild +++ b/haskell/haskell-cgi/haskell-cgi.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for cgi +# Slackware build script for haskell-cgi # 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-cgi -VERSION=${VERSION:-3001.3.0.1} +VERSION=${VERSION:-3001.3.0.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" @@ -68,10 +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 {} \; + +# Remove upper version constraints on exceptions and time +patch -p0 < $CWD/cgi.cabal.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -102,8 +106,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-cgi/haskell-cgi.info b/haskell/haskell-cgi/haskell-cgi.info index c06ce36401..7c0ecfaa79 100644 --- a/haskell/haskell-cgi/haskell-cgi.info +++ b/haskell/haskell-cgi/haskell-cgi.info @@ -1,10 +1,10 @@ PRGNAM="haskell-cgi" -VERSION="3001.3.0.1" -HOMEPAGE="http://hackage.haskell.org/package/cgi" -DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.3.0.1/cgi-3001.3.0.1.tar.gz" -MD5SUM="acb7fdbbdba59b2cf33033c316a66346" +VERSION="3001.3.0.2" +HOMEPAGE="https://hackage.haskell.org/package/cgi" +DOWNLOAD="https://hackage.haskell.org/packages/archive/cgi/3001.3.0.2/cgi-3001.3.0.2.tar.gz" +MD5SUM="f8768b7aacecad88f910e4712cd337bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ghc haskell-exceptions haskell-multipart haskell-parsec haskell-network haskell-network-uri haskell-mtl" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +REQUIRES="haskell-exceptions haskell-multipart haskell-network haskell-network-uri" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/haskell/haskell-cgi/slack-desc b/haskell/haskell-cgi/slack-desc index 2e402659f5..48a26255c5 100644 --- a/haskell/haskell-cgi/slack-desc +++ b/haskell/haskell-cgi/slack-desc @@ -10,7 +10,7 @@ haskell-cgi: haskell-cgi (A Haskell library for writing CGI programs) haskell-cgi: haskell-cgi: This is a Haskell library for writing CGI programs. haskell-cgi: -haskell-cgi: http://hackage.haskell.org/package/cgi +haskell-cgi: https://hackage.haskell.org/package/cgi haskell-cgi: haskell-cgi: haskell-cgi: |