Update nhc98 to 1.16.

Changes since 1.14a include:
* A large subset of the base package of hierarchical libraries is now
  included in the build.
* The primitive FFI mechanism has been updated to match the latest official
  spec, and the full Foreign libraries are also included (in hierarchical
  form).
* The library function List.sortBy now uses a stable O(n log n) mergesort.
* Numerous other small fixes, including revisions to the Haskell'98 standard.

4 files changed, 210 insertions, 207 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 959fbf6ddfd..08dfee5321c 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/01/24 13:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/19 23:14:35 kristerw Exp $
 
-DISTNAME=		nhc98src-1.14a
-PKGNAME=		nhc98-1.14a
+DISTNAME=		nhc98src-1.16
+PKGNAME=		nhc98-1.16
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
@@ -35,5 +35,4 @@ post-extract:
 	@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
 
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nhc98/PLIST b/lang/nhc98/PLIST
index 8bc061fb5a0..cb30c630ac9 100644
--- a/lang/nhc98/PLIST
+++ b/lang/nhc98/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/14 22:38:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/03/19 23:14:35 kristerw Exp $
 bin/greencard-nhc98
 bin/harch
 bin/hi
@@ -8,72 +8,114 @@ bin/hood
 bin/hp2graph
 bin/nhc98
 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
-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/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
-include/nhc98/IOExtras.T.hi
-include/nhc98/IOExtras.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/NHC/BinArray.hi
+include/nhc98/NHC/Binary.hi
+include/nhc98/NHC/Bit.hi
+include/nhc98/NHC/FFI.hi
+include/nhc98/NHC/GreenCard.gc
+include/nhc98/NHC/GreenCard.hi
+include/nhc98/NHC/IOExtras.hi
+include/nhc98/NHC/Internal.hi
+include/nhc98/NHC/Observe.hi
+include/nhc98/NHC/PackedString.hi
+include/nhc98/NHC/Prelude.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/Observe.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/base/Control/Arrow.hi
+include/nhc98/base/Control/Monad.hi
+include/nhc98/base/Control/Monad/Fix.hi
+include/nhc98/base/Control/Monad/Trans.hi
+include/nhc98/base/Data/Array.hi
+include/nhc98/base/Data/Bits.hi
+include/nhc98/base/Data/Bool.hi
+include/nhc98/base/Data/Char.hi
+include/nhc98/base/Data/Complex.hi
+include/nhc98/base/Data/Dynamic.hi
+include/nhc98/base/Data/Either.hi
+include/nhc98/base/Data/FiniteMap.hi
+include/nhc98/base/Data/IORef.hi
+include/nhc98/base/Data/Int.hi
+include/nhc98/base/Data/Ix.hi
+include/nhc98/base/Data/List.hi
+include/nhc98/base/Data/Maybe.hi
+include/nhc98/base/Data/PackedString.hi
+include/nhc98/base/Data/Ratio.hi
+include/nhc98/base/Data/Set.hi
+include/nhc98/base/Data/Tuple.hi
+include/nhc98/base/Data/Word.hi
+include/nhc98/base/Debug/Trace.hi
+include/nhc98/base/Foreign.hi
+include/nhc98/base/Foreign/C.hi
+include/nhc98/base/Foreign/C/Error.hi
+include/nhc98/base/Foreign/C/String.hi
+include/nhc98/base/Foreign/C/Types.hi
+include/nhc98/base/Foreign/C/TypesISO.hi
+include/nhc98/base/Foreign/ForeignPtr.hi
+include/nhc98/base/Foreign/Marshal.hi
+include/nhc98/base/Foreign/Marshal/Alloc.hi
+include/nhc98/base/Foreign/Marshal/Array.hi
+include/nhc98/base/Foreign/Marshal/Error.hi
+include/nhc98/base/Foreign/Marshal/Pool.hi
+include/nhc98/base/Foreign/Marshal/Utils.hi
+include/nhc98/base/Foreign/Ptr.hi
+include/nhc98/base/Foreign/StablePtr.hi
+include/nhc98/base/Foreign/Storable.hi
+include/nhc98/base/System/Cmd.hi
+include/nhc98/base/System/Console/GetOpt.hi
+include/nhc98/base/System/Directory.hi
+include/nhc98/base/System/Environment.hi
+include/nhc98/base/System/Exit.hi
+include/nhc98/base/System/IO.hi
+include/nhc98/base/System/IO/Error.hi
+include/nhc98/base/System/IO/Unsafe.hi
+include/nhc98/base/System/Info.hi
+include/nhc98/base/System/Locale.hi
+include/nhc98/base/System/Mem.hi
+include/nhc98/base/System/Random.hi
+include/nhc98/base/Text/Html.hi
+include/nhc98/base/Text/Html/BlockTable.hi
+include/nhc98/base/Text/ParserCombinators/Parsec.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Char.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Combinator.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Error.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Expr.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Perm.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Pos.hi
+include/nhc98/base/Text/ParserCombinators/Parsec/Prim.hi
+include/nhc98/base/Text/PrettyPrint.hi
+include/nhc98/base/Text/PrettyPrint/HughesPJ.hi
+include/nhc98/base/Text/Read.hi
+include/nhc98/base/Text/Show.hi
+include/nhc98/base/Text/Show/Functions.hi
 include/nhc98/bytecode.h
 include/nhc98/bytecode_o.h
 include/nhc98/cinterface.h
