Update to 1.22.

Does not include all the changes in PR 45318, some of which need
further investigation.

pkgsrc changes:
   - update MASTER_SITES and HOMEPAGE
   - remove LP64 restriction (LP64 platforms are supported using -m32)
   - add destdir support (provided by upstream) and lift BROKEN
   - remove some pkglint
   - mark MAKE_JOBS_SAFE=no
   - add readline.bl3.mk
   - patch-ag was applied upstream
   - remove patch-ah and handle the issue involved a cleaner way

Caution: so far the LP64 build does not actually work yet, -m32
notwithstanding; it dies with
   PreludeList.init: empty list
   PreludeList.init: empty list
   PreludeList.init: empty list
i386 works though.

Upstream changes:

nhc98 1.22 (2010-07-09) features

    There are no new features, just an update to the current set of
    libraries as of the release date.

nhc98 1.20 (2007-11-22) features

    New: Pattern guards are supported.
    New: More hierarchical libraries have been added to the base package.
    Bugfix: Now builds on 64-bit machines (in 32-bit mode)
    Bugfix: Newer version of hmake (3.13)
    Bugfix: The evil mangler is now less evil (and more robust)
    Bugfix: Add a workaround for the hi-membug that caused build
            failures on many recent Linux platforms.
    Bugfix: Lexical error on varid _2a is fixed.
    Bugfix: Renaming bug in newtype A a = A a.
    Bugfix: hp2graph problem with x-axis resolution in interval (-i) sampling.
    Bugfix: hp2graph end-of-file parsing bug.
    New: The runtime system code is now documented using funnelweb.

4 files changed, 191 insertions, 91 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 0e2483f6ca1..a677c2914c1 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/10/25 04:09:14 dholland Exp $
+# $NetBSD: Makefile,v 1.45 2013/10/25 06:25:18 dholland Exp $
 
 DISTNAME=		nhc98src-1.22
 PKGNAME=		nhc98-1.22
@@ -11,8 +11,6 @@ COMMENT=		Portable Haskell 98 compiler
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
-BROKEN=			incomplete update, blame dholland
-
 MAKE_JOBS_SAFE=		no
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake
@@ -30,7 +28,7 @@ BUILD_MAKE_FLAGS+=	PKGSRC_M32=-m32
 BUILD_MAKE_FLAGS+=	PKGSRC_M32=
 .endif
 
-#PLIST_SUBST+=		HARCH=`${WRKSRC}/script/harch`
+PLIST_SUBST+=		HARCH=`${WRKSRC}/script/harch`
 
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
diff --git a/lang/nhc98/PLIST b/lang/nhc98/PLIST
index 229f100001d..85c7bf6e13c 100644
--- a/lang/nhc98/PLIST
+++ b/lang/nhc98/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:03:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/10/25 06:25:18 dholland Exp $
+bin/cabal-parse
 bin/cpphs
 bin/greencard-nhc98
 bin/harch
@@ -8,6 +9,8 @@ bin/hmake-config
 bin/hood
 bin/hp2graph
 bin/nhc98
+bin/nhc98-pkg
+bin/runhs
 bin/tprofprel
 include/nhc98/Array.hi
 include/nhc98/CPUTime.hi
@@ -33,6 +36,7 @@ include/nhc98/NHC/Internal.hi
 include/nhc98/NHC/Observe.hi
 include/nhc98/NHC/PackedString.hi
 include/nhc98/NHC/Prelude.hi
+include/nhc98/NHC/Vector.hi
 include/nhc98/NonStdEval.hi
 include/nhc98/NonStdGetPID.hi
 include/nhc98/NonStdProfile.hi
@@ -62,67 +66,103 @@ include/nhc98/mutlib.h
 include/nhc98/newbytecode.h
 include/nhc98/newmacros.h
 include/nhc98/node.h
-include/nhc98/packages/Cabal/Distribution/Compat/Directory.hi
+include/nhc98/packages/Cabal.cabal
 include/nhc98/packages/Cabal/Distribution/Compat/Exception.hi
-include/nhc98/packages/Cabal/Distribution/Compat/FilePath.hi
-include/nhc98/packages/Cabal/Distribution/Compat/RawSystem.hi
 include/nhc98/packages/Cabal/Distribution/Compat/ReadP.hi
-include/nhc98/packages/Cabal/Distribution/Extension.hi
+include/nhc98/packages/Cabal/Distribution/Compat/TempFile.hi
+include/nhc98/packages/Cabal/Distribution/Compiler.hi
 include/nhc98/packages/Cabal/Distribution/GetOpt.hi
 include/nhc98/packages/Cabal/Distribution/InstalledPackageInfo.hi
 include/nhc98/packages/Cabal/Distribution/License.hi
 include/nhc98/packages/Cabal/Distribution/Make.hi
+include/nhc98/packages/Cabal/Distribution/ModuleName.hi
 include/nhc98/packages/Cabal/Distribution/Package.hi
 include/nhc98/packages/Cabal/Distribution/PackageDescription.hi
+include/nhc98/packages/Cabal/Distribution/PackageDescription/Check.hi
+include/nhc98/packages/Cabal/Distribution/PackageDescription/Configuration.hi
+include/nhc98/packages/Cabal/Distribution/PackageDescription/Parse.hi
 include/nhc98/packages/Cabal/Distribution/ParseUtils.hi
-include/nhc98/packages/Cabal/Distribution/PreProcess.hi
-include/nhc98/packages/Cabal/Distribution/PreProcess/Unlit.hi
-include/nhc98/packages/Cabal/Distribution/Setup.hi
+include/nhc98/packages/Cabal/Distribution/ReadE.hi
 include/nhc98/packages/Cabal/Distribution/Simple.hi
 include/nhc98/packages/Cabal/Distribution/Simple/Build.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Build/Macros.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Build/PathsModule.hi
+include/nhc98/packages/Cabal/Distribution/Simple/BuildPaths.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Command.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Compiler.hi
 include/nhc98/packages/Cabal/Distribution/Simple/Configure.hi
-include/nhc98/packages/Cabal/Distribution/Simple/GHCPackageConfig.hi
+include/nhc98/packages/Cabal/Distribution/Simple/GHC.hi
+include/nhc98/packages/Cabal/Distribution/Simple/GHC/IPI641.hi
+include/nhc98/packages/Cabal/Distribution/Simple/GHC/IPI642.hi
+include/nhc98/packages/Cabal/Distribution/Simple/GHC/Makefile.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Haddock.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Hugs.hi
 include/nhc98/packages/Cabal/Distribution/Simple/Install.hi
+include/nhc98/packages/Cabal/Distribution/Simple/InstallDirs.hi
+include/nhc98/packages/Cabal/Distribution/Simple/JHC.hi
 include/nhc98/packages/Cabal/Distribution/Simple/LocalBuildInfo.hi
+include/nhc98/packages/Cabal/Distribution/Simple/NHC.hi
+include/nhc98/packages/Cabal/Distribution/Simple/PackageIndex.hi
+include/nhc98/packages/Cabal/Distribution/Simple/PackageSet.hi
+include/nhc98/packages/Cabal/Distribution/Simple/PreProcess.hi
+include/nhc98/packages/Cabal/Distribution/Simple/PreProcess/Unlit.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Program.hi
 include/nhc98/packages/Cabal/Distribution/Simple/Register.hi
+include/nhc98/packages/Cabal/Distribution/Simple/Setup.hi
 include/nhc98/packages/Cabal/Distribution/Simple/SrcDist.hi
+include/nhc98/packages/Cabal/Distribution/Simple/UserHooks.hi
 include/nhc98/packages/Cabal/Distribution/Simple/Utils.hi
+include/nhc98/packages/Cabal/Distribution/System.hi
+include/nhc98/packages/Cabal/Distribution/Text.hi
+include/nhc98/packages/Cabal/Distribution/Verbosity.hi
 include/nhc98/packages/Cabal/Distribution/Version.hi
