Update to version 1.06.

Changes include:

* Updated  the  Prelude/Libraries  to  match the newly revised
  Haskell'98 Report.
* Default  build  target  is  now  basic + tracer (was just basic).
* Building  with  gcc  now  builds  everything  with  gcc, including
  profiling and tracing. This is much faster.
* Bugfixes.

4 files changed, 42 insertions, 77 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 2b040482a8d..69ac10002f4 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/05/22 13:20:57 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/07/15 12:40:20 jtb Exp $
 
-DISTNAME=		nhc98src-1.04
-PKGNAME=		nhc98-1.04
+DISTNAME=		nhc98src-1.06
+PKGNAME=		nhc98-1.06
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
@@ -9,12 +9,15 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.york.ac.uk/fp/nhc98/
 COMMENT=		Portable Haskell 98 compiler
 
+DEPENDS+=		ncurses>=5.2:../../devel/ncurses
+
 # Not yet ported to 64-bit machines
 NOT_FOR_PLATFORM=	*-*-alpha
 
 WRKSRC=			${WRKDIR}/${PKGNAME}
 
-HAS_CONFIGURE=		#defined
+HAS_CONFIGURE=		yes
+CONFIGURE_ENV+=		CC=gcc
 CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 			+docs --docdir=${PREFIX}/share/doc/nhc98
 
@@ -22,12 +25,13 @@ CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 # hbc (Chalmers Haskell).
 
 USE_GMAKE=		yes
-ALL_TARGET=		basic-gcc
+
+ALL_TARGET=		default
 
 HARCH=			`${WRKSRC}/script/harch`
 PLIST_SUBST+=		HARCH=${HARCH}
 
 post-extract:
-	${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 1579a5e7b16..3c3be75147c 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,5 +1,5 @@
-SHA1 (patch-aa) = dbe63c3e3cbf2182d40cda9b28757f0b93548d0c
+$NetBSD: distinfo,v 1.4 2001/07/15 12:40:20 jtb Exp $
 
-SHA1 (nhc98src-1.04.tar.gz) = 1a3ed2bf54a0ad8620ea5db7eaf9576323b5f2ae
-Size (nhc98src-1.04.tar.gz) = 3211304 bytes
-SHA1 (patch-aa) = dbe63c3e3cbf2182d40cda9b28757f0b93548d0c
+SHA1 (nhc98src-1.06.tar.gz) = acae0326af4321c78db9179bdd2d6825906815bb
+Size (nhc98src-1.06.tar.gz) = 5753553 bytes
+SHA1 (patch-aa) = 1ae868ccb72832d6a13ff6de7dd822386cacb9eb
diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa
index 726284c2079..88964f36d0c 100644
--- a/lang/nhc98/patches/patch-aa
+++ b/lang/nhc98/patches/patch-aa
@@ -1,66 +1,15 @@
-$NetBSD: patch-aa,v 1.1 2001/05/22 00:45:55 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/15 12:40:20 jtb Exp $
 
---- Makefile.orig	Tue May 22 00:22:29 2001
-+++ Makefile
-@@ -149,10 +149,10 @@
- 	 timeruntime timeprelude \
- 	 timetraceruntime timetraceprelude \
- 	 traceruntime traceprelude \
--	 compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \
--	 hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \
--	 greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \
--	 prelude-$(CC) pragma-$(CC)
-+	 compiler-nhc compiler-hbc compiler-ghc compiler-gcc \
-+	 hmake-nhc hmake-hbc hmake-ghc hmake-gcc \
-+	 greencard-nhc greencard-hbc greencard-ghc greencard-gcc \
-+	 prelude-gcc pragma-gcc
+--- src/tracer/hat/Makefile.orig	Fri Jun  1 14:13:44 2001
++++ src/tracer/hat/Makefile
+@@ -47,8 +47,8 @@
  
- .PHONY: basic all tracer compiler help config install hattools
  
-@@ -182,8 +182,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
--basic-$(CC):   runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \
--		 greencard-$(CC) hmake-$(CC)
-+basic-gcc:   runtime prelude-gcc pragma-gcc compiler-gcc \
-+		 greencard-gcc hmake-gcc
+ # Thorsten's libraries and tools
+-THORFLAGS = -g
+-LINKFLAGS = -lncurses -g
++THORFLAGS = -I$(LOCALBASE)/include
++LINKFLAGS = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lncurses
  
- all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui
- 
-@@ -302,25 +302,25 @@
- 	touch $(TARGDIR)/$(MACHINE)/timeprelude
- 
- 
--$(TARGDIR)/$(MACHINE)/prelude-$(CC): $(PRELUDEC)
-+$(TARGDIR)/$(MACHINE)/prelude-gcc: $(PRELUDEC)
- 	cd src/prelude;        $(MAKE) fromC 
--	touch $(TARGDIR)/$(MACHINE)/prelude-$(CC)
--$(TARGDIR)/$(MACHINE)/compiler-$(CC): $(COMPILERC)
-+	touch $(TARGDIR)/$(MACHINE)/prelude-gcc
-+$(TARGDIR)/$(MACHINE)/compiler-gcc: $(COMPILERC)
- 	cd src/compiler98;     $(MAKE) fromC
- 	cd src/prelude/$(MACHINE); $(MAKE) clean all	# Patch machine-specific parts.
- 	cd src/prelude;        $(MAKE) relink
- 	cd src/compiler98;     $(MAKE) relink
--	touch $(TARGDIR)/$(MACHINE)/compiler-$(CC)
--$(TARGDIR)/$(MACHINE)/greencard-$(CC): $(GREENCARDC)
-+	touch $(TARGDIR)/$(MACHINE)/compiler-gcc
-+$(TARGDIR)/$(MACHINE)/greencard-gcc: $(GREENCARDC)
- 	cd src/greencard;      $(MAKE) fromC
--	touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-$(CC)
--$(TARGDIR)/$(MACHINE)/pragma-$(CC): script/hmake-PRAGMA.c
-+	touch $(TARGDIR)/$(MACHINE)/greencard $(TARGDIR)/$(MACHINE)/greencard-gcc
-+$(TARGDIR)/$(MACHINE)/pragma-gcc: script/hmake-PRAGMA.c
- 	script/nhc98 -o $(PRAGMA) script/hmake-PRAGMA.c
--	touch $(TARGDIR)/$(MACHINE)/pragma-$(CC)
--$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC)
-+	touch $(TARGDIR)/$(MACHINE)/pragma-gcc
-+$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC)
- 	cd src/hmake;          $(MAKE) fromC
- 	cd src/interpreter;    $(MAKE) fromC
--	touch $(TARGDIR)/$(MACHINE)/hmake-$(CC)
-+	touch $(TARGDIR)/$(MACHINE)/hmake-gcc
- 
- 
- script/errnogen.c: script/GenerateErrNo.hs
+ $(THOROBJS) : $(OBJDIR)/%.o : %.c
+ 	$(CC) -c $(THORFLAGS) -o $@ $<
diff --git a/lang/nhc98/pkg/PLIST b/lang/nhc98/pkg/PLIST
index 224170bbf7f..3c6b29a3841 100644
--- a/lang/nhc98/pkg/PLIST
+++ b/lang/nhc98/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/05/22 00:45:55 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/07/15 12:40:21 jtb Exp $
 bin/greencard-nhc98
 bin/harch
 bin/hat-check