@@ -93,80 +135,73 @@ include/nhc98/node.h
 include/nhc98/runtime.h
 include/nhc98/stableptr.h
 include/nhc98/twopass.h
-lib/hmake/${HARCH}/HInteractive
-lib/hmake/${HARCH}/MkConfig
-lib/hmake/${HARCH}/MkProg
-lib/hmake/${HARCH}/Older
-lib/hmake/${HARCH}/hmakerc
+lib/hmake/ix86-${OPSYS}/HInteractive
+lib/hmake/ix86-${OPSYS}/MkConfig
+lib/hmake/ix86-${OPSYS}/MkProg
+lib/hmake/ix86-${OPSYS}/Older
+lib/hmake/ix86-${OPSYS}/hmakerc
 lib/nhc98/hood.jar
-lib/nhc98/${HARCH}/Array.z.a
-lib/nhc98/${HARCH}/BinArray.z.a
-lib/nhc98/${HARCH}/Binary.z.a
-lib/nhc98/${HARCH}/Bit.z.a
-lib/nhc98/${HARCH}/CPUTime.z.a
-lib/nhc98/${HARCH}/CString.z.a
-lib/nhc98/${HARCH}/Char.z.a
-lib/nhc98/${HARCH}/Complex.z.a
-lib/nhc98/${HARCH}/DErrNo.z.a
-lib/nhc98/${HARCH}/DbgIface.z.a
-lib/nhc98/${HARCH}/Directory.z.a
-lib/nhc98/${HARCH}/Driver.z.a
-lib/nhc98/${HARCH}/FFI.z.a
-lib/nhc98/${HARCH}/GreenCard.z.a
-lib/nhc98/${HARCH}/Haskell.z.a
-lib/nhc98/${HARCH}/IO.z.a
-lib/nhc98/${HARCH}/IOExtras.z.a
-lib/nhc98/${HARCH}/Ix.z.a
-lib/nhc98/${HARCH}/List.z.a
-lib/nhc98/${HARCH}/Locale.z.a
-lib/nhc98/${HARCH}/Maybe.z.a
-lib/nhc98/${HARCH}/Monad.z.a
-lib/nhc98/${HARCH}/NonStdEval.z.a
-lib/nhc98/${HARCH}/NonStdGetPID.z.a
-lib/nhc98/${HARCH}/NonStdProfile.z.a
-lib/nhc98/${HARCH}/NonStdTrace.z.a
-lib/nhc98/${HARCH}/NonStdUnsafeCoerce.z.a
-lib/nhc98/${HARCH}/Numeric.z.a
-lib/nhc98/${HARCH}/Observe.z.a
-lib/nhc98/${HARCH}/PackedString.z.a
-lib/nhc98/${HARCH}/Prelude.a
-lib/nhc98/${HARCH}/Prelude.p.a
-lib/nhc98/${HARCH}/PreludeAll.z.a
-lib/nhc98/${HARCH}/Random.z.a
-lib/nhc98/${HARCH}/Ratio.z.a
-lib/nhc98/${HARCH}/Runtime.a
-lib/nhc98/${HARCH}/Runtime.p.a
-lib/nhc98/${HARCH}/Runtime.z.a
-lib/nhc98/${HARCH}/System.z.a
-lib/nhc98/${HARCH}/Time.z.a
-lib/nhc98/${HARCH}/UnboxedArray.z.a
-lib/nhc98/${HARCH}/Warning.z.a
-lib/nhc98/${HARCH}/config
-lib/nhc98/${HARCH}/greencard-nhc98
-lib/nhc98/${HARCH}/hmake-PRAGMA
-lib/nhc98/${HARCH}/hp2graph
-lib/nhc98/${HARCH}/main.o
-lib/nhc98/${HARCH}/main.p.o
-lib/nhc98/${HARCH}/main.z.o
-lib/nhc98/${HARCH}/mutator.o
-lib/nhc98/${HARCH}/mutator.p.o
-lib/nhc98/${HARCH}/mutator.z.o
-lib/nhc98/${HARCH}/mutlib.o
-lib/nhc98/${HARCH}/mutlib.p.o
-lib/nhc98/${HARCH}/mutlib.z.o
-lib/nhc98/${HARCH}/nhc98comp
-lib/nhc98/${HARCH}/nhc98heap
-lib/nhc98/${HARCH}/tprofprel1.z.o
-lib/nhc98/${HARCH}/tprofprel2.z.o
-lib/nhc98/${HARCH}/tprofprel3.z.o
-man/man1/harch.1
-man/man1/hat-detect.1
-man/man1/hat-observe.1
-man/man1/hat-stack.1
-man/man1/hat-trail.1
-man/man1/hmake.1
-man/man1/hp2graph.1
-man/man1/nhc98.1
+lib/nhc98/ix86-${OPSYS}/Array.z.a
+lib/nhc98/ix86-${OPSYS}/BinArray.z.a
+lib/nhc98/ix86-${OPSYS}/Binary.z.a
+lib/nhc98/ix86-${OPSYS}/Bit.z.a
+lib/nhc98/ix86-${OPSYS}/CPUTime.z.a
+lib/nhc98/ix86-${OPSYS}/CString.z.a
+lib/nhc98/ix86-${OPSYS}/Char.z.a
+lib/nhc98/ix86-${OPSYS}/Complex.z.a
+lib/nhc98/ix86-${OPSYS}/DErrNo.z.a
+lib/nhc98/ix86-${OPSYS}/DbgIface.z.a
+lib/nhc98/ix86-${OPSYS}/Directory.z.a
+lib/nhc98/ix86-${OPSYS}/Driver.z.a
+lib/nhc98/ix86-${OPSYS}/FFI.z.a
+lib/nhc98/ix86-${OPSYS}/GreenCard.z.a
+lib/nhc98/ix86-${OPSYS}/Haskell.z.a
+lib/nhc98/ix86-${OPSYS}/IO.z.a
+lib/nhc98/ix86-${OPSYS}/IOExtras.z.a
+lib/nhc98/ix86-${OPSYS}/Ix.z.a
+lib/nhc98/ix86-${OPSYS}/List.z.a
+lib/nhc98/ix86-${OPSYS}/Locale.z.a
+lib/nhc98/ix86-${OPSYS}/Maybe.z.a
+lib/nhc98/ix86-${OPSYS}/Monad.z.a
+lib/nhc98/ix86-${OPSYS}/NonStdEval.z.a
+lib/nhc98/ix86-${OPSYS}/NonStdGetPID.z.a
+lib/nhc98/ix86-${OPSYS}/NonStdProfile.z.a
+lib/nhc98/ix86-${OPSYS}/NonStdTrace.z.a
+lib/nhc98/ix86-${OPSYS}/NonStdUnsafeCoerce.z.a
+lib/nhc98/ix86-${OPSYS}/Numeric.z.a
+lib/nhc98/ix86-${OPSYS}/Observe.z.a
+lib/nhc98/ix86-${OPSYS}/PackedString.z.a
+lib/nhc98/ix86-${OPSYS}/Prelude.a
+lib/nhc98/ix86-${OPSYS}/Prelude.p.a
+lib/nhc98/ix86-${OPSYS}/PreludeAll.z.a
+lib/nhc98/ix86-${OPSYS}/Random.z.a
+lib/nhc98/ix86-${OPSYS}/Ratio.z.a
+lib/nhc98/ix86-${OPSYS}/Runtime.a
+lib/nhc98/ix86-${OPSYS}/Runtime.p.a
+lib/nhc98/ix86-${OPSYS}/Runtime.z.a
+lib/nhc98/ix86-${OPSYS}/System.z.a
+lib/nhc98/ix86-${OPSYS}/Time.z.a
+lib/nhc98/ix86-${OPSYS}/UnboxedArray.z.a
+lib/nhc98/ix86-${OPSYS}/Warning.z.a
+lib/nhc98/ix86-${OPSYS}/config
+lib/nhc98/ix86-${OPSYS}/greencard-nhc98
+lib/nhc98/ix86-${OPSYS}/hmake-PRAGMA
+lib/nhc98/ix86-${OPSYS}/hp2graph
+lib/nhc98/ix86-${OPSYS}/libHSbase.a
+lib/nhc98/ix86-${OPSYS}/main.o
+lib/nhc98/ix86-${OPSYS}/main.p.o
+lib/nhc98/ix86-${OPSYS}/main.z.o
+lib/nhc98/ix86-${OPSYS}/mutator.o
+lib/nhc98/ix86-${OPSYS}/mutator.p.o
+lib/nhc98/ix86-${OPSYS}/mutator.z.o
+lib/nhc98/ix86-${OPSYS}/mutlib.o
+lib/nhc98/ix86-${OPSYS}/mutlib.p.o
+lib/nhc98/ix86-${OPSYS}/mutlib.z.o
+lib/nhc98/ix86-${OPSYS}/nhc98comp
+lib/nhc98/ix86-${OPSYS}/nhc98heap
+lib/nhc98/ix86-${OPSYS}/tprofprel1.z.o
+lib/nhc98/ix86-${OPSYS}/tprofprel2.z.o
+lib/nhc98/ix86-${OPSYS}/tprofprel3.z.o
 share/doc/nhc98/98.html
 share/doc/nhc98/CcallingHaskell.html
 share/doc/nhc98/bugs.html
