diff options
| -rw-r--r-- | libraries/haskell-cgi/README | 6 | ||||
| -rw-r--r-- | libraries/haskell-cgi/doinst.sh | 4 | ||||
| -rw-r--r-- | libraries/haskell-cgi/haskell-cgi.SlackBuild | 32 | ||||
| -rw-r--r-- | libraries/haskell-cgi/haskell-cgi.info | 10 |
4 files changed, 26 insertions, 26 deletions
diff --git a/libraries/haskell-cgi/README b/libraries/haskell-cgi/README index 7a422f52de..e3c6f1b2c1 100644 --- a/libraries/haskell-cgi/README +++ b/libraries/haskell-cgi/README @@ -2,7 +2,7 @@ haskell-cgi (A Haskell library for writing CGI programs) This is a Haskell library for writing CGI programs. -This requires haskell-network and haskell-xhtml. +This requires haskell-MonadCatchIO-mtl, haskell-network and haskell-xhtml. -When uninstalling, run this command to unregister the package from the ghc -package database: ghc-pkg unregister cgi +After uninstalling, run this command to unregister the package from the ghc +package database: ghc-pkg recache diff --git a/libraries/haskell-cgi/doinst.sh b/libraries/haskell-cgi/doinst.sh index 4038a8fd5c..3268c238bf 100644 --- a/libraries/haskell-cgi/doinst.sh +++ b/libraries/haskell-cgi/doinst.sh @@ -1,3 +1 @@ -chroot . sh /install/register.sh -rm -f install/register.sh -rmdir install 2>/dev/null +chroot . /usr/bin/ghc-pkg recache diff --git a/libraries/haskell-cgi/haskell-cgi.SlackBuild b/libraries/haskell-cgi/haskell-cgi.SlackBuild index a3e859188d..4c48f13511 100644 --- a/libraries/haskell-cgi/haskell-cgi.SlackBuild +++ b/libraries/haskell-cgi/haskell-cgi.SlackBuild @@ -1,24 +1,22 @@ #!/bin/sh -# Slackware build script for haskell-cgi +# Slackware build script for cgi -# Written by Mikko Varri (vmj@linuxbox.fi) +# Written by Mikko Värri (vmj@linuxbox.fi) # Public domain. -PRGNAM=haskell-cgi -VERSION=${VERSION:-3001.1.7.1} +SRCNAM=cgi +PRGNAM=haskell-$SRCNAM +VERSION=${VERSION:-3001.1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -TARNAM=cgi -GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2) +GHC_VERSION=$(ghc --numeric-version) -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -47,9 +45,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $TARNAM-$VERSION -tar xvf $CWD/$TARNAM-$VERSION.tar.gz -cd $TARNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -58,18 +56,23 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ runghc Setup.hs configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libsubdir=ghc-${GHC_VERSION}/$TARNAM-$VERSION \ + --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ --enable-shared \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup.hs build runghc Setup.hs haddock runghc Setup.hs copy --destdir=$PKG -runghc Setup.hs register --gen-script +runghc Setup.hs register --gen-pkg-config + +PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d +PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 ) +mkdir -p $PKG/$PKGCONFD +mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -81,7 +84,6 @@ 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 -mv $TMP/$TARNAM-$VERSION/register.sh $PKG/install/register.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/haskell-cgi/haskell-cgi.info b/libraries/haskell-cgi/haskell-cgi.info index 80a17733c4..e1d10ad6ca 100644 --- a/libraries/haskell-cgi/haskell-cgi.info +++ b/libraries/haskell-cgi/haskell-cgi.info @@ -1,10 +1,10 @@ PRGNAM="haskell-cgi" -VERSION="3001.1.7.1" +VERSION="3001.1.8.1" HOMEPAGE="http://hackage.haskell.org/package/cgi" -DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.1.7.1/cgi-3001.1.7.1.tar.gz" -MD5SUM="02b1d2fe6f271a17c1eb8b897fbd1d7f" +DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.1.8.1/cgi-3001.1.8.1.tar.gz" +MD5SUM="b4a770dc103d1276e416d56ca16b6492" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Mikko Varri" +MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="Erik Hanson" |