Tarball has been rerolled. Developer added one tiny extra fix for Cygwin

configuration, and removed lots of files that belonged to the Hat project,
which are no longer relevant to building nhc98.

No functional change, so no need to bump PORTREVISION.

Noticed by:	Matthew Donadio <m.p.donadio@ieee.org>

4 files changed, 13 insertions, 123 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 6feef1f75b52..4e2f017fcfa4 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -64,10 +64,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/nhc98.1.fix ${PREFIX}/man/man1/nhc98.1
 	${RM} ${WRKSRC}/man/nhc98.1.fix
 .if !defined(NOPORTDOCS)
-.for ending in aux log out toc
-	${RM} ${PREFIX}/share/doc/nhc98/hat/hatuser.${ending}
-.endfor
-.for directory in . bugs examples hat hmake implementation-notes libs
+.for directory in . bugs examples hmake implementation-notes libs
 	${RM} -r ${PREFIX}/share/doc/nhc98/${directory}/CVS
 .endfor
 .endif
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 40ce5fbeecaa..b6dccc028057 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1 +1 @@
-MD5 (nhc98/nhc98src-1.16.tar.gz) = 2cd04f83ea9c02f4188ec0d6a8035c17
+MD5 (nhc98/nhc98src-1.16.tar.gz) = a62866b8d966108cba325d0322a3010d
diff --git a/lang/nhc98/files/patch-Makefile b/lang/nhc98/files/patch-Makefile
index 66321b3206df..5acdb1feb78d 100644
--- a/lang/nhc98/files/patch-Makefile
+++ b/lang/nhc98/files/patch-Makefile
@@ -1,28 +1,26 @@
---- Makefile.orig	Tue Mar 11 10:20:35 2003
-+++ Makefile	Tue Mar 11 10:21:23 2003
-@@ -155,14 +155,14 @@
+--- Makefile.orig	Tue Mar 11 18:34:49 2003
++++ Makefile	Tue Mar 25 12:02:24 2003
+@@ -132,13 +132,13 @@
  
  TARGDIR= targets
- TARGETS= runtime prelude libraries greencard hp2graph hattools \
+ TARGETS= runtime prelude libraries greencard hp2graph \
 -	 profruntime profprelude profprelude-$(CC) \
 -	 timeruntime timeprelude timeprelude-$(CC) \
 +	 profruntime profprelude profprelude-gcc \
 +	 timeruntime timeprelude timeprelude-gcc \
  	 timetraceruntime timetraceprelude \
--	 traceruntime traceprelude traceprelude-$(CC) \
 -	 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) libraries-$(CC) \
