Index: head/x11-wm/hs-xmonad/Makefile
===================================================================
--- head/x11-wm/hs-xmonad/Makefile	(revision 379051)
+++ head/x11-wm/hs-xmonad/Makefile	(revision 379052)
@@ -1,23 +1,33 @@
 # Created by: Matthieu Guegan <matt.guegan@free.fr>
 # $FreeBSD$
 
 PORTNAME=	xmonad
 PORTVERSION=	0.11
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Tiling window manager
 
 LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	extensible-exceptions mtl utf8-string>=0.3 X11>=1.5
 USE_XORG=	x11
 
 MAN1PAGES=	xmonad.1
 MAN1SRC=	man
 
 EXECUTABLE=	xmonad
 
+OPTIONS_DEFINE+=	XFORK_FIX
+OPTIONS_DEFAULT+=	XFORK_FIX
+
+XFORK_FIX_DESC=		Apply workaround for losing hotkeys (XMonad \#576)
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${PORT_OPTIONS:MXFORK_FIX}
+EXTRA_PATCHES+=	${PATCHDIR}/nopatch-XMonad_Core.hs
+.endif
+
 .include <bsd.port.mk>
Index: head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
===================================================================
--- head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs	(nonexistent)
+++ head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs	(revision 379052)
@@ -0,0 +1,20 @@
+--- XMonad/Core.hs.orig	2013-01-01 01:31:47 UTC
++++ XMonad/Core.hs
+@@ -400,10 +400,13 @@ spawnPID x = xfork $ executeFile "/bin/s
+ 
+ -- | A replacement for 'forkProcess' which resets default signal handlers.
+ xfork :: MonadIO m => IO () -> m ProcessID
+-xfork x = io . forkProcess . finally nullStdin $ do
+-                uninstallSignalHandlers
+-                createSession
+-                x
++xfork x = do 
++    pid <- liftIO $ forkProcess $ finally nullStdin $ do
++        forkProcess $ do
++            uninstallSignalHandlers
++            createSession
++            x
++    return pid
+  where
+     nullStdin = do
+         fd <- openFd "/dev/null" ReadOnly Nothing defaultFileFlags

Property changes on: head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-wm/hs-xmonad-contrib/Makefile
===================================================================
--- head/x11-wm/hs-xmonad-contrib/Makefile	(revision 379051)
+++ head/x11-wm/hs-xmonad-contrib/Makefile	(revision 379052)
@@ -1,28 +1,28 @@
 # Created by: Matthieu Guegan <matt.guegan@free.fr>
 # $FreeBSD$
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.11.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 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_XORG=	x11
 
 RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
 
 FLAGS_DEFINE=		XFT
 FLAGS_DEFAULT=		XFT
 
 XFT_DESC=		Use Xft to render text
 XFT_FLAG_ENABLE=	use_xft
 XFT_FLAG_CABAL=		X11-xft>=0.2
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>