13 files changed, 107 insertions, 329 deletions

diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile
index 90115ce41a25..e3a9d7646ffd 100644
--- a/devel/hs-hat/Makefile
+++ b/devel/hs-hat/Makefile
@@ -5,24 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	nhc98
-PORTVERSION=	1.12
+PORTVERSION=	1.14
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
 DISTNAME=	${PORTNAME}src-${PORTVERSION}
 DIST_SUBDIR=	nhc98
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.12-ranlib \
-		patch-1.12-hmake-config \
-		patch-1.12-getEnv
-
 MAINTAINER=	obraun@informatik.unibw-muenchen.de
 
-.if defined(WITH_TRACER)
-RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
-BUILD_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk11
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
@@ -30,15 +20,6 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST=		${WRKSRC}/pkg-plist
-
-.if !defined(WITH_TRACER)
-ALL_TARGET=	basic
-PLIST_SUB+=	TRACER="@comment "
-.else
-PLIST_SUB+=	TRACER=""
-MAKE_ENV+=	PATH=${PREFIX}/jdk1.1.8/bin:$$PATH
-.endif
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
@@ -54,21 +35,13 @@ CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/nhc98 +docs
 MAN1=		harch.1 hmake.1	hp2graph.1 nhc98.1 \
 		hat-detect.1 hat-observe.1 hat-stack.1 hat-trail.1
 
-pre-fetch:
-.if !defined(WITH_TRACER)
-	@${ECHO} ""
-	@${ECHO} "	To build nhc98 with the tracer (requires JAVA)"
-	@${ECHO} "	define WITH_TRACER"
-	@${ECHO} ""
-.else
-	@${ECHO} ""
-	@${ECHO} "	Building nhc98 with the tracer (requires JAVA)"
-	@${ECHO} ""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc
 
