summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haskell/haskell-socks/haskell-socks.SlackBuild15
-rw-r--r--haskell/haskell-socks/haskell-socks.info12
2 files changed, 14 insertions, 13 deletions
diff --git a/haskell/haskell-socks/haskell-socks.SlackBuild b/haskell/haskell-socks/haskell-socks.SlackBuild
index 977f7915ea..5c390e7f5a 100644
--- a/haskell/haskell-socks/haskell-socks.SlackBuild
+++ b/haskell/haskell-socks/haskell-socks.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for socks
+# Slackware build script for haskell-socks
# 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
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-socks
-VERSION=${VERSION:-0.5.5}
+VERSION=${VERSION:-0.5.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -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"
@@ -71,7 +72,7 @@ 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -101,7 +102,7 @@ cp -a Example.hs LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# Remove duplicate README.md and Example.hs in usr/share/$ARCH-linux-ghc-$GHC_VERSION/$SRCNAM-$VERSION
-rm -rfv $PKG/usr/share
+####rm -rfv $PKG/usr/share
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/haskell/haskell-socks/haskell-socks.info b/haskell/haskell-socks/haskell-socks.info
index 9e28634dc4..f2df701961 100644
--- a/haskell/haskell-socks/haskell-socks.info
+++ b/haskell/haskell-socks/haskell-socks.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-socks"
-VERSION="0.5.5"
-HOMEPAGE="http://hackage.haskell.org/package/socks"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/socks/0.5.5/socks-0.5.5.tar.gz"
-MD5SUM="d56670aa720b505469f9f348dc020773"
+VERSION="0.5.6"
+HOMEPAGE="https://hackage.haskell.org/package/socks"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/socks/0.5.6/socks-0.5.6.tar.gz"
+MD5SUM="80d611a49f5f040caf16c4915880513f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="haskell-cereal haskell-network"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"