aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2010-05-24 21:52:43 +0000
committerGabor Pali <pgj@FreeBSD.org>2010-05-24 21:52:43 +0000
commit52a16208eaba05e0c1cb0d95be24e44e71706dd2 (patch)
tree5a7ea66d25b9bb72643f4945eee29bb8e70f7bd5
parent8d576420f06c4fab68fe0ebef32941d23d62e84d (diff)
downloadports-52a16208eaba05e0c1cb0d95be24e44e71706dd2.tar.gz
ports-52a16208eaba05e0c1cb0d95be24e44e71706dd2.zip
Rename the following Haskell ports to bring them in sync with the
HackageDB: archivers/hs-zip-archive-ghc -> archivers/hs-zip-archive devel/hs-binary-ghc -> devel/hs-binary devel/darcs -> devel/hs-darcs devel/hs-language-c-ghc -> devel/hs-language-c devel/hs-lazysmallcheck-ghc -> devel/hs-lazysmallcheck devel/hs-pcre-light-ghc -> devel/hs-pcre-light devel/hs-utf8-string-ghc -> devel/hs-utf8-string graphics/hs-HGL-ghc -> graphics/hs-HGL ports-mgmt/porte -> ports-mgmt/hs-porte security/hs-digest-ghc -> security/hs-digest textproc/hs-haxml -> textproc/hs-HaXml textproc/hs-highlighting-kate-ghc -> textproc/hs-highlighting-kate textproc/hs-polyparse-ghc -> textproc/hs-polyparse textproc/pandoc -> textproc/hs-pandoc x11/hs-x11-ghc -> x11/hs-X11 x11/hs-x11-xft-ghc -> x11/hs-X11-xft x11/xmobar -> x11/hs-xmobar x11-toolkits/hs-opengl-ghc -> x11-toolkits/hs-OpenGL x11-toolkits/hs-OpenGLRaw-ghc -> x11-toolkits/hs-OpenGLRaw x11-toolkits/hs-GLURaw-ghc -> x11-toolkits/hs-GLURaw x11-toolkits/hs-glut-ghc -> x11-toolkits/hs-GLUT x11-wm/xmonad -> x11-wm/hs-xmonad x11-wm/xmonad-contrib -> x11-wm/hs-xmonad-contrib
Notes
Notes: svn path=/head/; revision=254999
-rw-r--r--MOVED23
-rw-r--r--archivers/Makefile2
-rw-r--r--archivers/hs-zip-archive-ghc/Makefile33
-rw-r--r--archivers/hs-zip-archive-ghc/distinfo3
-rw-r--r--archivers/hs-zip-archive-ghc/pkg-descr4
-rw-r--r--archivers/hs-zip-archive-ghc/pkg-plist16
-rw-r--r--archivers/hs-zip-archive/Makefile1
-rw-r--r--deskutils/checkrdf/Makefile2
-rw-r--r--devel/Makefile12
-rw-r--r--devel/cvs2darcs/Makefile2
-rw-r--r--devel/darcs/Makefile117
-rw-r--r--devel/darcs/distinfo3
-rw-r--r--devel/darcs/files/patch-Setup.lhs20
-rw-r--r--devel/darcs/files/patch-darcs.cabal47
-rw-r--r--devel/darcs/pkg-descr19
-rw-r--r--devel/darcs/pkg-plist160
-rw-r--r--devel/hs-binary-ghc/Makefile17
-rw-r--r--devel/hs-binary-ghc/distinfo3
-rw-r--r--devel/hs-binary-ghc/pkg-descr7
-rw-r--r--devel/hs-binary-ghc/pkg-plist18
-rw-r--r--devel/hs-binary/Makefile1
-rw-r--r--devel/hs-darcs/Makefile1
-rw-r--r--devel/hs-language-c-ghc/Makefile23
-rw-r--r--devel/hs-language-c-ghc/distinfo3
-rw-r--r--devel/hs-language-c-ghc/pkg-descr5
-rw-r--r--devel/hs-language-c-ghc/pkg-plist51
-rw-r--r--devel/hs-language-c/Makefile1
-rw-r--r--devel/hs-lazysmallcheck-ghc/Makefile22
-rw-r--r--devel/hs-lazysmallcheck-ghc/distinfo3
-rw-r--r--devel/hs-lazysmallcheck-ghc/pkg-descr8
-rw-r--r--devel/hs-lazysmallcheck-ghc/pkg-plist14
-rw-r--r--devel/hs-lazysmallcheck/Makefile1
-rw-r--r--devel/hs-pcre-light-ghc/Makefile19
-rw-r--r--devel/hs-pcre-light-ghc/distinfo3
-rw-r--r--devel/hs-pcre-light-ghc/pkg-descr7
-rw-r--r--devel/hs-pcre-light-ghc/pkg-plist19
-rw-r--r--devel/hs-pcre-light/Makefile1
-rw-r--r--devel/hs-utf8-string-ghc/Makefile17
-rw-r--r--devel/hs-utf8-string-ghc/distinfo3
-rw-r--r--devel/hs-utf8-string-ghc/pkg-descr5
-rw-r--r--devel/hs-utf8-string-ghc/pkg-plist29
-rw-r--r--devel/hs-utf8-string/Makefile1
-rw-r--r--devel/lhs2TeX/Makefile2
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/hs-HGL-ghc/Makefile20
-rw-r--r--graphics/hs-HGL-ghc/distinfo3
-rw-r--r--graphics/hs-HGL-ghc/pkg-descr10
-rw-r--r--graphics/hs-HGL-ghc/pkg-plist44
-rw-r--r--graphics/hs-HGL/Makefile1
-rw-r--r--lang/ghc/bsd.hackage.mk44
-rw-r--r--ports-mgmt/Makefile2
-rw-r--r--ports-mgmt/hs-porte/Makefile1
-rw-r--r--ports-mgmt/porte/Makefile22
-rw-r--r--ports-mgmt/porte/distinfo3
-rw-r--r--ports-mgmt/porte/pkg-descr5
-rw-r--r--ports-mgmt/porte/pkg-plist17
-rw-r--r--security/Makefile2
-rw-r--r--security/hs-digest-ghc/Makefile19
-rw-r--r--security/hs-digest-ghc/distinfo3
-rw-r--r--security/hs-digest-ghc/pkg-descr6
-rw-r--r--security/hs-digest-ghc/pkg-plist16
-rw-r--r--security/hs-digest/Makefile1
-rw-r--r--security/hs-digest/pkg-descr1
-rw-r--r--textproc/Makefile8
-rw-r--r--textproc/hs-HaXml/Makefile5
-rw-r--r--textproc/hs-HaXml/pkg-plist6
-rw-r--r--textproc/hs-haxml/Makefile25
-rw-r--r--textproc/hs-haxml/distinfo3
-rw-r--r--textproc/hs-haxml/pkg-descr5
-rw-r--r--textproc/hs-haxml/pkg-plist57
-rw-r--r--textproc/hs-highlighting-kate-ghc/Makefile33
-rw-r--r--textproc/hs-highlighting-kate-ghc/distinfo3
-rw-r--r--textproc/hs-highlighting-kate-ghc/pkg-descr18
-rw-r--r--textproc/hs-highlighting-kate-ghc/pkg-plist79
-rw-r--r--textproc/hs-highlighting-kate/Makefile1
-rw-r--r--textproc/hs-lhs2tex/Makefile2
-rw-r--r--textproc/hs-pandoc/Makefile1
-rw-r--r--textproc/hs-polyparse-ghc/Makefile19
-rw-r--r--textproc/hs-polyparse-ghc/distinfo3
-rw-r--r--textproc/hs-polyparse-ghc/pkg-descr8
-rw-r--r--textproc/hs-polyparse-ghc/pkg-plist27
-rw-r--r--textproc/hs-polyparse/Makefile1
-rw-r--r--textproc/pandoc/Makefile85
-rw-r--r--textproc/pandoc/distinfo3
-rw-r--r--textproc/pandoc/files/patch-Setup.hs20
-rw-r--r--textproc/pandoc/pkg-descr20
-rw-r--r--textproc/pandoc/pkg-plist46
-rw-r--r--x11-toolkits/Makefile8
-rw-r--r--x11-toolkits/hs-GLURaw-ghc/Makefile21
-rw-r--r--x11-toolkits/hs-GLURaw-ghc/distinfo3
-rw-r--r--x11-toolkits/hs-GLURaw-ghc/pkg-descr5
-rw-r--r--x11-toolkits/hs-GLURaw-ghc/pkg-plist23
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile1
-rw-r--r--x11-toolkits/hs-GLUT/Makefile6
-rw-r--r--x11-toolkits/hs-GLUT/pkg-plist6
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile6
-rw-r--r--x11-toolkits/hs-OpenGL/pkg-plist6
-rw-r--r--x11-toolkits/hs-OpenGLRaw-ghc/Makefile20
-rw-r--r--x11-toolkits/hs-OpenGLRaw-ghc/distinfo3
-rw-r--r--x11-toolkits/hs-OpenGLRaw-ghc/pkg-descr11
-rw-r--r--x11-toolkits/hs-OpenGLRaw-ghc/pkg-plist205
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile1
-rw-r--r--x11-toolkits/hs-glut-ghc/Makefile23
-rw-r--r--x11-toolkits/hs-glut-ghc/distinfo3
-rw-r--r--x11-toolkits/hs-glut-ghc/pkg-descr6
-rw-r--r--x11-toolkits/hs-glut-ghc/pkg-plist42
-rw-r--r--x11-toolkits/hs-opengl-ghc/Makefile22
-rw-r--r--x11-toolkits/hs-opengl-ghc/distinfo3
-rw-r--r--x11-toolkits/hs-opengl-ghc/pkg-descr7
-rw-r--r--x11-toolkits/hs-opengl-ghc/pkg-plist101
-rw-r--r--x11-wm/Makefile4
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile1
-rw-r--r--x11-wm/hs-xmonad/Makefile1
-rw-r--r--x11-wm/xmonad-contrib/Makefile31
-rw-r--r--x11-wm/xmonad-contrib/distinfo3
-rw-r--r--x11-wm/xmonad-contrib/pkg-descr13
-rw-r--r--x11-wm/xmonad-contrib/pkg-plist201
-rw-r--r--x11-wm/xmonad/Makefile28
-rw-r--r--x11-wm/xmonad/distinfo3
-rw-r--r--x11-wm/xmonad/pkg-descr16
-rw-r--r--x11-wm/xmonad/pkg-plist22
-rw-r--r--x11/Makefile6
-rw-r--r--x11/hs-X11-xft/Makefile6
-rw-r--r--x11/hs-X11-xft/pkg-descr1
-rw-r--r--x11/hs-X11-xft/pkg-plist6
-rw-r--r--x11/hs-X11/Makefile6
-rw-r--r--x11/hs-X11/pkg-plist6
-rw-r--r--x11/hs-x11-ghc/Makefile35
-rw-r--r--x11/hs-x11-ghc/distinfo3
-rw-r--r--x11/hs-x11-ghc/pkg-descr7
-rw-r--r--x11/hs-x11-ghc/pkg-plist45
-rw-r--r--x11/hs-x11-xft-ghc/Makefile24
-rw-r--r--x11/hs-x11-xft-ghc/distinfo3
-rw-r--r--x11/hs-x11-xft-ghc/pkg-descr4
-rw-r--r--x11/hs-x11-xft-ghc/pkg-plist16
-rw-r--r--x11/hs-xmobar/Makefile2
-rw-r--r--x11/xmobar/Makefile57
-rw-r--r--x11/xmobar/distinfo3
-rw-r--r--x11/xmobar/pkg-descr5
-rw-r--r--x11/xmobar/pkg-plist4
140 files changed, 93 insertions, 2449 deletions
diff --git a/MOVED b/MOVED
index ee88849d385e..008eb65a9f0c 100644
--- a/MOVED
+++ b/MOVED
@@ -4403,3 +4403,26 @@ databases/postgresql-contrib|databases/postgresql82-contrib|2010-05-20|Use datab
lang/yorick-doc||2010-05-20|Has expired: up-to-date docs are included in the lang/yorick port
devel/perforce|devel/p4|2010-05-20|Split into multiple ports
net/dgd-net||2010-05-24|Has expired: all network functionality is included in net/dgd
+archivers/hs-zip-archive-ghc|archivers/hs-zip-archive|2010-05-24|Renamed: No need for suffix.
+devel/hs-binary-ghc|devel/hs-binary|2010-05-24|Renamed: No need for suffix.
+devel/darcs|devel/hs-darcs|2010-05-24|Renamed: It has become a hackage transcript.
+devel/hs-language-c-ghc|devel/hs-language-c|2010-05-24|Renamed: No need for suffix.
+devel/hs-lazysmallcheck-ghc|devel/hs-lazysmallcheck|2010-05-24|Renamed: No need for suffix.
+devel/hs-pcre-light-ghc|devel/hs-pcre-light|2010-05-24|Renamed: No need for suffix.
+devel/hs-utf8-string-ghc|devel/hs-utf8-string|2010-05-24|Renamed: No need for suffix.
+graphics/hs-HGL-ghc|graphics/hs-HGL|2010-05-24|Renamed: No need for suffix.
+ports-mgmt/porte|ports-mgmt/hs-porte|2010-05-24|Renamed: It has become a hackage transcript.
+security/hs-digest-ghc|security/hs-digest|2010-05-24|Renamed: No need for suffix.
+textproc/hs-haxml|textproc/hs-HaXml|2010-05-24|Renamed: Brought in sync with HackageDB.
+textproc/hs-highlighting-kate-ghc|textproc/hs-highlighting-kate|2010-05-24|Renamed: No need for suffix.
+textproc/hs-polyparse-ghc|textproc/hs-polyparse|2010-05-24|Renamed: No need for suffix.
+textproc/pandoc|textproc/hs-pandoc|2010-05-24|Renamed: It has become a Cabal transcript.
+x11/hs-x11-ghc|x11/hs-X11|2010-05-24|Renamed: Brought in sync with HackageDB and no need for suffix.
+x11/hs-x11-xft-ghc|x11/hs-X11-xft|2010-05-24|Renamed: Brought in sync with HackageDB and no need for suffix.
+x11/xmobar|x11/hs-xmobar|2010-05-24|Renamed: It has become a hackage transcript.
+x11-toolkits/hs-OpenGLRaw-ghc|x11-toolkits/hs-OpenGLRaw|2010-05-24|Renamed; No need for suffix.
+x11-toolkits/hs-GLURaw-ghc|x11-toolkits/hs-GLURaw|2010-05-24|Renamed: No need for suffix.
+x11-toolkits/hs-opengl-ghc|x11-toolkits/hs-OpenGL|2010-05-24|Renamed: Brought in sync with HackageDB and no need for suffix.
+x11-toolkits/hs-glut-ghc|x11-toolkits/hs-GLUT|2010-05-24|Renamed: Brought in sync with HackageDB and no need for suffix.
+x11-wm/xmonad|x11-wm/hs-xmonad|2010-05-24|Renamed: It has become a Cabal transcript.
+x11-wm/xmonad-contrib|hs-xmonad-contrib|2010-05-24|Renamed: It has become a Cabal transcript.
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
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index da2afc939635..44a819211182 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for RDF site summaries based news-check
-BUILD_DEPENDS= hs-haxml>=1.19:${PORTSDIR}/textproc/hs-haxml
+BUILD_DEPENDS= hs-HaXml>=1.19:${PORTSDIR}/textproc/hs-HaXml
USE_BZIP2= yes
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
diff --git a/graphics/Makefile b/graphics/Makefile
index bff83dced1c4..13e1e6a2ec38 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -318,7 +318,7 @@
SUBDIR += gx
SUBDIR += hobbes-icons-xpm
SUBDIR += hppsmtools
- SUBDIR += hs-HGL-ghc
+ SUBDIR += hs-HGL
SUBDIR += hs-hgl
SUBDIR += hsetroot
SUBDIR += hugin
diff --git a/graphics/hs-HGL-ghc/Makefile b/graphics/hs-HGL-ghc/Makefile
deleted file mode 100644
index ab3cf686db33..000000000000
--- a/graphics/hs-HGL-ghc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for: hs-HGL-ghc
-# Date created: February 25 2008
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= HGL
-PORTVERSION= 3.2.0.2
-CATEGORIES= graphics haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= jacula@gmail.com
-COMMENT= A simple Haskell graphics library based on X11 or Win32
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= X11
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/graphics/hs-HGL-ghc/distinfo b/graphics/hs-HGL-ghc/distinfo
deleted file mode 100644
index e1c0efd24da4..000000000000
--- a/graphics/hs-HGL-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (HGL-3.2.0.2.tar.gz) = fd653c4fe622312920754a5ec35f4d65
-SHA256 (HGL-3.2.0.2.tar.gz) = 7f0734d1a8a8ad1fdfff44b7838a2d8e6aef025a08549461bc2946b78cdb8c8f
-SIZE (HGL-3.2.0.2.tar.gz) = 38914
diff --git a/graphics/hs-HGL-ghc/pkg-descr b/graphics/hs-HGL-ghc/pkg-descr
deleted file mode 100644
index 893d95650fd7..000000000000
--- a/graphics/hs-HGL-ghc/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-A simple graphics library, designed to give the programmer access to most
-interesting parts of the Win32 Graphics Device Interface and X11 library
-without exposing the programmer to the pain and anguish usually associated with
-using these interfaces.
-
-The library also includes a module Graphics.SOE providing the interface used
-in "The Haskell School of Expression", by Paul Hudak,
-cf <http://www.haskell.org/soe/>.
-
-WWW: http://www.haskell.org/graphics/index.html
diff --git a/graphics/hs-HGL-ghc/pkg-plist b/graphics/hs-HGL-ghc/pkg-plist
deleted file mode 100644
index cf79ba076332..000000000000
--- a/graphics/hs-HGL-ghc/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Brush.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Font.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Monad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Pen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Picture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Region.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Text.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Draw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Event.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Events.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Flag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Utilities.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Key.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Run.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Units.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/DC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Display.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Timer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/SOE.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%%@dirrm %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index ab3cf686db33..6057f6207972 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -8,7 +8,6 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.2
CATEGORIES= graphics haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= jacula@gmail.com
COMMENT= A simple Haskell graphics library based on X11 or Win32
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index c38002bd9c05..1a636969db1d 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -18,7 +18,7 @@ ALUT_port= audio/hs-ALUT
ansi-terminal_port= devel/hs-ansi-terminal
ansi-wl-pprint_port= devel/hs-ansi-wl-pprint
arrows_port= devel/hs-arrows
-binary_port= devel/hs-binary-ghc
+binary_port= devel/hs-binary
bio_port= science/hs-bio
brainfuck_port= lang/hs-brainfuck # executable
bytestring-csv_port= textproc/hs-bytestring-csv
@@ -37,7 +37,7 @@ datetime_port= devel/hs-datetime
DeepArrow_port= devel/hs-DeepArrow
deepseq_port= devel/hs-deepseq
Diff_port= textproc/hs-Diff
-digest_port= security/hs-digest-ghc
+digest_port= security/hs-digest
dlist_port= devel/hs-dlist
erf_port= math/hs-erf
fastcgi_port= www/hs-fastcgi # lib_depends
@@ -46,16 +46,16 @@ fgl_port= devel/hs-fgl
FileManip_port= devel/hs-FileManip
ghc-mtl_port= devel/hs-ghc-mtl
ghc-paths_port= devel/hs-ghc-paths
-GLURaw_port= x11-toolkits/hs-GLURaw-ghc
-GLUT_port= x11-toolkits/hs-glut-ghc
+GLURaw_port= x11-toolkits/hs-GLURaw
+GLUT_port= x11-toolkits/hs-GLUT
haddock_port= devel/hs-haddock # executable
happy_port= devel/hs-happy # executable
hashed-storage_port= devel/hs-hashed-storage
haskeline_port= devel/hs-haskeline
haskell-src-exts_port= devel/hs-haskell-src-exts
-HaXml_port= textproc/hs-haxml # executable
-HGL_port= graphics/hs-HGL-ghc
-highlighting-kate_port= textproc/hs-highlighting-kate-ghc
+HaXml_port= textproc/hs-HaXml # executable
+HGL_port= graphics/hs-HGL
+highlighting-kate_port= textproc/hs-highlighting-kate
hint_port= devel/hs-hint
hoogle_port= devel/hs-hoogle # executable
hostname_port= net/hs-hostname
@@ -66,8 +66,8 @@ HTTP_port= www/hs-HTTP
http-server_port= www/hs-http-server
hxt_port= textproc/hs-hxt
json_port= converters/hs-json
-language-c_port= devel/hs-language-c-ghc
-lazysmallcheck_port= devel/hs-lazysmallcheck-ghc
+language-c_port= devel/hs-language-c
+lazysmallcheck_port= devel/hs-lazysmallcheck
libmpd_port= audio/hs-libmpd
libxml_port= textproc/hs-libxml
MemoTrie_port= devel/hs-MemoTrie
@@ -80,13 +80,13 @@ mwc-random_port= math/hs-mwc-random
ObjectName_port= devel/hs-ObjectName
oeis_port= www/hs-oeis
OpenAL_port= audio/hs-OpenAL
-OpenGL_port= x11-toolkits/hs-opengl-ghc
-OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw-ghc
-pandoc_port= textproc/pandoc # executable
+OpenGL_port= x11-toolkits/hs-OpenGL
+OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw
+pandoc_port= textproc/hs-pandoc # executable
pcap_port= net/hs-pcap
-pcre-light_port= devel/hs-pcre-light-ghc # lib_depends
-polyparse_port= textproc/hs-polyparse-ghc
-porte_port= ports-mgmt/porte # executable
+pcre-light_port= devel/hs-pcre-light # lib_depends
+polyparse_port= textproc/hs-polyparse
+porte_port= ports-mgmt/hs-porte # executable
probability_port= math/hs-probability
QuickCheck_port= devel/hs-QuickCheck
reactive_port= devel/hs-reactive
@@ -116,18 +116,18 @@ uniplate_port= devel/hs-uniplate
unix-compat_port= devel/hs-unix-compat
unlambda_port= lang/hs-unlambda # executable
url_port= www/hs-url
-utf8-string_port= devel/hs-utf8-string-ghc
+utf8-string_port= devel/hs-utf8-string
utility-ht_port= devel/hs-utility-ht
uuagc_port= devel/hs-uuagc # executable
uulib_port= devel/hs-uulib
uvector_port= devel/hs-uvector
uvector-algorithms_port= devel/hs-uvector-algorithms
vector-space_port= math/hs-vector-space
-X11_port= x11/hs-x11-ghc # lib_depends
-X11-xft_port= x11/hs-x11-xft-ghc
+X11_port= x11/hs-X11 # lib_depends
+X11-xft_port= x11/hs-X11-xft
xml_port= textproc/hs-xml
-xmobar_port= x11/xmobar # executable
-xmonad_port= x11-wm/xmonad # executable
-xmonad-contrib_port= x11-wm/xmonad-contrib
-zip-archive_port= archivers/hs-zip-archive-ghc
+xmobar_port= x11/hs-xmobar # executable
+xmonad_port= x11-wm/hs-xmonad # executable
+xmonad-contrib_port= x11-wm/hs-xmonad-contrib
+zip-archive_port= archivers/hs-zip-archive
zlib_port= archivers/hs-zlib
diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index 968418aa866f..4ea6c98253f4 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -9,6 +9,7 @@
SUBDIR += fastest_sites
SUBDIR += genplist
SUBDIR += gnome-packagekit
+ SUBDIR += hs-porte
SUBDIR += jailaudit
SUBDIR += kports
SUBDIR += kports-qt4
@@ -45,7 +46,6 @@
SUBDIR += portcheckout
SUBDIR += portconf
SUBDIR += portdowngrade
- SUBDIR += porte
SUBDIR += porteasy
SUBDIR += portell
SUBDIR += portless
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 771295fafc8f..30d66d8c06f6 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -8,7 +8,6 @@ PORTNAME= porte
PORTVERSION= 0.0.3
PORTREVISION= 4
CATEGORIES= ports-mgmt haskell
-PKGNAMEPREFIX=
MAINTAINER= sbahra@kerneled.org
COMMENT= FreeBSD ports index search and statistical analysis tool
diff --git a/ports-mgmt/porte/Makefile b/ports-mgmt/porte/Makefile
deleted file mode 100644
index 771295fafc8f..000000000000
--- a/ports-mgmt/porte/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for: porte
-# Date created: November 4, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
-# $FreeBSD$
-
-PORTNAME= porte
-PORTVERSION= 0.0.3
-PORTREVISION= 4
-CATEGORIES= ports-mgmt haskell
-PKGNAMEPREFIX=
-
-MAINTAINER= sbahra@kerneled.org
-COMMENT= FreeBSD ports index search and statistical analysis tool
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= stringsearch
-
-EXECUTABLE= porte
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/ports-mgmt/porte/distinfo b/ports-mgmt/porte/distinfo
deleted file mode 100644
index 4c40dfc33abe..000000000000
--- a/ports-mgmt/porte/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (porte-0.0.3.tar.gz) = 1b314f3a33cc0831dd1a22950af49d44
-SHA256 (porte-0.0.3.tar.gz) = 843169fa258872582a05ac38a046df0def28cbdbe3d0d6d526baca317dfcabf3
-SIZE (porte-0.0.3.tar.gz) = 3737
diff --git a/ports-mgmt/porte/pkg-descr b/ports-mgmt/porte/pkg-descr
deleted file mode 100644
index d6579f3f73ab..000000000000
--- a/ports-mgmt/porte/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Porte provides a simple, fast and efficient interface to searching
-FreeBSD ports index fields. It also has a simple statistics mode which
-allows collecting frequency statistics for these fields.
-
-WWW: http://www.kerneled.org/
diff --git a/ports-mgmt/porte/pkg-plist b/ports-mgmt/porte/pkg-plist
deleted file mode 100644
index 97b48bca44b0..000000000000
--- a/ports-mgmt/porte/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD$
-bin/porte
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.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%%/Porte
-@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/security/Makefile b/security/Makefile
index 75c31c1a294b..342d1549c7ae 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -192,7 +192,7 @@
SUBDIR += hostsentry
SUBDIR += hotssh
SUBDIR += hs-SHA
- SUBDIR += hs-digest-ghc
+ SUBDIR += hs-digest
SUBDIR += httprint
SUBDIR += hunch
SUBDIR += hydra
diff --git a/security/hs-digest-ghc/Makefile b/security/hs-digest-ghc/Makefile
deleted file mode 100644
index a076dea6bb1c..000000000000
--- a/security/hs-digest-ghc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for: hs-digest-ghc
-# Date created: January 22, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= digest
-PORTVERSION= 0.0.0.8
-CATEGORIES= security haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Efficient cryptographic hash implementations in Haskell
-
-CABAL_SETUP= Setup.hs
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/security/hs-digest-ghc/distinfo b/security/hs-digest-ghc/distinfo
deleted file mode 100644
index 1f98b7fcdc59..000000000000
--- a/security/hs-digest-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (digest-0.0.0.8.tar.gz) = 3a730a6439b14fb7a30bcd03c9e3f4ff
-SHA256 (digest-0.0.0.8.tar.gz) = 0b213020c064cf36d1a3d5a77e1d19337713d2cb2ac4c170bc0fc8dc370af6f3
-SIZE (digest-0.0.0.8.tar.gz) = 2534
diff --git a/security/hs-digest-ghc/pkg-descr b/security/hs-digest-ghc/pkg-descr
deleted file mode 100644
index a160a7000e9e..000000000000
--- a/security/hs-digest-ghc/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package provides efficient cryptographic hash implementations for
-strict and lazy bytestrings for the functional programming language
-Haskell.
-
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
-
diff --git a/security/hs-digest-ghc/pkg-plist b/security/hs-digest-ghc/pkg-plist
deleted file mode 100644
index 3d370d552e2b..000000000000
--- a/security/hs-digest-ghc/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/Adler32.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/CRC32.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/Digest
-@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/security/hs-digest/Makefile b/security/hs-digest/Makefile
index a076dea6bb1c..65f479871b80 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -8,7 +8,6 @@
PORTNAME= digest
PORTVERSION= 0.0.0.8
CATEGORIES= security haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= Efficient cryptographic hash implementations in Haskell
diff --git a/security/hs-digest/pkg-descr b/security/hs-digest/pkg-descr
index a160a7000e9e..c57435d330e6 100644
--- a/security/hs-digest/pkg-descr
+++ b/security/hs-digest/pkg-descr
@@ -3,4 +3,3 @@ strict and lazy bytestrings for the functional programming language
Haskell.
WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest
-
diff --git a/textproc/Makefile b/textproc/Makefile
index a60fd664e04a..15cc92fd07bd 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -219,15 +219,16 @@
SUBDIR += hil-aspell
SUBDIR += hr-aspell
SUBDIR += hs-Diff
+ SUBDIR += hs-HaXml
SUBDIR += hs-bytestring-csv
SUBDIR += hs-citeproc-hs
SUBDIR += hs-feed
- SUBDIR += hs-haxml
- SUBDIR += hs-highlighting-kate-ghc
+ SUBDIR += hs-highlighting-kate
SUBDIR += hs-hs-bibutils
SUBDIR += hs-hxt
SUBDIR += hs-libxml
- SUBDIR += hs-polyparse-ghc
+ SUBDIR += hs-pandoc
+ SUBDIR += hs-polyparse
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-texmath
@@ -897,7 +898,6 @@
SUBDIR += p5-podlators
SUBDIR += p5-xmltv
SUBDIR += pa-aspell
- SUBDIR += pandoc
SUBDIR += par
SUBDIR += pardiff
SUBDIR += pcrs
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index bf3e1d3a8bc1..fdf2ec689ac2 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTNAME= haxml
+PORTNAME= HaXml
PORTVERSION= 1.20.2
CATEGORIES= textproc haskell
@@ -18,8 +18,5 @@ EXECUTABLE= Canonicalise CanonicaliseLazy \
DtdToHaskell MkOneOf Validate \
Xtract XtractLazy
-MASTER_SITES= http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
-DISTNAME= HaXml-${PORTVERSION}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index c85632abd010..ce55b177c260 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -37,8 +37,8 @@ bin/XtractLazy
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
@@ -53,5 +53,5 @@ bin/XtractLazy
@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 HaXml-%%PORTVERSION%%
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
deleted file mode 100644
index bf3e1d3a8bc1..000000000000
--- a/textproc/hs-haxml/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for: HaXml
-# Date created: 01 June 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
-# $FreeBSD$
-
-PORTNAME= haxml
-PORTVERSION= 1.20.2
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of utilities for using Haskell and XML together
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= polyparse>=1.2
-
-EXECUTABLE= Canonicalise CanonicaliseLazy \
- DtdToHaskell MkOneOf Validate \
- Xtract XtractLazy
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
-DISTNAME= HaXml-${PORTVERSION}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-haxml/distinfo b/textproc/hs-haxml/distinfo
deleted file mode 100644
index 54455016dd19..000000000000
--- a/textproc/hs-haxml/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (HaXml-1.20.2.tar.gz) = 9635c348e70c0446e74783e7c267050c
-SHA256 (HaXml-1.20.2.tar.gz) = c32c10b95446ecb938dc6cd34585187efd3fcb4b21f7d0c7cbd646ba94c87516
-SIZE (HaXml-1.20.2.tar.gz) = 642240
diff --git a/textproc/hs-haxml/pkg-descr b/textproc/hs-haxml/pkg-descr
deleted file mode 100644
index 706847f35887..000000000000
--- a/textproc/hs-haxml/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-HaXml is a collection of utilities for using Haskell and XML together. It
-includes a parser for XML, a separate error-correcting parser for HTML, and
-pretty-printers for XML and HTML.
-
-WWW: http://www.haskell.org/HaXml/
diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist
deleted file mode 100644
index c85632abd010..000000000000
--- a/textproc/hs-haxml/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-@comment $FreeBSD$
-bin/Canonicalise
-bin/CanonicaliseLazy
-bin/DtdToHaskell
-bin/MkOneOf
-bin/Validate
-bin/Xtract
-bin/XtractLazy
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
-@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 HaXml-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-highlighting-kate-ghc/Makefile b/textproc/hs-highlighting-kate-ghc/Makefile
deleted file mode 100644
index bcf28714b49a..000000000000
--- a/textproc/hs-highlighting-kate-ghc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: highlighting-kate
-# Date created: December 16, 2008
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= highlighting-kate
-PORTVERSION= 0.2.6.2
-CATEGORIES= textproc haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell syntax highlighting library for 50+ languages
-
-USE_HACKAGE= pcre-light
-
-OPTIONS= EXECUTABLE "Build the Highlight executable" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_EXECUTABLE)
-CONFIGURE_ARGS+= --flags="executable"
-EXECUTABLE+= Highlight
-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/textproc/hs-highlighting-kate-ghc/distinfo b/textproc/hs-highlighting-kate-ghc/distinfo
deleted file mode 100644
index e335b46dbe8e..000000000000
--- a/textproc/hs-highlighting-kate-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (highlighting-kate-0.2.6.2.tar.gz) = 2795391871b8e21b8c6754b331af22ec
-SHA256 (highlighting-kate-0.2.6.2.tar.gz) = 3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7
-SIZE (highlighting-kate-0.2.6.2.tar.gz) = 428243
diff --git a/textproc/hs-highlighting-kate-ghc/pkg-descr b/textproc/hs-highlighting-kate-ghc/pkg-descr
deleted file mode 100644
index db931da9a667..000000000000
--- a/textproc/hs-highlighting-kate-ghc/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-The highlighting-kate is a syntax highlighting library for Haskell with
-support for over 50 languages. The syntax parsers are automatically
-generated from Kate syntax descriptions [1], so any syntax supported by
-Kate can be added. An (optional) command-line program is provided,
-along with a utility for generating new parsers from Kate XML syntax
-descriptions.
-
-Currently the following languages are supported: Ada, Asp, Awk, Bash,
-Bibtex, C, Cmake, Coldfusion, Commonlisp, Cpp, Css, D, Djangotemplate,
-Doxygen, Dtd, Eiffel, Erlang, Fortran, Haskell, Html, Java, Javadoc,
-Javascript, Json, Latex, Lex, LiterateHaskell, Lua, Makefile, Matlab,
-Mediawiki, Modula3, Nasm, Objectivec, Ocaml, Pascal, Perl, Php,
-Postscript, Prolog, Python, Rhtml, Ruby, Scala, Scheme, Sgml, Sql,
-SqlMysql, SqlPostgresql, Tcl, Texinfo, Xml, Xslt, Yacc.
-
-[1] <http://kate-editor.org>
-
-WWW: http://johnmacfarlane.net/highlighting-kate
diff --git a/textproc/hs-highlighting-kate-ghc/pkg-plist b/textproc/hs-highlighting-kate-ghc/pkg-plist
deleted file mode 100644
index 10756b59595f..000000000000
--- a/textproc/hs-highlighting-kate-ghc/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_EXECUTABLE%%bin/Highlight
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_highlighting_kate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Common.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Definitions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Format.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ada.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Alert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Asp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Awk.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bash.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bibtex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cmake.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cpp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Css.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/D.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Doxygen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Dtd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Eiffel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Erlang.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Fortran.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Haskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Html.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Java.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javadoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javascript.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Json.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Latex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lua.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Makefile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Matlab.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Modula3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Nasm.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Objectivec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ocaml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Pascal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Perl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Php.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Postscript.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Prolog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Python.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Relaxngcompact.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Rhtml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ruby.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scala.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scheme.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sgml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Tcl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Texinfo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xslt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Yacc.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/Highlighting/Kate/Syntax
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting
-@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/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index bcf28714b49a..4c28a64f7061 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -8,7 +8,6 @@
PORTNAME= highlighting-kate
PORTVERSION= 0.2.6.2
CATEGORIES= textproc haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell syntax highlighting library for 50+ languages
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index e7e41e0dd0f9..2a0697e8b7a0 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-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
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7d604d9e5e64..8f44616caca8 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -8,7 +8,6 @@
PORTNAME= pandoc
PORTVERSION= 1.5.1.1
CATEGORIES= textproc haskell
-PKGNAMEPREFIX=
MAINTAINER= haskell@FreeBSD.org
COMMENT= A general markup converter
diff --git a/textproc/hs-polyparse-ghc/Makefile b/textproc/hs-polyparse-ghc/Makefile
deleted file mode 100644
index 821e65d2b003..000000000000
--- a/textproc/hs-polyparse-ghc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for: hs-polyparse-ghc
-# Date created: January 23, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= polyparse
-PORTVERSION= 1.4
-CATEGORIES= textproc haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Alternative parser combinator libraries for Haskell
-
-CABAL_SETUP= Setup.hs
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-polyparse-ghc/distinfo b/textproc/hs-polyparse-ghc/distinfo
deleted file mode 100644
index 369f42646672..000000000000
--- a/textproc/hs-polyparse-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (polyparse-1.4.tar.gz) = 1783867124b49eefdbdc9ac39caf3174
-SHA256 (polyparse-1.4.tar.gz) = 6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44
-SIZE (polyparse-1.4.tar.gz) = 18002
diff --git a/textproc/hs-polyparse-ghc/pkg-descr b/textproc/hs-polyparse-ghc/pkg-descr
deleted file mode 100644
index 9677bdd925da..000000000000
--- a/textproc/hs-polyparse-ghc/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-A variety of alternative parser combinator libraries for the functional
-programming language Haskell, including the original HuttonMeijer set.
-The Poly sets have features like good error reporting, arbitrary token
-type, running state, lazy parsing, and so on. Finally, Text.Parse is a
-proposed replacement for the standard Read class, for better
-deserialisation of Haskell values from Strings.
-
-WWW: http://www.cs.york.ac.uk/fp/polyparse/
diff --git a/textproc/hs-polyparse-ghc/pkg-plist b/textproc/hs-polyparse-ghc/pkg-plist
deleted file mode 100644
index 64c92e0ef130..000000000000
--- a/textproc/hs-polyparse-ghc/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse/ByteString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijerWallace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/ByteString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Lazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Plain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/StateLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse
-@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/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 821e65d2b003..9bd9fbbbf6f8 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -8,7 +8,6 @@
PORTNAME= polyparse
PORTVERSION= 1.4
CATEGORIES= textproc haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= Alternative parser combinator libraries for Haskell
diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
deleted file mode 100644
index 7d604d9e5e64..000000000000
--- a/textproc/pandoc/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# New ports collection makefile for: pandoc
-# Date created: 9 February 2007
-# Whom: John MacFarlane <jgm@berkeley.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME= pandoc
-PORTVERSION= 1.5.1.1
-CATEGORIES= textproc haskell
-PKGNAMEPREFIX=
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A general markup converter
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= utf8-string>=0.3 zip-archive>=0.1.1.4 xml>=1.3.5 texmath HTTP>=4000.0.5
-
-MAN1= pandoc.1 markdown2pdf.1
-
-PORTDATA= *
-
-OPTIONS= HIGHLIGHTING "Compile in support for syntax highlighting" off \
- EXECUTABLE "Build the pandoc executable" on \
- WRAPPERS "Build the wrappers (markdown2pdf)" on \
- LIBRARY "Build the pandoc library" on \
- CITEPROC "Compile in support for citeproc-hs" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_HIGHLIGHTING)
-CONFIGURE_ARGS+= --flags="highlighting"
-USE_HACKAGE+= highlighting-kate
-.else
-CONFIGURE_ARGS+= --flags="-highlighting"
-.endif
-
-.if defined(WITH_EXECUTABLE)
-CONFIGURE_ARGS+= --flags="exectuable"
-EXECUTABLE+= pandoc
-PLIST_SUB+= MAYBE_EXECUTABLE=""
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-PLIST_SUB+= MAYBE_EXECUTABLE="@comment "
-.endif
-
-.if defined(WITH_WRAPPERS)
-CONFIGURE_ARGS+= --flags="wrappers"
-EXECUTABLE+= markdown2pdf
-PLIST_SUB+= MAYBE_WRAPPERS=""
-
-.if !defined(WITH_EXECUTABLE)
-IGNORE= cannot be compiled since wrappers require an executable. Please (re)run 'make config' and choose EXECUTABLE
-.endif
-
-.else
-CONFIGURE_ARGS+= --flags="-wrappers"
-PLIST_SUB+= MAYBE_WRAPPERS="@comment "
-.endif
-
-.if defined(WITH_LIBRARY)
-CONFIGURE_ARGS+= --flags="library"
-PLIST_SUB+= MAYBE_LIBRARY=""
-.else
-CONFIGURE_ARGS+= --flags="-library"
-PLIST_SUB+= MAYBE_LIBRARY="@comment "
-STANDALONE= yes
-.endif
-
-.if !defined(WITH_EXECUTABLE) && !defined(WITH_LIBRARY)
-IGNORE= cannot be compiled in this configuration. Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
-.endif
-
-.if defined(WITH_CITEPROC)
-CONFIGURE_ARGS+= --flags="citeproc"
-USE_HACKAGE+= citeproc-hs
-PLIST_SUB+= MAYBE_CITEPROC=""
-.else
-CONFIGURE_ARGS+= --flags="-citeproc"
-PLIST_SUB+= MAYBE_CITEPROC="@comment "
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/pandoc/distinfo b/textproc/pandoc/distinfo
deleted file mode 100644
index 2bc2c6fef918..000000000000
--- a/textproc/pandoc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pandoc-1.5.1.1.tar.gz) = bfccc042ae0cf0901bbca1f87748f969
-SHA256 (pandoc-1.5.1.1.tar.gz) = 6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9
-SIZE (pandoc-1.5.1.1.tar.gz) = 353653
diff --git a/textproc/pandoc/files/patch-Setup.hs b/textproc/pandoc/files/patch-Setup.hs
deleted file mode 100644
index 1de649dd9d37..000000000000
--- a/textproc/pandoc/files/patch-Setup.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Setup.hs.orig 2010-03-29 16:24:56.000000000 +0200
-+++ ./Setup.hs 2010-05-15 13:39:12.000000000 +0200
-@@ -6,7 +6,7 @@
- import Distribution.Simple.LocalBuildInfo
- (LocalBuildInfo(..), absoluteInstallDirs)
- import Distribution.Verbosity ( Verbosity, silent )
--import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
- import Distribution.Simple.Utils (copyFiles)
- import Control.Exception ( bracket_ )
- import Control.Monad ( unless )
-@@ -86,7 +86,7 @@
- installManpages :: PackageDescription -> LocalBuildInfo
- -> Verbosity -> CopyDest -> IO ()
- installManpages pkg lbi verbosity copy =
-- copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
-+ copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
- (zip (repeat manDir) manpages)
-
- -- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/pandoc/pkg-descr b/textproc/pandoc/pkg-descr
deleted file mode 100644
index 7902266b0355..000000000000
--- a/textproc/pandoc/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Pandoc is a command-line tool for converting from one markup format
-to another. It can read markdown and (subsets of) reStructuredText,
-HTML, and LaTeX, and it can write markdown, reStructuredText, HTML,
-LaTeX, ConTeXt, DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo,
-MediaWiki markup, groff man pages, and S5 HTML slide shows.
-
-Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
-and other features. A compatibility mode is provided for those who
-need a drop-in replacement for Markdown.pl. Included wrapper scripts
-make it easy to convert markdown documents to PDF and to convert web
-pages to markdown documents.
-
-In contrast to existing tools for converting markdown to HTML, which
-use regex substitutions, pandoc has a modular design: it consists of a
-set of readers, which parse text in a given format and produce a native
-representation of the document, and a set of writers, which convert
-this native representation into a target format. Thus, adding an input
-or output format requires only adding a reader or writer.
-
-WWW: http://johnmacfarlane.net/pandoc/
diff --git a/textproc/pandoc/pkg-plist b/textproc/pandoc/pkg-plist
deleted file mode 100644
index 6855f3c090ee..000000000000
--- a/textproc/pandoc/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_WRAPPERS%%bin/markdown2pdf
-%%MAYBE_EXECUTABLE%%bin/pandoc
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
-%%MAYBE_LIBRARY%%%%MAYBE_CITEPROC%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Biblio.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%
-%%MAYBE_LIBRARY%%@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-%%MAYBE_LIBRARY%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-%%MAYBE_LIBRARY%%@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-%%MAYBE_LIBRARY%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index f1afb85d70c6..7744b15bb95e 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -85,12 +85,12 @@
SUBDIR += gtoolkit
SUBDIR += guile-gtk
SUBDIR += hippo-canvas
- SUBDIR += hs-GLURaw-ghc
- SUBDIR += hs-OpenGLRaw-ghc
+ SUBDIR += hs-GLURaw
+ SUBDIR += hs-GLUT
+ SUBDIR += hs-OpenGL
+ SUBDIR += hs-OpenGLRaw
SUBDIR += hs-frantk
- SUBDIR += hs-glut-ghc
SUBDIR += hs-gtk2hs
- SUBDIR += hs-opengl-ghc
SUBDIR += irrlicht
SUBDIR += itk
SUBDIR += iwidgets
diff --git a/x11-toolkits/hs-GLURaw-ghc/Makefile b/x11-toolkits/hs-GLURaw-ghc/Makefile
deleted file mode 100644
index c78cdcc688a4..000000000000
--- a/x11-toolkits/hs-GLURaw-ghc/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for: hs-GLURaw-ghc
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= GLURaw
-PORTVERSION= 1.1.0.0
-CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= jacula@gmail.com
-COMMENT= A raw Haskell binding for the OpenGL Utility Toolkit
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= OpenGLRaw
-USE_GL= glu
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-GLURaw-ghc/distinfo b/x11-toolkits/hs-GLURaw-ghc/distinfo
deleted file mode 100644
index 22bf343b3227..000000000000
--- a/x11-toolkits/hs-GLURaw-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (GLURaw-1.1.0.0.tar.gz) = 3f195f73f5c58edc3dd32c5048c5b64e
-SHA256 (GLURaw-1.1.0.0.tar.gz) = 4ce5bb03bb7d7822554d4bafb8b82d05ff7379f97d41c4ed9a070bd8f1d49a0e
-SIZE (GLURaw-1.1.0.0.tar.gz) = 7670
diff --git a/x11-toolkits/hs-GLURaw-ghc/pkg-descr b/x11-toolkits/hs-GLURaw-ghc/pkg-descr
deleted file mode 100644
index 72227ae677a5..000000000000
--- a/x11-toolkits/hs-GLURaw-ghc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library.
-It is basically a 1:1 mapping of GLU's C API, intended as a basis for a
-nicer interface.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-GLURaw-ghc/pkg-plist b/x11-toolkits/hs-GLURaw-ghc/pkg-plist
deleted file mode 100644
index 57a1db218f1b..000000000000
--- a/x11-toolkits/hs-GLURaw-ghc/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/APIEntry.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/Callbacks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/Functions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU/Raw/TypesInternal.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%%/Graphics/Rendering/GLU/Raw
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/GLU
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index c78cdcc688a4..3ebe7f779a5d 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -8,7 +8,6 @@
PORTNAME= GLURaw
PORTVERSION= 1.1.0.0
CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= jacula@gmail.com
COMMENT= A raw Haskell binding for the OpenGL Utility Toolkit
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 8cb364590d22..65b6b9b7892b 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -4,10 +4,9 @@
#
# $FreeBSD$
-PORTNAME= glut
+PORTNAME= GLUT
PORTVERSION= 2.2.2.0
CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell binding for the OpenGL Utility Toolkit
@@ -16,8 +15,5 @@ CABAL_SETUP= Setup.hs
USE_HACKAGE= OpenGL>=2.3 StateVar Tensor
USE_GL= glut
-MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
-DISTNAME= GLUT-${PORTVERSION}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-GLUT/pkg-plist b/x11-toolkits/hs-GLUT/pkg-plist
index f16a8e98b1aa..2fd1aa4770d1 100644
--- a/x11-toolkits/hs-GLUT/pkg-plist
+++ b/x11-toolkits/hs-GLUT/pkg-plist
@@ -24,8 +24,8 @@
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/State.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Types.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSGLUT-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSGLUT-%%PORTVERSION%%.a
+%%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%%
@@ -38,5 +38,5 @@
@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 GLUT-%%PORTVERSION%%
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 6891cf9d0167..7f993d12cd51 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -4,10 +4,9 @@
#
# $FreeBSD$
-PORTNAME= opengl
+PORTNAME= OpenGL
PORTVERSION= 2.4.0.1
CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= OpenGL bindings for Haskell programs
@@ -15,8 +14,5 @@ COMMENT= OpenGL bindings for Haskell programs
CABAL_SETUP= Setup.hs
USE_HACKAGE= GLURaw>=1.1.0.0 ObjectName OpenGLRaw>=1.1.0.0 StateVar Tensor
-MASTER_SITES= http://hackage.haskell.org/packages/archive/OpenGL/${PORTVERSION}/
-DISTNAME= OpenGL-${PORTVERSION}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/pkg-plist b/x11-toolkits/hs-OpenGL/pkg-plist
index 93f520f6a253..439d11f6d034 100644
--- a/x11-toolkits/hs-OpenGL/pkg-plist
+++ b/x11-toolkits/hs-OpenGL/pkg-plist
@@ -81,8 +81,8 @@
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/NURBS.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Quadrics.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Tessellation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSOpenGL-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSOpenGL-%%PORTVERSION%%.a
+%%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%%
@@ -97,5 +97,5 @@
@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 OpenGL-%%PORTVERSION%%
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-toolkits/hs-OpenGLRaw-ghc/Makefile b/x11-toolkits/hs-OpenGLRaw-ghc/Makefile
deleted file mode 100644
index 0189670b2176..000000000000
--- a/x11-toolkits/hs-OpenGLRaw-ghc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for: hs-OpenGLRaw-ghc
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= OpenGLRaw
-PORTVERSION= 1.1.0.1
-CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= jacula@gmail.com
-COMMENT= A raw Haskell binding for the OpenGL graphics system
-
-CABAL_SETUP= Setup.hs
-USE_GL= gl
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGLRaw-ghc/distinfo b/x11-toolkits/hs-OpenGLRaw-ghc/distinfo
deleted file mode 100644
index 4d78d058b8e1..000000000000
--- a/x11-toolkits/hs-OpenGLRaw-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (OpenGLRaw-1.1.0.1.tar.gz) = efe968cf32e46ae61b7b19edc2711044
-SHA256 (OpenGLRaw-1.1.0.1.tar.gz) = cee27bab424717bac8eed663bda76b295aa0a1815af27c467845cadd8967df6c
-SIZE (OpenGLRaw-1.1.0.1.tar.gz) = 73758
diff --git a/x11-toolkits/hs-OpenGLRaw-ghc/pkg-descr b/x11-toolkits/hs-OpenGLRaw-ghc/pkg-descr
deleted file mode 100644
index 3945b3cdbff0..000000000000
--- a/x11-toolkits/hs-OpenGLRaw-ghc/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
-lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
-intended as a basis for a nicer interface. OpenGLRaw offers access to all
-necessary functions, tokens and types plus a general facility for loading
-extension entries. The module hierarchy closely mirrors the naming structure
-of the OpenGL extensions, making it easy to find the right module to import.
-All API entries are loaded dynamically, so no special C header files are
-needed for building this package. If an API entry is not found at runtime, a
-userError is thrown.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-OpenGLRaw-ghc/pkg-plist b/x11-toolkits/hs-OpenGLRaw-ghc/pkg-plist
deleted file mode 100644
index a04c10253f1e..000000000000
--- a/x11-toolkits/hs-OpenGLRaw-ghc/pkg-plist
+++ /dev/null
@@ -1,205 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/ColorBufferFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Compatibility.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Compatibility/Functions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Compatibility/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/CopyBuffer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/CreateContextProfile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DepthBufferFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DepthClamp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DepthTexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DrawBuffers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DrawBuffersBlend.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DrawElementsBaseVertex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/DrawInstanced.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/FragmentProgram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/FragmentShader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/FramebufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/FramebufferSRGB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/GeometryShader4.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/HalfFloatPixel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/HalfFloatVertex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/InstancedArrays.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/MapBufferRange.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/MatrixPalette.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Multisample.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Multitexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/OcclusionQuery.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/PixelBufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/PointParameters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/PointSprite.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/ProvokingVertex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/SampleShading.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/SeamlessCubeMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/ShaderObjects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/ShadingLanguage100.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Shadow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/ShadowAmbient.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Sync.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureBorderClamp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureBufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureCompression.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureCompressionRGTC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureCubeMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureCubeMapArray.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureEnvAdd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureEnvCombine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureEnvCrossbar.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureEnvDot3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureGather.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureMirroredRepeat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureMultisample.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureRG.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TextureRectangle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/TransposeMatrix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/UniformBufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/VertexArrayObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/VertexBlend.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/VertexBufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/VertexProgram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/VertexShader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/WindowPos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31/Functions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31/TypesInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core32.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Abgr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Bgra.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BindableUniform.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BlendColor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BlendEquationSeparate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BlendFuncSeparate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BlendMinmax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/BlendSubtract.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/ClipVolumeHint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Cmyka.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/ColorSubtable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/CompiledVertexArray.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Convolution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/CoordinateFrame.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/CopyTexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/CullVertex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/DepthBoundsTest.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/DirectStateAccess.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/DrawRangeElements.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/FogCoord.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/FourTwoTwoPixels.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/FragmentLighting.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/FramebufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/FramebufferSRGB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/GeometryShader4.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/GpuProgramParameters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Histogram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/IndexArrayFormats.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/IndexFunc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/IndexMaterial.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/LightTexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/MultiDrawArrays.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Multisample.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PackedFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PackedPixels.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PalettedTexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PixelTransform.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PointParameters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/PolygonOffset.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/ProvokingVertex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/RescaleNormal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/SceneMarker.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/SecondaryColor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/SeparateSpecularColor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/SharedTexturePalette.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/StencilClearTag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/StencilTwoSide.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/StencilWrap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Subtexture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Texture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/Texture3D.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureCompressionDxt1.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureCompressionLatc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureCompressionS3tc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureEnvAdd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureEnvCombine.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureEnvDot3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureFilterAnisotropic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureInteger.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureLodBias.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureMirrorClamp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TexturePerturbNormal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureSRGB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TextureSwizzle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/TimerQuery.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/VertexArray.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/VertexShader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT/VertexWeighting.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Extensions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/GetProcAddress.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/ConditionalRender.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/CopyDepthToColor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/DepthBufferFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/DepthClamp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/ExplicitMultisample.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/Fence.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/FloatBuffer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/FogDistance.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/FragmentProgram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/FragmentProgram2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/FramebufferMultisampleCoverage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/GeometryProgram4.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/GpuProgram4.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/HalfFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/LightMaxExponent.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/MultisampleFilterHint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/OcclusionQuery.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/PackedDepthStencil.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/ParameterBufferObject.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/PixelDataRange.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/PointSprite.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/PresentVideo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/PrimitiveRestart.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/RegisterCombiners.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/RegisterCombiners2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TexgenEmboss.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TexgenReflection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureCompressionVtc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureEnvCombine4.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureExpandNormal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureRectangle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureShader.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureShader2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TextureShader3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TransformFeedback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/TransformFeedback2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexArrayRange.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexArrayRange2.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexProgram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexProgram2Option.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexProgram3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/NV/VertexProgram4.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%%/Graphics/Rendering/OpenGL/Raw/NV
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/EXT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/Core31
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB/Compatibility
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw/ARB
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/Raw
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index 0189670b2176..11fd96dbd387 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -8,7 +8,6 @@
PORTNAME= OpenGLRaw
PORTVERSION= 1.1.0.1
CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= jacula@gmail.com
COMMENT= A raw Haskell binding for the OpenGL graphics system
diff --git a/x11-toolkits/hs-glut-ghc/Makefile b/x11-toolkits/hs-glut-ghc/Makefile
deleted file mode 100644
index 8cb364590d22..000000000000
--- a/x11-toolkits/hs-glut-ghc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for: hs-glut-ghc
-# Date created: 2007-09-04
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME= glut
-PORTVERSION= 2.2.2.0
-CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell binding for the OpenGL Utility Toolkit
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= OpenGL>=2.3 StateVar Tensor
-USE_GL= glut
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
-DISTNAME= GLUT-${PORTVERSION}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-glut-ghc/distinfo b/x11-toolkits/hs-glut-ghc/distinfo
deleted file mode 100644
index c0e2734cf51a..000000000000
--- a/x11-toolkits/hs-glut-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (GLUT-2.2.2.0.tar.gz) = e11912f50b76950b0d9e27d25127e391
-SHA256 (GLUT-2.2.2.0.tar.gz) = 3d7febc48af4688b6b10a7356c25f33e54d4eb3643e10fbe26ff6e39b9bc3442
-SIZE (GLUT-2.2.2.0.tar.gz) = 650235
diff --git a/x11-toolkits/hs-glut-ghc/pkg-descr b/x11-toolkits/hs-glut-ghc/pkg-descr
deleted file mode 100644
index 3038ec260e5b..000000000000
--- a/x11-toolkits/hs-glut-ghc/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The GLUT package contains a Haskell binding for the OpenGL Utility Toolkit, a
-window system independent toolkit for writing OpenGL programs. For more
-information about the C library on which this binding is based, please see:
-<http://www.opengl.org/resources/libraries/glut/>.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-glut-ghc/pkg-plist b/x11-toolkits/hs-glut-ghc/pkg-plist
deleted file mode 100644
index f16a8e98b1aa..000000000000
--- a/x11-toolkits/hs-glut-ghc/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Begin.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Global.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Registration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Colormap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Debugging.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/DeviceControl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Fonts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/GameMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Initialization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Menu.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Objects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Overlay.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/QueryUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/APIEntry.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Callbacks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Fonts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Functions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw/Tokens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSGLUT-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSGLUT-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Callbacks
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT/Raw
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI/GLUT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/UI
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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 GLUT-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-toolkits/hs-opengl-ghc/Makefile b/x11-toolkits/hs-opengl-ghc/Makefile
deleted file mode 100644
index 6891cf9d0167..000000000000
--- a/x11-toolkits/hs-opengl-ghc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for: hs-opengl-ghc
-# Date created: 2008-09-04
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME= opengl
-PORTVERSION= 2.4.0.1
-CATEGORIES= x11-toolkits haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= OpenGL bindings for Haskell programs
-
-CABAL_SETUP= Setup.hs
-USE_HACKAGE= GLURaw>=1.1.0.0 ObjectName OpenGLRaw>=1.1.0.0 StateVar Tensor
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/OpenGL/${PORTVERSION}/
-DISTNAME= OpenGL-${PORTVERSION}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-opengl-ghc/distinfo b/x11-toolkits/hs-opengl-ghc/distinfo
deleted file mode 100644
index 683422b17ea6..000000000000
--- a/x11-toolkits/hs-opengl-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (OpenGL-2.4.0.1.tar.gz) = 71b03fce1e3d64be1e874d7989f0272c
-SHA256 (OpenGL-2.4.0.1.tar.gz) = c59a718a3a992be4fc140f4c1563c4eef8bbbc5e6c14704a20b7e35381a3ac75
-SIZE (OpenGL-2.4.0.1.tar.gz) = 105262
diff --git a/x11-toolkits/hs-opengl-ghc/pkg-descr b/x11-toolkits/hs-opengl-ghc/pkg-descr
deleted file mode 100644
index d4979028de6b..000000000000
--- a/x11-toolkits/hs-opengl-ghc/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The OpenGL package contains a Haskell binding for the OpenGL graphics system.
-OpenGL is the industry's most widely used and supported 2D and 3D graphics
-application programming interface (API), incorporating a broad set of rendering,
-texture mapping, special effects, and other powerful visualization functions.
-For more information about OpenGL, please see: <http://www.opengl.org/>.
-
-WWW: http://www.haskell.org/HOpenGL/
diff --git a/x11-toolkits/hs-opengl-ghc/pkg-plist b/x11-toolkits/hs-opengl-ghc/pkg-plist
deleted file mode 100644
index 93f520f6a253..000000000000
--- a/x11-toolkits/hs-opengl-ghc/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Antialiasing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BeginEnd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Bitmaps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BlendingFactor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BufferMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/BufferObjects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Capability.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Clipping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ColorSum.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Colors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ComparisonFunction.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ControlPoint.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/CoordTrans.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/DataType.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/DisplayLists.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Domain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/EdgeFlag.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Evaluators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Exception.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Face.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Feedback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/FlushFinish.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Fog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Framebuffer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/GLboolean.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Hints.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/IOState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/LineSegments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PeekPoke.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PerFragment.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelFormat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/ColorTable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Convolution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Histogram.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Minmax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelStorage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/PixelTransfer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Rasterization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Reset.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles/Sink.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PointParameter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Points.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PolygonMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Polygons.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PrimitiveMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/QueryUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/RasterPos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/ReadCopyPixels.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Rectangles.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/RenderMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/SavingState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Selection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Shaders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/StringQueries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Application.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Environments.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Objects.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Parameters.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/Specification.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TexParameter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TextureTarget.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing/TextureUnit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexArrays.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexAttributes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/VertexSpec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Errors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/ErrorsInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Initialization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Matrix.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Mipmapping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/NURBS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Quadrics.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU/Tessellation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSOpenGL-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSOpenGL-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GLU
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/Texturing
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL/PixelRectangles
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL/GL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering/OpenGL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/Rendering
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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 OpenGL-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 4a47d03c0447..42c435feae1e 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -64,6 +64,8 @@
SUBDIR += genmenu
SUBDIR += golem
SUBDIR += hackedbox
+ SUBDIR += hs-xmonad
+ SUBDIR += hs-xmonad-contrib
SUBDIR += i3
SUBDIR += icewm
SUBDIR += ion
@@ -144,7 +146,5 @@
SUBDIR += xfce4-panel
SUBDIR += xfce4-session
SUBDIR += xfce4-wm
- SUBDIR += xmonad
- SUBDIR += xmonad-contrib
.include <bsd.port.subdir.mk>
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 81f5950c2611..908d31cfa18b 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -9,7 +9,6 @@ PORTNAME= xmonad-contrib
PORTVERSION= 0.9.1
PORTREVISION= 1
CATEGORIES= x11-wm haskell
-PKGNAMEPREFIX=
MAINTAINER= haskell@FreeBSD.org
COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index e53eda10541f..9ad4a9fb18d7 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -9,7 +9,6 @@ PORTNAME= xmonad
PORTVERSION= 0.9.1
PORTREVISION= 1
CATEGORIES= x11-wm haskell
-PKGNAMEPREFIX=
MAINTAINER= haskell@FreeBSD.org
COMMENT= Xmonad is a minimalist and tiling window manager for X
diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile
deleted file mode 100644
index 81f5950c2611..000000000000
--- a/x11-wm/xmonad-contrib/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: xmonad-contrib
-# Date created: 2008-01-23
-# Whom: Matthieu Guegan <matt.guegan@free.fr>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xmonad-contrib
-PORTVERSION= 0.9.1
-PORTREVISION= 1
-CATEGORIES= x11-wm haskell
-PKGNAMEPREFIX=
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
-
-USE_HACKAGE= xmonad utf8-string
-USE_XORG= x11
-
-OPTIONS= XFT "Enable Xft support for fonts" On
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_XFT)
-CONFIGURE_ARGS+= --flags="use_xft"
-USE_HACKAGE+= X11-xft>=0.2
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-wm/xmonad-contrib/distinfo b/x11-wm/xmonad-contrib/distinfo
deleted file mode 100644
index 0837e18555bc..000000000000
--- a/x11-wm/xmonad-contrib/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xmonad-contrib-0.9.1.tar.gz) = 09a6e5173878d43b9f3ddd13b3ec955b
-SHA256 (xmonad-contrib-0.9.1.tar.gz) = b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47
-SIZE (xmonad-contrib-0.9.1.tar.gz) = 291348
diff --git a/x11-wm/xmonad-contrib/pkg-descr b/x11-wm/xmonad-contrib/pkg-descr
deleted file mode 100644
index d2d4dabfa7c6..000000000000
--- a/x11-wm/xmonad-contrib/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Third party tiling algorithms, configurations and scripts to xmonad.
-
-For an introduction to building, configuring and using xmonad extensions,
-see XMonad.Doc.
-
-In particular:
-
-* XMonad.Doc.Configuring, a guide to configuring xmonad.
-* XMonad.Doc.Extending, using the contributed extensions library.
-* XMonad.Doc.Developing, introduction to xmonad internals and
- writing your own extensions.
-
-WWW: http://www.xmonad.org/
diff --git a/x11-wm/xmonad-contrib/pkg-plist b/x11-wm/xmonad-contrib/pkg-plist
deleted file mode 100644
index 38a3771818f3..000000000000
--- a/x11-wm/xmonad-contrib/pkg-plist
+++ /dev/null
@@ -1,201 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatSnap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/GridSelect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/OnScreen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MessageFeedback.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PhysicalScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RandomBackground.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SpawnOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TopicSpace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdateFocus.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowMenu.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WithAll.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WorkspaceCursors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Azerty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FloatNext.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/InsertPosition.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Place.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/RestoreMinimized.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/WorkspaceByPos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/AutoMaster.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BorderResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/CenteredMaster.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Cross.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Column.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ComboP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/FixedColumn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/GridVariants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IndependentScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutBuilder.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LimitWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MessageControl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Minimize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Monitor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Mosaic.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MouseResizableTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoFrillsDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/OneBig.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spacing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SubLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Cursor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedActions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedScratchpad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/StringProp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Paste.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Replace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleRecentWS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleSelectedLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CycleWS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DeManage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DwmPromote.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/DynamicWorkspaces.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FindEmptyWorkspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleManipulate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FlexibleResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FloatKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/FocusNth.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseGestures.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/MouseResize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/NoBorders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/PerWorkspaceKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Plane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Promote.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/RotSlaves.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Search.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SimpleDate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SinkAll.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Submap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/SwapWorkspaces.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/TagWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/UpdatePointer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Warp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowBringer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowGo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions/WindowNavigation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Arossato.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Desktop.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Droundy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Gnome.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Kde.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Sjanssen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config/Xfce.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Configuring.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Developing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc/Extending.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicHooks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/DynamicLog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/EwmhDesktops.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/FadeInactive.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageDocks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ManageHelpers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/Script.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/ServerMode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/SetWMName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/UrgencyHook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks/XPropManage.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Accordion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/BoringWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Circle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Combo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Decoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DecorationMadness.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Dishes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DragPane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/DwmStyle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Gaps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Grid.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedGrid.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/HintedTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/IM.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutCombinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutHints.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutModifier.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/LayoutScreens.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MagicFocus.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Magnifier.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Master.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Maximize.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MosaicAlt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle/Instances.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Named.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/NoBorders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/PerWorkspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Reflect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizableTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ResizeScreen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Roledex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ShowWName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimpleFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Simplest.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/SimplestFloat.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Spiral.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Square.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/StackTile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TabBarDecoration.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/Tabbed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ThreeColumns.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/ToggleLayouts.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/TwoPane.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowArranger.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WindowNavigation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/WorkspaceDir.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppLauncher.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/AppendFile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/DirExec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Directory.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Email.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Input.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Layout.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Man.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/RunOrRaise.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Shell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Ssh.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Theme.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/Workspace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt/XMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/CustomKeys.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dmenu.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Dzen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/EZConfig.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Font.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Invisible.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Loggers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/NamedWindows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Run.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Scratchpad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Themes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/Timer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WindowProperties.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/WorkspaceCompare.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.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%%/XMonad/Util
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Prompt
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Hooks
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Doc
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Actions
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
-@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%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
deleted file mode 100644
index e53eda10541f..000000000000
--- a/x11-wm/xmonad/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for: xmonad
-# Date created: 2007-10-25
-# Whom: Matthieu Guegan <matt.guegan@free.fr>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xmonad
-PORTVERSION= 0.9.1
-PORTREVISION= 1
-CATEGORIES= x11-wm haskell
-PKGNAMEPREFIX=
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Xmonad is a minimalist and tiling window manager for X
-
-USE_HACKAGE= X11>=1.5.0.0
-USE_XORG= x11
-
-MAN1= xmonad.1
-MAN1SRC= man
-
-EXECUTABLE= xmonad
-
-PORTDATA= *
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-wm/xmonad/distinfo b/x11-wm/xmonad/distinfo
deleted file mode 100644
index dc0b9edebd9d..000000000000
--- a/x11-wm/xmonad/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xmonad-0.9.1.tar.gz) = 3d0dd5cf77768b10e1b7f3a47e32b09e
-SHA256 (xmonad-0.9.1.tar.gz) = 014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927
-SIZE (xmonad-0.9.1.tar.gz) = 56974
diff --git a/x11-wm/xmonad/pkg-descr b/x11-wm/xmonad/pkg-descr
deleted file mode 100644
index 2ffa5758986f..000000000000
--- a/x11-wm/xmonad/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-XMonad is a tiling window manager written in Haskell for X.
-
-Features :
- * Very stable, fast, small and simple.
- * Automatic window tiling and management
- * First class keyboard support: a mouse is unnecessary
- * Full support for tiling windows on multi-head displays
- * Full support for floating windows
- * XRandR support to rotate, add or remove monitors
- * Per-workspace layout algorithms
- * Per-screens custom status bars
- * Easy, powerful customisation and reconfiguration
- * Large extension library
- * Extensive documentation and support for hacking
-
-WWW: http://www.xmonad.org/
diff --git a/x11-wm/xmonad/pkg-plist b/x11-wm/xmonad/pkg-plist
deleted file mode 100644
index 49ddc371d8d1..000000000000
--- a/x11-wm/xmonad/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $FreeBSD$
-bin/xmonad
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.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%%/XMonad
-@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%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/Makefile b/x11/Makefile
index 18643c018b40..bd01e46c0f12 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -135,8 +135,9 @@
SUBDIR += gtstarter
SUBDIR += gxset
SUBDIR += hotwire-shell
- SUBDIR += hs-x11-ghc
- SUBDIR += hs-x11-xft-ghc
+ SUBDIR += hs-X11
+ SUBDIR += hs-X11-xft
+ SUBDIR += hs-xmobar
SUBDIR += i3lock
SUBDIR += iceauth
SUBDIR += ico
@@ -421,7 +422,6 @@
SUBDIR += xmascot
SUBDIR += xmessage
SUBDIR += xmh
- SUBDIR += xmobar
SUBDIR += xmodmap
SUBDIR += xmold
SUBDIR += xmon
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 9a63976c7dcf..76577c37ecb6 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -5,11 +5,10 @@
# $FreeBSD$
#
-PORTNAME= x11-xft
+PORTNAME= X11-xft
PORTVERSION= 0.3
PORTREVISION= 4
CATEGORIES= x11 haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= wahjava@gmail.com
COMMENT= Bindings to the Xft, Xrender and Freetype for Haskell programs
@@ -17,8 +16,5 @@ COMMENT= Bindings to the Xft, Xrender and Freetype for Haskell programs
USE_HACKAGE= utf8-string>=0.1 X11>=1.2.1
USE_XORG= xft xrender
-MASTER_SITES= http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/
-DISTNAME= X11-xft-${PORTVERSION}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11/hs-X11-xft/pkg-descr b/x11/hs-X11-xft/pkg-descr
index d9029e595b30..451353b8370a 100644
--- a/x11/hs-X11-xft/pkg-descr
+++ b/x11/hs-X11-xft/pkg-descr
@@ -1,4 +1,3 @@
Bindings to the Xft, X Free Type interface library, and some Xrender parts.
WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
-
diff --git a/x11/hs-X11-xft/pkg-plist b/x11/hs-X11-xft/pkg-plist
index 7bd28895ed43..02bdbd2b0846 100644
--- a/x11/hs-X11-xft/pkg-plist
+++ b/x11/hs-X11-xft/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-xft-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-xft-%%PORTVERSION%%.a
+%%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%%
@@ -12,5 +12,5 @@
@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 X11-xft-%%PORTVERSION%%
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 35c69bbc1549..667f7730b11b 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -4,11 +4,10 @@
#
# $FreeBSD$
-PORTNAME= x11
+PORTNAME= X11
PORTVERSION= 1.5.0.0
PORTREVISION= 1
CATEGORIES= x11 haskell
-PKGNAMESUFFIX= -ghc
MAINTAINER= haskell@FreeBSD.org
COMMENT= X11 bindings for Haskell programs
@@ -16,9 +15,6 @@ COMMENT= X11 bindings for Haskell programs
CABAL_SETUP= Setup.hs
USE_XORG= x11 xext sm
-MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
-DISTNAME= X11-${PORTVERSION}
-
OPTIONS= XINERAMA "Build with Xinerama support" off
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
diff --git a/x11/hs-X11/pkg-plist b/x11/hs-X11/pkg-plist
index c1867ac3519b..1744ca61519c 100644
--- a/x11/hs-X11/pkg-plist
+++ b/x11/hs-X11/pkg-plist
@@ -24,11 +24,11 @@
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
@@ -41,5 +41,5 @@
@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 X11-%%PORTVERSION%%
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-x11-ghc/Makefile b/x11/hs-x11-ghc/Makefile
deleted file mode 100644
index 35c69bbc1549..000000000000
--- a/x11/hs-x11-ghc/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: hs-x11-ghc
-# Date created: 2007-09-03
-# Whom: Volker Stolz <vs@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME= x11
-PORTVERSION= 1.5.0.0
-PORTREVISION= 1
-CATEGORIES= x11 haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= X11 bindings for Haskell programs
-
-CABAL_SETUP= Setup.hs
-USE_XORG= x11 xext sm
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
-DISTNAME= X11-${PORTVERSION}
-
-OPTIONS= XINERAMA "Build with Xinerama support" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_XINERAMA)
-USE_XORG+= xinerama
-CONFIGURE_ARGS+= --configure-option="--with-xinerama"
-.else
-CONFIGURE_ARGS+= --configure-option="--without-xinerama"
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11/hs-x11-ghc/distinfo b/x11/hs-x11-ghc/distinfo
deleted file mode 100644
index 4968910cc116..000000000000
--- a/x11/hs-x11-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (X11-1.5.0.0.tar.gz) = ec6670f5ce1812206903c8a0fd9df04c
-SHA256 (X11-1.5.0.0.tar.gz) = 653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f
-SIZE (X11-1.5.0.0.tar.gz) = 178211
diff --git a/x11/hs-x11-ghc/pkg-descr b/x11/hs-x11-ghc/pkg-descr
deleted file mode 100644
index ba10e1af57ec..000000000000
--- a/x11/hs-x11-ghc/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A Haskell binding to the X11 library.
-
-The binding is a direct translation of C binding;
-for documentation of these calls, refer to /The Xlib Programming Manual/,
-available online at <http://tronche.com/gui/x/xlib/>.
-
-WWW: http://darcs.haskell.org/X11
diff --git a/x11/hs-x11-ghc/pkg-plist b/x11/hs-x11-ghc/pkg-plist
deleted file mode 100644
index c1867ac3519b..000000000000
--- a/x11/hs-x11-ghc/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Cursor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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 X11-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-x11-xft-ghc/Makefile b/x11/hs-x11-xft-ghc/Makefile
deleted file mode 100644
index 9a63976c7dcf..000000000000
--- a/x11/hs-x11-xft-ghc/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for: hs-x11-xft-ghc
-# Date created: 2008-10-21
-# Whom: Ashish Shukla <wahjava@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= x11-xft
-PORTVERSION= 0.3
-PORTREVISION= 4
-CATEGORIES= x11 haskell
-PKGNAMESUFFIX= -ghc
-
-MAINTAINER= wahjava@gmail.com
-COMMENT= Bindings to the Xft, Xrender and Freetype for Haskell programs
-
-USE_HACKAGE= utf8-string>=0.1 X11>=1.2.1
-USE_XORG= xft xrender
-
-MASTER_SITES= http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/
-DISTNAME= X11-xft-${PORTVERSION}
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11/hs-x11-xft-ghc/distinfo b/x11/hs-x11-xft-ghc/distinfo
deleted file mode 100644
index 165a4f290ab4..000000000000
--- a/x11/hs-x11-xft-ghc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (X11-xft-0.3.tar.gz) = 1b4a528a2a4fe5e9de715f6758ff9015
-SHA256 (X11-xft-0.3.tar.gz) = 48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d
-SIZE (X11-xft-0.3.tar.gz) = 13684
diff --git a/x11/hs-x11-xft-ghc/pkg-descr b/x11/hs-x11-xft-ghc/pkg-descr
deleted file mode 100644
index d9029e595b30..000000000000
--- a/x11/hs-x11-xft-ghc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Bindings to the Xft, X Free Type interface library, and some Xrender parts.
-
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
-
diff --git a/x11/hs-x11-xft-ghc/pkg-plist b/x11/hs-x11-xft-ghc/pkg-plist
deleted file mode 100644
index 7bd28895ed43..000000000000
--- a/x11/hs-x11-xft-ghc/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-xft-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-xft-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@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 X11-xft-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 31561db048e5..f2547f51e397 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -7,7 +7,6 @@
PORTNAME= xmobar
PORTVERSION= 0.11.1
CATEGORIES= x11 haskell
-PKGNAMEPREFIX=
MAINTAINER= haskell@FreeBSD.org
COMMENT= A minimalistic text based status bar
@@ -25,6 +24,7 @@ OPTIONS= XFT "Use Xft to render text (UTF-8 support included)" off \
UTF8 "UTF-8 support" on \
MPD "mpd support" off
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
# Disable Linux-only options
diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
deleted file mode 100644
index 31561db048e5..000000000000
--- a/x11/xmobar/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for: xmobar
-# Date created: November 7, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
-# $FreeBSD$
-
-PORTNAME= xmobar
-PORTVERSION= 0.11.1
-CATEGORIES= x11 haskell
-PKGNAMEPREFIX=
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= A minimalistic text based status bar
-
-USE_HACKAGE= X11>=1.3.0
-USE_XORG= x11
-
-EXECUTABLE= xmobar
-STANDALONE= yes
-
-PORTDATA= *
-INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${DATADIR}
-
-OPTIONS= XFT "Use Xft to render text (UTF-8 support included)" off \
- UTF8 "UTF-8 support" on \
- MPD "mpd support" off
-
-.include <bsd.port.options.mk>
-
-# Disable Linux-only options
-CONFIGURE_ARGS+= --flags="-with_inotify -with_iwlib"
-
-.if defined(WITH_XFT)
-CONFIGURE_ARGS+= --flags="with_xft"
-USE_HACKAGE+= utf8-string X11-xft>=0.2
-.else
-CONFIGURE_ARGS+= --flags="-with_xft"
-.endif
-
-.if defined(WITH_UTF8)
-CONFIGURE_ARGS+= --flags="with_utf8"
-.if !defined(WITH_XFT)
-USE_HACKAGE+= utf8-string
-.endif
-.else
-CONFIGURE_ARGS+= --flags="-with_utf8"
-.endif
-
-.if defined(WITH_MPD)
-CONFIGURE_ARGS+= --flags="with_mpd"
-USE_HACKAGE+= libmpd
-.else
-CONFIGURE_ARGS+= --flags="-with_mpd"
-.endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11/xmobar/distinfo b/x11/xmobar/distinfo
deleted file mode 100644
index 94ce4739c49e..000000000000
--- a/x11/xmobar/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xmobar-0.11.1.tar.gz) = 766fe504909384628321fb7472fdb621
-SHA256 (xmobar-0.11.1.tar.gz) = 753b755b96852008bbbf8c79933d9ebb87554bf7e562888e8d6fb5b8320a6a73
-SIZE (xmobar-0.11.1.tar.gz) = 45872
diff --git a/x11/xmobar/pkg-descr b/x11/xmobar/pkg-descr
deleted file mode 100644
index 5cf0dedd308f..000000000000
--- a/x11/xmobar/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Xmobar is a minimalistic text based status bar. Inspired by the Ion3 status
-bar, it supports similar features, like dynamic color management, output
-templates, and extensibility through plugins.
-
-WWW: http://code.haskell.org/~arossato/xmobar
diff --git a/x11/xmobar/pkg-plist b/x11/xmobar/pkg-plist
deleted file mode 100644
index f4b7e0083752..000000000000
--- a/x11/xmobar/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/xmobar
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%