- Update to 0.1.1.3

- Add security/hs-digest-ghc as dependency
- Fix PORTDOCS

Approved by:	tabthorpe

6 files changed, 38 insertions, 54 deletions

diff --git a/archivers/hs-zip-archive-ghc/Makefile b/archivers/hs-zip-archive-ghc/Makefile
index d4ed0964450a..be4e0aed7977 100644
--- a/archivers/hs-zip-archive-ghc/Makefile
+++ b/archivers/hs-zip-archive-ghc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.1.1.1
+PORTVERSION=	0.1.1.3
 CATEGORIES=	archivers haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,11 +18,13 @@ 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:${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-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc		
 
 GHC_VERSION=	6.8.3
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
@@ -33,12 +35,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
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
 .endif
 
 do-configure:
@@ -46,7 +52,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/archivers/hs-zip-archive-ghc/distinfo b/archivers/hs-zip-archive-ghc/distinfo
index ef8f143197cc..8f1c88c8e349 100644
--- a/archivers/hs-zip-archive-ghc/distinfo
+++ b/archivers/hs-zip-archive-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (zip-archive-0.1.1.1.tar.gz) = fc7eab8f0cf98b20df4bb97fa7a9674b
-SHA256 (zip-archive-0.1.1.1.tar.gz) = f93b21e6f118fbf79d8eaaa2759887c9048fb298b78e48b214cb02a24be9e777
-SIZE (zip-archive-0.1.1.1.tar.gz) = 19175
+MD5 (zip-archive-0.1.1.3.tar.gz) = edf3924c929b5592b1b9dbf4853b754f
+SHA256 (zip-archive-0.1.1.3.tar.gz) = 2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a
+SIZE (zip-archive-0.1.1.3.tar.gz) = 16425
diff --git a/archivers/hs-zip-archive-ghc/pkg-plist b/archivers/hs-zip-archive-ghc/pkg-plist
index c6e5aac83dbd..f7b70ee8dde0 100644
--- a/archivers/hs-zip-archive-ghc/pkg-plist
+++ b/archivers/hs-zip-archive-ghc/pkg-plist
@@ -1,23 +1,9 @@
 %%SUBDIR%%/Codec/Archive/Zip.hi
-%%SUBDIR%%/Data/Hash/CRC32/GZip.hi
-%%SUBDIR%%/HSzip-archive-%%PORTVERSION%%.o
-%%SUBDIR%%/libHSzip-archive-%%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/Codec-Archive-Zip.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Data/Hash/CRC32
-@dirrmtry %%SUBDIR%%/Data/Hash
-@dirrmtry %%SUBDIR%%/Data
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Codec/Archive
 @dirrmtry %%SUBDIR%%/Codec
 @exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index d4ed0964450a..be4e0aed7977 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.1.1.1
+PORTVERSION=	0.1.1.3
 CATEGORIES=	archivers haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -18,11 +18,13 @@ 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:${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-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc		
 
 GHC_VERSION=	6.8.3
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
@@ -33,12 +35,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
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
 .endif
 
 do-configure:
@@ -46,7 +52,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/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index ef8f143197cc..8f1c88c8e349 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,3 +1,3 @@
-MD5 (zip-archive-0.1.1.1.tar.gz) = fc7eab8f0cf98b20df4bb97fa7a9674b
-SHA256 (zip-archive-0.1.1.1.tar.gz) = f93b21e6f118fbf79d8eaaa2759887c9048fb298b78e48b214cb02a24be9e777
-SIZE (zip-archive-0.1.1.1.tar.gz) = 19175
+MD5 (zip-archive-0.1.1.3.tar.gz) = edf3924c929b5592b1b9dbf4853b754f
+SHA256 (zip-archive-0.1.1.3.tar.gz) = 2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a
+SIZE (zip-archive-0.1.1.3.tar.gz) = 16425
diff --git a/archivers/hs-zip-archive/pkg-plist b/archivers/hs-zip-archive/pkg-plist
index c6e5aac83dbd..f7b70ee8dde0 100644
--- a/archivers/hs-zip-archive/pkg-plist
+++ b/archivers/hs-zip-archive/pkg-plist
@@ -1,23 +1,9 @@
 %%SUBDIR%%/Codec/Archive/Zip.hi
-%%SUBDIR%%/Data/Hash/CRC32/GZip.hi
-%%SUBDIR%%/HSzip-archive-%%PORTVERSION%%.o
-%%SUBDIR%%/libHSzip-archive-%%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/Codec-Archive-Zip.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/Data/Hash/CRC32
-@dirrmtry %%SUBDIR%%/Data/Hash
-@dirrmtry %%SUBDIR%%/Data
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/Codec/Archive
 @dirrmtry %%SUBDIR%%/Codec
 @exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh