summaryrefslogtreecommitdiff
path: root/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2018-10-26 10:15:59 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-11-10 07:47:04 +0700
commit2bdca3a15678c147466d841c4bc753a2e4b3b29f (patch)
tree9a8303a077ff5b5636b01601490edaa037243dd3 /haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
parent0fdeea0223f8f552a6dfb23de370f7d4bf1495fe (diff)
downloadslackbuilds-2bdca3a15678c147466d841c4bc753a2e4b3b29f.tar.gz
haskell/haskell-X11-xft: Updated for version 0.3.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild')
-rw-r--r--haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild23
1 files changed, 12 insertions, 11 deletions
diff --git a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
index 4730cf77d6..a81476ba1c 100644
--- a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
+++ b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for X11-xft
+# Slackware build script for haskell-X11-xft
# Copyright 2012 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
@@ -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,19 +69,19 @@ 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 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup configure \
--prefix=/usr \
- --enable-shared \
- --enable-library-profiling \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
+ --enable-shared \
+ --enable-library-profiling \
--docdir=/usr/doc/$PRGNAM-$VERSION
runghc Setup build
@@ -101,8 +102,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}