summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2010-07-16 13:59:43 -0500
committerErik Hanson <erik@slackbuilds.org>2010-07-21 01:42:40 -0500
commit09e0a9dd2f55ae9241ac232fb07153054fd931a5 (patch)
tree80f913998241bf96e504ed0ae753ab45dc2be9ed
parent9125b30c9e197a15435b6bedef1e271c7f23f448 (diff)
downloadslackbuilds-09e0a9dd2f55ae9241ac232fb07153054fd931a5.tar.gz
libraries/haskell-editline: Build bump, various changes.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--libraries/haskell-editline/README4
-rw-r--r--libraries/haskell-editline/doinst.sh4
-rw-r--r--libraries/haskell-editline/haskell-editline.SlackBuild40
-rw-r--r--libraries/haskell-editline/haskell-editline.info4
4 files changed, 26 insertions, 26 deletions
diff --git a/libraries/haskell-editline/README b/libraries/haskell-editline/README
index 6c99ec20f2..3ffb39b8bb 100644
--- a/libraries/haskell-editline/README
+++ b/libraries/haskell-editline/README
@@ -7,5 +7,5 @@ subset of the functions from the readline package.
This requires libedit and ghc.
-When uninstalling, run this command to unregister the package from the ghc
-package database: ghc-pkg unregister editline
+After uninstalling, run this command to unregister the package from the ghc
+package database: ghc-pkg recache
diff --git a/libraries/haskell-editline/doinst.sh b/libraries/haskell-editline/doinst.sh
index 4038a8fd5c..3268c238bf 100644
--- a/libraries/haskell-editline/doinst.sh
+++ b/libraries/haskell-editline/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-editline/haskell-editline.SlackBuild b/libraries/haskell-editline/haskell-editline.SlackBuild
index 8f17fdcccb..23c4064e65 100644
--- a/libraries/haskell-editline/haskell-editline.SlackBuild
+++ b/libraries/haskell-editline/haskell-editline.SlackBuild
@@ -1,24 +1,22 @@
#!/bin/sh
-# Slackware build script for haskell-editline
+# Slackware build script for editline
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
# Public domain.
-PRGNAM=haskell-editline
+SRCNAM=editline
+PRGNAM=haskell-$SRCNAM
VERSION=${VERSION:-0.2.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-TARNAM=editline
-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" \
-runhaskell Setup.lhs configure \
+CXXFLAGS="$SLKCFLAGS" \
+runghc Setup.lhs 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
-runhaskell Setup.lhs build
-runhaskell Setup.lhs haddock
-runhaskell Setup.lhs copy --destdir=$PKG
-runhaskell Setup.lhs register --gen-script
+runghc Setup.lhs build
+runghc Setup.lhs haddock
+runghc Setup.lhs copy --destdir=$PKG
+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
@@ -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-editline/haskell-editline.info b/libraries/haskell-editline/haskell-editline.info
index c7ab8ed812..a0fae610dd 100644
--- a/libraries/haskell-editline/haskell-editline.info
+++ b/libraries/haskell-editline/haskell-editline.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/editline/0.2.1.0/editline-
MD5SUM="fa57f434e538bb32bbfa97aface34358"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"