aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm/hs-xmonad-contrib
diff options
context:
space:
mode:
authorpgj <pgj@FreeBSD.org>2010-01-13 22:11:34 +0800
committerpgj <pgj@FreeBSD.org>2010-01-13 22:11:34 +0800
commite506a0a7ee9ac71b4e682492def10401f997104b (patch)
tree0b11b8afe9ce05c6be8883b42d961099af8ee03c /x11-wm/hs-xmonad-contrib
parente64ef57b2c25d7047f3c74ec8737e34a33731c72 (diff)
downloadfreebsd-ports-gnome-e506a0a7ee9ac71b4e682492def10401f997104b.tar.gz
freebsd-ports-gnome-e506a0a7ee9ac71b4e682492def10401f997104b.tar.zst
freebsd-ports-gnome-e506a0a7ee9ac71b4e682492def10401f997104b.zip
- Update x11/hs-x11-ghc to 1.5.0.0
- Update x11-wm/xmonad to 0.9.1 - Update x11-wm/xmonad-contrib to 0.9.1 PR: ports/142106, ports/142121 Submitted by: Jacula Modyun <jacula(at)gmail.com> Approved by: maintainer timeout (for xmonad and xmonad-contrib)
Diffstat (limited to 'x11-wm/hs-xmonad-contrib')
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile27
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo6
2 files changed, 14 insertions, 19 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 53c6191ff1e6..77a42c6c9f50 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmonad-contrib
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
@@ -15,17 +14,19 @@ MAINTAINER= matt.guegan@free.fr
COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
USE_XORG= x11
GHC_VERSION= 6.10.4
XMONADC_VERSION= ${PORTVERSION}
-UTF8STR_VERSION= 0.3.5
-HSX11XFT_VERSION= 0.3
+UTF8STR_VERSION= 0.3.6
+HSX11XFT_VERSION= 0.7
GHC_CMD= ${LOCALBASE}/bin/ghc
SETUP_CMD= ./setup
@@ -38,8 +39,7 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
XMONADC_LIBDIR_REL=${XMONADC_LIBDIR_REL}
# See (1)
-OPTIONS= XFT "Enable Xft support for fonts" On \
- UTF8 "Enable UTF-8 support" Off
+OPTIONS= XFT "Enable Xft support for fonts" On
.include <bsd.port.pre.mk>
@@ -48,17 +48,12 @@ CONFIGURE_ARGS= --haddock-options=-w --prefix=${PREFIX}
# (1)
.if exists(${LOCALBASE}/lib/X11-xft-${HSX11XFT_VERSION}/register.sh)
WITH_XFT=
-.elif exists(${LOCALBASE}/lib/utf8-string-${UTF8STR_VERSION}/register.sh)
-WITH_UTF8=
.endif
.if defined(WITH_XFT)
-CONFIGURE_ARGS+= --flags="with_xft"
-BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc \
- hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
-.elif defined(WITH_UTF8)
-CONFIGURE_ARGS+= --flags="with_utf8"
-BUILD_DEPENDS+= hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
+CONFIGURE_ARGS+= --flags="use_xft"
+BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
+RUN_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
.endif
.if defined(NOPORTDOCS)
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 277dd26dd2b9..0837e18555bc 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-contrib-0.9.tar.gz) = 545485c8ec417de9e1c36975c17656d4
-SHA256 (xmonad-contrib-0.9.tar.gz) = f67471785eba323ac416f912d3503976ef6ed43e93e53fabf5621b2c93351ae9
-SIZE (xmonad-contrib-0.9.tar.gz) = 291502
+MD5 (xmonad-contrib-0.9.1.tar.gz) = 09a6e5173878d43b9f3ddd13b3ec955b
+SHA256 (xmonad-contrib-0.9.1.tar.gz) = b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47
+SIZE (xmonad-contrib-0.9.1.tar.gz) = 291348