-include/nhc98/packages/HUnit/Test/HUnit.hi
-include/nhc98/packages/HUnit/Test/HUnit/Base.hi
-include/nhc98/packages/HUnit/Test/HUnit/Lang.hi
-include/nhc98/packages/HUnit/Test/HUnit/Terminal.hi
-include/nhc98/packages/HUnit/Test/HUnit/Text.hi
-include/nhc98/packages/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
+include/nhc98/packages/Cabal/Language/Haskell/Extension.hi
+include/nhc98/packages/HaXml.cabal
 include/nhc98/packages/HaXml/Text/XML/HaXml.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/ByteStringPP.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Combinators.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/DtdToHaskell/Convert.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/DtdToHaskell/Instance.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Escape.hi
-include/nhc98/packages/HaXml/Text/XML/HaXml/Haskell2Xml.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Generate.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Parse.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Html/ParseLazy.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Html/Pretty.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Lex.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Namespaces.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/OneOfN.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Parse.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/ParseLazy.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Posn.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Pretty.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/SAX.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/ShowXmlLazy.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/TypeMapping.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Types.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/Util.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Validate.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Verbatim.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Wrappers.hi
-include/nhc98/packages/HaXml/Text/XML/HaXml/Xml2Haskell.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/XmlContent.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/XmlContent/Haskell.hi
+include/nhc98/packages/HaXml/Text/XML/HaXml/XmlContent/Parser.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Lex.hi
 include/nhc98/packages/HaXml/Text/XML/HaXml/Xtract/Parse.hi
-include/nhc98/packages/QuickCheck/Debug/QuickCheck.hi
-include/nhc98/packages/QuickCheck/Debug/QuickCheck/Poly.hi
-include/nhc98/packages/QuickCheck/Debug/QuickCheck/Utils.hi
-include/nhc98/packages/QuickCheck/Test/QuickCheck.hi
-include/nhc98/packages/QuickCheck/Test/QuickCheck/Poly.hi
-include/nhc98/packages/QuickCheck/Test/QuickCheck/Utils.hi
+include/nhc98/packages/array.cabal
+include/nhc98/packages/array/Data/Array.hi
+include/nhc98/packages/base.cabal
+include/nhc98/packages/base/Control/Applicative.hi
 include/nhc98/packages/base/Control/Arrow.hi
+include/nhc98/packages/base/Control/Category.hi
+include/nhc98/packages/base/Control/Exception.hi
+include/nhc98/packages/base/Control/Exception/Base.hi
 include/nhc98/packages/base/Control/Monad.hi
 include/nhc98/packages/base/Control/Monad/Fix.hi
-include/nhc98/packages/base/Data/Array.hi
+include/nhc98/packages/base/Control/Monad/Instances.hi
+include/nhc98/packages/base/DErrNo.hi
+include/nhc98/packages/base/DIOError.hi
 include/nhc98/packages/base/Data/Bits.hi
 include/nhc98/packages/base/Data/Bool.hi
 include/nhc98/packages/base/Data/Char.hi
@@ -130,24 +170,20 @@ include/nhc98/packages/base/Data/Complex.hi
 include/nhc98/packages/base/Data/Dynamic.hi
 include/nhc98/packages/base/Data/Either.hi
 include/nhc98/packages/base/Data/Eq.hi
-include/nhc98/packages/base/Data/FiniteMap.hi
-include/nhc98/packages/base/Data/FunctorM.hi
+include/nhc98/packages/base/Data/Fixed.hi
+include/nhc98/packages/base/Data/Foldable.hi
+include/nhc98/packages/base/Data/Function.hi
+include/nhc98/packages/base/Data/Functor.hi
 include/nhc98/packages/base/Data/HashTable.hi
 include/nhc98/packages/base/Data/IORef.hi
 include/nhc98/packages/base/Data/Int.hi
-include/nhc98/packages/base/Data/IntMap.hi
-include/nhc98/packages/base/Data/IntSet.hi
 include/nhc98/packages/base/Data/Ix.hi
 include/nhc98/packages/base/Data/List.hi
-include/nhc98/packages/base/Data/Map.hi
 include/nhc98/packages/base/Data/Maybe.hi
 include/nhc98/packages/base/Data/Monoid.hi
 include/nhc98/packages/base/Data/Ord.hi
