summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Spencer <baildon.research@googlemail.com>2018-10-26 11:01:37 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2018-11-10 07:47:55 +0700
commitc039cf323fc4b9bb431b3e01ddb1d8e2972a814b (patch)
treebb0e79f89c4793534c0e0d0e07a0cd301fcbab7c
parent36d5a5e5ef46157171222c4416825ef73e051566 (diff)
downloadslackbuilds-c039cf323fc4b9bb431b3e01ddb1d8e2972a814b.tar.gz
slackbuilds-c039cf323fc4b9bb431b3e01ddb1d8e2972a814b.tar.xz
haskell/haskell-utf8-string: Updated for version 1.0.1.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild20
-rw-r--r--haskell/haskell-utf8-string/haskell-utf8-string.info8
-rw-r--r--haskell/haskell-utf8-string/slack-desc2
3 files changed, 17 insertions, 13 deletions
diff --git a/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild b/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
index 0a2ca9f05b..fb860ef67a 100644
--- a/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
+++ b/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for utf8-string
+# Slackware build script for haskell-utf8-string
# Copyright 2015 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,13 @@ 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 {} \;
+
+# Remove bogus upper version constraint on base
+sed -i -E 's/(base *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/haskell/haskell-utf8-string/haskell-utf8-string.info b/haskell/haskell-utf8-string/haskell-utf8-string.info
index fdaa87f1c6..0a0663fbc6 100644
--- a/haskell/haskell-utf8-string/haskell-utf8-string.info
+++ b/haskell/haskell-utf8-string/haskell-utf8-string.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-utf8-string"
VERSION="1.0.1.1"
-HOMEPAGE="http://hackage.haskell.org/package/utf8-string"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/utf8-string/1.0.1.1/utf8-string-1.0.1.1.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/utf8-string"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/utf8-string/1.0.1.1/utf8-string-1.0.1.1.tar.gz"
MD5SUM="fe24e26bd4b09731af66ef27b18b5177"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ghc"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/haskell/haskell-utf8-string/slack-desc b/haskell/haskell-utf8-string/slack-desc
index ee8017c5e5..8f18c8c9f7 100644
--- a/haskell/haskell-utf8-string/slack-desc
+++ b/haskell/haskell-utf8-string/slack-desc
@@ -12,7 +12,7 @@ haskell-utf8-string: A UTF8 layer for IO and Strings. The utf8-string package p
haskell-utf8-string: operations for encoding UTF8 strings to Word8 lists and back, and
haskell-utf8-string: for reading and writing UTF8 without truncation.
haskell-utf8-string:
-haskell-utf8-string: Homepage: http://hackage.haskell.org/package/utf8-string
+haskell-utf8-string: Homepage: https://hackage.haskell.org/package/utf8-string
haskell-utf8-string:
haskell-utf8-string:
haskell-utf8-string: