summaryrefslogtreecommitdiffstats
path: root/haskell/xmonad-contrib
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/xmonad-contrib')
-rw-r--r--haskell/xmonad-contrib/doinst.sh1
-rw-r--r--haskell/xmonad-contrib/xmonad-contrib.SlackBuild13
-rw-r--r--haskell/xmonad-contrib/xmonad-contrib.info14
3 files changed, 13 insertions, 15 deletions
diff --git a/haskell/xmonad-contrib/doinst.sh b/haskell/xmonad-contrib/doinst.sh
index 2a44817807..3268c238bf 100644
--- a/haskell/xmonad-contrib/doinst.sh
+++ b/haskell/xmonad-contrib/doinst.sh
@@ -1,2 +1 @@
chroot . /usr/bin/ghc-pkg recache
-
diff --git a/haskell/xmonad-contrib/xmonad-contrib.SlackBuild b/haskell/xmonad-contrib/xmonad-contrib.SlackBuild
index 89ea84ba92..605730cfdc 100644
--- a/haskell/xmonad-contrib/xmonad-contrib.SlackBuild
+++ b/haskell/xmonad-contrib/xmonad-contrib.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for xmonad-contrib
# 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=xmonad-contrib
-VERSION=${VERSION:-0.12}
+VERSION=${VERSION:-0.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -31,7 +32,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
@@ -42,8 +43,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"
@@ -94,9 +95,7 @@ mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-cp -a \
- README.md LICENSE CHANGES.md \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE CHANGES.md $PKG/usr/doc/$PRGNAM-$VERSION
cp -a scripts $PKG/usr/doc/$PRGNAM-$VERSION/scripts
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/haskell/xmonad-contrib/xmonad-contrib.info b/haskell/xmonad-contrib/xmonad-contrib.info
index 76bbfc8b5f..b00e87fb6c 100644
--- a/haskell/xmonad-contrib/xmonad-contrib.info
+++ b/haskell/xmonad-contrib/xmonad-contrib.info
@@ -1,10 +1,10 @@
PRGNAM="xmonad-contrib"
-VERSION="0.12"
-HOMEPAGE="http://www.xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.12/xmonad-contrib-0.12.tar.gz"
-MD5SUM="39345f462f069f2f0e4a488f7e435dbb"
+VERSION="0.15"
+HOMEPAGE="https://www.xmonad.org/"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/xmonad-contrib/0.15/xmonad-contrib-0.15.tar.gz"
+MD5SUM="be854e4ad4be47a706c297079b25292b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-extensible-exceptions haskell-old-time haskell-random xmonad"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-extensible-exceptions haskell-old-time haskell-random haskell-semigroups xmonad"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"