8 files changed, 40 insertions, 78 deletions

diff --git a/devel/hs-binary-ghc/Makefile b/devel/hs-binary-ghc/Makefile
index 73b07755d36f..da84c8155aba 100644
--- a/devel/hs-binary-ghc/Makefile
+++ b/devel/hs-binary-ghc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	binary
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -27,12 +28,16 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
 		PORTNAME=${PORTNAME}			\
 		PORTVERSION=${PORTVERSION}		\
 		SUBDIR=${CABALDIR}
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -40,7 +45,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/devel/hs-binary-ghc/pkg-plist b/devel/hs-binary-ghc/pkg-plist
index b0b29313a345..a9e56d73bf36 100644
--- a/devel/hs-binary-ghc/pkg-plist
+++ b/devel/hs-binary-ghc/pkg-plist
@@ -2,24 +2,9 @@
 %%SUBDIR%%/Data/Binary/Builder.hi
 %%SUBDIR%%/Data/Binary/Get.hi
 %%SUBDIR%%/Data/Binary/Put.hi
-%%SUBDIR%%/HSbinary-%%PORTVERSION%%.o
-%%SUBDIR%%/libHSbinary-%%PORTVERSION%%.a
+%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/%%PORTNAME%%.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Builder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Get.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Put.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Data/Binary
 @dirrmtry %%SUBDIR%%/Data
 @exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
diff --git a/devel/hs-binary/Makefile b/devel/hs-binary/Makefile
index 73b07755d36f..da84c8155aba 100644
--- a/devel/hs-binary/Makefile
+++ b/devel/hs-binary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	binary
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -27,12 +28,16 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
 		PORTNAME=${PORTNAME}			\
 		PORTVERSION=${PORTVERSION}		\
 		SUBDIR=${CABALDIR}
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -40,7 +45,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/devel/hs-binary/pkg-plist b/devel/hs-binary/pkg-plist
index b0b29313a345..a9e56d73bf36 100644
--- a/devel/hs-binary/pkg-plist
+++ b/devel/hs-binary/pkg-plist
@@ -2,24 +2,9 @@
 %%SUBDIR%%/Data/Binary/Builder.hi
 %%SUBDIR%%/Data/Binary/Get.hi
 %%SUBDIR%%/Data/Binary/Put.hi
-%%SUBDIR%%/HSbinary-%%PORTVERSION%%.o
-%%SUBDIR%%/libHSbinary-%%PORTVERSION%%.a
+%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/%%PORTNAME%%.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Builder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Get.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary-Put.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-Binary.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Data/Binary
 @dirrmtry %%SUBDIR%%/Data
 @exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
diff --git a/devel/hs-pcre-light-ghc/Makefile b/devel/hs-pcre-light-ghc/Makefile
index 74ffa1c4db59..1b80dc3662ca 100644
--- a/devel/hs-pcre-light-ghc/Makefile
+++ b/devel/hs-pcre-light-ghc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcre-light
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -28,12 +29,16 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
 		PORTNAME=${PORTNAME}			\
 		PORTVERSION=${PORTVERSION}		\
 		SUBDIR=${CABALDIR}
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -41,7 +46,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/devel/hs-pcre-light-ghc/pkg-plist b/devel/hs-pcre-light-ghc/pkg-plist
index 70be97fc590c..655486b56580 100644
--- a/devel/hs-pcre-light-ghc/pkg-plist
+++ b/devel/hs-pcre-light-ghc/pkg-plist
@@ -1,23 +1,9 @@
-%%SUBDIR%%/HSpcre-light-%%PORTVERSION%%.o
 %%SUBDIR%%/Text/Regex/PCRE/Light.hi
 %%SUBDIR%%/Text/Regex/PCRE/Light/Base.hi
 %%SUBDIR%%/Text/Regex/PCRE/Light/Char8.hi
-%%SUBDIR%%/libHSpcre-light-%%PORTVERSION%%.a
+%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/%%PORTNAME%%.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light-Base.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light-Char8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Text/Regex/PCRE/Light
 @dirrmtry %%SUBDIR%%/Text/Regex/PCRE
 @dirrmtry %%SUBDIR%%/Text/Regex
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 74ffa1c4db59..1b80dc3662ca 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcre-light
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -28,12 +29,16 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION}		\
 		PORTNAME=${PORTNAME}			\
 		PORTVERSION=${PORTVERSION}		\
 		SUBDIR=${CABALDIR}
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir=''
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -41,7 +46,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/devel/hs-pcre-light/pkg-plist b/devel/hs-pcre-light/pkg-plist
index 70be97fc590c..655486b56580 100644
--- a/devel/hs-pcre-light/pkg-plist
+++ b/devel/hs-pcre-light/pkg-plist
@@ -1,23 +1,9 @@
-%%SUBDIR%%/HSpcre-light-%%PORTVERSION%%.o
 %%SUBDIR%%/Text/Regex/PCRE/Light.hi
 %%SUBDIR%%/Text/Regex/PCRE/Light/Base.hi
 %%SUBDIR%%/Text/Regex/PCRE/Light/Char8.hi
-%%SUBDIR%%/libHSpcre-light-%%PORTVERSION%%.a
+%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/%%PORTNAME%%.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light-Base.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light-Char8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Text-Regex-PCRE-Light.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Text/Regex/PCRE/Light
 @dirrmtry %%SUBDIR%%/Text/Regex/PCRE
 @dirrmtry %%SUBDIR%%/Text/Regex