Update to nhc98-1.04.

nhc98 1.04 (2001-05-21) features

     * New:   Support   for   extended  module  namespaces  of  the  form
       Long.Hierarchical.Module.Name  is  now  provided in both nhc98 and
       hmake.
     * Update: Improved printing of I/O error messages.
     * Update: Improved (more accurate) time profiling now provided.
     * Bugfix:  An  identifier  hidden  on  import  and  redefined in the
       current  module,  then  exported,  but also imported qualified and
       used  qualified  in  the  current  module,  led  to  an  incorrect
       interface file being generated.
     * Bugfix:  hmake  issued  an  unnecessary -cpp flag on some literate
       files.
     * Bugfix:  Type  of IO.hSetPosn :: Handle -> HandlePosn -> IO () was
       incorrect
     * Bugfix: Compile-time error in src/tracer/runtime/ident.c on RedHat
       7 and other systems using the new ISO C standard for fpos_t.
     * Bugfix: A file opened in ReadMode or WriteMode was actually opened
       in  ReadWriteMode,  so  if  the  file  had  strict permissions the
       correct   opening  command  would  fail.  Conversely,  opening  in
       ReadWriteMode  actually  gave  ReadMode  instead, and file updates
       silently failed.
     * Bugfix:  Operator  sections  suffered from priority inversion, for
       example  (^2*3)  was incorrectly parsed as (^(2*3)), even though ^
       binds more tightly than *.
     * Bugfix:   The   library  function  Directory.createDirectory  gave
       strange  permissions  to  the new directory. (Mode was in hex, but
       should have been octal!)

   The  following  updates  and  bugfixes  are  specifically for Hat, the
   redex-trail-based tracing and debugging system.
     * New architecture: Traced programs now build their trails in files,
       not  in  the  heap.  This has four consequences: (1) you no longer
       need  to  give your program large amounts of extra memory to trace
       it; but (2) you may need to have large amounts of free disk space,
       particularly  to  trace long-running programs; (3) for the moment,
       traced  programs  now  run  even slower (we are working to improve
       this);  and  (4)  trails are now first-class objects, so new tools
       can  manipulate  them  to  provide  several different views of the
       computation.
     * New  tools:  Storing trails in files means we can now provide more
       tools  to  examine  them.  The  original  graphical browser is now
       renamed hat-trail, and can fully explore the redex trails in file.
       hat-stack  gives  a virtual stack back-trace from a trail file (no
       need  to  re-run  the  program).  hat-observe  gives you HOOD-like
       observation  of  the  input  and output from functions. hat-detect
       does algorithmic debugging in the style of Freja; it discovers and
       identifies  the  location  of  a  bug after asking you some simple
       questions.  hat-check  verifies  the  integrity of the trail file,
       prints a textual dump, and gives statistics about its contents.
     * Update:   Fuller  Standard  Library  support  for  tracing:  added
       Directory, System, CPUTime, Random. (Still missing: Time, Locale.)
     * Update:  More  Haskell'98  language  features  are accepted: named
       fields  can  now  be traced, although the hat tools don't yet show
       them in source form. Pattern bindings are also handled better.
     _________________________________________________________________

4 files changed, 122 insertions, 38 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 86aa8b6dcad..9649215d734 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/04/14 21:43:47 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/22 00:45:54 jtb Exp $
 
-DISTNAME=		nhc98src-1.02
-PKGNAME=		nhc98-1.02
+DISTNAME=		nhc98src-1.04
+PKGNAME=		nhc98-1.04
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
@@ -10,27 +10,24 @@ HOMEPAGE=		http://www.cs.york.ac.uk/fp/nhc98/
 COMMENT=		Portable Haskell 98 compiler
 
 # Not yet ported to 64-bit machines
-
 NOT_FOR_PLATFORM=	*-*-alpha
 
-WRKSRC=			${WRKDIR}/nhc98-1.02
+WRKSRC=			${WRKDIR}/${PKGNAME}
 
 HAS_CONFIGURE=		#defined
 CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 			+docs --docdir=${PREFIX}/share/doc/nhc98
 
-# Note that you can also build with ghc (Glasgow Haskell Compiler).
+# Note that you can also build with ghc (Glasgow Haskell Compiler) or
+# hbc (Chalmers Haskell).
 
-USE_GMAKE=		#defined
+USE_GMAKE=		yes
 ALL_TARGET=		all-gcc
 
 HARCH=			`${WRKSRC}/script/harch`
 PLIST_SUBST+=		HARCH=${HARCH}
 
