35 files changed, 8 insertions, 656 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 04baf3e625f2..803226d8d812 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -269,7 +269,6 @@
     SUBDIR += cxmon
     SUBDIR += cxref
     SUBDIR += cxxtest
-    SUBDIR += darcs
     SUBDIR += darts
     SUBDIR += datadesigner
     SUBDIR += datadraw
@@ -556,12 +555,13 @@
     SUBDIR += hs-ansi-terminal
     SUBDIR += hs-ansi-wl-pprint
     SUBDIR += hs-arrows
-    SUBDIR += hs-binary-ghc
+    SUBDIR += hs-binary
     SUBDIR += hs-bsd-sysctl
     SUBDIR += hs-c2hs
     SUBDIR += hs-checkers
     SUBDIR += hs-convertible
     SUBDIR += hs-cpphs
+    SUBDIR += hs-darcs
     SUBDIR += hs-datetime
     SUBDIR += hs-deepseq
     SUBDIR += hs-dlist
@@ -583,11 +583,11 @@
     SUBDIR += hs-hoogle
     SUBDIR += hs-hslogger
     SUBDIR += hs-idoc
-    SUBDIR += hs-language-c-ghc
-    SUBDIR += hs-lazysmallcheck-ghc
+    SUBDIR += hs-language-c
+    SUBDIR += hs-lazysmallcheck
     SUBDIR += hs-mmap
     SUBDIR += hs-mueval
-    SUBDIR += hs-pcre-light-ghc
+    SUBDIR += hs-pcre-light
     SUBDIR += hs-reactive
     SUBDIR += hs-readline
     SUBDIR += hs-safe
@@ -603,7 +603,7 @@
     SUBDIR += hs-unamb
     SUBDIR += hs-uniplate
     SUBDIR += hs-unix-compat
-    SUBDIR += hs-utf8-string-ghc
+    SUBDIR += hs-utf8-string
     SUBDIR += hs-utility-ht
     SUBDIR += hs-uuagc
     SUBDIR += hs-uulib
diff --git a/devel/cvs2darcs/Makefile b/devel/cvs2darcs/Makefile
index e1a97ae95ff5..f99dbb8dedc0 100644
--- a/devel/cvs2darcs/Makefile
+++ b/devel/cvs2darcs/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ab-initio.mit.edu/${PORTNAME}/
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Convert CVS module to darcs repository
 
-BUILD_DEPENDS=	darcs:${PORTSDIR}/devel/darcs \
+BUILD_DEPENDS=	darcs:${PORTSDIR}/devel/hs-darcs \
 		cvsps:${PORTSDIR}/devel/cvsps \
 		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
deleted file mode 100644
index 70ad11a8774b..000000000000
--- a/devel/darcs/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# New ports collection makefile for:	darcs
-# Date created:				13 April 2003
-# Whom:					Oliver Braun <obraun@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	darcs
-PORTVERSION=	2.4.3
-CATEGORIES=	devel haskell
-PKGNAMEPREFIX=
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A distributed, interactive, smart revision control system
-
-USE_HACKAGE=	hashed-storage haskeline>=0.6.1 utf8-string>=0.3 zlib>=0.5.1.0
-
-EXECUTABLE=	darcs
-
-MAN1=		darcs.1
-MAN1SRC=	dist/build/darcs
-
-OPTIONS=	CURL            "Use libcurl for HTTP support" on \
-		CURL_PIPELINING "Use libcurl's HTTP pipelining" off \
-		HTTP            "Use the pure HTTP package" off \
-		STATIC          "Build static binary" off \
-		TERMINFO        "Use the terminfo package" off \
-		THREADED        "Use threading and SMP support" on \
-		TYPE_WITNESSES  "Use GADT type witnesses" off \
-		COLOR           "Use ANSI color escapes" off \
-		MMAP            "Compile with mmap support" off \
-		TEST            "Compile unit tests" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_CURL)
-CONFIGURE_ARGS+=	--flags="curl"
-LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+=	--flags="-curl"
-.endif
-
-.if defined(WITH_CURL_PIPELINING)
-CONFIGURE_ARGS+=	--flags="curl-pipelining"
-BUILD_DEPENDS+=		pkg-config>=0.9.0:${PORTSDIR}/devel/pkg-config
-.if !defined(WITH_CURL)
-IGNORE=	cannot be compiled without CURL in this configuration.  Please (re)run 'make config' and choose CURL too
-.endif
-.else
-CONFIGURE_ARGS+=	--flags="-curl-pipelining"
-.endif
-
-.if defined(WITH_HTTP)
-CONFIGURE_ARGS+=	--flags="http"
-USE_HACKAGE+=		HTTP>=3000.0
-.else
-CONFIGURE_ARGS+=	--flags="-http"
-.endif
-
-.if !defined(WITH_CURL) && !defined(WITH_HTTP)
-IGNORE=	cannot be compiled without HTTP support.  Please (re)run 'make config' and choose either CURL or HTTP
-.endif
-
-.if defined(WITH_STATIC)
-CONFIGURE_ARGS+=	--flags="static"
-.else
-CONFIGURE_ARGS+=	--flags="-static"
-.endif
-
-.if defined(WITH_TERMINFO)
-CONFIGURE_ARGS+=	--flags="terminfo"
-USE_HACKAGE+=		terminfo>=0.3
-.else
-CONFIGURE_ARGS+=	--flags="-terminfo"
-.endif
-
-.if defined(WITH_THREADED)
-CONFIGURE_ARGS+=	--flags="threaded"
-.else
-CONFIGURE_ARGS+=	--flags="-threaded"
-.endif
-
-.if defined(WITH_TYPE_WITNESSES)
-CONFIGURE_ARGS+=	--flags="type-witnesses"
-EXECUTABLE+=		witnesses
-PLIST_SUB+=		MAYBE_TYPE_WITNESSES=""
-.else
-CONFIGURE_ARGS+=	--flags="-type-witnesses"
-PLIST_SUB+=		MAYBE_TYPE_WITNESSES="@comment "
-.endif
-
-.if defined(WITH_COLOR)
-CONFIGURE_ARGS+=	--flags="color"
-.else
-CONFIGURE_ARGS+=	--flags="-color"
-.endif
-
-.if defined(WITH_MMAP)
-CONFIGURE_ARGS+=	--flags="mmap"
-USE_HACKAGE+=		mmap>=0.2
-.else
-CONFIGURE_ARGS+=	--flags="-mmap"
-.endif
-
-.if defined(WITH_TEST)
-CONFIGURE_ARGS+=	--flags="test"
-USE_HACKAGE+=		QuickCheck>=2.1.0.0 test-framework>=0.2.2 test-framework-hunit>=0.2.2 test-framework-quickcheck2>=0.2.2
-EXECUTABLE+=		unit
-PLIST_SUB+=		MAYBE_TEST=""
-.else
-CONFIGURE_ARGS+=	--flags="-test"
-PLIST_SUB+=		MAYBE_TEST="@comment "
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
deleted file mode 100644
index afb41bcb05cf..000000000000
--- a/devel/darcs/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (darcs-2.4.3.tar.gz) = 7263a8578f2a1f4e57ad90f3ad5bfe04
-SHA256 (darcs-2.4.3.tar.gz) = 3aa1d00bad07e4e797fb6420d2fd1f22fda04af52d51839690e3047e16759ddb
-SIZE (darcs-2.4.3.tar.gz) = 1193044
diff --git a/devel/darcs/files/patch-Setup.lhs b/devel/darcs/files/patch-Setup.lhs
deleted file mode 100644
index 5bf1fce13516..000000000000
--- a/devel/darcs/files/patch-Setup.lhs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Setup.lhs.orig	2010-05-09 15:23:32.000000000 +0200
-+++ ./Setup.lhs	2010-05-15 13:37:00.000000000 +0200
-@@ -17,7 +17,7 @@
-          ( Version(versionBranch) )
- import Distribution.Simple.LocalBuildInfo
-          ( LocalBuildInfo(..), absoluteInstallDirs )
--import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
- import Distribution.Simple.Setup
-     (buildVerbosity, copyDest, copyVerbosity, fromFlag,
-      haddockVerbosity, installVerbosity, sDistVerbosity)
-@@ -168,7 +168,7 @@
-                   -> Verbosity -> CopyDest -> IO ()
- installManpage pkg lbi verbosity copy =
-     copyFiles verbosity
--              (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
-+              (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
-               [(buildDir lbi </> "darcs", "darcs.1")]
- 
- determineVersion :: Verbosity -> PackageDescription -> IO (String, String)
diff --git a/devel/darcs/files/patch-darcs.cabal b/devel/darcs/files/patch-darcs.cabal
deleted file mode 100644
index 595619a55580..000000000000
--- a/devel/darcs/files/patch-darcs.cabal
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./darcs.cabal.orig	2010-05-09 15:23:32.000000000 +0200
-+++ ./darcs.cabal	2010-05-21 21:08:36.000000000 +0200
-@@ -328,7 +328,7 @@
-                    html         == 1.0.*,
-                    filepath     == 1.1.*,
-                    haskeline    >= 0.6.1 && < 0.7,
--                   hashed-storage == 0.4.13
-+                   hashed-storage
- 
-   if !os(windows)
-     build-depends: unix >= 1.0 && < 2.5
-@@ -374,7 +374,7 @@
-       buildable: False
- 
-   if flag(mmap) && !os(windows)
--    build-depends:    mmap >= 0.2 && < 0.5
-+    build-depends:    mmap >= 0.2
-     cpp-options:      -DHAVE_MMAP
- 
-   build-depends:    zlib >= 0.5.1.0 && < 0.6.0.0
-@@ -459,7 +459,7 @@
-                    html         == 1.0.*,
-                    filepath     == 1.1.*,
-                    haskeline    >= 0.6.1 && < 0.7,
--                   hashed-storage == 0.4.13
-+                   hashed-storage
- 
-   if !os(windows)
-     build-depends: unix >= 1.0 && < 2.5
-@@ -497,7 +497,7 @@
-       buildable: False
- 
-   if flag(mmap) && !os(windows)
--    build-depends:    mmap >= 0.2 && < 0.5
-+    build-depends:    mmap >= 0.2
-     cpp-options:      -DHAVE_MMAP
- 
-   build-depends:    zlib >= 0.5.1.0 && < 0.6.0.0
-@@ -605,7 +605,7 @@
-                    random     == 1.0.*
- 
-   if flag(mmap) && !os(windows)
--    build-depends:    mmap >= 0.2 && < 0.5
-+    build-depends:    mmap >= 0.2
-     cpp-options:      -DHAVE_MMAP
- 
-   build-depends:    zlib >= 0.5.1.0 && < 0.6.0.0
diff --git a/devel/darcs/pkg-descr b/devel/darcs/pkg-descr
deleted file mode 100644
index 97c938b0857c..000000000000
--- a/devel/darcs/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Darcs is a free, open source revision control system. It is:
-
-* Distributed: Every user has access to the full command set, removing
-boundaries between server and client or committer and non-committers.
-
-* Interactive: Darcs is easy to learn and efficient to use because it
-asks you questions in response to simple commands, giving you choices in
-your work flow. You can choose to record one change in a file, while
-ignoring another. As you update from upstream, you can review each patch
-name, even the full "diff" for interesting patches.
-
-* Smart: Originally developed by physicist David Roundy, darcs is based
-on a unique algebra of patches.
-
-This smartness lets you respond to changing demands in ways that would
-otherwise not be possible. Learn more about spontaneous branches with
-darcs.
-
-WWW: http://darcs.net/
diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist
deleted file mode 100644
index 0091e7a49aa6..000000000000
--- a/devel/darcs/pkg-plist
+++ /dev/null
@@ -1,160 +0,0 @@
-@comment $FreeBSD$
-bin/darcs
-%%MAYBE_TEST%%bin/unit
-%%MAYBE_TYPE_WITNESSES%%bin/witnesses
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/ByteStringUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/CommandLine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Crypt/SHA256.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ArgumentDefaults.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Arguments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Bug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/CheckFileSystem.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ColorPrinter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Add.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/AmendRecord.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Annotate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Apply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Changes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Check.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Convert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Diff.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Dist.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/GZCRCs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Get.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Help.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Init.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/MarkConflicts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Move.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Optimize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Pull.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Push.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Put.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Record.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Remove.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Repair.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Replace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Revert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Rollback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Send.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/SetPref.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowAuthors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowBug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowContents.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowFiles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowIndex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/ShowTags.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Tag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/TrackDown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/TransferMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Unrecord.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/Unrevert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands/WhatsNew.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/CommandsAux.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Compat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Diff.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Email.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/External.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/FilePathMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Flags.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Global.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Hopefully.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/IO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Lock.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Apply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Bundle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Choices.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Commute.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Depends.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/FileName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Info.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/MatchData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Non.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/OldDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Patchy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Permutations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Prim.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Properties.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Read.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/ReadMonads.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Real.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/RegChars.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Set.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Split.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/TouchesFiles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch/Viewing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Population.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/PopulationData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/PrintPatch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/ProgressPatches.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RemoteApply.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RepoPath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/ApplyPatches.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Cache.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Checkpoint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/DarcsRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Format.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/HashedIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/HashedRepo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/InternalTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/LowLevel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Merge.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Motd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Prefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Pristine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/Repair.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Resolution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/RunCommand.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SelectChanges.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SignalHandler.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory/Internal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Test.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/TheCommands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/URL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Ordered.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Sealed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses/Show.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/DateMatcher.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/English.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Exec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HTTP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/IsoDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Lcs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Printer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Progress.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Ratified.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/SHA1.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Ssh.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/URL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Version.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Workaround.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%%/COPYING
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Witnesses
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/SlurpDirectory
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Repository
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Patch
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs/Commands
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Darcs
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Crypt
-@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/devel/hs-binary-ghc/Makefile b/devel/hs-binary-ghc/Makefile
deleted file mode 100644
index 94b8bafc3c3e..000000000000
--- a/devel/hs-binary-ghc/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	binary
-# Date created:				December 15, 2008
-# Whom:					Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	binary
-PORTVERSION=	0.5.0.2
-CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Efficient binary serialisation for Haskell
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-binary-ghc/distinfo b/devel/hs-binary-ghc/distinfo
deleted file mode 100644
index d55a58bcab50..000000000000
--- a/devel/hs-binary-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (binary-0.5.0.2.tar.gz) = 6bf8f3d1441602c9ab09a75e3bd6e926
-SHA256 (binary-0.5.0.2.tar.gz) = e0c2dede617dc9b1611f62f2801f21d2fd48e044ee6886e77b55df10e0f2130b
-SIZE (binary-0.5.0.2.tar.gz) = 41494
diff --git a/devel/hs-binary-ghc/pkg-descr b/devel/hs-binary-ghc/pkg-descr
deleted file mode 100644
index 4af4cbcbf16b..000000000000
--- a/devel/hs-binary-ghc/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Efficient, pure binary serialisation using lazy ByteStrings.  Haskell
-values may be encoded to and from binary formats, written to disk as
-binary, or sent over the network.  Serialisation speeds of over 1 G/sec
-have been observed, so this library should be suitable for high
-performance scenarios.
-
-WWW: http://code.haskell.org/binary/
diff --git a/devel/hs-binary-ghc/pkg-plist b/devel/hs-binary-ghc/pkg-plist
deleted file mode 100644
index db13b5df3e71..000000000000
--- a/devel/hs-binary-ghc/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Builder.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Get.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Binary/Put.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%%/Data/Binary
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@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/devel/hs-binary/Makefile b/devel/hs-binary/Makefile
index 94b8bafc3c3e..32e67efcdc5b 100644
--- a/devel/hs-binary/Makefile
+++ b/devel/hs-binary/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	binary
 PORTVERSION=	0.5.0.2
 CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Efficient binary serialisation for Haskell
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 70ad11a8774b..4395fa1de3ab 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	darcs
 PORTVERSION=	2.4.3
 CATEGORIES=	devel haskell
-PKGNAMEPREFIX=
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A distributed, interactive, smart revision control system
diff --git a/devel/hs-language-c-ghc/Makefile b/devel/hs-language-c-ghc/Makefile
deleted file mode 100644
index 822d52c46ba3..000000000000
--- a/devel/hs-language-c-ghc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:	hs-language-c-ghc
-# Date created:				March 2, 2009
-# Whom:					Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	language-c
-PORTVERSION=	0.3.1.1
-PORTREVISION=	2
-CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Analysis and generation of C code in Haskell
-
-CABAL_SETUP=	Setup.hs
-
-USE_ALEX=	yes
-USE_HAPPY=	yes
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-language-c-ghc/distinfo b/devel/hs-language-c-ghc/distinfo
deleted file mode 100644
index 9c64ffadea77..000000000000
--- a/devel/hs-language-c-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (language-c-0.3.1.1.tar.gz) = 4e0360b6439bd8d6519cec6bc213d906
-SHA256 (language-c-0.3.1.1.tar.gz) = f0599a449bb60a6203a9d3aea9a6d20af6f4a12debf4914cca74741dfd6ebe0d
-SIZE (language-c-0.3.1.1.tar.gz) = 140876
diff --git a/devel/hs-language-c-ghc/pkg-descr b/devel/hs-language-c-ghc/pkg-descr
deleted file mode 100644
index 596676508857..000000000000
--- a/devel/hs-language-c-ghc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Language C is a Haskell library for the analysis and generation of C
-code.  It features a complete, well tested parser and pretty printer for
-all of C99 and a large set of GNU extensions.
-
-WWW: http://www.sivity.net/projects/language.c/
diff --git a/devel/hs-language-c-ghc/pkg-plist b/devel/hs-language-c-ghc/pkg-plist
deleted file mode 100644
index 67168498c5c7..000000000000
--- a/devel/hs-language-c-ghc/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/AstAnalysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Debug.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DeclAnalysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/DefTable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/NameSpaceMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemError.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/SemRep.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis/TravMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Ident.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/InputStream.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Name.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Node.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/Position.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data/RList.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Builtin.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Lexer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/ParserMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/AST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Constants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax/Ops.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/GCC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/System/Preprocess.hi
-%%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%%/Language/C/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Syntax
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Parser
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C/Analysis
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/C
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@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/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 822d52c46ba3..183068b4d83c 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	language-c
 PORTVERSION=	0.3.1.1
 PORTREVISION=	2
 CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Analysis and generation of C code in Haskell
diff --git a/devel/hs-lazysmallcheck-ghc/Makefile b/devel/hs-lazysmallcheck-ghc/Makefile
deleted file mode 100644
index 52766ad9abec..000000000000
--- a/devel/hs-lazysmallcheck-ghc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	hs-lazysmallcheck-ghc
-# Date created:				March 11, 2009
-# Whom:					Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	lazysmallcheck
-PORTVERSION=	0.5
-CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A library for demand-driven testing of Haskell programs
-
-CABAL_SETUP=	Setup.hs
-
-PORTEXAMPLES=		*
-INSTALL_PORTEXAMPLES=	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-lazysmallcheck-ghc/distinfo b/devel/hs-lazysmallcheck-ghc/distinfo
deleted file mode 100644
index cd032429b343..000000000000
--- a/devel/hs-lazysmallcheck-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (lazysmallcheck-0.5.tar.gz) = f14dc0b5e2e2df93bfc3ced9e040d98f
-SHA256 (lazysmallcheck-0.5.tar.gz) = 981d48118e02501cf5c7fe726ebe01428c99d94c19005dd7f4b55e1ad414faed
-SIZE (lazysmallcheck-0.5.tar.gz) = 17059
diff --git a/devel/hs-lazysmallcheck-ghc/pkg-descr b/devel/hs-lazysmallcheck-ghc/pkg-descr
deleted file mode 100644
index 9ad601a05337..000000000000
--- a/devel/hs-lazysmallcheck-ghc/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Lazy SmallCheck is a library for exhaustive, demand-driven testing of
-Haskell programs.  It is based on the idea that if a property holds for
-a partially-defined input then it must also hold for all fully-defined
-refinements of the that input.  Compared to `eager' input generation as
-in SmallCheck, Lazy SmallCheck may require significantly fewer
-test-cases to verify a property for all inputs up to a given depth.
-
-WWW: http://www.cs.york.ac.uk/~mfn/lazysmallcheck/
diff --git a/devel/hs-lazysmallcheck-ghc/pkg-plist b/devel/hs-lazysmallcheck-ghc/pkg-plist
deleted file mode 100644
index 492b19a8767f..000000000000
--- a/devel/hs-lazysmallcheck-ghc/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Test/LazySmallCheck.hi
-%%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%%/Test
-@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/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 52766ad9abec..dc056aa566f2 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	lazysmallcheck
 PORTVERSION=	0.5
 CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A library for demand-driven testing of Haskell programs
diff --git a/devel/hs-pcre-light-ghc/Makefile b/devel/hs-pcre-light-ghc/Makefile
deleted file mode 100644
index b79cf9bc5fef..000000000000
--- a/devel/hs-pcre-light-ghc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	pcre-light
-# Date created:				December 16, 2008
-# Whom:					Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pcre-light
-PORTVERSION=	0.3.1.1
-CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A lightweight Haskell regex library compatible with Perl 5
-
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-pcre-light-ghc/distinfo b/devel/hs-pcre-light-ghc/distinfo
deleted file mode 100644
index 18d0a6cc82e0..000000000000
--- a/devel/hs-pcre-light-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pcre-light-0.3.1.1.tar.gz) = 17667e02cbc389d39ba54259162650a5
-SHA256 (pcre-light-0.3.1.1.tar.gz) = b3cf67f4fb6f8dda459ee3316291a2f1b7fd3125e30f63d4c1270a827d5e47a2
-SIZE (pcre-light-0.3.1.1.tar.gz) = 29751
diff --git a/devel/hs-pcre-light-ghc/pkg-descr b/devel/hs-pcre-light-ghc/pkg-descr
deleted file mode 100644
index b4cc9d1c14dc..000000000000
--- a/devel/hs-pcre-light-ghc/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A small, efficient and portable Haskell regex library for Perl 5 compatible
-regular expressions.
-
-The PCRE library is a set of functions that implement regular expression
-pattern matching using the same syntax and semantics as Perl 5.
-
-WWW: http://code.haskell.org/~dons/code/pcre-light
diff --git a/devel/hs-pcre-light-ghc/pkg-plist b/devel/hs-pcre-light-ghc/pkg-plist
deleted file mode 100644
index 81a92be7e128..000000000000
--- a/devel/hs-pcre-light-ghc/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE/Light/Char8.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%%/Text/Regex/PCRE/Light
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex/PCRE
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Regex
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@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/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index b79cf9bc5fef..54d770b10e65 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	pcre-light
 PORTVERSION=	0.3.1.1
 CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A lightweight Haskell regex library compatible with Perl 5
diff --git a/devel/hs-utf8-string-ghc/Makefile b/devel/hs-utf8-string-ghc/Makefile
deleted file mode 100644
index ad5b1d9bef48..000000000000
--- a/devel/hs-utf8-string-ghc/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:	hs-utf8-string-ghc
-# Date created:		2008-10-21
-# Whom:			Ashish Shukla <wahjava@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	utf8-string
-PORTVERSION=	0.3.6
-CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
-
-MAINTAINER=	wahjava@gmail.com
-COMMENT=	Support for reading/writing UTF8 strings for Haskell programs
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-utf8-string-ghc/distinfo b/devel/hs-utf8-string-ghc/distinfo
deleted file mode 100644
index 61d99ea45e48..000000000000
--- a/devel/hs-utf8-string-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (utf8-string-0.3.6.tar.gz) = be8c5ef52a0824babdc89d60c1e9b600
-SHA256 (utf8-string-0.3.6.tar.gz) = c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69
-SIZE (utf8-string-0.3.6.tar.gz) = 8871
diff --git a/devel/hs-utf8-string-ghc/pkg-descr b/devel/hs-utf8-string-ghc/pkg-descr
deleted file mode 100644
index 52a189edfd36..000000000000
--- a/devel/hs-utf8-string-ghc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A UTF8 layer for IO and Strings. The utf8-string package provides operations for
-encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8
-without truncation.
-
-WWW: http://github.com/glguy/utf8-string/
diff --git a/devel/hs-utf8-string-ghc/pkg-plist b/devel/hs-utf8-string-ghc/pkg-plist
deleted file mode 100644
index 546971bab69c..000000000000
--- a/devel/hs-utf8-string-ghc/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/Generic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8/String.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/IO/UTF8.hi
-%%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%%/System/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Environment
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/String
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary/UTF8
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Binary
-@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/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index ad5b1d9bef48..f58a5f3a316e 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	utf8-string
 PORTVERSION=	0.3.6
 CATEGORIES=	devel haskell
-PKGNAMESUFFIX=	-ghc
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	Support for reading/writing UTF8 strings for Haskell programs
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile
index e7e41e0dd0f9..2a0697e8b7a0 100644
--- a/devel/lhs2TeX/Makefile
+++ b/devel/lhs2TeX/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A preprocessor to generate LaTeX code from literate Haskell sources
 
 BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
+		hs-utf8-string>=0.3:${PORTSDIR}/devel/hs-utf8-string
 
 RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base