11 files changed, 17 insertions, 48 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index c390008ba4ae..e1da4419a6b9 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -41,7 +41,6 @@
     SUBDIR += hs-zip-archive
     SUBDIR += hs-zlib
     SUBDIR += hs-zlib-bindings
-    SUBDIR += hs-zlib-conduit
     SUBDIR += hs-zlib-enum
     SUBDIR += javatar
     SUBDIR += jzip.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index 75a3124b4a01..6bde66c71010 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	tar
 PORTVERSION=	0.4.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 863d5db2bad4..18fdaa34ab13 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.1.3.4
-PORTREVISION=	5
+PORTVERSION=	0.2.3.2
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,20 +9,13 @@ COMMENT=	Library for creating and modifying zip archives
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib
+USE_CABAL=	digest>=0.0.0.1 mtl text>=0.11 zlib
 
-OPTIONS_DEFINE=		EXECUTABLE
+FLAGS_DEFINE=		EXECUTABLE
 
-EXECUTABLE_DESC=	Build the Zip executable
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+=	--flags="executable"
-EXECUTABLE=		Zip
-.else
-CONFIGURE_ARGS+=	--flags="-executable"
-.endif
+EXECUTABLE_DESC=		Build the Zip executable
+EXECUTABLE_FLAG_ENABLE=		executable
+EXECUTABLE_FLAG_EXECUTABLE=	Zip
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index f4b39a753877..e346eb9932dd 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.3.4.tar.gz) = cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643
-SIZE (cabal/zip-archive-0.1.3.4.tar.gz) = 11250
+SHA256 (cabal/zip-archive-0.2.3.2.tar.gz) = c18120e1d2e50c8b56d2a4a70fcd28c1f31403ae8a2d43efa333702fcdd4c9f8
+SIZE (cabal/zip-archive-0.2.3.2.tar.gz) = 11513
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 0b9c649ea0da..b7a4f013b9e1 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	zlib-bindings
 PORTVERSION=	0.1.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Low-level bindings to the zlib package
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	zlib>=0.5.2.0
 
diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile
deleted file mode 100644
index 1ffcb8800e9a..000000000000
--- a/archivers/hs-zlib-conduit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	zlib-conduit
-PORTVERSION=	1.0.0
-PORTREVISION=	5
-CATEGORIES=	archivers haskell
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Streaming compression/decompression via conduits
-
-LICENSE=	BSD3CLAUSE
-
-USE_CABAL=	conduit>=1.0 transformers>=0.2.2 void zlib-bindings>=0.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/archivers/hs-zlib-conduit/distinfo b/archivers/hs-zlib-conduit/distinfo
deleted file mode 100644
index 2edd2c0aad79..000000000000
--- a/archivers/hs-zlib-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/zlib-conduit-1.0.0.tar.gz) = 7b81c7902e7c0b3fc1ec089764d4eaa11fa2964020121b8e949c091738261460
-SIZE (cabal/zlib-conduit-1.0.0.tar.gz) = 3461
diff --git a/archivers/hs-zlib-conduit/pkg-descr b/archivers/hs-zlib-conduit/pkg-descr
deleted file mode 100644
index cac9da7c5919..000000000000
--- a/archivers/hs-zlib-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Streaming compression/decompression via conduits.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 3d3a5ac35cd3..9031d1880704 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zlib-enum
-PORTVERSION=	0.2.3
-PORTREVISION=	6
+PORTVERSION=	0.2.3.1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT=	Enumerator interface for zlib compression
 
 LICENSE=	MIT
 
-USE_CABAL=	enumerator transformers>=0.2 zlib-bindings
+USE_CABAL=	enumerator>=0.4 zlib-bindings>=0.1
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/archivers/hs-zlib-enum/distinfo b/archivers/hs-zlib-enum/distinfo
index 9c44df60332f..8360108738e8 100644
--- a/archivers/hs-zlib-enum/distinfo
+++ b/archivers/hs-zlib-enum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-enum-0.2.3.tar.gz) = 21b644a72ae4b971d4a6229801f3e1f424ec62579c17092ed88a32ca09142753
-SIZE (cabal/zlib-enum-0.2.3.tar.gz) = 4652
+SHA256 (cabal/zlib-enum-0.2.3.1.tar.gz) = e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9
+SIZE (cabal/zlib-enum-0.2.3.1.tar.gz) = 4652
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 51ba4bd9aa89..df63a1f96536 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	zlib
 PORTVERSION=	0.5.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Compression and decompression in the gzip and zlib formats
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD3CLAUSE
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>