-include/nhc98/packages/base/Data/PackedString.hi
-include/nhc98/packages/base/Data/Queue.hi
 include/nhc98/packages/base/Data/Ratio.hi
-include/nhc98/packages/base/Data/Set.hi
-include/nhc98/packages/base/Data/Tree.hi
+include/nhc98/packages/base/Data/Traversable.hi
 include/nhc98/packages/base/Data/Tuple.hi
 include/nhc98/packages/base/Data/Typeable.hi
 include/nhc98/packages/base/Data/Version.hi
@@ -168,47 +204,83 @@ include/nhc98/packages/base/Foreign/Marshal/Utils.hi
 include/nhc98/packages/base/Foreign/Ptr.hi
 include/nhc98/packages/base/Foreign/StablePtr.hi
 include/nhc98/packages/base/Foreign/Storable.hi
+include/nhc98/packages/base/GHC/IO/Device.hi
+include/nhc98/packages/base/NHC/PosixTypes.hi
 include/nhc98/packages/base/NHC/SizedTypes.hi
+include/nhc98/packages/base/Nhc98BaseConfig.h
 include/nhc98/packages/base/System/CPUTime.hi
-include/nhc98/packages/base/System/Cmd.hi
 include/nhc98/packages/base/System/Console/GetOpt.hi
-include/nhc98/packages/base/System/Directory.hi
-include/nhc98/packages/base/System/Directory/Internals.hi
 include/nhc98/packages/base/System/Environment.hi
 include/nhc98/packages/base/System/Exit.hi
 include/nhc98/packages/base/System/IO.hi
 include/nhc98/packages/base/System/IO/Error.hi
 include/nhc98/packages/base/System/IO/Unsafe.hi
 include/nhc98/packages/base/System/Info.hi
-include/nhc98/packages/base/System/Locale.hi
 include/nhc98/packages/base/System/Mem.hi
-include/nhc98/packages/base/System/Random.hi
-include/nhc98/packages/base/System/Time.hi
-include/nhc98/packages/base/Text/Html.hi
-include/nhc98/packages/base/Text/Html/BlockTable.hi
+include/nhc98/packages/base/System/Posix/Internals.hi
+include/nhc98/packages/base/System/Posix/Types.hi
+include/nhc98/packages/base/System/Timeout.hi
 include/nhc98/packages/base/Text/ParserCombinators/ReadP.hi
-include/nhc98/packages/base/Text/PrettyPrint.hi
-include/nhc98/packages/base/Text/PrettyPrint/HughesPJ.hi
 include/nhc98/packages/base/Text/Printf.hi
 include/nhc98/packages/base/Text/Read.hi
-include/nhc98/packages/base/Text/Regex.hi
-include/nhc98/packages/base/Text/Regex/Posix.hi
 include/nhc98/packages/base/Text/Show.hi
 include/nhc98/packages/base/Text/Show/Functions.hi
-include/nhc98/packages/haskell-src/Language/Haskell/Lexer.hi
-include/nhc98/packages/haskell-src/Language/Haskell/ParseMonad.hi
-include/nhc98/packages/haskell-src/Language/Haskell/ParseUtils.hi
-include/nhc98/packages/haskell-src/Language/Haskell/Parser.hi
-include/nhc98/packages/haskell-src/Language/Haskell/Pretty.hi
-include/nhc98/packages/haskell-src/Language/Haskell/Syntax.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Char.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Combinator.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Error.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Expr.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Perm.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Pos.hi
-include/nhc98/packages/parsec/Text/ParserCombinators/Parsec/Prim.hi
+include/nhc98/packages/base/Typeable.h
+include/nhc98/packages/base/Unsafe/Coerce.hi
+include/nhc98/packages/bytestring.cabal
+include/nhc98/packages/bytestring/Data/ByteString.hi
+include/nhc98/packages/bytestring/Data/ByteString/Char8.hi
+include/nhc98/packages/bytestring/Data/ByteString/Fusion.hi
+include/nhc98/packages/bytestring/Data/ByteString/Internal.hi
+include/nhc98/packages/bytestring/Data/ByteString/Lazy.hi
+include/nhc98/packages/bytestring/Data/ByteString/Lazy/Char8.hi
+include/nhc98/packages/bytestring/Data/ByteString/Lazy/Internal.hi
+include/nhc98/packages/bytestring/Data/ByteString/Unsafe.hi
+include/nhc98/packages/containers.cabal
+include/nhc98/packages/containers/Data/Graph.hi
+include/nhc98/packages/containers/Data/IntMap.hi
+include/nhc98/packages/containers/Data/IntSet.hi
+include/nhc98/packages/containers/Data/Map.hi
+include/nhc98/packages/containers/Data/Sequence.hi
+include/nhc98/packages/containers/Data/Set.hi
+include/nhc98/packages/containers/Data/Tree.hi
+include/nhc98/packages/directory.cabal
+include/nhc98/packages/directory/System/Directory.hi
+include/nhc98/packages/filepath.cabal
+include/nhc98/packages/filepath/System/FilePath.hi
+include/nhc98/packages/filepath/System/FilePath/Posix.hi
+include/nhc98/packages/filepath/System/FilePath/Windows.hi
+include/nhc98/packages/haskell98.cabal
+include/nhc98/packages/old-locale.cabal
+include/nhc98/packages/old-locale/System/Locale.hi
+include/nhc98/packages/old-time.cabal
+include/nhc98/packages/old-time/System/Time.hi
+include/nhc98/packages/packedstring.cabal
+include/nhc98/packages/packedstring/Data/PackedString.hi
+include/nhc98/packages/polyparse.cabal
+include/nhc98/packages/polyparse/Text/Parse.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/HuttonMeijer.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/HuttonMeijerWallace.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/Base.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/Lazy.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/NoLeak/Lazy.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/NoLeak/Plain.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/NoLeak/State.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/NoLeak/StateLazy.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/Plain.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/State.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/Poly/StateLazy.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/PolyLazy.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/PolyState.hi
+include/nhc98/packages/polyparse/Text/ParserCombinators/PolyStateLazy.hi
+include/nhc98/packages/pretty.cabal
+include/nhc98/packages/pretty/Text/PrettyPrint.hi
+include/nhc98/packages/pretty/Text/PrettyPrint/HughesPJ.hi
+include/nhc98/packages/process.cabal
+include/nhc98/packages/process/System/Cmd.hi
+include/nhc98/packages/random.cabal
+include/nhc98/packages/random/System/Random.hi
 include/nhc98/runtime.h
 include/nhc98/stableptr.h
 include/nhc98/twopass.h
@@ -217,9 +289,7 @@ lib/hmake/${HARCH}/MkConfig
 lib/hmake/${HARCH}/MkProg
 lib/hmake/${HARCH}/Older
 lib/hmake/${HARCH}/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
@@ -256,35 +326,59 @@ 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}/cabal-parse
 lib/nhc98/${HARCH}/config
 lib/nhc98/${HARCH}/cpphs
 lib/nhc98/${HARCH}/greencard-nhc98
 lib/nhc98/${HARCH}/hmake-PRAGMA
 lib/nhc98/${HARCH}/hp2graph
 lib/nhc98/${HARCH}/hsc2hs
-lib/nhc98/${HARCH}/libHSCabal.a
-lib/nhc98/${HARCH}/libHSCabal.p.a
-lib/nhc98/${HARCH}/libHSCabal.z.a
-lib/nhc98/${HARCH}/libHSHUnit.a
-lib/nhc98/${HARCH}/libHSHUnit.p.a
-lib/nhc98/${HARCH}/libHSHUnit.z.a
 lib/nhc98/${HARCH}/libHSHaXml.a
 lib/nhc98/${HARCH}/libHSHaXml.p.a
 lib/nhc98/${HARCH}/libHSHaXml.z.a
