- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump

  port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
  with GHC 6.10.4

PR:		ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
   		ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
   		ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
   		ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
   		ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
   		ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
   		ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
   		ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
   		ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
   		ports/137107, ports/137108, ports/137109, ports/137110, ports/137111

Submitted by:	Jacula Modyun (jacula (at) gmail (dot) com),
             	Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by:	wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by:	tabthorpe (mentor), respective maintainers

12 files changed, 554 insertions, 410 deletions

diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 74840f0ff9e2..918f9ce7dca3 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
 
@@ -15,28 +15,42 @@ MAINTAINER=	matt.guegan@free.fr
 COMMENT=	Third party tiling algorithms, configurations and scripts to xmonad
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc \
 		xmonad:${PORTSDIR}/x11-wm/xmonad
-RUN_DEPENDS=	xmonad:${PORTSDIR}/x11-wm/xmonad
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		xmonad:${PORTSDIR}/x11-wm/xmonad
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
 USE_XORG=	x11
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+XMONADC_VERSION=	${PORTVERSION}
+UTF8STR_VERSION=	0.3.5
+HSX11XFT_VERSION=	0.3
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+XMONADC_LIBDIR_REL=	lib/${DISTNAME}
+
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		SUBDIR=${SUBDIR}
+		XMONADC_VERSION=${XMONADC_VERSION} \
+		XMONADC_LIBDIR_REL=${XMONADC_LIBDIR_REL}
 
