aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2015-08-20 23:02:14 +0000
committerGabor Pali <pgj@FreeBSD.org>2015-08-20 23:02:14 +0000
commit39b8e49140afdb1d1d001c477befb4b05efa7fc3 (patch)
tree607a5ca77efd301a2b4dc49b05d108829fcffa77 /x11-wm
parent75b64b1cb42c127b71646f039269eb7bd560d8ef (diff)
downloadports-39b8e49140afdb1d1d001c477befb4b05efa7fc3.tar.gz
ports-39b8e49140afdb1d1d001c477befb4b05efa7fc3.zip
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile9
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo4
-rw-r--r--x11-wm/hs-xmonad/Makefile5
-rw-r--r--x11-wm/hs-xmonad/distinfo4
-rw-r--r--x11-wm/hs-xmonad/files/patch-xmonad.cabal11
5 files changed, 23 insertions, 10 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index f00b9c56aa27..561c6254dd39 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
-PORTVERSION= 0.11.3
-PORTREVISION= 2
+PORTVERSION= 0.11.4
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl>=1 random utf8-string X11>=1.6.1 \
- xmonad>=0.11
+USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
+ X11>=1.6.1 xmonad>=0.11
USE_XORG= x11
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
@@ -24,5 +23,7 @@ XFT_DESC= Use Xft to render text
XFT_FLAG_ENABLE= use_xft
XFT_FLAG_CABAL= X11-xft>=0.2
+FLAGS_DISABLE= testing
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index e39158a57635..7ccfe7a18ef4 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.11.3.tar.gz) = aae39e11681fe8e8763d203ed6964a7e18b1558d8b8322b9ae5e523f46de0992
-SIZE (cabal/xmonad-contrib-0.11.3.tar.gz) = 401707
+SHA256 (cabal/xmonad-contrib-0.11.4.tar.gz) = a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc
+SIZE (cabal/xmonad-contrib-0.11.4.tar.gz) = 401743
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index b50229ea4b39..ce204d73d907 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad
-PORTVERSION= 0.11
-PORTREVISION= 10
+PORTVERSION= 0.11.1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -22,6 +21,8 @@ EXECUTABLE= xmonad
OPTIONS_DEFINE+= XFORK_FIX
OPTIONS_DEFAULT+= XFORK_FIX
+FLAGS_DISABLE= testing
+
XFORK_FIX_DESC= Apply workaround for losing hotkeys (XMonad \#576)
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index 175ac674dd3e..c48469c9bf12 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-0.11.tar.gz) = e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb
-SIZE (cabal/xmonad-0.11.tar.gz) = 59119
+SHA256 (cabal/xmonad-0.11.1.tar.gz) = 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd
+SIZE (cabal/xmonad-0.11.1.tar.gz) = 59307
diff --git a/x11-wm/hs-xmonad/files/patch-xmonad.cabal b/x11-wm/hs-xmonad/files/patch-xmonad.cabal
new file mode 100644
index 000000000000..31e082540956
--- /dev/null
+++ b/x11-wm/hs-xmonad/files/patch-xmonad.cabal
@@ -0,0 +1,11 @@
+--- xmonad.cabal.orig 2015-03-27 17:59:21 UTC
++++ xmonad.cabal
+@@ -58,7 +58,7 @@ library
+ else
+ build-depends: base < 3
+ build-depends: X11>=1.5 && < 1.7, mtl, unix,
+- utf8-string >= 0.3 && < 0.4
++ utf8-string >= 0.3
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall