- Please welcome GHC 7.0.3

GHC in the ports tree has been updated to 7.0.3 and all other Haskell ports
are also updated to their corresponding Haskell Platform versions, or latest
versions.

We would like to acknowledge the support of the FreeBSD Donations Team and
Eotvos Lorand University, Faculty of Informatics who contributed to the server
that we used for testing.

We would also like to thank all the testers who tested FreeBSD Haskell ports
and provided their feedback.

PR:		ports/156642
Approved by:	tabthorpe (mentor)
Obtained from:	FreeBSD Haskell

7 files changed, 12 insertions, 44 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index fc47e7df684b..274c35de4b8f 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -40,6 +40,7 @@
     SUBDIR += hffzip
     SUBDIR += hlextract
     SUBDIR += hpack.non-usa.only
+    SUBDIR += hs-tar
     SUBDIR += hs-zip-archive
     SUBDIR += hs-zlib
     SUBDIR += javatar
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 35bf9688c4d5..801f1bfa8d00 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.1.1.6
+PORTVERSION=	0.1.1.7
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A Haskell library for working with zip archives
 
-USE_HACKAGE=	binary digest>=0.0.0.1 utf8-string>=0.3.1 zlib
+LICENSE=	GPLv2
+
+USE_CABAL=	binary digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib
 
 OPTIONS=	EXECUTABLE "Build the Zip executable" off
 
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index d61d0b3ddafc..6b52cc4be630 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.1.1.6.tar.gz) = 16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa
-SIZE (cabal/zip-archive-0.1.1.6.tar.gz) = 16730
+SHA256 (cabal/zip-archive-0.1.1.7.tar.gz) = 88c096d469d8b4d816dbe15571f2c1e61e31c1cd67f931672240063a51d8a2e0
+SIZE (cabal/zip-archive-0.1.1.7.tar.gz) = 16795
diff --git a/archivers/hs-zip-archive/pkg-plist b/archivers/hs-zip-archive/pkg-plist
deleted file mode 100644
index 510d701b8dda..000000000000
--- a/archivers/hs-zip-archive/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_EXECUTABLE%%bin/Zip
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive/Zip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@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 9a9282f5e2af..b277cb77148d 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -5,13 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	zlib
-PORTVERSION=	0.5.2.0
-PORTREVISION=	1
+PORTVERSION=	0.5.3.1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Pure Haskell interface to the C zlib library
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index dedc966d359a..60690b4a3bc1 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-0.5.2.0.tar.gz) = 4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f
-SIZE (cabal/zlib-0.5.2.0.tar.gz) = 125081
+SHA256 (cabal/zlib-0.5.3.1.tar.gz) = 382a16d09d47ba9c742d552b80cf3902c81556fc69a8d6983af98b47263545c2
+SIZE (cabal/zlib-0.5.3.1.tar.gz) = 125087
diff --git a/archivers/hs-zlib/pkg-plist b/archivers/hs-zlib/pkg-plist
deleted file mode 100644
index 91c098e372c4..000000000000
--- a/archivers/hs-zlib/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/GZip.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Raw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Stream.hi
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old