3 files changed, 66 insertions, 33 deletions

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