--- xmonad/Makefile	2008-11-08 10:25:47.000000000 +0530
+++ xmonad/Makefile	2008-11-21 18:01:39.000000000 +0530
@@ -7,6 +7,7 @@ 
 
 PORTNAME=	xmonad
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -22,17 +23,25 @@ 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.3
 SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		SUBDIR=${SUBDIR}
 
 MAN1=		xmonad.1
 
+.ifndef (NOPORTDOCS)
+BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+.ifndef (NOPORTDOCS)
+	cd ${WRKSRC} && ${CABALCMD} haddock
+.endif
 
 do-install:
 	cd ${WRKSRC} && ${CABALCMD} install
--- xmonad/pkg-plist	2008-04-05 16:17:59.000000000 +0530
+++ xmonad/pkg-plist	2008-11-21 17:40:44.000000000 +0530
@@ -10,11 +10,28 @@ 
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
 %%SUBDIR%%/register.sh
-share/doc/xmonad-%%PORTVERSION%%/LICENSE
-@dirrm share/doc/xmonad-%%PORTVERSION%%
+%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Core.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Main.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-ManageHook.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Operations.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-StackSet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/XMonad.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
+%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
+%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/xmonad.haddock
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
-@dirrm lib/xmonad-%%PORTVERSION%%
+@dirrm %%SUBDIR%%
 @exec /bin/sh %D/%%SUBDIR%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister xmonad