@@ -215,61 +250,10 @@ share/doc/nhc98/fig3.html
 share/doc/nhc98/fig4.html
 share/doc/nhc98/greencard-york.html
 share/doc/nhc98/greencard.html
-share/doc/nhc98/hat/BadInsort.hs
-share/doc/nhc98/hat/Insort.hs
-share/doc/nhc98/hat/browser-detail.html
-share/doc/nhc98/hat/bugs-tools.html
-share/doc/nhc98/hat/bugs.html
-share/doc/nhc98/hat/config.html
-share/doc/nhc98/hat/copyright.html
-share/doc/nhc98/hat/download.html
-share/doc/nhc98/hat/faq.html
-share/doc/nhc98/hat/feature-table.html
-share/doc/nhc98/hat/fest-0202.bugs
-share/doc/nhc98/hat/frejaHatHood.ps.gz
-share/doc/nhc98/hat/hat-reference.tex
-share/doc/nhc98/hat/hat-trail-1.eps
-share/doc/nhc98/hat/hat-trail-1.pdf
-share/doc/nhc98/hat/hat-trail.gif
-share/doc/nhc98/hat/hat.gif
-share/doc/nhc98/hat/hatuser-old.html
-share/doc/nhc98/hat/hatuser.aux
-share/doc/nhc98/hat/hatuser.dvi
-share/doc/nhc98/hat/hatuser.html
-share/doc/nhc98/hat/hatuser.log
-share/doc/nhc98/hat/hatuser.out
-share/doc/nhc98/hat/hatuser.pdf
-share/doc/nhc98/hat/hatuser.ps
-share/doc/nhc98/hat/hatuser.tex
-share/doc/nhc98/hat/hatuser.toc
-share/doc/nhc98/hat/hatuser001.gif
-share/doc/nhc98/hat/hw01-draft.ps.gz
-share/doc/nhc98/hat/index.html
-share/doc/nhc98/hat/install.html
-share/doc/nhc98/hat/libraries.html
-share/doc/nhc98/hat/limitations-detail.html
-share/doc/nhc98/hat/limitations.html
-share/doc/nhc98/hat/maillist.html
-share/doc/nhc98/hat/newhat.ps.gz
-share/doc/nhc98/hat/old-tracing.html
-share/doc/nhc98/hat/paper.dvi
-share/doc/nhc98/hat/proposal.html
-share/doc/nhc98/hat/publications.html
-share/doc/nhc98/hat/requirements.html
-share/doc/nhc98/hat/status.html
-share/doc/nhc98/hat/toolkitThesis.ps.gz
-share/doc/nhc98/hat/tracing.html
-share/doc/nhc98/hat/tutorial1.aux
-share/doc/nhc98/hat/tutorial1.dvi
-share/doc/nhc98/hat/tutorial1.html
-share/doc/nhc98/hat/tutorial1.hva
-share/doc/nhc98/hat/tutorial1.log
-share/doc/nhc98/hat/tutorial1.pdf
-share/doc/nhc98/hat/tutorial1.ps
-share/doc/nhc98/hat/tutorial1.tex
 share/doc/nhc98/heapprof.html
 share/doc/nhc98/history.html
 share/doc/nhc98/history98.html
