- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump

  port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
  with GHC 6.10.4

PR:		ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
   		ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
   		ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
   		ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
   		ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
   		ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
   		ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
   		ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
   		ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
   		ports/137107, ports/137108, ports/137109, ports/137110, ports/137111

Submitted by:	Jacula Modyun (jacula (at) gmail (dot) com),
             	Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by:	wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by:	tabthorpe (mentor), respective maintainers

8 files changed, 189 insertions, 101 deletions

diff --git a/archivers/hs-zip-archive-ghc/Makefile b/archivers/hs-zip-archive-ghc/Makefile
index be4e0aed7977..3cd9d70d993e 100644
--- a/archivers/hs-zip-archive-ghc/Makefile
+++ b/archivers/hs-zip-archive-ghc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zip-archive
 PORTVERSION=	0.1.1.3
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,46 +19,67 @@ COMMENT=	A Haskell library for working with zip archives
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
 		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc		
+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
+
+GHC_VERSION=	6.10.4
+ZIPARCHIVE_VERSION=	${PORTVERSION}
 
-GHC_VERSION=	6.8.3
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
 
-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
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+ZIPARCHIVE_LIBDIR_REL=	lib/${DISTNAME}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		ZIPARCHIVE_VERSION=${ZIPARCHIVE_VERSION} \
+		ZIPARCHIVE_LIBDIR_REL=${ZIPARCHIVE_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.lhs -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}/${ZIPARCHIVE_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/archivers/hs-zip-archive-ghc/pkg-plist b/archivers/hs-zip-archive-ghc/pkg-plist
index f7b70ee8dde0..fb78819dffb1 100644
--- a/archivers/hs-zip-archive-ghc/pkg-plist
+++ b/archivers/hs-zip-archive-ghc/pkg-plist
@@ -1,12 +1,15 @@
-%%SUBDIR%%/Codec/Archive/Zip.hi
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Codec/Archive
-@dirrmtry %%SUBDIR%%/Codec
-@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
+@comment $FreeBSD$
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive/Zip.hi
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzip-archive-%%ZIPARCHIVE_VERSION%%.o
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzip-archive-%%ZIPARCHIVE_VERSION%%.a
+%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%
+@exec /bin/sh %D/%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister zip-archive
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index be4e0aed7977..3cd9d70d993e 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zip-archive
 PORTVERSION=	0.1.1.3
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,46 +19,67 @@ COMMENT=	A Haskell library for working with zip archives
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
 		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
 RUN_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \
 		hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc		
+		hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc
+
+GHC_VERSION=	6.10.4
+ZIPARCHIVE_VERSION=	${PORTVERSION}
 
-GHC_VERSION=	6.8.3
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	lib/ghc-${GHC_VERSION}/cabal
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
 
-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
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+ZIPARCHIVE_LIBDIR_REL=	lib/${DISTNAME}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		ZIPARCHIVE_VERSION=${ZIPARCHIVE_VERSION} \
+		ZIPARCHIVE_LIBDIR_REL=${ZIPARCHIVE_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.lhs -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}/${ZIPARCHIVE_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/archivers/hs-zip-archive/pkg-plist b/archivers/hs-zip-archive/pkg-plist
index f7b70ee8dde0..fb78819dffb1 100644
--- a/archivers/hs-zip-archive/pkg-plist
+++ b/archivers/hs-zip-archive/pkg-plist
@@ -1,12 +1,15 @@
-%%SUBDIR%%/Codec/Archive/Zip.hi
-%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Codec/Archive
-@dirrmtry %%SUBDIR%%/Codec
-@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
+@comment $FreeBSD$
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive/Zip.hi
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzip-archive-%%ZIPARCHIVE_VERSION%%.o
+%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzip-archive-%%ZIPARCHIVE_VERSION%%.a
+%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%ZIPARCHIVE_LIBDIR_REL%%
+@exec /bin/sh %D/%%ZIPARCHIVE_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister zip-archive
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index bf362ee1ca35..8a86d048fb8d 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zlib
-PORTVERSION=	0.5.0.0
-PORTREVISION=	2
+PORTVERSION=	0.5.2.0
 CATEGORIES=	archivers haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \
 		http://kerneled.org/tmp/
@@ -16,23 +15,61 @@ MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Pure Haskell interface to the C zlib library
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
-CABAL=		${LOCALBASE}/bin/runghc Setup.hs
-GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	GHC_VERSION="${GHC_VERSION}"		\
-		PORTVERSION=${PORTVERSION}		\
-		SUBDIR=${SUBDIR}
+GHC_VERSION=	6.10.4
+ZLIB_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+ZLIB_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		ZLIB_VERSION=${ZLIB_VERSION} \
+		ZLIB_LIBDIR_REL=${ZLIB_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
+.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} && ${CABAL} configure --prefix=${PREFIX} --ghc
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+.endif
 
 do-install:
-	cd ${WRKSRC} && ${CABAL} install
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${ZLIB_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index 32a2ff8fd31f..6a32d42da26e 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (zlib-0.5.0.0.tar.gz) = 22fa6d394c42c8584b234799b923f860
-SHA256 (zlib-0.5.0.0.tar.gz) = 20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891
-SIZE (zlib-0.5.0.0.tar.gz) = 122533
+MD5 (zlib-0.5.2.0.tar.gz) = 19859e241dc18ef1501a5d44d8523507
+SHA256 (zlib-0.5.2.0.tar.gz) = 4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f
+SIZE (zlib-0.5.2.0.tar.gz) = 125081
diff --git a/archivers/hs-zlib/pkg-descr b/archivers/hs-zlib/pkg-descr
index 8d178293cde6..d723ed05600f 100644
--- a/archivers/hs-zlib/pkg-descr
+++ b/archivers/hs-zlib/pkg-descr
@@ -3,6 +3,6 @@ streams of data represented as lazy ByteStrings. It uses the zlib C
 library so it has high performance. It supports the "zlib",  "gzip" and
 "raw" compression formats. It provides a convenient high level api suitable
 for most tasks and for the few cases where more control is needed it provides
-access to the full zlib feature set. 
+access to the full zlib feature set.
 
 WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/zlib
diff --git a/archivers/hs-zlib/pkg-plist b/archivers/hs-zlib/pkg-plist
index b136d3360832..53ee34210146 100644
--- a/archivers/hs-zlib/pkg-plist
+++ b/archivers/hs-zlib/pkg-plist
@@ -1,19 +1,20 @@
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSzlib-%%PORTVERSION%%.a
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSzlib-%%PORTVERSION%%.o
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/GZip.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Internal.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Raw.hi
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Stream.hi
-%%SUBDIR%%/register.sh
-share/doc/zlib-%%PORTVERSION%%/LICENSE
-@dirrm share/doc/zlib-%%PORTVERSION%%
-@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib
-@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec/Compression
-@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec
-@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%
-@dirrm lib/zlib-%%PORTVERSION%%
-@exec /bin/sh %D/%%SUBDIR%%/register.sh
+@comment $FreeBSD$
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzlib-%%ZLIB_VERSION%%.a
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzlib-%%ZLIB_VERSION%%.o
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/GZip.hi
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib.hi
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Internal.hi
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Raw.hi
+%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Stream.hi
+%%ZLIB_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib
+@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression
+@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
+@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%ZLIB_LIBDIR_REL%%
+@exec /bin/sh %D/%%ZLIB_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg unregister zlib
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old