diff options
author | Andy Bailey <GooseYArd@gmail.com> | 2010-07-25 18:26:45 -0500 |
---|---|---|
committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-25 21:52:41 -0500 |
commit | 7d822cf36789cba5e398ef849cb24c92ac63df1a (patch) | |
tree | 43f477a85da3cb104113668697a62bda044ecfd6 /libraries | |
parent | 5120869d0f712786f728f01a0953f1e83a781c23 (diff) | |
download | slackbuilds-7d822cf36789cba5e398ef849cb24c92ac63df1a.tar.gz |
libraries/haskell-X11-xft: Build bump, various changes.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/haskell-X11-xft/README | 5 | ||||
-rw-r--r-- | libraries/haskell-X11-xft/doinst.sh | 5 | ||||
-rw-r--r-- | libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild | 30 | ||||
-rw-r--r-- | libraries/haskell-X11-xft/haskell-X11-xft.info | 2 |
4 files changed, 23 insertions, 19 deletions
diff --git a/libraries/haskell-X11-xft/README b/libraries/haskell-X11-xft/README index 5e523ff5b6..711cb15ac9 100644 --- a/libraries/haskell-X11-xft/README +++ b/libraries/haskell-X11-xft/README @@ -1,3 +1,6 @@ haskell-X11-xft is haskell support for xft in X11. -This requires ghc and haskell-X11. +This requires ghc, haskell-X11, and haskell-utf8-string. + +After uninstalling, run this command to unregister the package from +the ghc package database: ghc-pkg recache diff --git a/libraries/haskell-X11-xft/doinst.sh b/libraries/haskell-X11-xft/doinst.sh index 87825cdcca..3268c238bf 100644 --- a/libraries/haskell-X11-xft/doinst.sh +++ b/libraries/haskell-X11-xft/doinst.sh @@ -1,4 +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-X11-xft/haskell-X11-xft.SlackBuild b/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild index 601cd667dd..5e678db3f5 100644 --- a/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild +++ b/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild @@ -1,17 +1,17 @@ #!/bin/sh -# Slackware build script for haskell-hinotify +# Slackware build script for X11-xft -# Written by Mikko Varri (vmj@linuxbox.fi) -# Modified by Andy Bailey (GooseYArd@gmail.com) for hinotify +# Written by Mikko Värri (vmj@linuxbox.fi) +# Modified by Andy Bailey (GooseYArd@gmail.com) for X11-xft # Public domain. -PRGNAM=haskell-X11-xft +SRCNAM=X11-xft +PRGNAM=haskell-$SRCNAM VERSION=${VERSION:-0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -TARNAM=X11-xft -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 @@ -47,9 +47,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 \) \ @@ -63,13 +63,18 @@ runghc Setup.lhs configure \ --prefix=/usr \ --enable-shared \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libsubdir=ghc-${GHC_VERSION}/$TARNAM-$VERSION \ + --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup.lhs build runghc Setup.lhs haddock runghc Setup.lhs copy --destdir=$PKG -runghc Setup.lhs register --gen-script +runghc Setup.lhs 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 @@ -79,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-X11-xft/haskell-X11-xft.info b/libraries/haskell-X11-xft/haskell-X11-xft.info index c8e21f6cf5..c12d37f9b7 100644 --- a/libraries/haskell-X11-xft/haskell-X11-xft.info +++ b/libraries/haskell-X11-xft/haskell-X11-xft.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Andy Bailey" EMAIL="GooseYArd@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" |