+share/doc/nhc98/hmake/bugs.html
 share/doc/nhc98/hmake/changes.html
 share/doc/nhc98/hmake/hi-commands.html
 share/doc/nhc98/hmake/hmake-config.html
@@ -307,15 +291,36 @@ share/doc/nhc98/tprof.html
 share/doc/nhc98/tracer.html
 share/doc/nhc98/windows.html
 share/doc/nhc98/york-release.html
-@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
+man/man1/harch.1
+man/man1/hmake.1
+man/man1/hp2graph.1
+man/man1/nhc98.1
 @dirrm share/doc/nhc98/bugs
+@dirrm share/doc/nhc98/examples
+@dirrm share/doc/nhc98/hmake
+@dirrm share/doc/nhc98/implementation-notes
+@dirrm share/doc/nhc98/libs
 @dirrm share/doc/nhc98
-@dirrm lib/nhc98/${HARCH}
+@dirrm lib/nhc98/ix86-${OPSYS}
 @dirrm lib/nhc98
-@dirrm lib/hmake/${HARCH}
+@dirrm lib/hmake/ix86-${OPSYS}
 @dirrm lib/hmake
+@dirrm include/nhc98/base/Text/Show
+@dirrm include/nhc98/base/Text/PrettyPrint
+@dirrm include/nhc98/base/Text/ParserCombinators/Parsec
+@dirrm include/nhc98/base/Text/ParserCombinators
+@dirrm include/nhc98/base/Text/Html
+@dirrm include/nhc98/base/Text
+@dirrm include/nhc98/base/System/IO
+@dirrm include/nhc98/base/System/Console
+@dirrm include/nhc98/base/System
+@dirrm include/nhc98/base/Foreign/Marshal
+@dirrm include/nhc98/base/Foreign/C
+@dirrm include/nhc98/base/Foreign
+@dirrm include/nhc98/base/Debug
+@dirrm include/nhc98/base/Data
+@dirrm include/nhc98/base/Control/Monad
+@dirrm include/nhc98/base/Control
+@dirrm include/nhc98/base
+@dirrm include/nhc98/NHC
 @dirrm include/nhc98
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 78b51376035..b05f695ee1a 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/11/14 22:38:30 jlam Exp $
+$NetBSD: distinfo,v 1.8 2003/03/19 23:14:35 kristerw Exp $
 
