summaryrefslogtreecommitdiffstats
path: root/haskell
diff options
context:
space:
mode:
author David Spencer2018-10-26 12:01:53 +0200
committer Willy Sudiarto Raharjo2018-11-10 01:47:58 +0100
commit5e4e09c45dc9df5927c302872c9661767243f355 (patch)
tree7b196596489e78dbb14cf96578d5e35b1de9ce5b /haskell
parent072e32c5c4339645ed5e43b2dab39b28225f854b (diff)
downloadslackbuilds-5e4e09c45dc9df5927c302872c9661767243f355.tar.gz
haskell/hscolour: Updated for version 1.24.4.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'haskell')
-rw-r--r--haskell/hscolour/doinst.sh1
-rw-r--r--haskell/hscolour/hscolour.SlackBuild15
-rw-r--r--haskell/hscolour/hscolour.info4
3 files changed, 11 insertions, 9 deletions
diff --git a/haskell/hscolour/doinst.sh b/haskell/hscolour/doinst.sh
new file mode 100644
index 0000000000..3268c238bf
--- /dev/null
+++ b/haskell/hscolour/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/ghc-pkg recache
diff --git a/haskell/hscolour/hscolour.SlackBuild b/haskell/hscolour/hscolour.SlackBuild
index 2e25ca4189..1c2e99d5ab 100644
--- a/haskell/hscolour/hscolour.SlackBuild
+++ b/haskell/hscolour/hscolour.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,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"
@@ -66,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$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" \
@@ -100,6 +100,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
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}
diff --git a/haskell/hscolour/hscolour.info b/haskell/hscolour/hscolour.info
index 4d9698a9bf..d7d90568dc 100644
--- a/haskell/hscolour/hscolour.info
+++ b/haskell/hscolour/hscolour.info
@@ -1,7 +1,7 @@
PRGNAM="hscolour"
VERSION="1.24.4"
-HOMEPAGE="http://hackage.haskell.org/package/hscolour/"
-DOWNLOAD="http://hackage.haskell.org/package/hscolour-1.24.4/hscolour-1.24.4.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/hscolour/"
+DOWNLOAD="https://hackage.haskell.org/package/hscolour-1.24.4/hscolour-1.24.4.tar.gz"
MD5SUM="3b071820df13cbee7e90199e8e598007"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""