--- hs-hscolour-docs/Makefile	2009-03-06 19:29:45.000000000 +0000
+++ hs-hscolour-docs/Makefile	2009-07-22 13:35:58.000000000 +0000
@@ -5,20 +5,25 @@ 
 # $FreeBSD: ports/print/hs-hscolour-docs/Makefile,v 1.4 2009/03/06 19:29:45 pgj Exp $
 #
 
-PORTNAME=	hscolour-docs
-PORTVERSION=	1.12
+PORTNAME=	hscolour
+PORTVERSION=	1.13
 CATEGORIES=	print haskell
 MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
 		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
-DISTNAME=	hscolour-${PORTVERSION}
+PKGNAMESUFFIX=	-doc
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Documentation for HsColour
 
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		haddock:${PORTSDIR}/devel/hs-haddock \
 		HsColour:${PORTSDIR}/print/hs-hscolour
+RUN_DEPENDS=	hs-hscolour=${PORTVERSION}:${PORTSDIR}/print/hs-hscolour
+
+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}
--- hs-hscolour-docs/distinfo	2009-03-06 19:29:45.000000000 +0000
+++ hs-hscolour-docs/distinfo	2009-07-13 09:58:18.000000000 +0000
@@ -1,3 +1,3 @@ 
-MD5 (hscolour-1.12.tar.gz) = 4328a84b87b245693bcf10b49c608e43
-SHA256 (hscolour-1.12.tar.gz) = b80a446c0b27d1eaca172d07e7a5d814e4b3a63db0bc8689e60a3db2fc92cfc0
-SIZE (hscolour-1.12.tar.gz) = 54116
+MD5 (hscolour-1.13.tar.gz) = a48b90999b0b28903e774e53fb4ec4e6
+SHA256 (hscolour-1.13.tar.gz) = f52f978dbd0e31101c514968e0d2c0302683a38f72b47f054e99a11e465243e8
+SIZE (hscolour-1.13.tar.gz) = 56410
--- hs-hscolour-docs/pkg-plist	2009-03-06 19:29:45.000000000 +0000
+++ hs-hscolour-docs/pkg-plist	2009-07-13 10:02:51.000000000 +0000
@@ -6,6 +6,7 @@ 
 %%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
@@ -14,10 +15,28 @@ 
 %%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
@@ -30,6 +49,7 @@ 
 %%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
@@ -37,11 +57,28 @@ 
 %%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
@@ -52,6 +89,7 @@ 
 %%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