-SHA1 (nhc98src-1.14a.tar.gz) = e82f815367790d7a090c676d6e1f3b368efebe35
-Size (nhc98src-1.14a.tar.gz) = 6215952 bytes
-SHA1 (patch-aa) = 075cbe18ad64194e66fed94d687b4027e28cb037
+SHA1 (nhc98src-1.16.tar.gz) = 7ca27c190d06462cab5d642726b7e5e73b61a7e4
+Size (nhc98src-1.16.tar.gz) = 5689485 bytes
+SHA1 (patch-aa) = ba484e67af2574abda0708f882e4c5f973ef125e
diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa
index 768b76aa12b..5a5ed252221 100644
--- a/lang/nhc98/patches/patch-aa
+++ b/lang/nhc98/patches/patch-aa
@@ -1,34 +1,33 @@
-$NetBSD: patch-aa,v 1.5 2002/11/14 22:38:30 jlam Exp $
-
---- configure.orig	Tue Aug 13 09:52:51 2002
-+++ configure
-@@ -345,13 +345,13 @@ int main (void) { test(); }
-     if $CCC -o curses curses.c >/dev/null 2>/dev/null
-     then CURSES=""
-     else
--      if $CCC -o curses curses.c -lncurses >/dev/null 2>/dev/null
-+      if $CCC $LDFLAGS -o curses curses.c -lncurses >/dev/null 2>/dev/null
-       then CURSES="-lncurses"
+$NetBSD: patch-aa,v 1.6 2003/03/19 23:14:35 kristerw Exp $
+--- configure.orig	Wed Mar 12 23:55:24 2003
++++ configure	Wed Mar 12 23:57:47 2003
+@@ -363,13 +363,13 @@
+       if $CCC -o curses curses.c >/dev/null 2>/dev/null
+       then CURSES=""
        else