-OPTIONS=	XFT "Enable Xft support for fonts" Off	\
+# See (1)
+OPTIONS=	XFT "Enable Xft support for fonts" On	\
 		UTF8 "Enable UTF-8 support" Off
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
+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"
@@ -47,24 +61,46 @@ CONFIGURE_ARGS+=	--flags="with_utf8"
 BUILD_DEPENDS+=		hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
 .endif
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure ${CONFIGURE_ARGS}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${XMONADC_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/hs-xmonad-contrib/pkg-descr b/x11-wm/hs-xmonad-contrib/pkg-descr
index 13ac4a4e128c..d2d4dabfa7c6 100644
--- a/x11-wm/hs-xmonad-contrib/pkg-descr
+++ b/x11-wm/hs-xmonad-contrib/pkg-descr
@@ -10,4 +10,4 @@ In particular:
 * XMonad.Doc.Developing, introduction to xmonad internals and
   writing your own extensions.
 
-WWW:	http://www.xmonad.org/
+WWW: http://www.xmonad.org/
diff --git a/x11-wm/hs-xmonad-contrib/pkg-plist b/x11-wm/hs-xmonad-contrib/pkg-plist
index 85266f454be0..6f6b0a1f867d 100644
--- a/x11-wm/hs-xmonad-contrib/pkg-plist
+++ b/x11-wm/hs-xmonad-contrib/pkg-plist
@@ -1,154 +1,157 @@
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/PlainConfig.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EventHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%PORTVERSION%%.a
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%PORTVERSION%%.o
-%%SUBDIR%%/register.sh
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
-@dirrm %%SUBDIR%%
-@exec /bin/sh %D/%%SUBDIR%%/register.sh
+@comment $FreeBSD$
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%XMONADC_VERSION%%.o
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/PlainConfig.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EventHook.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%XMONADC_VERSION%%.a
+%%XMONADC_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%XMONADC_LIBDIR_REL%%
+@exec /bin/sh %D/%%XMONADC_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister xmonad-contrib
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 4399457bf948..a30871bb405b 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -16,40 +16,69 @@ COMMENT=	Xmonad is a minimalist and tiling window manager for X
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
 USE_XORG=	x11
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=	6.10.4
+XMONAD_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+XMONAD_LIBDIR_REL=	lib/${DISTNAME}
+
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		SUBDIR=${SUBDIR}
+		XMONAD_VERSION=${XMONAD_VERSION} \
+		XMONAD_LIBDIR_REL=${XMONAD_LIBDIR_REL}
 
 MAN1=		xmonad.1
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
+.endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
 .endif
 
+.SILENT:
+
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install
-	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${XMONAD_LIBDIR_REL}/register.sh \
+		     && ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1 \
+		     && ${INSTALL_DATA} ${WRKSRC}/CONFIG ${DOCSDIR}
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad/pkg-descr b/x11-wm/hs-xmonad/pkg-descr
index a144dc5c9e7e..2ffa5758986f 100644
--- a/x11-wm/hs-xmonad/pkg-descr
+++ b/x11-wm/hs-xmonad/pkg-descr
@@ -13,4 +13,4 @@ Features :
     * Large extension library
     * Extensive documentation and support for hacking
 
-WWW:	http://www.xmonad.org/
+WWW: http://www.xmonad.org/
diff --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist
index e6efdf8b9ce5..70c9922513d3 100644
--- a/x11-wm/hs-xmonad/pkg-plist
+++ b/x11-wm/hs-xmonad/pkg-plist
@@ -1,19 +1,23 @@
+@comment $FreeBSD$
 bin/xmonad
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-%%PORTVERSION%%.o
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
-%%SUBDIR%%/register.sh
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
-@dirrm %%SUBDIR%%
-@exec /bin/sh %D/%%SUBDIR%%/register.sh
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSxmonad-%%XMONAD_VERSION%%.o
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%XMONAD_VERSION%%.a
+%%XMONAD_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%%%DOCSDIR%%/CONFIG
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%XMONAD_LIBDIR_REL%%
+@exec /bin/sh %D/%%XMONAD_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister xmonad
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile
index 74840f0ff9e2..918f9ce7dca3 100644
--- a/x11-wm/xmonad-contrib/Makefile
+++ b/x11-wm/xmonad-contrib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
 
@@ -15,28 +15,42 @@ MAINTAINER=	matt.guegan@free.fr
 COMMENT=	Third party tiling algorithms, configurations and scripts to xmonad
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc \
 		xmonad:${PORTSDIR}/x11-wm/xmonad
-RUN_DEPENDS=	xmonad:${PORTSDIR}/x11-wm/xmonad
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		xmonad:${PORTSDIR}/x11-wm/xmonad
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
 USE_XORG=	x11
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+XMONADC_VERSION=	${PORTVERSION}
+UTF8STR_VERSION=	0.3.5
+HSX11XFT_VERSION=	0.3
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+XMONADC_LIBDIR_REL=	lib/${DISTNAME}
+
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		SUBDIR=${SUBDIR}
+		XMONADC_VERSION=${XMONADC_VERSION} \
+		XMONADC_LIBDIR_REL=${XMONADC_LIBDIR_REL}
 
-OPTIONS=	XFT "Enable Xft support for fonts" Off	\
+# See (1)
+OPTIONS=	XFT "Enable Xft support for fonts" On	\
 		UTF8 "Enable UTF-8 support" Off
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
+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"
@@ -47,24 +61,46 @@ CONFIGURE_ARGS+=	--flags="with_utf8"
 BUILD_DEPENDS+=		hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
 .endif
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure ${CONFIGURE_ARGS}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${XMONADC_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xmonad-contrib/pkg-descr b/x11-wm/xmonad-contrib/pkg-descr
index 13ac4a4e128c..d2d4dabfa7c6 100644
--- a/x11-wm/xmonad-contrib/pkg-descr
+++ b/x11-wm/xmonad-contrib/pkg-descr
@@ -10,4 +10,4 @@ In particular:
 * XMonad.Doc.Developing, introduction to xmonad internals and
   writing your own extensions.
 
-WWW:	http://www.xmonad.org/
+WWW: http://www.xmonad.org/
diff --git a/x11-wm/xmonad-contrib/pkg-plist b/x11-wm/xmonad-contrib/pkg-plist
index 85266f454be0..6f6b0a1f867d 100644
--- a/x11-wm/xmonad-contrib/pkg-plist
+++ b/x11-wm/xmonad-contrib/pkg-plist
@@ -1,154 +1,157 @@
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/PlainConfig.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EventHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%PORTVERSION%%.a
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%PORTVERSION%%.o
-%%SUBDIR%%/register.sh
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Doc
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
-@dirrm %%SUBDIR%%
-@exec /bin/sh %D/%%SUBDIR%%/register.sh
+@comment $FreeBSD$
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%XMONADC_VERSION%%.o
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/PlainConfig.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EventHook.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
+%%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%XMONADC_VERSION%%.a
+%%XMONADC_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%XMONADC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%XMONADC_LIBDIR_REL%%
+@exec /bin/sh %D/%%XMONADC_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister xmonad-contrib
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
index 4399457bf948..a30871bb405b 100644
--- a/x11-wm/xmonad/Makefile
+++ b/x11-wm/xmonad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -16,40 +16,69 @@ COMMENT=	Xmonad is a minimalist and tiling window manager for X
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
 USE_XORG=	x11
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=	6.10.4
+XMONAD_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+XMONAD_LIBDIR_REL=	lib/${DISTNAME}
+
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		SUBDIR=${SUBDIR}
+		XMONAD_VERSION=${XMONAD_VERSION} \
+		XMONAD_LIBDIR_REL=${XMONAD_LIBDIR_REL}
 
 MAN1=		xmonad.1
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
+.endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
 .endif
 
+.SILENT:
+
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install
-	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${XMONAD_LIBDIR_REL}/register.sh \
+		     && ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1 \
+		     && ${INSTALL_DATA} ${WRKSRC}/CONFIG ${DOCSDIR}
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xmonad/pkg-descr b/x11-wm/xmonad/pkg-descr
index a144dc5c9e7e..2ffa5758986f 100644
--- a/x11-wm/xmonad/pkg-descr
+++ b/x11-wm/xmonad/pkg-descr
@@ -13,4 +13,4 @@ Features :
     * Large extension library
     * Extensive documentation and support for hacking
 
-WWW:	http://www.xmonad.org/
+WWW: http://www.xmonad.org/
diff --git a/x11-wm/xmonad/pkg-plist b/x11-wm/xmonad/pkg-plist
index e6efdf8b9ce5..70c9922513d3 100644
--- a/x11-wm/xmonad/pkg-plist
+++ b/x11-wm/xmonad/pkg-plist
@@ -1,19 +1,23 @@
+@comment $FreeBSD$
 bin/xmonad
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-%%PORTVERSION%%.o
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
-%%SUBDIR%%/register.sh
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
-@dirrm %%SUBDIR%%
-@exec /bin/sh %D/%%SUBDIR%%/register.sh
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSxmonad-%%XMONAD_VERSION%%.o
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%XMONAD_VERSION%%.a
+%%XMONAD_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%%%DOCSDIR%%/CONFIG
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
+@dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%XMONAD_LIBDIR_REL%%
+@exec /bin/sh %D/%%XMONAD_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister xmonad
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old