diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile
index 5ffa184a8ccf..61a6f7a35ce5 100644
--- a/devel/hs-haddock-docs/Makefile
+++ b/devel/hs-haddock-docs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	haddock-docs
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/haddock/dist/
 PKGNAMEPREFIX=	hs-
@@ -33,13 +34,12 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textpr
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-HSCOLOUR_VERSION=	1.9
+HSCOLOUR_VERSION=	1.10
 HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 CABAL_CMD=	runghc Setup.lhs
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PLIST_SUB=	DOCSDIR_REL=${DOCSDIR_REL}
 
 .SILENT:
 
@@ -47,20 +47,20 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/doc/configure.ac
 
 do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w ${CONFIGURE_ARGS}
 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build && \
-		${CABAL_CMD} haddock --executables --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 	cd ${WRKSRC}/doc && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html
 
 do-install:
 	${MKDIR} ${DOCSDIR}/html && \
-		cd ${WRKSRC}/dist/doc/html/haddock && ${CP} -R * ${DOCSDIR}/html
+		cd ${WRKSRC}/dist/doc/html/haddock && ${COPYTREE_SHARE} \*  ${DOCSDIR}/html
 	${MKDIR} ${DOCSDIR}/users_guide && \
-		cd ${WRKSRC}/doc/haddock && ${CP} -R * ${DOCSDIR}/users_guide
+		cd ${WRKSRC}/doc/haddock && ${COPYTREE_SHARE} \* ${DOCSDIR}/users_guide
 
 post-install:
 	@${ECHO_MSG}
