6 files changed, 1 insertions, 58 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 213dd66186ba..2230a152b0d0 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -39,7 +39,7 @@
     SUBDIR += hffzip
     SUBDIR += hlextract
     SUBDIR += hpack.non-usa.only
-    SUBDIR += hs-zip-archive-ghc
+    SUBDIR += hs-zip-archive
     SUBDIR += hs-zlib
     SUBDIR += javatar
     SUBDIR += jzip.org
diff --git a/archivers/hs-zip-archive-ghc/Makefile b/archivers/hs-zip-archive-ghc/Makefile
deleted file mode 100644
index 2d9e6e07f795..000000000000
--- a/archivers/hs-zip-archive-ghc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	zip-archive
-# Date created:				December 15, 2008
-# Whom:					Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zip-archive
-PORTVERSION=	0.1.1.6
-CATEGORIES=	archivers haskell
-PKGNAMESUFFIX=	-ghc
-
-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
-
-OPTIONS=	EXECUTABLE "Build the Zip executable" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_EXECUTABLE)
-CONFIGURE_ARGS+=	--flags="executable"
-EXECUTABLE=		Zip
-PLIST_SUB+=		MAYBE_EXECUTABLE=""
-.else
-CONFIGURE_ARGS+=	--flags="-executable"
-PLIST_SUB+=		MAYBE_EXECUTABLE="@comment "
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/archivers/hs-zip-archive-ghc/distinfo b/archivers/hs-zip-archive-ghc/distinfo
deleted file mode 100644
index d9d83253086b..000000000000
--- a/archivers/hs-zip-archive-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (zip-archive-0.1.1.6.tar.gz) = 4806077be79ecb5486306432ee93e38d
-SHA256 (zip-archive-0.1.1.6.tar.gz) = 16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa
-SIZE (zip-archive-0.1.1.6.tar.gz) = 16730
diff --git a/archivers/hs-zip-archive-ghc/pkg-descr b/archivers/hs-zip-archive-ghc/pkg-descr
deleted file mode 100644
index 8ed682939f39..000000000000
--- a/archivers/hs-zip-archive-ghc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The zip-archive library provides functions for creating, modifying, and
-extracting files from zip archives.
-
-WWW: http://johnmacfarlane.net/zip-archive/
diff --git a/archivers/hs-zip-archive-ghc/pkg-plist b/archivers/hs-zip-archive-ghc/pkg-plist
deleted file mode 100644
index 510d701b8dda..000000000000
--- a/archivers/hs-zip-archive-ghc/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-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 2d9e6e07f795..35bf9688c4d5 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	zip-archive
 PORTVERSION=	0.1.1.6
 CATEGORIES=	archivers haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A Haskell library for working with zip archives