summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild19
-rw-r--r--haskell/haskell-ghc-paths/haskell-ghc-paths.info8
2 files changed, 14 insertions, 13 deletions
diff --git a/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild b/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
index a6d4108dfd..ec6e8f37e7 100644
--- a/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
+++ b/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for ghc-paths
+# Slackware build script for haskell-ghc-paths
# Copyright 2013 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,10 +69,10 @@ 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" \
@@ -97,7 +98,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/haskell/haskell-ghc-paths/haskell-ghc-paths.info b/haskell/haskell-ghc-paths/haskell-ghc-paths.info
index da4861c200..d9a3b307b4 100644
--- a/haskell/haskell-ghc-paths/haskell-ghc-paths.info
+++ b/haskell/haskell-ghc-paths/haskell-ghc-paths.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-ghc-paths"
VERSION="0.1.0.9"
-HOMEPAGE="http://hackage.haskell.org/package/ghc-paths"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/ghc-paths/0.1.0.9/ghc-paths-0.1.0.9.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/ghc-paths/0.1.0.9/ghc-paths-0.1.0.9.tar.gz"
MD5SUM="03d8df6ad0f5c2d1e92a379716b59845"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ghc"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"