diff --git a/devel/hs-haddock-docs/pkg-plist b/devel/hs-haddock-docs/pkg-plist
index 869814388c1d..8b7593649fa9 100644
--- a/devel/hs-haddock-docs/pkg-plist
+++ b/devel/hs-haddock-docs/pkg-plist
@@ -1,96 +1,96 @@
-%%DOCSDIR_REL%%/html/Distribution-Haddock.html
-%%DOCSDIR_REL%%/html/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/doc-index.html
-%%DOCSDIR_REL%%/html/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock.css
-%%DOCSDIR_REL%%/html/haddock.haddock
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-DevHelp.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HH.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HH2.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HaddockDB.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-Hoogle.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-Html.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC-Typecheck.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-AttachInstances.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-Create.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-Rename.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-ModuleTree.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Options.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Types.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-BlockTable.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-FastMutInt2.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-Html.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Version.html
-%%DOCSDIR_REL%%/html/haddock/Main.html
-%%DOCSDIR_REL%%/html/haddock/Paths_haddock.html
-%%DOCSDIR_REL%%/html/haddock/doc-index.html
-%%DOCSDIR_REL%%/html/haddock/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock/haddock.css
-%%DOCSDIR_REL%%/html/haddock/haskell_icon.gif
-%%DOCSDIR_REL%%/html/haddock/index.html
-%%DOCSDIR_REL%%/html/haddock/minus.gif
-%%DOCSDIR_REL%%/html/haddock/plus.gif
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-DevHelp.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HH.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HH2.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HaddockDB.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-Hoogle.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-Html.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC-Typecheck.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-AttachInstances.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-Create.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-Rename.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-ModuleTree.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Options.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Types.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-BlockTable.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-FastMutInt2.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-Html.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Version.html
-%%DOCSDIR_REL%%/html/haddock/src/Main.html
-%%DOCSDIR_REL%%/html/haddock/src/hscolour.css
-%%DOCSDIR_REL%%/html/haskell_icon.gif
-%%DOCSDIR_REL%%/html/index.html
-%%DOCSDIR_REL%%/html/minus.gif
-%%DOCSDIR_REL%%/html/plus.gif
-%%DOCSDIR_REL%%/html/src/Distribution-Haddock.html
-%%DOCSDIR_REL%%/html/src/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/src/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/src/Haddock-Types.html
-%%DOCSDIR_REL%%/html/src/hscolour.css
-%%DOCSDIR_REL%%/users_guide/ch01s03.html
-%%DOCSDIR_REL%%/users_guide/ch03s02.html
-%%DOCSDIR_REL%%/users_guide/ch03s03.html
-%%DOCSDIR_REL%%/users_guide/ch03s04.html
-%%DOCSDIR_REL%%/users_guide/ch03s05.html
-%%DOCSDIR_REL%%/users_guide/ch03s08.html
-%%DOCSDIR_REL%%/users_guide/fptools.css
-%%DOCSDIR_REL%%/users_guide/hyperlinking.html
-%%DOCSDIR_REL%%/users_guide/index.html
-%%DOCSDIR_REL%%/users_guide/introduction.html
-%%DOCSDIR_REL%%/users_guide/invoking.html
-%%DOCSDIR_REL%%/users_guide/ix01.html
-%%DOCSDIR_REL%%/users_guide/license.html
-%%DOCSDIR_REL%%/users_guide/markup.html
-%%DOCSDIR_REL%%/users_guide/module-attributes.html
-@dirrm %%DOCSDIR_REL%%/users_guide
-@dirrm %%DOCSDIR_REL%%/html/src
-@dirrm %%DOCSDIR_REL%%/html/haddock/src
-@dirrm %%DOCSDIR_REL%%/html/haddock
-@dirrm %%DOCSDIR_REL%%/html
-@dirrmtry %%DOCSDIR_REL%%
+%%DOCSDIR%%/html/Distribution-Haddock.html
+%%DOCSDIR%%/html/Haddock-DocName.html
+%%DOCSDIR%%/html/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/doc-index.html
+%%DOCSDIR%%/html/haddock-util.js
+%%DOCSDIR%%/html/haddock.css
+%%DOCSDIR%%/html/haddock.haddock
+%%DOCSDIR%%/html/haddock/Haddock-Backends-DevHelp.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HH.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HH2.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HaddockDB.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-Hoogle.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-Html.html
+%%DOCSDIR%%/html/haddock/Haddock-DocName.html
+%%DOCSDIR%%/html/haddock/Haddock-Exception.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-AttachInstances.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-Create.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-Rename.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface.html
+%%DOCSDIR%%/html/haddock/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/haddock/Haddock-ModuleTree.html
+%%DOCSDIR%%/html/haddock/Haddock-Options.html
+%%DOCSDIR%%/html/haddock/Haddock-Types.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-BlockTable.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-FastMutInt2.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-Html.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils.html
+%%DOCSDIR%%/html/haddock/Haddock-Version.html
+%%DOCSDIR%%/html/haddock/Main.html
+%%DOCSDIR%%/html/haddock/Paths_haddock.html
+%%DOCSDIR%%/html/haddock/doc-index.html
+%%DOCSDIR%%/html/haddock/haddock-util.js
+%%DOCSDIR%%/html/haddock/haddock.css
+%%DOCSDIR%%/html/haddock/haskell_icon.gif
+%%DOCSDIR%%/html/haddock/index.html
+%%DOCSDIR%%/html/haddock/minus.gif
+%%DOCSDIR%%/html/haddock/plus.gif
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-DevHelp.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HH.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HH2.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HaddockDB.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Hoogle.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Html.html
+%%DOCSDIR%%/html/haddock/src/Haddock-DocName.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Exception.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Typecheck.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-AttachInstances.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Create.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Rename.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface.html
+%%DOCSDIR%%/html/haddock/src/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/haddock/src/Haddock-ModuleTree.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Options.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Types.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-BlockTable.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-FastMutInt2.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-Html.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Version.html
+%%DOCSDIR%%/html/haddock/src/Main.html
+%%DOCSDIR%%/html/haddock/src/hscolour.css
+%%DOCSDIR%%/html/haskell_icon.gif
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/minus.gif
+%%DOCSDIR%%/html/plus.gif
+%%DOCSDIR%%/html/src/Distribution-Haddock.html
+%%DOCSDIR%%/html/src/Haddock-Exception.html
+%%DOCSDIR%%/html/src/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/src/Haddock-Types.html
+%%DOCSDIR%%/html/src/hscolour.css
+%%DOCSDIR%%/users_guide/ch01s03.html
+%%DOCSDIR%%/users_guide/ch03s02.html
+%%DOCSDIR%%/users_guide/ch03s03.html
+%%DOCSDIR%%/users_guide/ch03s04.html
+%%DOCSDIR%%/users_guide/ch03s05.html
+%%DOCSDIR%%/users_guide/ch03s08.html
+%%DOCSDIR%%/users_guide/fptools.css
+%%DOCSDIR%%/users_guide/hyperlinking.html
+%%DOCSDIR%%/users_guide/index.html
+%%DOCSDIR%%/users_guide/introduction.html
+%%DOCSDIR%%/users_guide/invoking.html
+%%DOCSDIR%%/users_guide/ix01.html
+%%DOCSDIR%%/users_guide/license.html
+%%DOCSDIR%%/users_guide/markup.html
+%%DOCSDIR%%/users_guide/module-attributes.html
+@dirrm %%DOCSDIR%%/users_guide
+@dirrm %%DOCSDIR%%/html/src
+@dirrm %%DOCSDIR%%/html/haddock/src
+@dirrm %%DOCSDIR%%/html/haddock
+@dirrm %%DOCSDIR%%/html
+@dirrmtry %%DOCSDIR%%