aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobraun <obraun@FreeBSD.org>2002-09-05 02:39:09 +0800
committerobraun <obraun@FreeBSD.org>2002-09-05 02:39:09 +0800
commit00ece3cc38569a13d70b8d7ac0fcdcdcc858140a (patch)
tree413e61cda6339fe76b26fef28b5b7d4d987111d7
parent0a27b4bd064cf5921289d668992e59c35f95a26d (diff)
downloadfreebsd-ports-gnome-00ece3cc38569a13d70b8d7ac0fcdcdcc858140a.tar.gz
freebsd-ports-gnome-00ece3cc38569a13d70b8d7ac0fcdcdcc858140a.tar.zst
freebsd-ports-gnome-00ece3cc38569a13d70b8d7ac0fcdcdcc858140a.zip
Add prefix `hs-' for Haskell related ports after repo copy.
Remove Haskell ports without prefix.
-rw-r--r--CVSROOT/modules16
-rw-r--r--devel/Makefile14
-rw-r--r--devel/c2hs/Makefile32
-rw-r--r--devel/c2hs/distinfo1
-rw-r--r--devel/c2hs/pkg-comment1
-rw-r--r--devel/c2hs/pkg-descr13
-rw-r--r--devel/c2hs/pkg-plist15
-rw-r--r--devel/drift/Makefile37
-rw-r--r--devel/drift/distinfo1
-rw-r--r--devel/drift/pkg-comment1
-rw-r--r--devel/drift/pkg-descr16
-rw-r--r--devel/drift/pkg-plist4
-rw-r--r--devel/green-card/Makefile33
-rw-r--r--devel/green-card/distinfo1
-rw-r--r--devel/green-card/files/patch-src::Makefile12
-rw-r--r--devel/green-card/pkg-comment1
-rw-r--r--devel/green-card/pkg-descr8
-rw-r--r--devel/green-card/pkg-plist26
-rw-r--r--devel/haddock/Makefile44
-rw-r--r--devel/haddock/distinfo1
-rw-r--r--devel/haddock/pkg-comment1
-rw-r--r--devel/haddock/pkg-descr8
-rw-r--r--devel/haddock/pkg-plist34
-rw-r--r--devel/happy/Makefile48
-rw-r--r--devel/happy/distinfo1
-rw-r--r--devel/happy/pkg-comment1
-rw-r--r--devel/happy/pkg-descr5
-rw-r--r--devel/happy/pkg-plist53
-rw-r--r--devel/hat/Makefile96
-rw-r--r--devel/hat/distinfo1
-rw-r--r--devel/hat/files/patch-configure20
-rw-r--r--devel/hat/files/patch-script::harch13
-rw-r--r--devel/hat/pkg-comment1
-rw-r--r--devel/hat/pkg-descr10
-rw-r--r--devel/hat/pkg-plist226
-rw-r--r--devel/hmake/Makefile42
-rw-r--r--devel/hmake/distinfo1
-rw-r--r--devel/hmake/files/patch-script::harch13
-rw-r--r--devel/hmake/pkg-comment1
-rw-r--r--devel/hmake/pkg-descr20
-rw-r--r--devel/hmake/pkg-plist12
-rw-r--r--devel/hs-c2hs/Makefile1
-rw-r--r--devel/hs-drift/Makefile1
-rw-r--r--devel/hs-green-card/Makefile1
-rw-r--r--devel/hs-haddock/Makefile1
-rw-r--r--devel/hs-happy/Makefile1
-rw-r--r--devel/hs-hat/Makefile3
-rw-r--r--devel/hs-hmake/Makefile1
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/hgl/Makefile45
-rw-r--r--graphics/hgl/distinfo1
-rw-r--r--graphics/hgl/files/patch-aa41
-rw-r--r--graphics/hgl/pkg-comment1
-rw-r--r--graphics/hgl/pkg-descr15
-rw-r--r--graphics/hgl/pkg-plist39
-rw-r--r--graphics/hgl/scripts/hugs-hgl3
-rw-r--r--graphics/hs-hgl/Makefile1
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/haxml/Makefile80
-rw-r--r--textproc/haxml/distinfo1
-rw-r--r--textproc/haxml/pkg-comment1
-rw-r--r--textproc/haxml/pkg-descr8
-rw-r--r--textproc/haxml/pkg-plist154
-rw-r--r--textproc/hs-HaXml/Makefile3
-rw-r--r--textproc/hs-haxml/Makefile3
65 files changed, 30 insertions, 1263 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index 4340f70f1bb7..57be98efaf63 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -667,7 +667,6 @@ bzflag ports/games/bzflag
bzip ports/archivers/bzip
bzip2 ports/archivers/bzip2
c-nocem ports/news/c-nocem
-c2hs ports/devel/c2hs
c2html ports/textproc/c2html
c2lib ports/devel/c2lib
c2man ports/devel/c2man
@@ -1313,7 +1312,6 @@ dpt src/usr.sbin/dpt
drac ports/mail/drac
drbl ports/mail/drbl
dri-devel ports/graphics/dri-devel
-drift ports/devel/drift
driftnet ports/net/driftnet
drm ports/games/drm
drm-kmod ports/graphics/drm-kmod
@@ -2252,7 +2250,6 @@ grdb ports/misc/grdb
grdc src/games/grdc
greed ports/ftp/greed
greed_game ports/games/greed
-green-card ports/devel/green-card
grep src/gnu/usr.bin/grep
grepmail ports/mail/grepmail
gretl ports/misc/gretl
@@ -2378,18 +2375,14 @@ h2n ports/net/h2n
ha ports/archivers/ha
hack src/games/hack
hackedbox ports/x11-wm/hackedbox
-haddock ports/devel/haddock
hafiye ports/security/hafiye
hagelslag ports/net/hagelslag
halflifeserver ports/games/halflifeserver
handbook doc/en_US.ISO8859-1/books/handbook
hangman src/games/hangman
-happy ports/devel/happy
happydoc ports/devel/happydoc
harvest ports/www/harvest
hashish ports/security/hashish
-hat ports/devel/hat
-haxml ports/textproc/haxml
hb ports/misc/hb
hbiff ports/mail/hbiff
hdconv ports/palm/hdconv
@@ -2416,7 +2409,6 @@ hexpert ports/editors/hexpert
heyu ports/misc/heyu
hfs ports/emulators/hfs
hfsutils ports/emulators/hfsutils
-hgl ports/graphics/hgl
histring ports/misc/histring
hlfl ports/security/hlfl
hlmaster ports/net/hlmaster
@@ -2459,8 +2451,16 @@ hpijs ports/print/hpijs
hping ports/security/hping
hppsmtools ports/graphics/hppsmtools
hr-ooodict-HR ports/editors/ooodict-hr_HR
+hs-c2hs ports/devel/hs-c2hs
+hs-drift ports/devel/hs-drift
hs-frantk ports/x11-toolkits/hs-frantk
+hs-green-card ports/devel/hs-green-card
hs-gtk+hs ports/x11-toolkits/hs-gtk+hs
+hs-haddock ports/devel/hs-haddock
+hs-happy ports/devel/hs-happy
+hs-hat ports/devel/hs-hat
+hs-haxml ports/textproc/hs-haxml
+hs-hgl ports/graphics/hs-hgl
hs-hpl ports/devel/hs-hpl
hs-popenhs ports/devel/hs-popenhs
hsftp ports/ftp/hsftp
diff --git a/devel/Makefile b/devel/Makefile
index 9169f9e82ebb..f2b1218d223a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -70,7 +70,6 @@
SUBDIR += bugzilla
SUBDIR += buildtool
SUBDIR += byaccj
- SUBDIR += c2hs
SUBDIR += c2lib
SUBDIR += c2man
SUBDIR += c4
@@ -143,7 +142,6 @@
SUBDIR += domc
SUBDIR += dotconf
SUBDIR += doxygen
- SUBDIR += drift
SUBDIR += e4graph
SUBDIR += ebnf2yacc
SUBDIR += ecb
@@ -213,16 +211,18 @@
SUBDIR += gnustep-make
SUBDIR += gperf
SUBDIR += gputils
- SUBDIR += green-card
SUBDIR += gtgt
SUBDIR += gtranslator
SUBDIR += gvd
- SUBDIR += haddock
- SUBDIR += happy
SUBDIR += happydoc
- SUBDIR += hat
- SUBDIR += hmake
SUBDIR += hp48cc
+ SUBDIR += hs-c2hs
+ SUBDIR += hs-drift
+ SUBDIR += hs-green-card
+ SUBDIR += hs-haddock
+ SUBDIR += hs-happy
+ SUBDIR += hs-hat
+ SUBDIR += hs-hmake
SUBDIR += hs-hpl
SUBDIR += hs-popenhs
SUBDIR += hypersrc
diff --git a/devel/c2hs/Makefile b/devel/c2hs/Makefile
deleted file mode 100644
index 5af3f17d1eda..000000000000
--- a/devel/c2hs/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: c2hs
-# Date created: 23 August 2002
-# Whom: Oliver Braun <obraun@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= c2hs
-PORTVERSION= 0.10.15
-CATEGORIES= devel
-MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
-
-MAINTAINER= obraun@FreeBSD.org
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-HAS_CONFIGURE= yes
-USE_GMAKE= yes
-
-CONFIGURE_ARGS+= --prefix=${PREFIX} --enable-add-package
-
-MAN1= c2hs-config.1 c2hs.1
-
-post-build:
- @(cd ${WRKSRC}/doc/c2hs && ${GMAKE} man1/c2hs-config.1 man1/c2hs.1)
-
-post-install:
- @(cd ${WRKSRC}/doc/c2hs/man1 && \
- ${INSTALL_MAN} c2hs-config.1 c2hs.1 ${MANPREFIX}/man/man1)
-
-.include <bsd.port.mk>
diff --git a/devel/c2hs/distinfo b/devel/c2hs/distinfo
deleted file mode 100644
index 6ad2a8c7f15b..000000000000
--- a/devel/c2hs/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (c2hs-0.10.15.tar.gz) = 30f8163d43716f775aa633d6e461a24f
diff --git a/devel/c2hs/pkg-comment b/devel/c2hs/pkg-comment
deleted file mode 100644
index 97646c051237..000000000000
--- a/devel/c2hs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C->Haskell, an Interface Generator for Haskell
diff --git a/devel/c2hs/pkg-descr b/devel/c2hs/pkg-descr
deleted file mode 100644
index 0dae83c1c040..000000000000
--- a/devel/c2hs/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-C->Haskell is an interface generator that simplifies the development of Haskell
-bindings to C libraries. The tool processes existing C header files that
-determine data layout and function signatures on the C side in conjunction with
-Haskell modules that specify Haskell-side type signatures and marshaling
-details. Hooks embedded in the Haskell code signal access to C structures and
-functions -- they are expanded by the interfacing tool in dependence on
-information from the corresponding C header file. Another noteworthy property
-is the lightweight nature of the approach.
-
-WWW: http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
-
--- Oliver Braun
-obraun@FreeBSD.org
diff --git a/devel/c2hs/pkg-plist b/devel/c2hs/pkg-plist
deleted file mode 100644
index b4d2d3abb6cd..000000000000
--- a/devel/c2hs/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/c2hs
-bin/c2hs-config
-lib/c2hs-0.10.15/ghc5/c2hs.conf
-lib/c2hs-0.10.15/ghc5/import/C2HS.hi
-lib/c2hs-0.10.15/ghc5/import/C2HSBase.hi
-lib/c2hs-0.10.15/ghc5/import/C2HSDeprecated.hi
-lib/c2hs-0.10.15/ghc5/import/C2HSMarsh.hi
-lib/c2hs-0.10.15/ghc5/import/NewStablePtr.hi
-lib/c2hs-0.10.15/ghc5/import/NewStorable.hi
-lib/c2hs-0.10.15/ghc5/libc2hs.a
-@dirrm lib/c2hs-0.10.15/ghc5/import
-@dirrm lib/c2hs-0.10.15/ghc5
-@dirrm lib/c2hs-0.10.15
-@exec %D/bin/c2hs-config --package-conf | %D/bin/ghc-pkg -a
-@unexec %D/bin/ghc-pkg -r c2hs
diff --git a/devel/drift/Makefile b/devel/drift/Makefile
deleted file mode 100644
index 740be9029f27..000000000000
--- a/devel/drift/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for: drift
-# Date created: 13 August 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
-# $FreeBSD$
-
-PORTNAME= drift
-PORTVERSION= 2.0.r3
-CATEGORIES= devel
-MASTER_SITES= http://repetae.net/john/computer/haskell/DrIFT/
-DISTNAME= DrIFT-${PORTVERSION:S/.r/rc/}
-
-MAINTAINER= obraun@FreeBSD.org
-
-.if !defined(WITH_GHC)
-BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-.else
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-.endif
-
-HAS_CONFIGURE= yes
-
-.if !defined(WITH_GHC)
-CONFIGURE_ARGS+= --with-hc=nhc98
-.else
-CONFIGURE_ARGS+= --with-hc=ghc
-.endif
-
-.if !defined(WITH_GHC)
-pre-everything:
- @${ECHO} ""
- @${ECHO} " DrIFT will be build with nhc98."
- @${ECHO} " Define WITH_GHC to build with ghc."
- @${ECHO} ""
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/drift/distinfo b/devel/drift/distinfo
deleted file mode 100644
index fd306d872ade..000000000000
--- a/devel/drift/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (DrIFT-2.0rc3.tar.gz) = 7c30a950145181c6a79d813ce6f5eaad
diff --git a/devel/drift/pkg-comment b/devel/drift/pkg-comment
deleted file mode 100644
index d21ba3549932..000000000000
--- a/devel/drift/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A type sensitive preprocessor for Haskell
diff --git a/devel/drift/pkg-descr b/devel/drift/pkg-descr
deleted file mode 100644
index 29341782effb..000000000000
--- a/devel/drift/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-DrIFT is a type sensitive preprocessor for Haskell. It extracts type
-declarations and directives from modules. The directives cause rules to be
-fired on the parsed type declarations, generating new code which is then
-appended to the bottom of the input file. The rules are expressed as Haskell
-code, and it is intended that the user can add new rules as required.
-
-DrIFT automates instance derivation for classes that aren't supported by the
-standard compilers. In addition, instances can be produced in seperate modules
-to that containing the type declaration. This allows instances to be derived
-for a type after the original module has been compiled. As a bonus, simple
-utility functions can also be produced from a type.
-
-WWW: http://repetae.net/john/computer/haskell/DrIFT/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/devel/drift/pkg-plist b/devel/drift/pkg-plist
deleted file mode 100644
index cbb6bd37cd48..000000000000
--- a/devel/drift/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/DrIFT
-@unexec install-info --delete %D/info/drift.info %D/info/dir
-info/drift.info
-@exec install-info %D/info/drift.info %D/info/dir
diff --git a/devel/green-card/Makefile b/devel/green-card/Makefile
deleted file mode 100644
index 9a0e88f3a77d..000000000000
--- a/devel/green-card/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: green-card
-# Date created: 01 June 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= green-card
-PORTVERSION= 2.04
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= http://www.galois.com/~sof/
-DISTNAME= gc-${PORTVERSION}
-
-MAINTAINER= obraun@FreeBSD.org
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-WRKSRC= ${WRKDIR}/gc-${PORTVERSION}
-
-USE_GMAKE= yes
-ALL_TARGET= all
-
-do-install:
- @(cd ${WRKSRC}/src && ${CP} green-card ${PREFIX}/bin)
- -@mkdir ${PREFIX}/lib/green-card
- @(cd ${WRKSRC}/lib/ghc && ${CP} StdDIS.* libHSgreencard.a ${PREFIX}/lib/green-card)
-.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC}/doc && ${CP} -R green-card ${PREFIX}/share/doc \
- && ${CP} green-card.dvi.gz green-card.ps.gz ${DOCSDIR})
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/green-card/distinfo b/devel/green-card/distinfo
deleted file mode 100644
index b1e427765ec1..000000000000
--- a/devel/green-card/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gc-2.04.tar.gz) = 4a36ed69e253cb57d5caf16b0646e3a8
diff --git a/devel/green-card/files/patch-src::Makefile b/devel/green-card/files/patch-src::Makefile
deleted file mode 100644
index 9c168a15e363..000000000000
--- a/devel/green-card/files/patch-src::Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.orig Wed May 1 23:27:47 2002
-+++ src/Makefile Wed May 1 23:28:02 2002
-@@ -1,9 +1,6 @@
- # (GNU) Makefile for Green Card (GHC)
-
- ### User serviceable parts ###
--HC = /path/to/ghc
--CC = gcc
--RM = rm
-
- # Options to compile the sources with.
-
diff --git a/devel/green-card/pkg-comment b/devel/green-card/pkg-comment
deleted file mode 100644
index 1740ffaefde1..000000000000
--- a/devel/green-card/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A foreign function interface preprocessor for Haskell
diff --git a/devel/green-card/pkg-descr b/devel/green-card/pkg-descr
deleted file mode 100644
index e90df2606632..000000000000
--- a/devel/green-card/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Green Card is a foreign function interface preprocessor for Haskell,
-simplifying the task of interfacing Haskell programs to external libraries
-(which are normally exposed via C interfaces).
-
-WWW: http://haskell.org/greencard/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/devel/green-card/pkg-plist b/devel/green-card/pkg-plist
deleted file mode 100644
index c593838e66f4..000000000000
--- a/devel/green-card/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-bin/green-card
-lib/green-card/StdDIS.gc
-lib/green-card/StdDIS.hi
-lib/green-card/StdDIS.hs
-lib/green-card/StdDIS.o
-lib/green-card/libHSgreencard.a
-%%PORTDOCS%%share/doc/green-card/directives.html
-%%PORTDOCS%%share/doc/green-card/dis-std.html
-%%PORTDOCS%%share/doc/green-card/dis.html
-%%PORTDOCS%%share/doc/green-card/docbook.css
-%%PORTDOCS%%share/doc/green-card/extensions.html
-%%PORTDOCS%%share/doc/green-card/fill-in.html
-%%PORTDOCS%%share/doc/green-card/goals.html
-%%PORTDOCS%%share/doc/green-card/green-card.dvi.gz
-%%PORTDOCS%%share/doc/green-card/green-card.ps.gz
-%%PORTDOCS%%share/doc/green-card/greencard.html
-%%PORTDOCS%%share/doc/green-card/import.html
-%%PORTDOCS%%share/doc/green-card/invoking.html
-%%PORTDOCS%%share/doc/green-card/motivation.html
-%%PORTDOCS%%share/doc/green-card/overview.html
-%%PORTDOCS%%share/doc/green-card/proc-spec.html
-%%PORTDOCS%%share/doc/green-card/related.html
-%%PORTDOCS%%share/doc/green-card/type-sig.html
-%%PORTDOCS%%share/doc/green-card/using.html
-%%PORTDOCS%%@dirrm share/doc/green-card
-@dirrm lib/green-card
diff --git a/devel/haddock/Makefile b/devel/haddock/Makefile
deleted file mode 100644
index 7a9da23aff34..000000000000
--- a/devel/haddock/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for: haddock
-# Date created: 09 May 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
-# $FreeBSD$
-
-PORTNAME= haddock
-PORTVERSION= 0.4
-CATEGORIES= devel
-MASTER_SITES= http://www.haskell.org/haddock/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER= obraun@FreeBSD.org
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
- ${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook \
- ${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
- ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
- jade:${PORTSDIR}/textproc/jade
-.endif
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g}
-USE_REINPLACE= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/configure
-
-post-build:
-.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC}/haddock/doc && \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC}/haddock/doc && ${CP} -R haddock ${PREFIX}/share/doc)
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/haddock/distinfo b/devel/haddock/distinfo
deleted file mode 100644
index a1e54aebf46d..000000000000
--- a/devel/haddock/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (haddock-0.4-src.tar.gz) = 919e38378b91a223cb1e48178f1a85bd
diff --git a/devel/haddock/pkg-comment b/devel/haddock/pkg-comment
deleted file mode 100644
index b60bd6d16a9d..000000000000
--- a/devel/haddock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A documentation tool for Haskell
diff --git a/devel/haddock/pkg-descr b/devel/haddock/pkg-descr
deleted file mode 100644
index 2504df29fb2c..000000000000
--- a/devel/haddock/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Haddock is a tool for automatically generating documentation from
-annotated Haskell source code. The documentation generated by Haddock
-is fully hyperlinked.
-
-WWW: http://www.haskell.org/haddock/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/devel/haddock/pkg-plist b/devel/haddock/pkg-plist
deleted file mode 100644
index b4412dd9dd95..000000000000
--- a/devel/haddock/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/haddock
-bin/haddock-0.4
-lib/haddock-0.4/haddock.bin
-lib/haddock-0.4/haddock.css
-lib/haddock-0.4/haskell_icon.gif
-%%PORTDOCS%%share/doc/haddock/docbook.css
-%%PORTDOCS%%share/doc/haddock/haddock.html
-%%PORTDOCS%%share/doc/haddock/introduction.html
-%%PORTDOCS%%share/doc/haddock/invoking.html
-%%PORTDOCS%%share/doc/haddock/license.html
-%%PORTDOCS%%share/doc/haddock/markup.html
-%%PORTDOCS%%share/doc/haddock/module-attributes.html
-%%PORTDOCS%%share/doc/haddock/x331.html
-%%PORTDOCS%%share/doc/haddock/x355.html
-%%PORTDOCS%%share/doc/haddock/x360.html
-%%PORTDOCS%%share/doc/haddock/x403.html
-%%PORTDOCS%%share/doc/haddock/x418.html
-%%PORTDOCS%%share/doc/haddock/x486.html
-%%PORTDOCS%%share/doc/haddock/x57.html
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/caution.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/home.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/important.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/next.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/note.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/prev.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/tip.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/up.gif
-%%PORTDOCS%%share/doc/haddock/stylesheet-images/warning.gif
-@dirrm lib/haddock-0.4
-%%PORTDOCS%%@dirrm share/doc/haddock/stylesheet-images
-%%PORTDOCS%%@dirrm share/doc/haddock
diff --git a/devel/happy/Makefile b/devel/happy/Makefile
deleted file mode 100644
index 934a54c98d5d..000000000000
--- a/devel/happy/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for: happy
-# Date created: 22 December 2000
-# Whom: Simon Marlow <simonmar@microsoft.com>
-#
-# $FreeBSD$
-
-PORTNAME= happy
-PORTVERSION= 1.13
-CATEGORIES= devel
-MASTER_SITES= http://www.haskell.org/happy/dist/${PORTVERSION}/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER= simonmar@microsoft.com
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
- ${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook \
- ${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
- ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
- jade:${PORTSDIR}/textproc/jade
-.endif
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g}
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
-PLIST_SUB= HAPPY_VERSION=${PORTVERSION}
-
-BOOT_COOKIE = ${WRKDIR}/.boot_done
-
-${BOOT_COOKIE}:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot)
-
-pre-build: ${BOOT_COOKIE}
-
-post-build:
-.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC}/happy/doc && \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
- @(cd ${WRKSRC}/happy/doc && ${CP} -R happy ${PREFIX}/share/doc)
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/happy/distinfo b/devel/happy/distinfo
deleted file mode 100644
index dba23ab2e623..000000000000
--- a/devel/happy/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (happy-1.13-src.tar.gz) = d17619ae6e2caf883651d88be38dfd8a
diff --git a/devel/happy/pkg-comment b/devel/happy/pkg-comment
deleted file mode 100644
index 0437352c0069..000000000000
--- a/devel/happy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An LALR(1) parser generator for the functional language Haskell
diff --git a/devel/happy/pkg-descr b/devel/happy/pkg-descr
deleted file mode 100644
index 20f0c1a7c4f9..000000000000
--- a/devel/happy/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is Happy version 1.9, a parser generator for Haskell 98.
-
-WWW: http://www.haskell.org/happy/
-
--- Simon Marlow <simonmar@microsoft.com>
diff --git a/devel/happy/pkg-plist b/devel/happy/pkg-plist
deleted file mode 100644
index ae31ebf8ce79..000000000000
--- a/devel/happy/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-bin/happy
-bin/happy-%%HAPPY_VERSION%%
-lib/happy-%%HAPPY_VERSION%%/happy.bin
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-coerce-debug
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-debug
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-arrays-ghc-debug
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-coerce
-lib/happy-%%HAPPY_VERSION%%/happy/HappyTemplate-ghc
-share/doc/happy/docbook.css
-share/doc/happy/happy-introduction.html
-share/doc/happy/happy.html
-share/doc/happy/sec-compilation-time.html
-share/doc/happy/sec-conflict-tips.html
-share/doc/happy/sec-directives.html
-share/doc/happy/sec-error.html
-share/doc/happy/sec-finding-errors.html
-share/doc/happy/sec-grammar-files.html
-share/doc/happy/sec-grammar.html
-share/doc/happy/sec-info-files.html
-share/doc/happy/sec-invoking.html
-share/doc/happy/sec-license.html
-share/doc/happy/sec-module-header.html
-share/doc/happy/sec-module-trailer.html
-share/doc/happy/sec-monads.html
-share/doc/happy/sec-multiple-parsers.html
-share/doc/happy/sec-obtaining.html
-share/doc/happy/sec-precedences.html
-share/doc/happy/sec-reporting-bugs.html
-share/doc/happy/sec-sequences.html
-share/doc/happy/sec-tips.html
-share/doc/happy/sec-type-signatures.html
-share/doc/happy/sec-using.html
-share/doc/happy/sec-happy-ghci.html
-share/doc/happy/stylesheet-images/caution.gif
-share/doc/happy/stylesheet-images/home.gif
-share/doc/happy/stylesheet-images/important.gif
-share/doc/happy/stylesheet-images/next.gif
-share/doc/happy/stylesheet-images/note.gif
-share/doc/happy/stylesheet-images/prev.gif
-share/doc/happy/stylesheet-images/tip.gif
-share/doc/happy/stylesheet-images/toc-blank.gif
-share/doc/happy/stylesheet-images/toc-minus.gif
-share/doc/happy/stylesheet-images/toc-plus.gif
-share/doc/happy/stylesheet-images/up.gif
-share/doc/happy/stylesheet-images/warning.gif
-@dirrm lib/happy-%%HAPPY_VERSION%%/happy
-@dirrm lib/happy-%%HAPPY_VERSION%%
-@dirrm share/doc/happy/stylesheet-images
-@dirrm share/doc/happy
diff --git a/devel/hat/Makefile b/devel/hat/Makefile
deleted file mode 100644
index 204daf5bb5b5..000000000000
--- a/devel/hat/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# New ports collection makefile for: hat
-# Date created: 16 June 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= hat
-PORTVERSION= 2.00
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
-
-MAINTAINER= obraun@FreeBSD.org
-
-.if defined(WITHOUT_NHC98)
-FORBIDDEN= does not build with ghc-5.04 for the time being
-.endif
-
-.if defined(WITH_GHC)
-.undef WITH_GHC
-.endif
-
-.if !defined(WITHOUT_NHC98)
-BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-.else
-WITH_GHC= yes
-BUILD_DEPENDS+= hmake:${PORTSDIR}/devel/hmake
-.endif
-.if defined(WITH_GHC)
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-.endif
-
-USE_GMAKE= yes
-HAS_CONFIGURE= yes
-USE_REINPLACE= yes
-USE_GNOMENG= yes
-USE_GNOME= glib12
-.if !defined(WITH_GHC) || defined(WITHOUT_NHC98)
-ALL_TARGET= hat
-.endif
-.if !defined(WITHOUT_NHC98)
-PLIST_SUB+= NHC98=""
-.else
-PLIST_SUB+= NHC98="@comment "
-.endif
-.if defined(WITH_GHC)
-PLIST_SUB+= GHC=""
-.else
-PLIST_SUB+= GHC="@comment "
-.endif
-
-CONFIGURE_ARGS= --prefix=${PREFIX} --libdir=${PREFIX}/lib
-.if !defined(WITHOUT_NHC98)
-CONFIGURE_ARGS+= --buildwith=nhc98
-.else
-CONFIGURE_ARGS+= --buildwith=ghc
-.endif
-.if !defined(NOPORTDOCS)
-CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc +docs
-.endif
-
-MAN1= hat-detect.1 hat-observe.1 hat-stack.1 hat-trail.1
-
-pre-everything::
- @${ECHO_CMD} ""
-.if defined(WITH_GHC) && !defined(WITHOUT_NHC98)
- @${ECHO_CMD} " HAT will be built and installed for both nhc98 and ghc."
-.elif defined(WITHOUT_NHC98)
- @${ECHO_CMD} " HAT will be built and installed for ghc only."
-.else
- @${ECHO_CMD} " HAT will be built and installed for nhc98 only."
-# @${ECHO_CMD} " Define WITH_GHC to install for ghc, too."
-# @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only."
- @${ECHO_CMD} " HAT does not build with ghc-5.04 for the time being."
-.endif
- @${ECHO_CMD} ""
-
-post-patch:
- @${REINPLACE_CMD} -e "s|glib-config|${GLIB_CONFIG}|" \
- ${WRKSRC}/configure ${WRKSRC}/src/hat/tools/Makefile \
- ${WRKSRC}/src/hat/oldtools/Makefile
-
-.if !defined(NOPORTDOCS)
-post-install:
- @${RM} -r ${PREFIX}/share/doc/hat/CVS
-.for ending in aux log
- @${RM} ${PREFIX}/share/doc/hat/tutorial1.${ending}
-.endfor
-.for ending in aux log out toc
- @${RM} ${PREFIX}/share/doc/hat/hatuser.${ending}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/hat/distinfo b/devel/hat/distinfo
deleted file mode 100644
index 2222af54f6bd..000000000000
--- a/devel/hat/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (hat-2.00.tar.gz) = bd93dd2cc2b9bde2d4b24595074cd158
diff --git a/devel/hat/files/patch-configure b/devel/hat/files/patch-configure
deleted file mode 100644
index df9407d19b10..000000000000
--- a/devel/hat/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Tue Jun 18 20:12:04 2002
-+++ configure Tue Jun 18 20:12:36 2002
-@@ -385,8 +385,6 @@
- then mkdir -p $DESTDIR$BINDIR; echo ' (created)'
- else echo ' (exists)'
- fi
-- echo " harch"
-- cp script/harch $DESTDIR$BINDIR
- echo " hat-graph"
- cp script/hat-graph $DESTDIR$BINDIR
- echo " hat-trans"
-@@ -402,7 +400,7 @@
- ln $DESTDIR$BINDIR/hat-template $DESTDIR$BINDIR/$hattool
- done
- echo
-- chmod +x $DESTDIR$BINDIR/harch $DESTDIR$BINDIR/hat-trans
-+ chmod +x $DESTDIR$BINDIR/hat-trans
- chmod +x $DESTDIR$BINDIR/hat-template $DESTDIR$BINDIR/hat-graph
- rm $DESTDIR$BINDIR/hat-template
- else
diff --git a/devel/hat/files/patch-script::harch b/devel/hat/files/patch-script::harch
deleted file mode 100644
index df33c71c6959..000000000000
--- a/devel/hat/files/patch-script::harch
+++ /dev/null
@@ -1,13 +0,0 @@
---- script/harch.orig Mon May 27 10:30:55 2002
-+++ script/harch Mon May 27 10:31:11 2002
-@@ -13,8 +13,8 @@
-
- if uname >/dev/null 2>&1
- then
-- if uname -p >/dev/null 2>&1
-- then PROCESSOR=`uname -p`
-+ if uname -m >/dev/null 2>&1
-+ then PROCESSOR=`uname -m`
- case "$PROCESSOR" in
- unknown|*\ *)
- PROCESSOR=`uname -m`
diff --git a/devel/hat/pkg-comment b/devel/hat/pkg-comment
deleted file mode 100644
index 5774fd106ec7..000000000000
--- a/devel/hat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A source-level tracer for Haskell 98
diff --git a/devel/hat/pkg-descr b/devel/hat/pkg-descr
deleted file mode 100644
index fe4ebb49e0aa..000000000000
--- a/devel/hat/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Hat is a source-level tracer for Haskell 98, the standard lazy functional
-programming language. Hat is a tool that gives the user access to otherwise
-invisible information about a computation.
-
-Hat works with both ghc and nhc98.
-
-WWW: http://www.cs.york.ac.uk/fp/hat/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/devel/hat/pkg-plist b/devel/hat/pkg-plist
deleted file mode 100644
index b7479439b75a..000000000000
--- a/devel/hat/pkg-plist
+++ /dev/null
@@ -1,226 +0,0 @@
-bin/hat-graph
-bin/hat-trans
-bin/hat-stack
-bin/hat-check
-bin/hat-observe
-bin/hat-detect
-bin/hat-view
-bin/hat-trail
-include/hat/Array.hx
-include/hat/CPUTime.hx
-include/hat/Char.hx
-include/hat/Complex.hx
-include/hat/Directory.hx
-include/hat/DirectoryBuiltin.hx
-include/hat/DirectoryBuiltinTypes.hx
-include/hat/IO.hx
-include/hat/IOBuiltin.hx
-include/hat/IOBuiltinTypes.hx
-include/hat/Ix.hx
-include/hat/List.hx
-include/hat/Locale.hx
-include/hat/Maybe.hx
-include/hat/Monad.hx
-include/hat/Numeric.hx
-include/hat/Prelude.hx
-include/hat/PreludeBasic.hx
-include/hat/PreludeBuiltin.hx
-include/hat/PreludeBuiltinTypes.hx
-include/hat/Random.hx
-include/hat/RandomBuiltin.hx
-include/hat/Ratio.hx
-include/hat/System.hx
-include/hat/SystemBuiltin.hx
-include/hat/SystemBuiltinTypes.hx
-include/hat/Time.hx
-include/hat/TimeBuiltin.hx
-include/hat/TimeBuiltinTypes.hx
-%%NHC98%%include/nhc98/hat/Hat.hi
-%%NHC98%%include/nhc98/hat/TArray.hi
-%%NHC98%%include/nhc98/hat/TCPUTime.hi
-%%NHC98%%include/nhc98/hat/TChar.hi
-%%NHC98%%include/nhc98/hat/TComplex.hi
-%%NHC98%%include/nhc98/hat/TDirectory.hi
-%%NHC98%%include/nhc98/hat/TDirectoryBuiltin.hi
-%%NHC98%%include/nhc98/hat/TDirectoryBuiltinTypes.hi
-%%NHC98%%include/nhc98/hat/TIO.hi
-%%NHC98%%include/nhc98/hat/TIOBuiltin.hi
-%%NHC98%%include/nhc98/hat/TIOBuiltinTypes.hi
-%%NHC98%%include/nhc98/hat/TIx.hi
-%%NHC98%%include/nhc98/hat/TList.hi
-%%NHC98%%include/nhc98/hat/TLocale.hi
-%%NHC98%%include/nhc98/hat/TMaybe.hi
-%%NHC98%%include/nhc98/hat/TMonad.hi
-%%NHC98%%include/nhc98/hat/TNumeric.hi
-%%NHC98%%include/nhc98/hat/TPrelude.hi
-%%NHC98%%include/nhc98/hat/TPreludeBasic.hi
-%%NHC98%%include/nhc98/hat/TPreludeBuiltin.hi
-%%NHC98%%include/nhc98/hat/TPreludeBuiltinTypes.hi
-%%NHC98%%include/nhc98/hat/TRandom.hi
-%%NHC98%%include/nhc98/hat/TRandomBuiltin.hi
-%%NHC98%%include/nhc98/hat/TRatio.hi
-%%NHC98%%include/nhc98/hat/TSystem.hi
-%%NHC98%%include/nhc98/hat/TSystemBuiltin.hi
-%%NHC98%%include/nhc98/hat/TSystemBuiltinTypes.hi
-%%NHC98%%include/nhc98/hat/TTime.hi
-%%NHC98%%include/nhc98/hat/TTimeBuiltin.hi
-%%NHC98%%include/nhc98/hat/TTimeBuiltinTypes.hi
-lib/ix86-FreeBSD/config
-lib/ix86-FreeBSD/hat-trans
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/libHShat.a
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/Hat.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTime.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltinTypes.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystem.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRatio.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandomBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandom.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltinTypes.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBasic.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPrelude.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TNumeric.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMonad.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMaybe.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TLocale.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TList.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIx.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltinTypes.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIO.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltinTypes.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltin.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectory.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TComplex.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TChar.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TCPUTime.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TArray.hi
-%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/Hat.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TArray.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TCPUTime.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TChar.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TComplex.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TDirectory.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TDirectoryBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TDirectoryBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TIO.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TIOBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TIOBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TIx.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TList.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TLocale.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TMaybe.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TMonad.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TNumeric.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TPrelude.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TPreludeBasic.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TPreludeBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TPreludeBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TRandom.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TRandomBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TRatio.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TSystem.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TSystemBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TSystemBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TTime.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TTimeBuiltin.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TTimeBuiltinTypes.hi
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/ghcincdir
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/hat-package.conf
-%%GHC%%lib/ix86-FreeBSD/hatlib/ghc/libHShat.a
-lib/ix86-FreeBSD/hat-check
-lib/ix86-FreeBSD/hat-stack
-lib/ix86-FreeBSD/hat-view
-lib/ix86-FreeBSD/hat-trail
-lib/ix86-FreeBSD/hat-observe
-%%NHC98%%lib/nhc98/ix86-FreeBSD/libHShat.a
-%%GHC%%lib/ghc-5.02.2/imports/hat/Hat.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TArray.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TCPUTime.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TChar.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TComplex.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TDirectory.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TDirectoryBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TDirectoryBuiltinTypes.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TIO.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TIOBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TIOBuiltinTypes.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TIx.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TList.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TLocale.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TMaybe.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TMonad.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TNumeric.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TPrelude.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TPreludeBasic.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TPreludeBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TPreludeBuiltinTypes.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TRandom.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TRandomBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TRatio.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TSystem.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TSystemBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TSystemBuiltinTypes.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TTime.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TTimeBuiltin.hi
-%%GHC%%lib/ghc-5.02.2/imports/hat/TTimeBuiltinTypes.hi
-%%GHC%%lib/ghc-5.02.2/libHShat.a
-%%PORTDOCS%%share/doc/hat/BadInsort.hs
-%%PORTDOCS%%share/doc/hat/Insort.hs
-%%PORTDOCS%%share/doc/hat/browser-detail.html
-%%PORTDOCS%%share/doc/hat/bugs-tools.html
-%%PORTDOCS%%share/doc/hat/bugs.html
-%%PORTDOCS%%share/doc/hat/config.html
-%%PORTDOCS%%share/doc/hat/copyright.html
-%%PORTDOCS%%share/doc/hat/download.html
-%%PORTDOCS%%share/doc/hat/faq.html
-%%PORTDOCS%%share/doc/hat/feature-table.html
-%%PORTDOCS%%share/doc/hat/fest-0202.bugs
-%%PORTDOCS%%share/doc/hat/frejaHatHood.ps.gz
-%%PORTDOCS%%share/doc/hat/hat-reference.tex
-%%PORTDOCS%%share/doc/hat/hat-trail-1.eps
-%%PORTDOCS%%share/doc/hat/hat-trail-1.pdf
-%%PORTDOCS%%share/doc/hat/hat-trail.gif
-%%PORTDOCS%%share/doc/hat/hat.gif
-%%PORTDOCS%%share/doc/hat/hatuser-old.html
-%%PORTDOCS%%share/doc/hat/hatuser.dvi
-%%PORTDOCS%%share/doc/hat/hatuser.html
-%%PORTDOCS%%share/doc/hat/hatuser.pdf
-%%PORTDOCS%%share/doc/hat/hatuser.ps
-%%PORTDOCS%%share/doc/hat/hatuser.tex
-%%PORTDOCS%%share/doc/hat/hatuser001.gif
-%%PORTDOCS%%share/doc/hat/hw01-draft.ps.gz
-%%PORTDOCS%%share/doc/hat/index.html
-%%PORTDOCS%%share/doc/hat/install.html
-%%PORTDOCS%%share/doc/hat/libraries.html
-%%PORTDOCS%%share/doc/hat/limitations-detail.html
-%%PORTDOCS%%share/doc/hat/limitations.html
-%%PORTDOCS%%share/doc/hat/maillist.html
-%%PORTDOCS%%share/doc/hat/newhat.ps.gz
-%%PORTDOCS%%share/doc/hat/old-tracing.html
-%%PORTDOCS%%share/doc/hat/paper.dvi
-%%PORTDOCS%%share/doc/hat/proposal.html
-%%PORTDOCS%%share/doc/hat/publications.html
-%%PORTDOCS%%share/doc/hat/requirements.html
-%%PORTDOCS%%share/doc/hat/status.html
-%%PORTDOCS%%share/doc/hat/toolkitThesis.ps.gz
-%%PORTDOCS%%share/doc/hat/tracing.html
-%%PORTDOCS%%share/doc/hat/tutorial1-old.html
-%%PORTDOCS%%share/doc/hat/tutorial1.dvi
-%%PORTDOCS%%share/doc/hat/tutorial1.html
-%%PORTDOCS%%share/doc/hat/tutorial1.hva
-%%PORTDOCS%%share/doc/hat/tutorial1.pdf
-%%PORTDOCS%%share/doc/hat/tutorial1.ps
-%%PORTDOCS%%share/doc/hat/tutorial1.tex
-@dirrm include/hat
-%%NHC98%%@dirrm include/nhc98/hat
-%%NHC98%%@dirrm lib/ix86-FreeBSD/hatlib/nhc98
-%%GHC%%@dirrm lib/ix86-FreeBSD/hatlib/ghc
-@dirrm lib/ix86-FreeBSD/hatlib
-%%PORTDOCS%%@dirrm share/doc/hat
-%%GHC%%@dirrm lib/ghc-5.02.2/imports/hat
-%%GHC%%@exec /usr/local/bin/ghc-pkg -a < %D/lib/ix86-FreeBSD/hatlib/ghc/hat-package.conf
-%%GHC%%@unexec /usr/local/bin/ghc-pkg -r hat
diff --git a/devel/hmake/Makefile b/devel/hmake/Makefile
deleted file mode 100644
index d57dd512ef27..000000000000
--- a/devel/hmake/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for: hmake
-# Date created: 27 November 2001
-# Whom: mwest@uct.ac.za
-#
-# $FreeBSD$
-#
-
-PORTNAME= hmake
-PORTVERSION= 3.06
-CATEGORIES= devel
-MASTER_SITES= http://www.haskell.org/hmake/ \
- ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \
- http://www.cs.york.ac.uk/fp/hmake/
-
-MAINTAINER= mwest@uct.ac.za
-
-BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc
-
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-USE_GMAKE= YES
-
-.include <bsd.port.pre.mk>
-
-do-install:
-.if exists(${PREFIX}/bin/hmake) && !defined(OVERRIDE_HMAKE)
- @${ECHO} ""
- @${ECHO} "It seems that there is already a version of hmake installed on"
- @${ECHO} "this system. Please deinstall it, or define OVERRIDE_HMAKE to"
- @${ECHO} "override the installed version."
- @${ECHO} ""
- @${ECHO} "NOTE: hmake is part of nhc98"
- @${ECHO} ""
- @${FALSE}
-.else
-# cheat a bit, otherwise LIBDIR gets clobbered
- (cd ${WRKSRC} && ./configure --install)
-.endif
-
-MAN1= hmake.1
-
-.include <bsd.port.post.mk>
diff --git a/devel/hmake/distinfo b/devel/hmake/distinfo
deleted file mode 100644
index 605c492726e7..000000000000
--- a/devel/hmake/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (hmake-3.06.tar.gz) = 272353ab4a8677a85726f560d0896199
diff --git a/devel/hmake/files/patch-script::harch b/devel/hmake/files/patch-script::harch
deleted file mode 100644
index df33c71c6959..000000000000
--- a/devel/hmake/files/patch-script::harch
+++ /dev/null
@@ -1,13 +0,0 @@
---- script/harch.orig Mon May 27 10:30:55 2002
-+++ script/harch Mon May 27 10:31:11 2002
-@@ -13,8 +13,8 @@
-
- if uname >/dev/null 2>&1
- then
-- if uname -p >/dev/null 2>&1
-- then PROCESSOR=`uname -p`
-+ if uname -m >/dev/null 2>&1
-+ then PROCESSOR=`uname -m`
- case "$PROCESSOR" in
- unknown|*\ *)
- PROCESSOR=`uname -m`
diff --git a/devel/hmake/pkg-comment b/devel/hmake/pkg-comment
deleted file mode 100644
index fe411c47abc4..000000000000
--- a/devel/hmake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intelligent compilation management tool for Haskell programs
diff --git a/devel/hmake/pkg-descr b/devel/hmake/pkg-descr
deleted file mode 100644
index c5e9097097c5..000000000000
--- a/devel/hmake/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Hmake is an intelligent compilation management tool for Haskell
-programs. It automatically extracts dependencies between source
-modules, and issues the appropriate compiler commands to rebuild only
-those that have changed, given just the name of the program or module
-that you want to build. Yes, you need never write a Makefile again!
-
-A particular benefit is that hmake knows about interface (.hi) files.
-Even though a source module has changed, if its interface file has not
-changed, then other modules which import it do not need to be
-recompiled.
-
-Hmake is compiler-independent, although it is based on some earlier
-compiler-specific tools (hbcmake, lmlmake, nhc13make). The
-installation process automatically detects which Haskell compilers you
-have, and sets up hmake to use any of them.
-
-WWW: http://www.haskell.org/hmake/
-
---
-mwest@uct.ac.za
diff --git a/devel/hmake/pkg-plist b/devel/hmake/pkg-plist
deleted file mode 100644
index a9acf940e221..000000000000
--- a/devel/hmake/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/harch
-bin/hi
-bin/hmake
-bin/hmake-config
-lib/hmake/ix86-FreeBSD/HInteractive
-lib/hmake/ix86-FreeBSD/MkProg
-lib/hmake/ix86-FreeBSD/Older
-lib/hmake/ix86-FreeBSD/config
-lib/hmake/ix86-FreeBSD/MkConfig
-lib/hmake/ix86-FreeBSD/hmakerc
-@dirrm lib/hmake/ix86-FreeBSD
-@dirrm lib/hmake
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 5af3f17d1eda..ea0c40a07f3b 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -9,6 +9,7 @@ PORTNAME= c2hs
PORTVERSION= 0.10.15
CATEGORIES= devel
MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index 740be9029f27..4cf59913621f 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -9,6 +9,7 @@ PORTVERSION= 2.0.r3
CATEGORIES= devel
MASTER_SITES= http://repetae.net/john/computer/haskell/DrIFT/
DISTNAME= DrIFT-${PORTVERSION:S/.r/rc/}
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
diff --git a/devel/hs-green-card/Makefile b/devel/hs-green-card/Makefile
index 9a0e88f3a77d..9b1f877a96d2 100644
--- a/devel/hs-green-card/Makefile
+++ b/devel/hs-green-card/Makefile
@@ -11,6 +11,7 @@ PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.galois.com/~sof/
DISTNAME= gc-${PORTVERSION}
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 7a9da23aff34..6f6f03761a63 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -9,6 +9,7 @@ PORTVERSION= 0.4
CATEGORIES= devel
MASTER_SITES= http://www.haskell.org/haddock/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 934a54c98d5d..b3b8cd8a28be 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -9,6 +9,7 @@ PORTVERSION= 1.13
CATEGORIES= devel
MASTER_SITES= http://www.haskell.org/happy/dist/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
+PKGNAMEPREFIX= hs-
MAINTAINER= simonmar@microsoft.com
diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile
index 204daf5bb5b5..579e0975d71e 100644
--- a/devel/hs-hat/Makefile
+++ b/devel/hs-hat/Makefile
@@ -9,6 +9,7 @@ PORTNAME= hat
PORTVERSION= 2.00
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
@@ -25,7 +26,7 @@ BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
.else
WITH_GHC= yes
-BUILD_DEPENDS+= hmake:${PORTSDIR}/devel/hmake
+BUILD_DEPENDS+= hmake:${PORTSDIR}/devel/hs-hmake
.endif
.if defined(WITH_GHC)
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile
index d57dd512ef27..f1abed0a0448 100644
--- a/devel/hs-hmake/Makefile
+++ b/devel/hs-hmake/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.haskell.org/hmake/ \
ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \
http://www.cs.york.ac.uk/fp/hmake/
+PKGNAMEPREFIX= hs-
MAINTAINER= mwest@uct.ac.za
diff --git a/graphics/Makefile b/graphics/Makefile
index 57d671b78ab5..033af08604c0 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -130,9 +130,9 @@
SUBDIR += gxanim
SUBDIR += hdf
SUBDIR += hdf5
- SUBDIR += hgl
SUBDIR += hobbes-icons-xpm
SUBDIR += hppsmtools
+ SUBDIR += hs-hgl
SUBDIR += icod
SUBDIR += icontact
SUBDIR += imagesort
diff --git a/graphics/hgl/Makefile b/graphics/hgl/Makefile
deleted file mode 100644
index 87505292ff00..000000000000
--- a/graphics/hgl/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for: hgl
-# Date created: 22 January 2002
-# Whom: octaphial
-#
-# $FreeBSD$
-#
-
-PORTNAME= hgl
-PORTVERSION= 2.0.4
-CATEGORIES= graphics
-MASTER_SITES= http://haskell.org/graphics/downloads/
-DISTNAME= graphics-${PORTVERSION}.src
-
-MAINTAINER= octaphial@yahoo.com
-
-RUN_DEPENDS= hugs:${PORTSDIR}/lang/hugs
-
-WRKSRC= ${WRKDIR}/graphics-${PORTVERSION}
-USE_GMAKE= yes
-USE_XLIB= yes
-
-BUILD_WRKSRC= ${WRKSRC}/lib/x11
-MAKE_ENV= system=FreeBSD \
- hugs_install=${PREFIX}/share/hugs
-ALL_TARGET= all
-
-do-install:
- ${MKDIR} ${PREFIX}/share/hugs/lib/x11
- ${MKDIR} ${PREFIX}/share/hugs/demos/hgl
- ${INSTALL_SCRIPT} ${PKGDIR}/scripts/hugs-hgl ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/lib/x11/*.hs ${PREFIX}/share/hugs/lib/x11
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.o ${PREFIX}/share/hugs/lib/x11
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/x11/*.so ${PREFIX}/share/hugs/lib/x11
- ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/hugs/demos/hgl
- ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/hugs/demos/hgl
-
-post-install:
- ${MKDIR} ${PREFIX}/share/doc/hgl
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/hgl
- ${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/doc/hgl
- ${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/share/doc/hgl
- ${INSTALL_DATA} ${WRKSRC}/Version ${PREFIX}/share/doc/hgl
- ${INSTALL_DATA} ${WRKSRC}/Version-2.0.4 ${PREFIX}/share/doc/hgl
-
-.include <bsd.port.mk>
diff --git a/graphics/hgl/distinfo b/graphics/hgl/distinfo
deleted file mode 100644
index 88ccc64b766d..000000000000
--- a/graphics/hgl/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (graphics-2.0.4.src.tar.gz) = 60da7bc8f3a2414778fe1e693ba54ab4
diff --git a/graphics/hgl/files/patch-aa b/graphics/hgl/files/patch-aa
deleted file mode 100644
index 15413dfb577c..000000000000
--- a/graphics/hgl/files/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
---- lib/x11/X.c.orig Wed Sep 5 16:26:18 2001
-+++ lib/x11/X.c Tue Jan 22 11:18:50 2002
-@@ -5526,8 +5526,8 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--DLLEXPORT(void) initModule(HugsAPI3 *);
--DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) {
-+DLLEXPORT(void) _initModule(HugsAPI3 *);
-+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) {
- hugs = hugsAPI;
- hugs->registerPrims(&prims);
- }
-diff -Naur graphics-2.0.4.orig/lib/x11/Xlib.c graphics-2.0.4/lib/x11/Xlib.c
---- lib/x11/Xlib.c.orig Wed Sep 5 16:26:18 2001
-+++ lib/x11/Xlib.c Tue Jan 22 11:19:05 2002
-@@ -4349,8 +4349,8 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--DLLEXPORT(void) initModule(HugsAPI3 *);
--DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) {
-+DLLEXPORT(void) _initModule(HugsAPI3 *);
-+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) {
- hugs = hugsAPI;
- hugs->registerPrims(&prims);
- }
-diff -Naur graphics-2.0.4.orig/lib/x11/Xlib_StdDIS.c graphics-2.0.4/lib/x11/Xlib_StdDIS.c
---- lib/x11/Xlib_StdDIS.c.orig Wed Sep 5 16:26:18 2001
-+++ lib/x11/Xlib_StdDIS.c Tue Jan 22 11:17:48 2002
-@@ -65,8 +65,8 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--DLLEXPORT(void) initModule(HugsAPI3 *);
--DLLEXPORT(void) initModule(HugsAPI3 *hugsAPI) {
-+DLLEXPORT(void) _initModule(HugsAPI3 *);
-+DLLEXPORT(void) _initModule(HugsAPI3 *hugsAPI) {
- hugs = hugsAPI;
- hugs->registerPrims(&prims);
- }
diff --git a/graphics/hgl/pkg-comment b/graphics/hgl/pkg-comment
deleted file mode 100644
index 5d12a09ca598..000000000000
--- a/graphics/hgl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphics library for Hugs98, an implementation of Haskell 98
diff --git a/graphics/hgl/pkg-descr b/graphics/hgl/pkg-descr
deleted file mode 100644
index 6116627eafb5..000000000000
--- a/graphics/hgl/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-From homepage of HGL:
-
-The HGL gives the programmer access to the most interesting parts of
-the Win32 and X11 library without exposing the programmer to the pain
-and anguish usually associated with using these interfaces. The library
-library is distributed as open source and is suitable for use in
-teaching and in applications.
-
-...
-
-WWW: http://haskell.org/graphics/
-
-
- - Byunghyun Oh
- octaphial@yahoo.com
diff --git a/graphics/hgl/pkg-plist b/graphics/hgl/pkg-plist
deleted file mode 100644
index bf24fc9d51c2..000000000000
--- a/graphics/hgl/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/hugs-hgl
-share/doc/hgl/License
-share/doc/hgl/Readme
-share/doc/hgl/Version
-share/doc/hgl/Version-2.0.4
-share/doc/hgl/Graphics.dvi
-share/doc/hgl/Graphics.tex
-share/doc/hgl/appendix.tex
-share/doc/hgl/graphics.bib
-share/doc/hgl/oldappendix.tex
-share/hugs/demos/hgl/HelloWorld.hs
-share/hugs/demos/hgl/GTest.hs
-share/hugs/demos/hgl/Tests.hs
-share/hugs/lib/x11/GraphicsCore.hs
-share/hugs/lib/x11/GraphicsDC.hs
-share/hugs/lib/x11/GraphicsEvent.hs
-share/hugs/lib/x11/GraphicsEvents.hs
-share/hugs/lib/x11/GraphicsFlag.hs
-share/hugs/lib/x11/GraphicsFont.hs
-share/hugs/lib/x11/GraphicsKey.hs
-share/hugs/lib/x11/GraphicsPicture.hs
-share/hugs/lib/x11/GraphicsRegion.hs
-share/hugs/lib/x11/GraphicsTimer.hs
-share/hugs/lib/x11/GraphicsUtils.hs
-share/hugs/lib/x11/GraphicsWindow.hs
-share/hugs/lib/x11/GraphicsWindows.hs
-share/hugs/lib/x11/Graphics_Utilities.hs
-share/hugs/lib/x11/SOEGraphics.hs
-share/hugs/lib/x11/X.hs
-share/hugs/lib/x11/X.o
-share/hugs/lib/x11/X.so
-share/hugs/lib/x11/Xlib.hs
-share/hugs/lib/x11/Xlib.o
-share/hugs/lib/x11/Xlib.so
-share/hugs/lib/x11/Xlib_StdDIS.hs
-share/hugs/lib/x11/Xlib_StdDIS.so
-@dirrm share/doc/hgl
-@dirrm share/hugs/demos/hgl
-@dirrm share/hugs/lib/x11
diff --git a/graphics/hgl/scripts/hugs-hgl b/graphics/hgl/scripts/hugs-hgl
deleted file mode 100644
index 37ca106a7798..000000000000
--- a/graphics/hgl/scripts/hugs-hgl
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-hugs -P{Hugs}/lib/x11: $@
diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile
index 87505292ff00..cd4de6004734 100644
--- a/graphics/hs-hgl/Makefile
+++ b/graphics/hs-hgl/Makefile
@@ -10,6 +10,7 @@ PORTVERSION= 2.0.4
CATEGORIES= graphics
MASTER_SITES= http://haskell.org/graphics/downloads/
DISTNAME= graphics-${PORTVERSION}.src
+PKGNAMEPREFIX= hs-
MAINTAINER= octaphial@yahoo.com
diff --git a/textproc/Makefile b/textproc/Makefile
index e3a3fb1cdbee..ab3a1190d78c 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -77,8 +77,8 @@
SUBDIR += gutenmark
SUBDIR += gxditview
SUBDIR += gxmlviewer
- SUBDIR += haxml
SUBDIR += hevea
+ SUBDIR += hs-haxml
SUBDIR += htdig
SUBDIR += html
SUBDIR += html2fo
diff --git a/textproc/haxml/Makefile b/textproc/haxml/Makefile
deleted file mode 100644
index c090f4157453..000000000000
--- a/textproc/haxml/Makefile
+++ /dev/null
@@ -1,80 +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.07b
-PORTREVISION= 0
-CATEGORIES= textproc
-MASTER_SITES= http://www.haskell.org/HaXml/ \
- ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
-DISTNAME= HaXml-${PORTVERSION}
-
-MAINTAINER= obraun@FreeBSD.org
-
-.if !defined(WITHOUT_NHC98)
-BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
-.else
-WITH_GHC= yes
-BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hmake
-.endif
-.if defined(WITH_GHC)
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-.endif
-
-HAS_CONFIGURE= yes
-USE_GMAKE= yes
-ALL_TARGET= #empty
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-
-.if !defined(WITHOUT_NHC98) && !defined(WITH_GHC)
-CONFIGURE_ARGS+= --buildwith=nhc98
-.elif defined(WITHOUT_NHC98)
-CONFIGURE_ARGS+= --buildwith=ghc
-.endif
-
-.if !defined(WITHOUT_NHC98)
-PLIST_SUB+= NHC98=""
-.else
-PLIST_SUB+= NHC98="@comment "
-.endif
-.if defined(WITH_GHC)
-GHC_VERSION= `${PREFIX}/bin/ghc --version 2>&1 | \
- ${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
-PLIST_SUB+= GHC="" GHC_VERSION="${GHC_VERSION}"
-.else
-PLIST_SUB+= GHC="@comment "
-.endif
-
-pre-everything:
- @${ECHO_CMD} ""
-.if defined(WITH_GHC) && !defined(WITHOUT_NHC98)
- @${ECHO_CMD} " HaXml will be installed for both nhc98 and ghc.
-.elif defined(WITHOUT_NHC98)
- @${ECHO_CMD} " HaXml will be installed for ghc only."
-.else
- @${ECHO_CMD} " HaXml will be installed for nhc98 only."
- @${ECHO_CMD} " Define WITH_GHC to install for ghc, too."
- @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only."
-.endif
- @${ECHO_CMD} ""
-
-post-install:
-.if defined(WITH_GHC)
- @${INSTALL_DATA} ${WRKSRC}/obj/ghc/pkg.conf \
- ${PREFIX}/lib/ghc-${GHC_VERSION}/imports/HaXml/
-.endif
- @(cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- Canonicalise DtdToHaskell MkOneOf Validate Xtract ${PREFIX}/bin)
-.if !defined(NOPORTDOCS)
- @${RM} -rf ${WRKSRC}/docs/CVS
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
-.endif
-
-.include <bsd.port.mk>
diff --git a/textproc/haxml/distinfo b/textproc/haxml/distinfo
deleted file mode 100644
index 540b8d5413bd..000000000000
--- a/textproc/haxml/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (HaXml-1.07b.tar.gz) = 6c416bee3bdbbe272424d0bcc97fc21a
diff --git a/textproc/haxml/pkg-comment b/textproc/haxml/pkg-comment
deleted file mode 100644
index 6702cd978164..000000000000
--- a/textproc/haxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of utilities for using Haskell and XML together
diff --git a/textproc/haxml/pkg-descr b/textproc/haxml/pkg-descr
deleted file mode 100644
index b878e2e6ff0a..000000000000
--- a/textproc/haxml/pkg-descr
+++ /dev/null
@@ -1,8 +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/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/textproc/haxml/pkg-plist b/textproc/haxml/pkg-plist
deleted file mode 100644
index 9b31e486badf..000000000000
--- a/textproc/haxml/pkg-plist
+++ /dev/null
@@ -1,154 +0,0 @@
-bin/Canonicalise
-bin/DtdToHaskell
-bin/MkOneOf
-bin/Validate
-bin/Xtract
-%%NHC98%%include/nhc98/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
-%%NHC98%%include/nhc98/HaXml/Text/PrettyPrint/HughesPJ.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Combinators.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Haskell2Xml.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Html/Generate.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Html/Parse.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Lex.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/OneOfN.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Parse.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Pretty.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Types.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Validate.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Wrappers.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xml2Haskell.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml.hi
-%%NHC98%%lib/nhc98/ix86-FreeBSD/libHSHaXml.a
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/PrettyPrint/HughesPJ.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Combinators.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/Convert.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/Instance.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Haskell2Xml.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Generate.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Parse.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Lex.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/OneOfN.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Parse.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Lex.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Parse.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml.hi
-%%GHC%%lib/ghc-%%GHC_VERSION%%/HSHaXml.o
-%%GHC%%lib/ghc-%%GHC_VERSION%%/libHSHaXml.a
-%%PORTDOCS%%share/doc/haxml/Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.PrettyPrint.HughesPJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Convert.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Instance.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.TypeDef.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Generate.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Pretty.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Lex.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.OneOfN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Pretty.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Types.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Validate.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Wrappers.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xml2Haskell.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Combinators.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Lex.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Parse.html
-%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tA.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tB.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tC.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tD.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tE.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tF.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tG.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tH.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tI.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tK.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tL.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tM.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tO.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tP.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tQ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tR.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tS.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tT.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tU.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tV.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tW.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tX.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tY.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tZ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vA.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vB.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vC.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vD.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vE.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vF.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vG.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vH.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vI.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vJ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vK.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vL.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vM.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vN.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vO.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vP.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vQ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vR.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vS.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vT.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vU.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vV.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vW.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vX.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vY.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vZ.html
-%%PORTDOCS%%share/doc/haxml/HaXml/doc-index.html
-%%PORTDOCS%%share/doc/haxml/HaXml/haddock.css
-%%PORTDOCS%%share/doc/haxml/HaXml/haskell_icon.gif
-%%PORTDOCS%%share/doc/haxml/HaXml/index.html
-%%PORTDOCS%%share/doc/haxml/Haskell2Xml.html
-%%PORTDOCS%%share/doc/haxml/LICENSE
-%%PORTDOCS%%share/doc/haxml/Xml2Haskell.html
-%%PORTDOCS%%share/doc/haxml/Xtract.html
-%%PORTDOCS%%share/doc/haxml/brubeck.gif
-%%PORTDOCS%%share/doc/haxml/changelog.html
-%%PORTDOCS%%share/doc/haxml/icfp99.dvi
-%%PORTDOCS%%share/doc/haxml/icfp99.html
-%%PORTDOCS%%share/doc/haxml/icfp99.ps.gz
-%%PORTDOCS%%share/doc/haxml/index.html
-%%NHC98%%@dirrm include/nhc98/HaXml/Text/ParserCombinators
-%%NHC98%%@dirrm include/nhc98/HaXml/Text/PrettyPrint
-%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML/HaXml/Html
-%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML/HaXml
-%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML
-%%NHC98%%@dirrm include/nhc98/HaXml/Text
-%%NHC98%%@dirrm include/nhc98/HaXml
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/PrettyPrint
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text
-%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml
-%%PORTDOCS%%@dirrm share/doc/haxml/HaXml
-%%PORTDOCS%%@dirrm share/doc/haxml
-%%GHC%%@exec %D/bin/ghc-pkg -a < %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
-%%GHC%%@unexec %D/bin/ghc-pkg -r HaXml
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index c090f4157453..3b66e0b9bcb6 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.haskell.org/HaXml/ \
ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
DISTNAME= HaXml-${PORTVERSION}
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
@@ -19,7 +20,7 @@ BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
.else
WITH_GHC= yes
-BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hmake
+BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hs-hmake
.endif
.if defined(WITH_GHC)
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index c090f4157453..3b66e0b9bcb6 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.haskell.org/HaXml/ \
ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
DISTNAME= HaXml-${PORTVERSION}
+PKGNAMEPREFIX= hs-
MAINTAINER= obraun@FreeBSD.org
@@ -19,7 +20,7 @@ BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
.else
WITH_GHC= yes
-BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hmake
+BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hs-hmake
.endif
.if defined(WITH_GHC)
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc