8 files changed, 120 insertions, 72 deletions

diff --git a/security/hs-digest-ghc/Makefile b/security/hs-digest-ghc/Makefile
index 63a8072b1ffa..5ad1f482a07f 100644
--- a/security/hs-digest-ghc/Makefile
+++ b/security/hs-digest-ghc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	digest
-PORTVERSION=	0.0.0.5
+PORTVERSION=	0.0.0.6
 CATEGORIES=	security haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,38 +18,59 @@ COMMENT=	Efficient cryptographic hash implementations in Haskell
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 
-GHC_VERSION=	6.8.3
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
+GHC_VERSION=	6.10.4
+DIGEST_VERSION=	${PORTVERSION}
 
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
-		PORTNAME=${PORTNAME}			\
-		PORTVERSION=${PORTVERSION}		\
-		SUBDIR=${CABALDIR}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+DIGEST_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		DIGEST_VERSION=${DIGEST_VERSION} \
+		DIGEST_LIBDIR_REL=${DIGEST_LIBDIR_REL}
+
+.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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .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 ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+	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_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${DIGEST_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/security/hs-digest-ghc/distinfo b/security/hs-digest-ghc/distinfo
index 073182b6394d..53d787a30d9f 100644
--- a/security/hs-digest-ghc/distinfo
+++ b/security/hs-digest-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (digest-0.0.0.5.tar.gz) = ba60cc9d1ad6d0795ad84390976699d1
-SHA256 (digest-0.0.0.5.tar.gz) = dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd
-SIZE (digest-0.0.0.5.tar.gz) = 15487
+MD5 (digest-0.0.0.6.tar.gz) = bc75fa0d90cf58973144f9af18b29214
+SHA256 (digest-0.0.0.6.tar.gz) = a293da46aa874c5e75f28f4b100b766e42fbc7d6ebcb43c6351dbe3e1ec13752
+SIZE (digest-0.0.0.6.tar.gz) = 15522
diff --git a/security/hs-digest-ghc/pkg-descr b/security/hs-digest-ghc/pkg-descr
index c57435d330e6..a160a7000e9e 100644
--- a/security/hs-digest-ghc/pkg-descr
+++ b/security/hs-digest-ghc/pkg-descr
@@ -3,3 +3,4 @@ strict and lazy bytestrings for the functional programming language
 Haskell.
 
 WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
+
diff --git a/security/hs-digest-ghc/pkg-plist b/security/hs-digest-ghc/pkg-plist
index d1bd66c8263c..463379c61c82 100644
--- a/security/hs-digest-ghc/pkg-plist
+++ b/security/hs-digest-ghc/pkg-plist
@@ -1,14 +1,16 @@
 @comment $FreeBSD$
-%%SUBDIR%%/Data/Digest/Adler32.hi
-%%SUBDIR%%/Data/Digest/CRC32.hi
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Data/Digest
-@dirrmtry %%SUBDIR%%/Data
-@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister %%PORTNAME%%
-@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/Adler32.hi
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/CRC32.hi
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdigest-%%DIGEST_VERSION%%.o
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdigest-%%DIGEST_VERSION%%.a
+%%DIGEST_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%DIGEST_LIBDIR_REL%%
+@exec /bin/sh %D/%%DIGEST_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister digest
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index 63a8072b1ffa..5ad1f482a07f 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	digest
-PORTVERSION=	0.0.0.5
+PORTVERSION=	0.0.0.6
 CATEGORIES=	security haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,38 +18,59 @@ COMMENT=	Efficient cryptographic hash implementations in Haskell
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc
 
-GHC_VERSION=	6.8.3
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
+GHC_VERSION=	6.10.4
+DIGEST_VERSION=	${PORTVERSION}
 
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
-		PORTNAME=${PORTNAME}			\
-		PORTVERSION=${PORTVERSION}		\
-		SUBDIR=${CABALDIR}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+DIGEST_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		DIGEST_VERSION=${DIGEST_VERSION} \
+		DIGEST_LIBDIR_REL=${DIGEST_LIBDIR_REL}
+
+.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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .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 ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+	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_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${DIGEST_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/security/hs-digest/distinfo b/security/hs-digest/distinfo
index 073182b6394d..53d787a30d9f 100644
--- a/security/hs-digest/distinfo
+++ b/security/hs-digest/distinfo
@@ -1,3 +1,3 @@
-MD5 (digest-0.0.0.5.tar.gz) = ba60cc9d1ad6d0795ad84390976699d1
-SHA256 (digest-0.0.0.5.tar.gz) = dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd
-SIZE (digest-0.0.0.5.tar.gz) = 15487
+MD5 (digest-0.0.0.6.tar.gz) = bc75fa0d90cf58973144f9af18b29214
+SHA256 (digest-0.0.0.6.tar.gz) = a293da46aa874c5e75f28f4b100b766e42fbc7d6ebcb43c6351dbe3e1ec13752
+SIZE (digest-0.0.0.6.tar.gz) = 15522
diff --git a/security/hs-digest/pkg-descr b/security/hs-digest/pkg-descr
index c57435d330e6..a160a7000e9e 100644
--- a/security/hs-digest/pkg-descr
+++ b/security/hs-digest/pkg-descr
@@ -3,3 +3,4 @@ strict and lazy bytestrings for the functional programming language
 Haskell.
 
 WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
+
diff --git a/security/hs-digest/pkg-plist b/security/hs-digest/pkg-plist
index d1bd66c8263c..463379c61c82 100644
--- a/security/hs-digest/pkg-plist
+++ b/security/hs-digest/pkg-plist
@@ -1,14 +1,16 @@
 @comment $FreeBSD$
-%%SUBDIR%%/Data/Digest/Adler32.hi
-%%SUBDIR%%/Data/Digest/CRC32.hi
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Data/Digest
-@dirrmtry %%SUBDIR%%/Data
-@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister %%PORTNAME%%
-@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/Adler32.hi
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/CRC32.hi
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdigest-%%DIGEST_VERSION%%.o
+%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdigest-%%DIGEST_VERSION%%.a
+%%DIGEST_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%DIGEST_LIBDIR_REL%%
+@exec /bin/sh %D/%%DIGEST_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister digest
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old