4 files changed, 34 insertions, 205 deletions

diff --git a/print/hs-hscolour-docs/Makefile b/print/hs-hscolour-docs/Makefile
index af901635dcbe..e71b72a66b4c 100644
--- a/print/hs-hscolour-docs/Makefile
+++ b/print/hs-hscolour-docs/Makefile
@@ -10,41 +10,13 @@ PORTVERSION=	1.15
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
-		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
-PKGNAMESUFFIX=	-doc
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Documentation for HsColour
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		HsColour:${PORTSDIR}/print/hs-hscolour
-RUN_DEPENDS=	hs-hscolour=${PKGVERSION}:${PORTSDIR}/print/hs-hscolour
+CABAL_SETUP=	Setup.hs
 
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-
-HSCOLOUR_VERSION=	${PORTVERSION}
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-CABAL_CMD=	runghc Setup.hs
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-
-do-install:
-	${MKDIR} ${DOCSDIR}/html
-	cd ${WRKSRC}/dist/doc/html/hscolour && ${COPYTREE_SHARE} \* ${DOCSDIR}/html
+DOCUMENTATION=	yes
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/print/hs-hscolour-docs/pkg-plist b/print/hs-hscolour-docs/pkg-plist
deleted file mode 100644
index ebcb65f9e3f5..000000000000
--- a/print/hs-hscolour-docs/pkg-plist
+++ /dev/null
@@ -1,105 +0,0 @@
-@comment $FreeBSD$
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-General.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-InlineCSS.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Options.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Output.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour.html
-%%DOCSDIR%%/html/HsColour/Main.html
-%%DOCSDIR%%/html/HsColour/doc-index.html
-%%DOCSDIR%%/html/HsColour/frames.html
-%%DOCSDIR%%/html/HsColour/haddock-util.js
-%%DOCSDIR%%/html/HsColour/haddock.css
-%%DOCSDIR%%/html/HsColour/haskell_icon.gif
-%%DOCSDIR%%/html/HsColour/index-frames.html
-%%DOCSDIR%%/html/HsColour/index.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-CSS.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Classify.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-General.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-HTML.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-InlineCSS.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Options.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-Output.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour-TTY.html
-%%DOCSDIR%%/html/HsColour/mini_Language-Haskell-HsColour.html
-%%DOCSDIR%%/html/HsColour/mini_Main.html
-%%DOCSDIR%%/html/HsColour/minus.gif
-%%DOCSDIR%%/html/HsColour/plus.gif
-%%DOCSDIR%%/html/HsColour/src/Main.html
-%%DOCSDIR%%/html/HsColour/src/hscolour.css
-%%DOCSDIR%%/html/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-General.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-InlineCSS.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-Options.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-Output.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR%%/html/Language-Haskell-HsColour.html
-%%DOCSDIR%%/html/doc-index.html
-%%DOCSDIR%%/html/frames.html
-%%DOCSDIR%%/html/haddock-util.js
-%%DOCSDIR%%/html/haddock.css
-%%DOCSDIR%%/html/haskell_icon.gif
-%%DOCSDIR%%/html/hscolour.haddock
-%%DOCSDIR%%/html/index-frames.html
-%%DOCSDIR%%/html/index.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-CSS.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Classify.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-General.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-HTML.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-InlineCSS.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Options.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-Output.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour-TTY.html
-%%DOCSDIR%%/html/mini_Language-Haskell-HsColour.html
-%%DOCSDIR%%/html/minus.gif
-%%DOCSDIR%%/html/plus.gif
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-General.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-InlineCSS.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Options.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Output.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR%%/html/src/Language-Haskell-HsColour.html
-%%DOCSDIR%%/html/src/hscolour.css
-@dirrm %%DOCSDIR%%/html/src
-@dirrm %%DOCSDIR%%/html/HsColour/src
-@dirrm %%DOCSDIR%%/html/HsColour
-@dirrm %%DOCSDIR%%/html
-@dirrmtry %%DOCSDIR%%
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index ba035944dfb8..ab0adf80de23 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -10,54 +10,19 @@ PORTVERSION=	1.15
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
-		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Colourise Haskell code
 
-.if !defined(SLAVE)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
-.else
-NO_PKG_REGISTER=
-.endif
-
-GHC_VERSION=		6.10.4
-HSCOLOUR_VERSION=	${PORTVERSION}
-
-CABAL_CMD=	runghc Setup.hs
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-HSCOLOUR_LIBDIR_REL=	lib/${DISTNAME}
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+CABAL_SETUP=	Setup.hs
 
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HSCOLOUR_LIBDIR_REL=${HSCOLOUR_LIBDIR_REL} \
-		HSCOLOUR_VERSION=${HSCOLOUR_VERSION} \
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build
-.if !defined(SLAVE)
-	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
-.endif
+EXECUTABLE=	HsColour
 
-do-install:
-	cd ${WRKSRC} && ${CABAL_CMD} install
+PORTDATA=		*
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/HsColour
-.if !defined(SLAVE)
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSCOLOUR_LIBDIR_REL}/register.sh  && \
-		${INSTALL_DATA} README ${DOCSDIR}/README
+.if defined(SLAVE)
+GHC_CMD=	ghc
 .endif
-	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/print/hs-hscolour/pkg-plist b/print/hs-hscolour/pkg-plist
index 5ce6fa58d01b..f93e4681053a 100644
--- a/print/hs-hscolour/pkg-plist
+++ b/print/hs-hscolour/pkg-plist
@@ -1,34 +1,31 @@
 @comment $FreeBSD$
 bin/HsColour
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShscolour-%%HSCOLOUR_VERSION%%.o
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/ANSI.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Anchors.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/CSS.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Classify.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/ColourHighlight.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Colourise.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/General.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/HTML.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/InlineCSS.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/LaTeX.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/MIRC.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Options.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Output.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/TTY.hi
-%%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShscolour-%%HSCOLOUR_VERSION%%.a
-%%HSCOLOUR_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/ANSI.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Anchors.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/CSS.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Classify.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/ColourHighlight.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Colourise.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/General.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/HTML.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/InlineCSS.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/LaTeX.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/MIRC.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Options.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/Output.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/TTY.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%DOCSDIR%%/LICENCE-GPL
-%%DOCSDIR%%/README
-%%DATADIR%%/hscolour.css
-@dirrm %%DATADIR%%
 @dirrmtry %%DOCSDIR%%
-@dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour
-@dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HSCOLOUR_LIBDIR_REL%%
-@exec /bin/sh %%LOCALBASE%%/%%HSCOLOUR_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %%LOCALBASE%%/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %%LOCALBASE%%/bin/ghc-pkg unregister hscolour
+@unexec %%LOCALBASE%%/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old