-lib/nhc98/${HARCH}/libHSQuickCheck.a
-lib/nhc98/${HARCH}/libHSQuickCheck.p.a
-lib/nhc98/${HARCH}/libHSQuickCheck.z.a
+lib/nhc98/${HARCH}/libHSarray.a
+lib/nhc98/${HARCH}/libHSarray.p.a
+lib/nhc98/${HARCH}/libHSarray.z.a
 lib/nhc98/${HARCH}/libHSbase.a
 lib/nhc98/${HARCH}/libHSbase.p.a
 lib/nhc98/${HARCH}/libHSbase.z.a
-lib/nhc98/${HARCH}/libHShaskell-src.a
-lib/nhc98/${HARCH}/libHShaskell-src.p.a
-lib/nhc98/${HARCH}/libHShaskell-src.z.a
-lib/nhc98/${HARCH}/libHSparsec.a
-lib/nhc98/${HARCH}/libHSparsec.p.a
-lib/nhc98/${HARCH}/libHSparsec.z.a
+lib/nhc98/${HARCH}/libHSbytestring.a
+lib/nhc98/${HARCH}/libHSbytestring.p.a
+lib/nhc98/${HARCH}/libHSbytestring.z.a
+lib/nhc98/${HARCH}/libHScontainers.a
+lib/nhc98/${HARCH}/libHScontainers.p.a
+lib/nhc98/${HARCH}/libHScontainers.z.a
+lib/nhc98/${HARCH}/libHSdirectory.a
+lib/nhc98/${HARCH}/libHSdirectory.p.a
+lib/nhc98/${HARCH}/libHSdirectory.z.a
+lib/nhc98/${HARCH}/libHSfilepath.a
+lib/nhc98/${HARCH}/libHSfilepath.p.a
+lib/nhc98/${HARCH}/libHSfilepath.z.a
+lib/nhc98/${HARCH}/libHShaskell98.a
+lib/nhc98/${HARCH}/libHShaskell98.p.a
+lib/nhc98/${HARCH}/libHShaskell98.z.a
+lib/nhc98/${HARCH}/libHSold-locale.a
+lib/nhc98/${HARCH}/libHSold-locale.p.a
+lib/nhc98/${HARCH}/libHSold-locale.z.a
+lib/nhc98/${HARCH}/libHSold-time.a
+lib/nhc98/${HARCH}/libHSold-time.p.a
+lib/nhc98/${HARCH}/libHSold-time.z.a
+lib/nhc98/${HARCH}/libHSpackedstring.a
+lib/nhc98/${HARCH}/libHSpackedstring.p.a
+lib/nhc98/${HARCH}/libHSpackedstring.z.a
+lib/nhc98/${HARCH}/libHSpolyparse.a
+lib/nhc98/${HARCH}/libHSpolyparse.p.a
+lib/nhc98/${HARCH}/libHSpolyparse.z.a
+lib/nhc98/${HARCH}/libHSpretty.a
+lib/nhc98/${HARCH}/libHSpretty.p.a
+lib/nhc98/${HARCH}/libHSpretty.z.a
+lib/nhc98/${HARCH}/libHSprocess.a
+lib/nhc98/${HARCH}/libHSprocess.p.a
+lib/nhc98/${HARCH}/libHSprocess.z.a
+lib/nhc98/${HARCH}/libHSrandom.a
+lib/nhc98/${HARCH}/libHSrandom.p.a
+lib/nhc98/${HARCH}/libHSrandom.z.a
 lib/nhc98/${HARCH}/main.o
 lib/nhc98/${HARCH}/main.p.o
 lib/nhc98/${HARCH}/main.z.o
@@ -294,11 +388,13 @@ 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}/nhc98-pkg
 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
+lib/nhc98/hood.jar
 man/man1/harch.1
 man/man1/hi.1
 man/man1/hmake.1
@@ -307,10 +403,8 @@ 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/Nhc13Test10.hs
-share/doc/nhc98/bugs/Nhc13Test13.hs
 share/doc/nhc98/bugs/README
+share/doc/nhc98/bugs/badsqrt.hs
 share/doc/nhc98/bugs/nhc13test1.hs
 share/doc/nhc98/bugs/nhc13test10.hs
 share/doc/nhc98/bugs/nhc13test11.hs