+post-configure:
+	@${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \
+		>> ${WRKSRC}/targets/ix86-FreeBSD/config.cache
+
 pre-install:
 .if exists(${PREFIX}/bin/hmake) && !defined(OVERRIDE_HMAKE)
 	@${ECHO} ""
@@ -78,19 +51,6 @@ pre-install:
 	@${ECHO} ""
 	@${FALSE}
 .endif
-# We need this to ensure that the libs will be installed into
-# ${PREFIX}/lib/nhc98. Otherwise the libs will be installed
-# into the build directory. The configure option won't work in the
-# ports system.
-	${RM} -f ${WRKSRC}/include/*.orig
-	${SED} -e "s#LIBDIR=.*##" \
-	       < ${WRKSRC}/targets/ix86-FreeBSD/config.cache \
-	       > ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1
-	${ECHO} "LIBDIR=${PREFIX}/lib/nhc98" \
-	        >> ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1
-	${RM} ${WRKSRC}/targets/ix86-FreeBSD/config.cache
-	${MV} ${WRKSRC}/targets/ix86-FreeBSD/config.cache.fix1 \
-	      ${WRKSRC}/targets/ix86-FreeBSD/config.cache
 
 post-install:
 	${SED} -e "s#/usr/doc/nhc98#${PREFIX}/share/doc/nhc98#" \
diff --git a/devel/hs-hat/distinfo b/devel/hs-hat/distinfo
index 233beff00f29..62b2d02c0e47 100644
--- a/devel/hs-hat/distinfo
+++ b/devel/hs-hat/distinfo
@@ -1,4 +1 @@
-MD5 (nhc98/nhc98src-1.12.tar.gz) = cd10466ba0f06a19c55a67d3b9afd95c
-MD5 (nhc98/patch-1.12-ranlib) = cdf4b449d96ca7b4caf25ac8176f1870
-MD5 (nhc98/patch-1.12-hmake-config) = 3d55e0f423cbf8a899d60b85cefcc844
-MD5 (nhc98/patch-1.12-getEnv) = deae8fae985674b5a477ee8da85160e6
+MD5 (nhc98/nhc98src-1.14.tar.gz) = 2d19e65360e0370cb88cb0adad3014bb
diff --git a/devel/hs-hat/files/patch-Makefile b/devel/hs-hat/files/patch-Makefile
index 0df5f2df1033..944bdf4a06de 100644
--- a/devel/hs-hat/files/patch-Makefile
+++ b/devel/hs-hat/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Mar 15 20:32:19 2002
-+++ Makefile	Fri Mar 15 20:33:50 2002
-@@ -143,15 +143,15 @@
+--- Makefile.orig	Fri Jun 14 18:23:12 2002
++++ Makefile	Fri Jun 14 18:24:00 2002
+@@ -141,15 +141,15 @@
  
  TARGDIR= targets
  TARGETS= runtime prelude greencard hp2graph hattools \
@@ -23,7 +23,7 @@
  
  .PHONY: default basic all tracer compiler help config install hat hattools
  
-@@ -185,8 +185,8 @@
+@@ -183,8 +183,8 @@
  basic-nhc: $(PRAGMA) runtime hmake-nhc greencard-nhc compiler-nhc prelude
  basic-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc compiler-hbc prelude
  basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude
@@ -32,9 +32,9 @@
 +basic-gcc:   runtime prelude-gcc pragma-gcc compiler-gcc \
 +		 greencard-gcc hmake-gcc
  
- all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui
+ all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #tracer #hoodui
  
-@@ -206,9 +206,9 @@
+@@ -204,9 +204,9 @@
  		compiler-ghc traceruntime traceprelude hattools hat-ghc
  tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \
  		compiler-hbc traceruntime traceprelude hattools
diff --git a/devel/hs-hat/files/patch-include::localmalloc.h b/devel/hs-hat/files/patch-include::localmalloc.h
deleted file mode 100644
index 67a3ad4abe3e..000000000000
--- a/devel/hs-hat/files/patch-include::localmalloc.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/localmalloc.h.orig	Sun Mar 17 21:18:36 2002
-+++ include/localmalloc.h	Sun Mar 17 21:18:55 2002
-@@ -1,5 +1,5 @@
- #if defined(__APPLE__)
- #include <sys/malloc.h>
- #else
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
diff --git a/devel/hs-hat/files/patch-script::confhat b/devel/hs-hat/files/patch-script::confhat
deleted file mode 100644
index b117588b0dfb..000000000000
--- a/devel/hs-hat/files/patch-script::confhat
+++ /dev/null
@@ -1,9 +0,0 @@
---- script/confhat.orig	Wed Mar 20 12:03:42 2002
-+++ script/confhat	Wed Mar 20 12:35:43 2002
-@@ -14,5 +14,5 @@
- 
- cp -p lib/$MACHINE/libHShat.a $GHCLIBDIR
- cp -p lib/hat/*.hi lib/hat/*.hx $GHCINCDIR/hat
--ghc-pkg --remove-package=hat || /bin/true
-+ghc-pkg --remove-package=hat || /usr/bin/true
- ghc-pkg --add-package <lib/hat/hat-package.conf
diff --git a/devel/hs-hat/files/patch-src::greencard::Makefile b/devel/hs-hat/files/patch-src::greencard::Makefile
deleted file mode 100644
index 51d95c1effb8..000000000000
--- a/devel/hs-hat/files/patch-src::greencard::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/greencard/Makefile.orig	Fri Mar 15 21:04:02 2002
-+++ src/greencard/Makefile	Fri Mar 15 21:06:49 2002
-@@ -34,7 +34,7 @@
- 
- 
- $(OBJDIR):
--	mkdir -p $(OBJDIR) || /bin/true
-+	mkdir -p $(OBJDIR) || /usr/bin/true
- $(TARGET): $(OBJDIR) $(OBJDIR)/GreenCard$(EXE)
- 	mv $(OBJDIR)/GreenCard$(EXE) $(TARGET)
- 	strip $(TARGET)
diff --git a/devel/hs-hat/files/patch-src::hat::lib::Makefile b/devel/hs-hat/files/patch-src::hat::lib::Makefile
deleted file mode 100644
index a1811991c92a..000000000000
--- a/devel/hs-hat/files/patch-src::hat::lib::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hat/lib/Makefile.orig	Fri Mar 15 21:03:40 2002
-+++ src/hat/lib/Makefile	Fri Mar 15 21:06:25 2002
-@@ -41,7 +41,7 @@
- all: $(OBJDIR) $(TARGET)
- install: install-$(HC)
- install-ghc: $(OBJDIR) $(TARGET)
--	mkdir $(LIBDIR)/hat || /bin/true
-+	mkdir $(LIBDIR)/hat || /usr/bin/true
- 	$(INSTALL) *.hi *.hx hat-package.conf $(LIBDIR)/hat
- install-nhc98: $(OBJDIR) $(TARGET)
- 	$(INSTALL) *.hi *.hx $(INCDIR)
diff --git a/devel/hs-hat/files/patch-src::hmake::Makefile b/devel/hs-hat/files/patch-src::hmake::Makefile
deleted file mode 100644
index b3ce1c62e625..000000000000
--- a/devel/hs-hat/files/patch-src::hmake::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hmake/Makefile.orig	Fri Mar 15 21:04:20 2002
-+++ src/hmake/Makefile	Fri Mar 15 21:07:06 2002
-@@ -63,7 +63,7 @@
- 	strip $@
- 
- $(OBJDIR):
--	mkdir -p $(OBJDIR) || /bin/true
-+	mkdir -p $(OBJDIR) || /usr/bin/true
- $(OBJS): $(OBJDIR)/%.$O : %.hs
- 	$(HC) $(HFLAGS) -c -o $@ $<
- $(CPPOBJS) $(OBJDIR)/Older.$O $(OBJDIR)/MkConfig.$O: $(OBJDIR)/%.$O : %.hs
diff --git a/devel/hs-hat/files/patch-src::hp2graph::Makefile b/devel/hs-hat/files/patch-src::hp2graph::Makefile
deleted file mode 100644
index 109f73ad8ca6..000000000000
--- a/devel/hs-hat/files/patch-src::hp2graph::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hp2graph/Makefile.orig	Fri Mar 15 21:04:12 2002
-+++ src/hp2graph/Makefile	Fri Mar 15 21:06:58 2002
-@@ -31,7 +31,7 @@
- 
- 
- $(OBJDIR):
--	mkdir -p $(OBJDIR) || /bin/true
-+	mkdir -p $(OBJDIR) || /usr/bin/true
- 
- $(OBJS): $(OBJDIR)/%.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/devel/hs-hat/files/patch-src::prelude::Makefile b/devel/hs-hat/files/patch-src::prelude::Makefile
deleted file mode 100644
index 3ab026678c81..000000000000
--- a/devel/hs-hat/files/patch-src::prelude::Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/prelude/Makefile.orig	Fri Mar 15 21:03:48 2002
-+++ src/prelude/Makefile	Fri Mar 15 21:06:41 2002
-@@ -79,7 +79,7 @@
- 	mkdir -p ${OBJDIR}
- 
- ${OBJDIRS}: ${OBJDIR}/% :
--	mkdir -p $@ || /bin/true
-+	mkdir -p $@ || /usr/bin/true
- 
- 
- ifeq "${TPROF}" ""
-@@ -328,9 +328,9 @@
- 
- 
- ${OBJDIR}:
--	mkdir -p ${OBJDIR} || /bin/true
-+	mkdir -p ${OBJDIR} || /usr/bin/true
- ${OBJDIRS}: ${OBJDIR}/% :
--	mkdir -p $@ || /bin/true
-+	mkdir -p $@ || /usr/bin/true
- 
- ifeq "${TPROF}" ""
- 
diff --git a/devel/hs-hat/files/patch-src::runtime::Makefile b/devel/hs-hat/files/patch-src::runtime::Makefile
deleted file mode 100644
index dfcbe2d97ee0..000000000000
--- a/devel/hs-hat/files/patch-src::runtime::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/runtime/Makefile.orig	Fri Mar 15 21:03:33 2002
-+++ src/runtime/Makefile	Fri Mar 15 21:06:15 2002
-@@ -13,7 +13,7 @@
-   SUF=.${CFG}
- endif
- 
--TRUE = /bin/true
-+TRUE = /usr/bin/true
- LDFLAGS = -r
- ARFLAGS = r
- 
-@@ -51,7 +51,7 @@
- 	mkdir -p ${OBJDIR}
- 
- ${OBJDIRS}: ${OBJDIR}/% :
--	mkdir -p $@  || /bin/true
-+	mkdir -p $@  || /usr/bin/true
- 
- objdir: ${OBJDIR}
- 	cd Kernel;  $(MAKE) objdir
diff --git a/devel/hs-hat/pkg-plist b/devel/hs-hat/pkg-plist
index f62234c02127..b435ec5be4af 100644
--- a/devel/hs-hat/pkg-plist
+++ b/devel/hs-hat/pkg-plist
@@ -7,198 +7,70 @@ bin/hood
 bin/greencard-nhc98
 bin/tprofprel
 bin/hp2graph
-bin/hat-trail-in-java
-bin/hat-trans
-bin/hat-stack
-bin/hat-connect
-bin/hat-check
-bin/hat-observe
-bin/hat-detect
-bin/hat-checki
-bin/hat-port
-bin/hat-view
-bin/hat-names
-bin/hat-trail
-lib/nhc98/hat-trail.jar
-lib/nhc98/hood.jar
-lib/nhc98/ix86-FreeBSD/Prelude.a
-lib/nhc98/ix86-FreeBSD/Runtime.a
-lib/nhc98/ix86-FreeBSD/config
-lib/nhc98/ix86-FreeBSD/greencard-nhc98
-lib/nhc98/ix86-FreeBSD/hmake-PRAGMA
-lib/nhc98/ix86-FreeBSD/hmakerc
-lib/nhc98/ix86-FreeBSD/libdebug.a
-lib/nhc98/ix86-FreeBSD/main.o
-lib/nhc98/ix86-FreeBSD/mutator.o
-lib/nhc98/ix86-FreeBSD/mutlib.o
-lib/nhc98/ix86-FreeBSD/nhc98comp
-lib/nhc98/ix86-FreeBSD/nhc98heap
-lib/nhc98/ix86-FreeBSD/HInteractive
-lib/nhc98/ix86-FreeBSD/MkConfig
-lib/nhc98/ix86-FreeBSD/MkProg
-lib/nhc98/ix86-FreeBSD/Older
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-check
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-checki
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-connect
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-detect
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-observe
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-stack
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-trail
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-view
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hp2graph
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Array.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/BinArray.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Binary.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Bit.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/CPUTime.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/CString.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Char.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Complex.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/DErrNo.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/DbgIface.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Directory.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Driver.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/FFI.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/GreenCard.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Haskell.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/IO.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/IOExtras.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Ix.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/List.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Locale.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Maybe.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Monad.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/NonStdEval.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/NonStdGetPID.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/NonStdProfile.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/NonStdTrace.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/NonStdUnsafeCoerce.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Numeric.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Observe.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/PackedString.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Prelude.T.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Prelude.p.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/PreludeAll.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Random.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Ratio.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Runtime.T.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Runtime.p.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Runtime.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/System.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Time.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/UnboxedArray.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/Warning.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/hat-port
-%%TRACER%%lib/nhc98/ix86-FreeBSD/libdebug.T.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/libdebug.p.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/libdebug.z.a
-%%TRACER%%lib/nhc98/ix86-FreeBSD/main.T.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/main.p.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/main.z.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutator.T.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutator.p.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutator.z.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutlib.T.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutlib.p.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/mutlib.z.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel1.z.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel2.z.o
-%%TRACER%%lib/nhc98/ix86-FreeBSD/tprofprel3.z.o
 include/nhc98/Array.T.hi
 include/nhc98/Array.hi
-include/nhc98/Array.hx
 include/nhc98/BinArray.hi
-include/nhc98/BinArray.hx
 include/nhc98/Binary.T.hi
 include/nhc98/Binary.hi
-include/nhc98/Binary.hx
 include/nhc98/Bit.hi
-include/nhc98/Bit.hx
 include/nhc98/CPUTime.T.hi
 include/nhc98/CPUTime.hi
-include/nhc98/CPUTime.hx
 include/nhc98/Char.T.hi
 include/nhc98/Char.hi
-include/nhc98/Char.hx
 include/nhc98/Complex.T.hi
 include/nhc98/Complex.hi
-include/nhc98/Complex.hx
 include/nhc98/DPrelude.hi
 include/nhc98/DbgIface.hi
 include/nhc98/DbgStub.hi
 include/nhc98/Directory.T.hi
 include/nhc98/Directory.hi
-include/nhc98/Directory.hx
 include/nhc98/FFI.T.hi
 include/nhc98/FFI.hi
-include/nhc98/FFI.hx
 include/nhc98/FFIBuiltin.T.hi
 include/nhc98/FFIBuiltin.hi
-include/nhc98/FFIBuiltin.hx
 include/nhc98/GreenCard.T.hi
 include/nhc98/GreenCard.gc
 include/nhc98/GreenCard.hi
-include/nhc98/GreenCard.hx
 include/nhc98/Haskell.hi
-include/nhc98/Haskell.hx
-include/nhc98/Hat.hi
 include/nhc98/HatBuiltin.hi
 include/nhc98/HsFFI.h
 include/nhc98/IO.T.hi
 include/nhc98/IO.hi
-include/nhc98/IO.hx
 include/nhc98/IOExtras.T.hi
 include/nhc98/IOExtras.hi
-include/nhc98/IOExtras.hx
 include/nhc98/Ix.T.hi
 include/nhc98/Ix.hi
-include/nhc98/Ix.hx
 include/nhc98/List.T.hi
 include/nhc98/List.hi
-include/nhc98/List.hx
 include/nhc98/Locale.hi
-include/nhc98/Locale.hx
 include/nhc98/Maybe.T.hi
 include/nhc98/Maybe.hi
-include/nhc98/Maybe.hx
 include/nhc98/Monad.T.hi
 include/nhc98/Monad.hi
-include/nhc98/Monad.hx
 include/nhc98/NonStdEval.hi
 include/nhc98/NonStdGetPID.hi
 include/nhc98/NonStdProfile.hi
 include/nhc98/NonStdTrace.T.hi
 include/nhc98/NonStdTrace.hi
-include/nhc98/NonStdTrace.hx
 include/nhc98/NonStdUnsafeCoerce.T.hi
 include/nhc98/NonStdUnsafeCoerce.hi
 include/nhc98/Numeric.T.hi
 include/nhc98/Numeric.hi
-include/nhc98/Numeric.hx
 include/nhc98/Observe.hi
 include/nhc98/PackedString.T.hi
 include/nhc98/PackedString.hi
-include/nhc98/PackedString.hx
 include/nhc98/Prelude.T.hi
 include/nhc98/Prelude.hi
-include/nhc98/Prelude.hx
 include/nhc98/PreludeBuiltin.T.hi
 include/nhc98/PreludeBuiltin.hi
-include/nhc98/PreludeBuiltin.hx
 include/nhc98/Q8defs.h
 include/nhc98/Random.T.hi
 include/nhc98/Random.hi
-include/nhc98/Random.hx
 include/nhc98/Ratio.T.hi
 include/nhc98/Ratio.hi
-include/nhc98/Ratio.hx
 include/nhc98/System.T.hi
 include/nhc98/System.hi
-include/nhc98/System.hx
-include/nhc98/TChar.hi
 include/nhc98/Time.hi
-include/nhc98/Time.hx
-include/nhc98/TPrelude.hi
 include/nhc98/Warning.hi
 include/nhc98/art.h
 include/nhc98/bytecode.h
@@ -220,9 +92,72 @@ include/nhc98/node.h
 include/nhc98/runtime.h
 include/nhc98/stableptr.h
 include/nhc98/twopass.h
-@dirrm lib/nhc98/ix86-FreeBSD
-@dirrm lib/nhc98
-@dirrm include/nhc98
+lib/nhc98/hood.jar
+lib/nhc98/ix86-FreeBSD/Array.z.a
+lib/nhc98/ix86-FreeBSD/BinArray.z.a
+lib/nhc98/ix86-FreeBSD/Binary.z.a
+lib/nhc98/ix86-FreeBSD/Bit.z.a
+lib/nhc98/ix86-FreeBSD/CPUTime.z.a
+lib/nhc98/ix86-FreeBSD/CString.z.a
+lib/nhc98/ix86-FreeBSD/Char.z.a
+lib/nhc98/ix86-FreeBSD/Complex.z.a
+lib/nhc98/ix86-FreeBSD/DErrNo.z.a
+lib/nhc98/ix86-FreeBSD/DbgIface.z.a
+lib/nhc98/ix86-FreeBSD/Directory.z.a
+lib/nhc98/ix86-FreeBSD/Driver.z.a
+lib/nhc98/ix86-FreeBSD/FFI.z.a
+lib/nhc98/ix86-FreeBSD/GreenCard.z.a
+lib/nhc98/ix86-FreeBSD/Haskell.z.a
+lib/nhc98/ix86-FreeBSD/IO.z.a
+lib/nhc98/ix86-FreeBSD/IOExtras.z.a
+lib/nhc98/ix86-FreeBSD/Ix.z.a
+lib/nhc98/ix86-FreeBSD/List.z.a
+lib/nhc98/ix86-FreeBSD/Locale.z.a
+lib/nhc98/ix86-FreeBSD/Maybe.z.a
+lib/nhc98/ix86-FreeBSD/Monad.z.a
+lib/nhc98/ix86-FreeBSD/NonStdEval.z.a
+lib/nhc98/ix86-FreeBSD/NonStdGetPID.z.a
+lib/nhc98/ix86-FreeBSD/NonStdProfile.z.a
+lib/nhc98/ix86-FreeBSD/NonStdTrace.z.a
+lib/nhc98/ix86-FreeBSD/NonStdUnsafeCoerce.z.a
+lib/nhc98/ix86-FreeBSD/Numeric.z.a
+lib/nhc98/ix86-FreeBSD/Observe.z.a
+lib/nhc98/ix86-FreeBSD/PackedString.z.a
+lib/nhc98/ix86-FreeBSD/Prelude.a
+lib/nhc98/ix86-FreeBSD/Prelude.p.a
+lib/nhc98/ix86-FreeBSD/PreludeAll.z.a
+lib/nhc98/ix86-FreeBSD/Random.z.a
+lib/nhc98/ix86-FreeBSD/Ratio.z.a
+lib/nhc98/ix86-FreeBSD/Runtime.a
+lib/nhc98/ix86-FreeBSD/Runtime.p.a
+lib/nhc98/ix86-FreeBSD/Runtime.z.a
+lib/nhc98/ix86-FreeBSD/System.z.a
+lib/nhc98/ix86-FreeBSD/Time.z.a
+lib/nhc98/ix86-FreeBSD/UnboxedArray.z.a
+lib/nhc98/ix86-FreeBSD/Warning.z.a
+lib/nhc98/ix86-FreeBSD/config
+lib/nhc98/ix86-FreeBSD/greencard-nhc98
+lib/nhc98/ix86-FreeBSD/hmake-PRAGMA
+lib/nhc98/ix86-FreeBSD/hp2graph
+lib/nhc98/ix86-FreeBSD/main.o
+lib/nhc98/ix86-FreeBSD/main.p.o
+lib/nhc98/ix86-FreeBSD/main.z.o
+lib/nhc98/ix86-FreeBSD/mutator.o
+lib/nhc98/ix86-FreeBSD/mutator.p.o
+lib/nhc98/ix86-FreeBSD/mutator.z.o
+lib/nhc98/ix86-FreeBSD/mutlib.o
+lib/nhc98/ix86-FreeBSD/mutlib.p.o
+lib/nhc98/ix86-FreeBSD/mutlib.z.o
+lib/nhc98/ix86-FreeBSD/nhc98comp
+lib/nhc98/ix86-FreeBSD/nhc98heap
+lib/nhc98/ix86-FreeBSD/tprofprel1.z.o
+lib/nhc98/ix86-FreeBSD/tprofprel2.z.o
+lib/nhc98/ix86-FreeBSD/tprofprel3.z.o
+lib/hmake/ix86-FreeBSD/HInteractive
+lib/hmake/ix86-FreeBSD/MkConfig
+lib/hmake/ix86-FreeBSD/MkProg
+lib/hmake/ix86-FreeBSD/Older
+lib/hmake/ix86-FreeBSD/hmakerc
 %%PORTDOCS%%share/doc/nhc98/98.html
 %%PORTDOCS%%share/doc/nhc98/CcallingHaskell.html
 %%PORTDOCS%%share/doc/nhc98/bugs.html
@@ -235,6 +170,7 @@ include/nhc98/twopass.h
 %%PORTDOCS%%share/doc/nhc98/errmsgs.html
 %%PORTDOCS%%share/doc/nhc98/extensions.html
 %%PORTDOCS%%share/doc/nhc98/ffi.html
+%%PORTDOCS%%share/doc/nhc98/fig1.gif
 %%PORTDOCS%%share/doc/nhc98/fig2.html
 %%PORTDOCS%%share/doc/nhc98/fig3.html
 %%PORTDOCS%%share/doc/nhc98/fig4.html
@@ -249,20 +185,20 @@ include/nhc98/twopass.h
 %%PORTDOCS%%share/doc/nhc98/limits.html
 %%PORTDOCS%%share/doc/nhc98/limits.html.inst
 %%PORTDOCS%%share/doc/nhc98/maillist.html
+%%PORTDOCS%%share/doc/nhc98/new_tiny.gif
+%%PORTDOCS%%share/doc/nhc98/nhc13.gif
+%%PORTDOCS%%share/doc/nhc98/nhc98.gif
 %%PORTDOCS%%share/doc/nhc98/runtime-options.html
 %%PORTDOCS%%share/doc/nhc98/status.html
-%%PORTDOCS%%share/doc/nhc98/new_tiny.gif
 %%PORTDOCS%%share/doc/nhc98/todo.html
 %%PORTDOCS%%share/doc/nhc98/tprof.html
 %%PORTDOCS%%share/doc/nhc98/tracer.html
 %%PORTDOCS%%share/doc/nhc98/windows.html
 %%PORTDOCS%%share/doc/nhc98/york-release.html
-%%PORTDOCS%%share/doc/nhc98/fig1.gif
-%%PORTDOCS%%share/doc/nhc98/nhc13.gif
-%%PORTDOCS%%share/doc/nhc98/nhc98.gif
 %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test1.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test10.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/Nhc13Test13.hs
+%%PORTDOCS%%share/doc/nhc98/bugs/README
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc13test1.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc13test10.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc13test11.hs
@@ -288,29 +224,45 @@ include/nhc98/twopass.h
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test21.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs
-%%PORTDOCS%%share/doc/nhc98/bugs/README
 %%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs
 %%PORTDOCS%%share/doc/nhc98/hat/BadInsort.hs
 %%PORTDOCS%%share/doc/nhc98/hat/Insort.hs
 %%PORTDOCS%%share/doc/nhc98/hat/browser-detail.html
 %%PORTDOCS%%share/doc/nhc98/hat/bugs-tools.html
+%%PORTDOCS%%share/doc/nhc98/hat/bugs.html
+%%PORTDOCS%%share/doc/nhc98/hat/config.html
+%%PORTDOCS%%share/doc/nhc98/hat/copyright.html
+%%PORTDOCS%%share/doc/nhc98/hat/download.html
 %%PORTDOCS%%share/doc/nhc98/hat/faq.html
-%%PORTDOCS%%share/doc/nhc98/hat/fest-0202.bugs
 %%PORTDOCS%%share/doc/nhc98/hat/feature-table.html
+%%PORTDOCS%%share/doc/nhc98/hat/fest-0202.bugs
 %%PORTDOCS%%share/doc/nhc98/hat/frejaHatHood.ps.gz
+%%PORTDOCS%%share/doc/nhc98/hat/hat-reference.tex
 %%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.eps
 %%PORTDOCS%%share/doc/nhc98/hat/hat-trail-1.pdf
 %%PORTDOCS%%share/doc/nhc98/hat/hat-trail.gif
 %%PORTDOCS%%share/doc/nhc98/hat/hat.gif
+%%PORTDOCS%%share/doc/nhc98/hat/hatuser-old.html
 %%PORTDOCS%%share/doc/nhc98/hat/hatuser.dvi
+%%PORTDOCS%%share/doc/nhc98/hat/hatuser.html
+%%PORTDOCS%%share/doc/nhc98/hat/hatuser.pdf
+%%PORTDOCS%%share/doc/nhc98/hat/hatuser.ps
 %%PORTDOCS%%share/doc/nhc98/hat/hatuser.tex
+%%PORTDOCS%%share/doc/nhc98/hat/hatuser001.gif
+%%PORTDOCS%%share/doc/nhc98/hat/hw01-draft.ps.gz
 %%PORTDOCS%%share/doc/nhc98/hat/index.html
+%%PORTDOCS%%share/doc/nhc98/hat/install.html
+%%PORTDOCS%%share/doc/nhc98/hat/libraries.html
 %%PORTDOCS%%share/doc/nhc98/hat/limitations-detail.html
 %%PORTDOCS%%share/doc/nhc98/hat/limitations.html
 %%PORTDOCS%%share/doc/nhc98/hat/maillist.html
+%%PORTDOCS%%share/doc/nhc98/hat/newhat.ps.gz
 %%PORTDOCS%%share/doc/nhc98/hat/old-tracing.html
 %%PORTDOCS%%share/doc/nhc98/hat/paper.dvi
 %%PORTDOCS%%share/doc/nhc98/hat/proposal.html
+%%PORTDOCS%%share/doc/nhc98/hat/publications.html
+%%PORTDOCS%%share/doc/nhc98/hat/requirements.html
+%%PORTDOCS%%share/doc/nhc98/hat/status.html
 %%PORTDOCS%%share/doc/nhc98/hat/toolkitThesis.ps.gz
 %%PORTDOCS%%share/doc/nhc98/hat/tracing.html
 %%PORTDOCS%%share/doc/nhc98/hat/tutorial1.dvi
@@ -319,16 +271,10 @@ include/nhc98/twopass.h
 %%PORTDOCS%%share/doc/nhc98/hat/tutorial1.pdf
 %%PORTDOCS%%share/doc/nhc98/hat/tutorial1.ps
 %%PORTDOCS%%share/doc/nhc98/hat/tutorial1.tex
-%%PORTDOCS%%share/doc/nhc98/hat/hatuser.pdf
-%%PORTDOCS%%share/doc/nhc98/hat/hatuser.html
-%%PORTDOCS%%share/doc/nhc98/hat/hatuser001.gif
-%%PORTDOCS%%share/doc/nhc98/hat/hatuser.ps
-%%PORTDOCS%%share/doc/nhc98/hat/hw01-draft.ps.gz
-%%PORTDOCS%%share/doc/nhc98/hat/newhat.ps.gz
 %%PORTDOCS%%share/doc/nhc98/hmake/changes.html
 %%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html
-%%PORTDOCS%%share/doc/nhc98/hmake/hmake.html
 %%PORTDOCS%%share/doc/nhc98/hmake/hmake-config.html
+%%PORTDOCS%%share/doc/nhc98/hmake/hmake.html
 %%PORTDOCS%%share/doc/nhc98/hmake/index.html
 %%PORTDOCS%%share/doc/nhc98/hmake/interactive.html
 %%PORTDOCS%%share/doc/nhc98/hmake/lineedit.html
@@ -353,3 +299,8 @@ include/nhc98/twopass.h
 %%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes
 %%PORTDOCS%%@dirrm share/doc/nhc98/libs
 %%PORTDOCS%%@dirrm share/doc/nhc98
+@dirrm include/nhc98
+@dirrm lib/hmake/ix86-FreeBSD
+@dirrm lib/hmake
+@dirrm lib/nhc98/ix86-FreeBSD
+@dirrm lib/nhc98
diff --git a/devel/hs-hat/scripts/pre-install b/devel/hs-hat/scripts/pre-install
deleted file mode 100644
index f7fcf3ca9a72..000000000000
--- a/devel/hs-hat/scripts/pre-install
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-rm -f ${WRKSRC}/pkg-plist && touch ${WRKSRC}/pkg-plist
-
-MACHINE=`${WRKSRC}/script/harch`
-
-if [ `grep -c ghc ${WRKSRC}/lib/${MACHINE}/hmakerc` -gt 0 ]
-then
-    echo "lib/nhc98/ix86-FreeBSD/hat-trans" >> ${WRKSRC}/pkg-plist
-    if [ ${WITH_TRACER} ]
-    then
-	ONEDIR=`grep ghc ${WRKSRC}/lib/${MACHINE}/hmakerc | grep import | head -1 | cut -d'"' -f2 | sed -e "s#${PREFIX}/##"`
-	GHCINCDIR=`dirname $ONEDIR`
-	GHCLIBDIR=`dirname $GHCINCDIR`
-	FILES=`ls ${WRKSRC}/lib/hat/ | grep 'hi$\|hx$' | sed -e "s#^.*/lib/hat/##g"`
-	echo "lib/nhc98/ix86-FreeBSD/libHShat.a" >> ${WRKSRC}/pkg-plist
-	echo "${GHCLIBDIR}/libHShat.a" >> ${WRKSRC}/pkg-plist
-	for file in ${FILES}; do
-		echo ${GHCINCDIR}/hat/${file} >> ${WRKSRC}/pkg-plist
-	done
-	echo "@dirrm ${GHCINCDIR}/hat" >> ${WRKSRC}/pkg-plist
-    fi
-fi
-
-cat ${CURDIR}/pkg-plist >> ${WRKSRC}/pkg-plist