-do-build:
-	cd ${WRKSRC} && ${GMAKE}
-
-pre-install:
-	${RM} -fr ${WRKSRC}/docs/CVS ${WRKSRC}/docs/*/CVS
+post-extract:
+	${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 ac9a51956f1..1579a5e7b16 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:54 agc Exp $
+SHA1 (patch-aa) = dbe63c3e3cbf2182d40cda9b28757f0b93548d0c
 
-SHA1 (nhc98src-1.02.tar.gz) = 66bf2b56945fee9d1aa856fd3d6177dc3c1ca337
-Size (nhc98src-1.02.tar.gz) = 3036226 bytes
+SHA1 (nhc98src-1.04.tar.gz) = 1a3ed2bf54a0ad8620ea5db7eaf9576323b5f2ae
+Size (nhc98src-1.04.tar.gz) = 3211304 bytes
+SHA1 (patch-aa) = dbe63c3e3cbf2182d40cda9b28757f0b93548d0c
diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa
new file mode 100644
index 00000000000..726284c2079
--- /dev/null
+++ b/lang/nhc98/patches/patch-aa
@@ -0,0 +1,66 @@
+$NetBSD: patch-aa,v 1.1 2001/05/22 00:45:55 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
+ 
+ .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
+ 
+ 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
diff --git a/lang/nhc98/pkg/PLIST b/lang/nhc98/pkg/PLIST
index 9f1a14fe82a..224170bbf7f 100644
--- a/lang/nhc98/pkg/PLIST
+++ b/lang/nhc98/pkg/PLIST
@@ -1,18 +1,26 @@
-@comment $NetBSD: PLIST,v 1.3 2001/02/24 22:51:05 jtb Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/05/22 00:45:55 jtb Exp $
 bin/greencard-nhc98
 bin/harch
+bin/hat-check
+bin/hat-checki
+bin/hat-connect
+bin/hat-detect
+bin/hat-observe
+bin/hat-stack
+bin/hat-trail
 bin/hi
 bin/hmake
 bin/hood
 bin/hp2graph
 bin/nhc98
-bin/rtb
+bin/tprofprel
 include/nhc98/Array.T.hi
 include/nhc98/Array.hi
 include/nhc98/BinArray.hi
 include/nhc98/Binary.T.hi
 include/nhc98/Binary.hi
 include/nhc98/Bit.hi
+include/nhc98/CPUTime.T.hi
 include/nhc98/CPUTime.hi
 include/nhc98/Char.T.hi
 include/nhc98/Char.hi
@@ -21,14 +29,17 @@ include/nhc98/Complex.hi
 include/nhc98/DPrelude.hi
 include/nhc98/DbgIface.hi
 include/nhc98/DbgStub.hi
+include/nhc98/Directory.T.hi
 include/nhc98/Directory.hi
 include/nhc98/FFI.T.hi
 include/nhc98/FFI.hi
 include/nhc98/FFIBuiltin.T.hi
 include/nhc98/FFIBuiltin.hi
+include/nhc98/GreenCard.T.hi
 include/nhc98/GreenCard.gc
 include/nhc98/GreenCard.hi
 include/nhc98/Haskell.hi
+include/nhc98/HatBuiltin.hi
 include/nhc98/HsFFI.h
 include/nhc98/IO.T.hi
 include/nhc98/IO.hi
@@ -59,6 +70,7 @@ include/nhc98/Prelude.T.hi
 include/nhc98/Prelude.hi
 include/nhc98/PreludeBuiltin.T.hi
 include/nhc98/PreludeBuiltin.hi
+include/nhc98/Random.T.hi
 include/nhc98/Random.hi
 include/nhc98/Ratio.T.hi
 include/nhc98/Ratio.hi
@@ -73,6 +85,8 @@ include/nhc98/codemacros.h
 include/nhc98/flt.h
 include/nhc98/greencard.h
 include/nhc98/haskell2c.h
+include/nhc98/hat.h
+include/nhc98/localmalloc.h
 include/nhc98/macros_o.h
 include/nhc98/mk.h
 include/nhc98/mkByHand.h
@@ -88,7 +102,6 @@ lib/hmake/${HARCH}/HInteractive
 lib/hmake/${HARCH}/MkProg
 lib/hmake/${HARCH}/Older
 lib/hmake/${HARCH}/hmake.config
-lib/nhc98/hood.jar
 lib/nhc98/${HARCH}/Prelude.a
 lib/nhc98/${HARCH}/Runtime.a
 lib/nhc98/${HARCH}/config
@@ -101,20 +114,23 @@ lib/nhc98/${HARCH}/mutator.o
 lib/nhc98/${HARCH}/mutlib.o
 lib/nhc98/${HARCH}/nhc98comp
 lib/nhc98/${HARCH}/nhc98heap
-lib/nhc98/rtb.jar
+lib/nhc98/hat-trail.jar
+lib/nhc98/hood.jar
 man/man1/harch.1
 man/man1/hmake.1
 man/man1/hp2graph.1
 man/man1/nhc98.1
 share/doc/nhc98/98.html
 share/doc/nhc98/CcallingHaskell.html
+share/doc/nhc98/bugs.html
 share/doc/nhc98/bugs/Nhc13Test1.hs
-share/doc/nhc98/bugs/nhc13test1.hs
 share/doc/nhc98/bugs/Nhc13Test10.hs
+share/doc/nhc98/bugs/Nhc13Test13.hs
+share/doc/nhc98/bugs/README
+share/doc/nhc98/bugs/nhc13test1.hs
 share/doc/nhc98/bugs/nhc13test10.hs
 share/doc/nhc98/bugs/nhc13test11.hs
 share/doc/nhc98/bugs/nhc13test12.hs
-share/doc/nhc98/bugs/Nhc13Test13.hs
 share/doc/nhc98/bugs/nhc13test13.hs
 share/doc/nhc98/bugs/nhc13test14.hs
 share/doc/nhc98/bugs/nhc13test15.hs
@@ -127,7 +143,6 @@ share/doc/nhc98/bugs/nhc13test20.hs
 share/doc/nhc98/bugs/nhc13test3.hs
 share/doc/nhc98/bugs/nhc13test4.hs
 share/doc/nhc98/bugs/nhc13test5.hs
-share/doc/nhc98/bugs/README
 share/doc/nhc98/bugs/nhc13test6.hs
 share/doc/nhc98/bugs/nhc13test7.hs
 share/doc/nhc98/bugs/nhc13test8.hs
@@ -136,12 +151,13 @@ share/doc/nhc98/bugs/nhc98test19.hs
 share/doc/nhc98/bugs/nhc98test20.hs
 share/doc/nhc98/bugs/nhc98test21.hs
 share/doc/nhc98/bugs/nhc98test22.hs
-share/doc/nhc98/bugs.html
+share/doc/nhc98/bugs/nhc98test23.hs
 share/doc/nhc98/compiler-options.html
 share/doc/nhc98/config.html
 share/doc/nhc98/contrib.html
 share/doc/nhc98/copyright.html
 share/doc/nhc98/cvs.html
+share/doc/nhc98/download.html
 share/doc/nhc98/errmsgs.html
 share/doc/nhc98/examples/ZooQuiz.hs
 share/doc/nhc98/ffi.html
@@ -152,29 +168,33 @@ share/doc/nhc98/fig4.html
 share/doc/nhc98/greencard-york.html
 share/doc/nhc98/greencard.html
 share/doc/nhc98/hat/browser-detail.html
-share/doc/nhc98/hat/compiler.gif
-share/doc/nhc98/hat/compiler2.gif
 share/doc/nhc98/hat/faq.html
 share/doc/nhc98/hat/feature-table.html
+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
 share/doc/nhc98/hat/limitations.html
 share/doc/nhc98/hat/maillist.html
 share/doc/nhc98/hat/old-tracing.html
 share/doc/nhc98/hat/paper.dvi
-share/doc/nhc98/hat/people.html
 share/doc/nhc98/hat/proposal.html
 share/doc/nhc98/hat/tracing.html
-share/doc/nhc98/hatuser.ps
-share/doc/nhc98/hatuser.tex
+share/doc/nhc98/heapprof.html
 share/doc/nhc98/history.html
 share/doc/nhc98/history98.html
+share/doc/nhc98/hmake.html
 share/doc/nhc98/hmake/changes.html
 share/doc/nhc98/hmake/hmake.html
 share/doc/nhc98/hmake/index.html
 share/doc/nhc98/hmake/interactive.html
 share/doc/nhc98/hmake/lineedit.html
-share/doc/nhc98/hmake.html
+share/doc/nhc98/implementation-notes/build-system
+share/doc/nhc98/implementation-notes/index.html
 share/doc/nhc98/implementation-notes/intro
 share/doc/nhc98/implementation-notes/phases
 share/doc/nhc98/implementation-notes/space-efficient
@@ -194,20 +214,20 @@ share/doc/nhc98/nhc13.gif
 share/doc/nhc98/nhc98.gif
 share/doc/nhc98/runtime-options.html
 share/doc/nhc98/status.html
-share/doc/nhc98/timprof.
 share/doc/nhc98/todo.html
+share/doc/nhc98/tprof.html
 share/doc/nhc98/tracer.html
 share/doc/nhc98/windows.html
 share/doc/nhc98/york-release.html
-@dirrm include/nhc98
+@dirrm share/doc/nhc98/libs
+@dirrm share/doc/nhc98/implementation-notes
+@dirrm share/doc/nhc98/hmake
+@dirrm share/doc/nhc98/hat
+@dirrm share/doc/nhc98/examples
+@dirrm share/doc/nhc98/bugs
+@dirrm share/doc/nhc98
 @dirrm lib/nhc98/${HARCH}
 @dirrm lib/nhc98
 @dirrm lib/hmake/${HARCH}
 @dirrm lib/hmake
-@dirrm share/doc/nhc98/bugs
-@dirrm share/doc/nhc98/examples
-@dirrm share/doc/nhc98/hat
-@dirrm share/doc/nhc98/hmake
-@dirrm share/doc/nhc98/implementation-notes
-@dirrm share/doc/nhc98/libs
-@dirrm share/doc/nhc98
+@dirrm include/nhc98