@@ -325,6 +419,9 @@ share/doc/nhc98/bugs/nhc13test19.hs
 share/doc/nhc98/bugs/nhc13test2.hs
 share/doc/nhc98/bugs/nhc13test20.hs
 share/doc/nhc98/bugs/nhc13test3.hs
+share/doc/nhc98/bugs/nhc13test30.hs
+share/doc/nhc98/bugs/nhc13test31.hs
+share/doc/nhc98/bugs/nhc13test32.hs
 share/doc/nhc98/bugs/nhc13test4.hs
 share/doc/nhc98/bugs/nhc13test5.hs
 share/doc/nhc98/bugs/nhc13test6.hs
@@ -341,6 +438,7 @@ share/doc/nhc98/config.html
 share/doc/nhc98/contrib.html
 share/doc/nhc98/copyright.html
 share/doc/nhc98/cvs.html
+share/doc/nhc98/darcs.html
 share/doc/nhc98/download.html
 share/doc/nhc98/errmsgs.html
 share/doc/nhc98/examples/ZooQuiz.hs
@@ -363,6 +461,7 @@ 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/runhs.html
 share/doc/nhc98/implementation-notes/build-system
 share/doc/nhc98/implementation-notes/bytecode
 share/doc/nhc98/implementation-notes/gc
@@ -373,6 +472,7 @@ share/doc/nhc98/implementation-notes/phases
 share/doc/nhc98/implementation-notes/space-efficient
 share/doc/nhc98/index.html
 share/doc/nhc98/install.html
+share/doc/nhc98/interface.html
 share/doc/nhc98/libraries.html
 share/doc/nhc98/libs/BinArray.html
 share/doc/nhc98/libs/Binary.html
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 73ddffa008a..883f4ed2105 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2013/10/25 04:09:14 dholland Exp $
+$NetBSD: distinfo,v 1.18 2013/10/25 06:25:18 dholland Exp $
 
 SHA1 (nhc98src-1.22.tar.gz) = a8adc8f22371998ee0657bc0e01058a57d876abc
 RMD160 (nhc98src-1.22.tar.gz) = 99a90d00f77f66938c817c813f11c3d0ea5bf244
 Size (nhc98src-1.22.tar.gz) = 29854160 bytes
 SHA1 (patch-Makefile.inc) = 4b457e962497595f3201c34220be02f2d6bf867e
-SHA1 (patch-aa) = 69cd6329ef720ac9749b55a9b00ad94aec0fe1ff
+SHA1 (patch-aa) = 56c813285e90db7d0e4a6847b3806fcfc6e7d887
 SHA1 (patch-ab) = 07e9456007d38fcca7db92064b4d18a7ae8a60f9
diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa
index 66c79e971ad..0c33261490c 100644
--- a/lang/nhc98/patches/patch-aa
+++ b/lang/nhc98/patches/patch-aa
@@ -1,19 +1,21 @@
-$NetBSD: patch-aa,v 1.8 2013/10/25 04:09:14 dholland Exp $
+$NetBSD: patch-aa,v 1.9 2013/10/25 06:25:18 dholland Exp $
 
-- don't trip on newer macos versions
+- always set the compiler to "gcc" for pkgsrc
 - honor pkgsrc LDFLAGS
 
 --- configure.orig	2010-07-09 12:41:23.000000000 +0000
 +++ configure
-@@ -65,7 +65,7 @@ chmod +x script/harch || exit 1
+@@ -65,8 +65,8 @@ chmod +x script/harch || exit 1
  MACHINE=`script/harch`
  
  case $MACHINE in
 -  powerpc-Darwin[56]) CCC=${CC-cc} ;;
-+  powerpc-Darwin*)    CCC=${CC-cc} ;;
-   *)                  CCC=${CC-gcc} ;  ;;
+-  *)                  CCC=${CC-gcc} ;  ;;
++  powerpc-Darwin*)    CCC=gcc;;
++  *)                  CCC=gcc;;
  esac
  
+ STRIP=${STRIP}
 @@ -482,16 +482,16 @@ main() {
  void test (void) { mvaddstr(1,2,"hello world"); }
  int main (void) { test(); }