6 files changed, 16 insertions, 234 deletions

diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 908d31cfa18b..187f5cb639c5 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	xmonad-contrib
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.2
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Third party tiling algorithms, configurations and scripts to xmonad
 
-USE_HACKAGE=	xmonad utf8-string
+LICENSE=	BSD
+
+USE_CABAL=	mtl xmonad>=0.9.1 X11>=1.5 utf8-string
 USE_XORG=	x11
 
 OPTIONS=	XFT "Enable Xft support for fonts" On
@@ -23,7 +24,7 @@ OPTIONS=	XFT "Enable Xft support for fonts" On
 
 .if defined(WITH_XFT)
 CONFIGURE_ARGS+=	--flags="use_xft"
-USE_HACKAGE+=		X11-xft>=0.2
+USE_CABAL+=		X11-xft>=0.2
 .endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index af6934b88f8c..6d21429a1234 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.9.1.tar.gz) = b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47
-SIZE (cabal/xmonad-contrib-0.9.1.tar.gz) = 291348
+SHA256 (cabal/xmonad-contrib-0.9.2.tar.gz) = b7c0c0013b533234088bab0d0821ed2dc5c5fa61043fef2b17e647c4892c0f1a
+SIZE (cabal/xmonad-contrib-0.9.2.tar.gz) = 292481
diff --git a/x11-wm/hs-xmonad-contrib/pkg-plist b/x11-wm/hs-xmonad-contrib/pkg-plist
deleted file mode 100644
index 38a3771818f3..000000000000
--- a/x11-wm/hs-xmonad-contrib/pkg-plist
+++ /dev/null
@@ -1,201 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatSnap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/GridSelect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/OnScreen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MessageFeedback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PhysicalScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RandomBackground.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SpawnOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TopicSpace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdateFocus.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowMenu.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WithAll.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WorkspaceCursors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Azerty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FloatNext.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/InsertPosition.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Place.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/RestoreMinimized.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/WorkspaceByPos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/AutoMaster.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BorderResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/CenteredMaster.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Cross.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Column.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ComboP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/FixedColumn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/GridVariants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IndependentScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutBuilder.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LimitWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MessageControl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Minimize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Monitor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Mosaic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MouseResizableTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoFrillsDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/OneBig.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spacing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SubLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Cursor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedActions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedScratchpad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/StringProp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Paste.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Replace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%
-@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 9ad4a9fb18d7..82c149ab0a3d 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	xmonad
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.2
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Xmonad is a minimalist and tiling window manager for X
 
-USE_HACKAGE=	X11>=1.5.0.0
+LICENSE=	BSD
+
+# Temporarily disabled, because there is a bug in documentation generation.
+NOPORTDOCS=	yes
+
+USE_CABAL=	mtl X11>=1.5
 USE_XORG=	x11
 
 MAN1=		xmonad.1
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index ba93c05e7957..3ab18e016069 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-0.9.1.tar.gz) = 014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927
-SIZE (cabal/xmonad-0.9.1.tar.gz) = 56974
+SHA256 (cabal/xmonad-0.9.2.tar.gz) = adcda3f5b7a59fb1fa4f7f48e8c4eb0599642e7d215b013fb072f98aef98851f
+SIZE (cabal/xmonad-0.9.2.tar.gz) = 56974
diff --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist
deleted file mode 100644
index 49ddc371d8d1..000000000000
--- a/x11-wm/hs-xmonad/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $FreeBSD$
-bin/xmonad
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old