--        if $CCC -o curses curses.c -lcurses >/dev/null 2>/dev/null
-+        if $CCC $LDFLAGS -o curses curses.c -lcurses >/dev/null 2>/dev/null
-         then CURSES="-lcurses"
+-        if $CCC -o curses curses.c -lncurses >/dev/null 2>/dev/null
++        if $CCC $LDFLAGS -o curses curses.c -lncurses >/dev/null 2>/dev/null
+         then CURSES="-lncurses"
          else
--          if $CCC -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
-+          if $CCC $LDFLAGS -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
-           then CURSES="-lcurses -ltermcap"
-           else CURSES="-ltermcap -lcurses"	# don't know a good default?
-           fi
-@@ -368,10 +368,10 @@ int main (void) { test(); }
+-          if $CCC -o curses curses.c -lcurses >/dev/null 2>/dev/null
++          if $CCC $LDFLAGS -o curses curses.c -lcurses >/dev/null 2>/dev/null
+           then CURSES="-lcurses"
+           else
+-            if $CCC -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
++            if $CCC $LDFLAGS -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
+             then CURSES="-lcurses -ltermcap"
+             else CURSES="-ltermcap -lcurses"	# don't know a good default?
+             fi
+@@ -386,10 +386,10 @@
  
-   echo -n "Testing for the readline library: "
-   echo 'main(){readline();}' >rd.c
--  if ${CCC} -o rd.out rd.c -lreadline >/dev/null 2>&1
-+  if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline >/dev/null 2>&1
-   then echo '          -lreadline (detected)'
-        READLINE="-DUSE_READLINE=1 -lreadline"
--  else if ${CCC} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
-+  else if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
-     then echo "          -lreadline $CURSES (detected)"
-        READLINE="-DUSE_READLINE=1 -lreadline $CURSES"
-     else echo '          no  (detected)'
+     echo -n "Testing for the readline library: "
+     echo 'main(){readline();}' >rd.c
+-    if ${CCC} -o rd.out rd.c -lreadline >/dev/null 2>&1
++    if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline >/dev/null 2>&1
+     then echo '          -lreadline (detected)'
+          READLINE="-DUSE_READLINE=1 -lreadline"
+-    else if ${CCC} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
++    else if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
+       then echo "          -lreadline $CURSES (detected)"
+          READLINE="-DUSE_READLINE=1 -lreadline $CURSES"
+       else echo '          no  (detected)'