-+	 traceruntime traceprelude traceprelude-gcc \
+-	 prelude-$(CC) pragma-$(CC) libraries-$(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 libraries-gcc \
- 	 hat-nhc hat-ghc hat-trans-ghc hat-trans-nhc hat-lib-ghc hat-lib-nhc \
- 	 hat-tools-ghc hat-tools-nhc
++	 prelude-gcc pragma-gcc libraries-gcc
  
-@@ -203,8 +203,8 @@
+ .PHONY: default basic all compiler help config install
+ 
+@@ -173,8 +173,8 @@
  								libraries
  basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude \
  								libraries
@@ -31,22 +29,9 @@
 +basic-gcc:   runtime prelude-gcc pragma-gcc compiler-gcc \
 +		 greencard-gcc hmake-gcc libraries-gcc
  
- all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #tracer #hoodui
- 
-@@ -224,9 +224,9 @@
- 		compiler-ghc traceruntime traceprelude hattools hat-ghc
- tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \
- 		compiler-hbc traceruntime traceprelude hattools
--tracer-$(CC): runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \
--		greencard-$(CC) hmake-$(CC) \
--		traceruntime traceprelude-$(CC) hattools
-+tracer-gcc: runtime prelude-gcc pragma-gcc compiler-gcc \
-+		greencard-gcc hmake-gcc \
-+		traceruntime traceprelude-gcc hattools
- timetraceprofile: timetraceruntime timetraceprelude
+ all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #hoodui
  
- $(TARGETS): % : $(TARGDIR)/$(MACHINE)/%
-@@ -328,47 +328,47 @@
+@@ -275,41 +275,41 @@
  	touch $(TARGDIR)/$(MACHINE)/timeprelude
  
  
@@ -56,14 +41,6 @@
 -	touch $(TARGDIR)/$(MACHINE)/prelude-$(CC)
 +	touch $(TARGDIR)/$(MACHINE)/prelude-gcc
  	touch $(TARGDIR)/$(MACHINE)/prelude
--$(TARGDIR)/$(MACHINE)/traceprelude-$(CC): $(PRELUDEC)
-+$(TARGDIR)/$(MACHINE)/traceprelude-gcc: $(PRELUDEC)
- 	cd src/prelude;        $(MAKE) CFG=T fromC
- 	cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=T clean all
- 	cd src/prelude;        $(MAKE) CFG=T relink
--	touch $(TARGDIR)/$(MACHINE)/traceprelude-$(CC)
-+	touch $(TARGDIR)/$(MACHINE)/traceprelude-gcc
- 	touch $(TARGDIR)/$(MACHINE)/traceprelude
 -$(TARGDIR)/$(MACHINE)/timeprelude-$(CC): $(PRELUDEC)
 +$(TARGDIR)/$(MACHINE)/timeprelude-gcc: $(PRELUDEC)
  	cd src/prelude;        $(MAKE) CFG=z fromC
diff --git a/lang/nhc98/pkg-plist b/lang/nhc98/pkg-plist
index 8cbd20ede3a2..5098fcc71c27 100644
--- a/lang/nhc98/pkg-plist
+++ b/lang/nhc98/pkg-plist
@@ -7,63 +7,37 @@ bin/hood
 bin/greencard-nhc98
 bin/tprofprel
 bin/hp2graph
-include/nhc98/Array.T.hi
 include/nhc98/Array.hi
-include/nhc98/Binary.T.hi
-include/nhc98/CPUTime.T.hi
 include/nhc98/CPUTime.hi
-include/nhc98/Char.T.hi
 include/nhc98/Char.hi
-include/nhc98/Complex.T.hi
 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/FFIBuiltin.T.hi
-include/nhc98/GreenCard.T.hi
 include/nhc98/Haskell.hi
 include/nhc98/HatBuiltin.hi
 include/nhc98/HsFFI.h
-include/nhc98/IO.T.hi
 include/nhc98/IO.hi
-include/nhc98/IOExtras.T.hi
-include/nhc98/Ix.T.hi
 include/nhc98/Ix.hi
-include/nhc98/List.T.hi
 include/nhc98/List.hi
 include/nhc98/Locale.hi
-include/nhc98/Maybe.T.hi
 include/nhc98/Maybe.hi
-include/nhc98/Monad.T.hi
 include/nhc98/Monad.hi
 include/nhc98/NonStdEval.hi
 include/nhc98/NonStdGetPID.hi
 include/nhc98/NonStdProfile.hi
-include/nhc98/NonStdTrace.T.hi
 include/nhc98/NonStdTrace.hi
-include/nhc98/NonStdUnsafeCoerce.T.hi
 include/nhc98/NonStdUnsafeCoerce.hi
-include/nhc98/Numeric.T.hi
 include/nhc98/Numeric.hi
-include/nhc98/PackedString.T.hi
 include/nhc98/PackedString.hi
-include/nhc98/Prelude.T.hi
 include/nhc98/Prelude.hi
-include/nhc98/PreludeBuiltin.T.hi
 include/nhc98/PreludeBuiltin.hi
-include/nhc98/Q8defs.h
-include/nhc98/Random.T.hi
 include/nhc98/Random.hi
-include/nhc98/Ratio.T.hi
 include/nhc98/Ratio.hi
-include/nhc98/System.T.hi
 include/nhc98/System.hi
 include/nhc98/Time.hi
 include/nhc98/Warning.hi
-include/nhc98/art.h
 include/nhc98/bytecode.h
 include/nhc98/bytecode_o.h
 include/nhc98/cinterface.h
@@ -96,7 +70,6 @@ include/nhc98/NHC/PackedString.hi
 include/nhc98/NHC/Prelude.hi
 include/nhc98/base/Control/Arrow.hi
 include/nhc98/base/Control/Monad/Fix.hi
-include/nhc98/base/Control/Monad/Identity.hi
 include/nhc98/base/Control/Monad/Trans.hi
 include/nhc98/base/Control/Monad.hi
 include/nhc98/base/Data/Array.hi
@@ -295,61 +268,6 @@ lib/hmake/ix86-FreeBSD/hmakerc
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test22.hs
 %%PORTDOCS%%share/doc/nhc98/bugs/nhc98test23.hs
 %%PORTDOCS%%share/doc/nhc98/examples/ZooQuiz.hs
-%%PORTDOCS%%share/doc/nhc98/hat/.xvpics/hat.bmp
-%%PORTDOCS%%share/doc/nhc98/hat/.xvpics/hat.png
-%%PORTDOCS%%share/doc/nhc98/hat/BadInsort.hs
-%%PORTDOCS%%share/doc/nhc98/hat/Insort.hs
-%%PORTDOCS%%share/doc/nhc98/hat/afp2002.ps.gz
-%%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/cvs.html
-%%PORTDOCS%%share/doc/nhc98/hat/download.html
-%%PORTDOCS%%share/doc/nhc98/hat/faq.html
-%%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-tools.html
-%%PORTDOCS%%share/doc/nhc98/hat/hat-trans.html
-%%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.bmp
-%%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/ifl2002.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/todo.html
-%%PORTDOCS%%share/doc/nhc98/hat/toolkitThesis.ps.gz
-%%PORTDOCS%%share/doc/nhc98/hat/tracing.html
-%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.html
-%%PORTDOCS%%share/doc/nhc98/hat/tutorial1.hva
-%%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/tutorial1-old.html
 %%PORTDOCS%%share/doc/nhc98/hmake/bugs.html
 %%PORTDOCS%%share/doc/nhc98/hmake/changes.html
 %%PORTDOCS%%share/doc/nhc98/hmake/hi-commands.html
@@ -374,8 +292,6 @@ lib/hmake/ix86-FreeBSD/hmakerc
 %%PORTDOCS%%share/doc/nhc98/libs/index.html
 %%PORTDOCS%%@dirrm share/doc/nhc98/bugs
 %%PORTDOCS%%@dirrm share/doc/nhc98/examples
-%%PORTDOCS%%@dirrm share/doc/nhc98/hat/.xvpics
-%%PORTDOCS%%@dirrm share/doc/nhc98/hat
 %%PORTDOCS%%@dirrm share/doc/nhc98/hmake
 %%PORTDOCS%%@dirrm share/doc/nhc98/implementation-notes
 %%PORTDOCS%%@dirrm share/doc/nhc98/libs