@@ -102,20 +102,32 @@ lib/hmake/${HARCH}/HInteractive
 lib/hmake/${HARCH}/MkProg
 lib/hmake/${HARCH}/Older
 lib/hmake/${HARCH}/hmake.config
+lib/nhc98/hat-trail.jar
+lib/nhc98/hood.jar
 lib/nhc98/${HARCH}/Prelude.a
+lib/nhc98/${HARCH}/PreludeT.a
 lib/nhc98/${HARCH}/Runtime.a
+lib/nhc98/${HARCH}/RuntimeT.a
 lib/nhc98/${HARCH}/config
 lib/nhc98/${HARCH}/greencard-nhc98
+lib/nhc98/${HARCH}/hat-check
+lib/nhc98/${HARCH}/hat-checki
+lib/nhc98/${HARCH}/hat-connect
+lib/nhc98/${HARCH}/hat-detect
+lib/nhc98/${HARCH}/hat-observe
+lib/nhc98/${HARCH}/hat-stack
 lib/nhc98/${HARCH}/hmake-PRAGMA
 lib/nhc98/${HARCH}/hmake.config
 lib/nhc98/${HARCH}/libdebug.a
+lib/nhc98/${HARCH}/libdebugT.a
 lib/nhc98/${HARCH}/main.o
+lib/nhc98/${HARCH}/mainT.o
 lib/nhc98/${HARCH}/mutator.o
+lib/nhc98/${HARCH}/mutatorT.o
 lib/nhc98/${HARCH}/mutlib.o
+lib/nhc98/${HARCH}/mutlibT.o
 lib/nhc98/${HARCH}/nhc98comp
 lib/nhc98/${HARCH}/nhc98heap
-lib/nhc98/hat-trail.jar
-lib/nhc98/hood.jar
 man/man1/harch.1
 man/man1/hmake.1
 man/man1/hp2graph.1
@@ -170,11 +182,10 @@ share/doc/nhc98/greencard.html
 share/doc/nhc98/hat/browser-detail.html
 share/doc/nhc98/hat/faq.html
 share/doc/nhc98/hat/feature-table.html
+share/doc/nhc98/hat/frejaHatHood.ps.gz
 share/doc/nhc98/hat/hat-trail-1.eps
 share/doc/nhc98/hat/hat-trail.gif
 share/doc/nhc98/hat/hat.gif
-share/doc/nhc98/hat/hatuser.pdf
-share/doc/nhc98/hat/hatuser.ps
 share/doc/nhc98/hat/hatuser.tex
 share/doc/nhc98/hat/index.html
 share/doc/nhc98/hat/limitations-detail.html
@@ -231,3 +242,4 @@ share/doc/nhc98/york-release.html
 @dirrm lib/hmake/${HARCH}
 @dirrm lib/hmake
 @dirrm include/nhc98
+