3 files changed, 4 insertions, 179 deletions

diff --git a/devel/hs-haddock-docs/Makefile b/devel/hs-haddock-docs/Makefile
index 9b3d06654d11..042af190441c 100644
--- a/devel/hs-haddock-docs/Makefile
+++ b/devel/hs-haddock-docs/Makefile
@@ -9,20 +9,15 @@ PORTNAME=	haddock
 PORTVERSION=	2.4.2
 PORTREVISION=	1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.haskell.org/haddock/dist/ \
-		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
-PKGNAMESUFFIX=	-doc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Documentation for Haddock
 
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262:env
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		HsColour:${PORTSDIR}/print/hs-hscolour \
-		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
+DOCUMENTATION=	yes
+XMLDOCS=	doc/haddock:users_guide
+SHOW_PKGMSG=	yes
 
 PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
 .if ${PORT_HADDOCK} == 11
@@ -31,50 +26,7 @@ IGNORE+=	\n\t The ${LOCALBASE}/bin/haddock executable was already installed\n
 IGNORE+=	\t by the lang/ghc port, setting the option WITH_HADDOCK.\n
 IGNORE+=	\t You have to reinstall this last one with the right option\n
 IGNORE+=	\t WITHOUT_HADDOCK.\n\c
-.else
-BUILD_DEPENDS+=	hs-haddock=${PKGVERSION}:${PORTSDIR}/devel/hs-haddock
-RUN_DEPENDS=	hs-haddock=${PKGVERSION}:${PORTSDIR}/devel/hs-haddock
 .endif
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-CABAL_CMD=	runghc Setup.lhs
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-
-.SILENT:
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog|| ; \
-		s|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \
-		${WRKSRC}/doc/configure.ac
-
-do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w ${CONFIGURE_ARGS}
-	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source --executables \
-					     --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 && ${COPYTREE_SHARE} \*  ${DOCSDIR}/html
-	${MKDIR} ${DOCSDIR}/users_guide && \
-		cd ${WRKSRC}/doc/haddock && ${COPYTREE_SHARE} \* ${DOCSDIR}/users_guide
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-haddock-docs/pkg-message b/devel/hs-haddock-docs/pkg-message
index 941bf125540c..0e31206187a0 100644
--- a/devel/hs-haddock-docs/pkg-message
+++ b/devel/hs-haddock-docs/pkg-message
@@ -1,5 +1,3 @@
-===================================================================
-
   WARNING: if the lang/ghc port doesn't install the hyperlinkable
   documentation for its libraries, then haddock can't know about
   these. But also in this case haddock can't handle recursive
@@ -7,5 +5,3 @@
   In general haddock detects and reports as an error recursive
   modules and emits chatting warnings listing all the identifiers
   it couldn't resolve.
-
-===================================================================
diff --git a/devel/hs-haddock-docs/pkg-plist b/devel/hs-haddock-docs/pkg-plist
deleted file mode 100644
index cec54ce8190e..000000000000
--- a/devel/hs-haddock-docs/pkg-plist
+++ /dev/null
@@ -1,123 +0,0 @@
-@comment $FreeBSD$
-%%DOCSDIR%%/html/Distribution-Haddock.html
-%%DOCSDIR%%/html/doc-index.html
-%%DOCSDIR%%/html/frames.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-Exception.html
-%%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.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-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/frames.html
-%%DOCSDIR%%/html/haddock/haddock-util.js
-%%DOCSDIR%%/html/haddock/haddock.css
-%%DOCSDIR%%/html/haddock/haskell_icon.gif
-%%DOCSDIR%%/html/haddock/index-frames.html
-%%DOCSDIR%%/html/haddock/index.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-DevHelp.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HH2.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-HaddockDB.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Hoogle.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Backends-Html.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Exception.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-GHC-Typecheck.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-GHC.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-AttachInstances.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Create.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Interface-Rename.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Interface.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-InterfaceFile.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-ModuleTree.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Options.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-BlockTable.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-FastMutInt2.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Utils-Html.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Utils.html
-%%DOCSDIR%%/html/haddock/mini_Haddock-Version.html
-%%DOCSDIR%%/html/haddock/mini_Main.html
-%%DOCSDIR%%/html/haddock/mini_Paths_haddock.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-frames.html
-%%DOCSDIR%%/html/index.html
-%%DOCSDIR%%/html/mini_Distribution-Haddock.html
-%%DOCSDIR%%/html/minus.gif
-%%DOCSDIR%%/html/plus.gif
-%%DOCSDIR%%/html/src/Distribution-Haddock.html
-%%DOCSDIR%%/html/src/Haddock-DocName.html
-%%DOCSDIR%%/html/src/Haddock-Exception.html
-%%DOCSDIR%%/html/src/Haddock-GHC-Utils.html
-%%DOCSDIR%%/html/src/Haddock-InterfaceFile.html
-%%DOCSDIR%%/html/src/Haddock-Types.html
-%%DOCSDIR%%/html/src/Haddock-Utils.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%%