svn commit: r317973 - in head: graphics/hs-HGL x11-wm/hs-xmonad x11-wm/hs-xmonad-contrib x11/hs-X11 x11/hs-X11-xft x11/hs-xmobar

[Gabor Pali]

Author: pgj
Date: Sun May 12 19:30:28 2013
New Revision: 317973
URL: http://svnweb.freebsd.org/changeset/ports/317973

Log:
  - Restore and make default the XINERAMA option which was accidentally dropped
    in r309275
  - Bump port revision for the port and for all of its dependents, especially
    xmonad, because it can only work in dual-monitor configurations with this
    setting enabled
  
  PR:		ports/178336
  Submitted by:	Christopher J. Ruwe <cjr at cruwe.de>
  Obtained from:	FreeBSD Haskell

Modified:
  head/graphics/hs-HGL/Makefile
  head/x11-wm/hs-xmonad-contrib/Makefile
  head/x11-wm/hs-xmonad/Makefile
  head/x11/hs-X11-xft/Makefile
  head/x11/hs-X11/Makefile
  head/x11/hs-xmobar/Makefile

Modified: head/graphics/hs-HGL/Makefile
==============================================================================
--- head/graphics/hs-HGL/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/graphics/hs-HGL/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -3,7 +3,7 @@
 
 PORTNAME=	HGL
 PORTVERSION=	3.2.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Modified: head/x11-wm/hs-xmonad-contrib/Makefile
==============================================================================
--- head/x11-wm/hs-xmonad-contrib/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/x11-wm/hs-xmonad-contrib/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Modified: head/x11-wm/hs-xmonad/Makefile
==============================================================================
--- head/x11-wm/hs-xmonad/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/x11-wm/hs-xmonad/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Modified: head/x11/hs-X11-xft/Makefile
==============================================================================
--- head/x11/hs-X11-xft/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/x11/hs-X11-xft/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -2,7 +2,7 @@
 
 PORTNAME=	X11-xft
 PORTVERSION=	0.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell at FreeBSD.org

Modified: head/x11/hs-X11/Makefile
==============================================================================
--- head/x11/hs-X11/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/x11/hs-X11/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -3,6 +3,7 @@
 
 PORTNAME=	X11
 PORTVERSION=	1.6.1.1
+PORTREVISION=	1
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell at FreeBSD.org
@@ -15,5 +16,19 @@ CABAL_SETUP=	Setup.hs
 USE_CABAL=	data-default
 USE_XORG=	x11 xrandr xext
 
+OPTIONS_DEFINE=		XINERAMA
+OPTIONS_DEFAULT=	XINERAMA
+
+XINERAMA_DESC=	Build with Xinerama support
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+
+.if ${PORT_OPTIONS:MXINERAMA}
+USE_XORG+=		xinerama
+CONFIGURE_ARGS+=	--configure-option="--with-xinerama"
+.else
+CONFIGURE_ARGS+=	--configure-option="--without-xinerama"
+.endif
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>

Modified: head/x11/hs-xmobar/Makefile
==============================================================================
--- head/x11/hs-xmobar/Makefile	Sun May 12 19:08:49 2013	(r317972)
+++ head/x11/hs-xmobar/Makefile	Sun May 12 19:30:28 2013	(r317973)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmobar
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell at FreeBSD.org