pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/45318: [PATCH] lang/nhc98: DESTDIR support and version update



>Number:         45318
>Category:       pkg
>Synopsis:       [PATCH] lang/nhc98: DESTDIR support and version update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 31 12:30:00 +0000 2011
>Originator:     Emil Skoeldberg
>Release:        
>Organization:
>Environment:
>Description:
This is an update of nhc98 from 1.18 to 1.20, with DESTDIR support
added as well.

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.

>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/nhc98/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile    7 Jan 2010 07:36:54 -0000       1.41
+++ Makefile    31 Aug 2011 12:23:49 -0000
@@ -1,16 +1,18 @@
 # $NetBSD: Makefile,v 1.41 2010/01/07 07:36:54 wiz Exp $
 
-DISTNAME=              nhc98src-1.18.tar.gz
-PKGNAME=               nhc98-1.18
-PKGREVISION=           2
+DISTNAME=              nhc98src-1.22
+PKGNAME=               nhc98-1.22
 CATEGORIES=            lang
-MASTER_SITES=          ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
-DISTFILES=             nhc98src-1.18.tar.gz \
-                       nhc98-1.18-library-interfaces.tar.gz
+MASTER_SITES=          http://www.haskell.org/nhc98/
 
 MAINTAINER=            kristerw%NetBSD.org@localhost
 HOMEPAGE=              http://www.cs.york.ac.uk/fp/nhc98/
 COMMENT=               Portable Haskell 98 compiler
+LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+MAKE_JOBS_SAFE=                no
 
 # Not yet ported to 64-bit machines
 NOT_FOR_PLATFORM=      ${LP64PLATFORMS}
@@ -20,17 +22,19 @@
 INCOMPAT_CURSES=       NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=      NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
 
-HAS_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --buildwith=gcc --installdir=${PREFIX:Q} \
+HAS_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --buildwith=gcc --hostcc=gcc --installdir=${PREFIX} \
                        +docs --docdir=${PREFIX}/share/doc/nhc98
 
 USE_TOOLS+=            gmake
-BUILD_TARGET=          default
 
 PLIST_SUBST+=          HARCH=`${WRKSRC}/script/harch`
 
-post-extract:
-       @${FIND} ${WRKSRC}/docs -type d -name \*CVS\* -print | ${XARGS} ${RM} 
-rf
+SUBST_CLASSES+=                fix-cc
+SUBST_STAGE.fix-cc=    post-configure
+SUBST_MESSAGE.fix-cc=  Fixing c compiler name.
+SUBST_FILES.fix-cc=    lib/*/config
+SUBST_SED.fix-cc=      -e 's,CC=cc,CC=gcc,g'
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/nhc98/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST       14 Jun 2009 18:03:37 -0000      1.8
+++ PLIST       31 Aug 2011 12:23:49 -0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:03:37 joerg Exp $
+@comment $NetBSD$
+bin/cabal-parse
 bin/cpphs
 bin/greencard-nhc98
 bin/harch
@@ -8,6 +9,8 @@
 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/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/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/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/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
@@ -219,7 +291,6 @@
 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 +327,59 @@
 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,6 +389,7 @@
 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
@@ -307,10 +403,8 @@
 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/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/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/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/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
@@ -398,3 +498,6 @@
 share/doc/nhc98/tracer.html
 share/doc/nhc98/windows.html
 share/doc/nhc98/york-release.html
+@pkgdir include/nhc98/packages/haskell98
+@pkgdir include/nhc98/packages/base/Text/Regex
+@pkgdir include/nhc98/packages/base/Text/Html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/nhc98/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo    24 Jun 2005 23:58:17 -0000      1.16
+++ distinfo    31 Aug 2011 12:23:49 -0000
@@ -1,12 +1,6 @@
 $NetBSD: distinfo,v 1.16 2005/06/24 23:58:17 kristerw Exp $
 
-SHA1 (nhc98src-1.18.tar.gz) = 7de78b449f1e7efc9a12107ff26b441e35b34625
-RMD160 (nhc98src-1.18.tar.gz) = 7b643958cd68c7417c50a66374e1ab20d90d433d
-Size (nhc98src-1.18.tar.gz) = 14509719 bytes
-SHA1 (nhc98-1.18-library-interfaces.tar.gz) = 
1a149fc6d01a4fcab4ec65f07b00f1d13cdbe3d5
-RMD160 (nhc98-1.18-library-interfaces.tar.gz) = 
480e8c8f9985d396e29661dedf489a5e1bb9c9ba
-Size (nhc98-1.18-library-interfaces.tar.gz) = 116668 bytes
-SHA1 (patch-aa) = b7fe50f0a79c935e980daa9b2d5bb163bf31124e
-SHA1 (patch-ab) = 07e9456007d38fcca7db92064b4d18a7ae8a60f9
-SHA1 (patch-ag) = 0c92edc1d6938afe178b5acaacec889e699f4b51
-SHA1 (patch-ah) = 9121f63bbc3d1de26a1b57bab53787e4e8f9a327
+SHA1 (nhc98src-1.22.tar.gz) = a8adc8f22371998ee0657bc0e01058a57d876abc
+RMD160 (nhc98src-1.22.tar.gz) = 99a90d00f77f66938c817c813f11c3d0ea5bf244
+Size (nhc98src-1.22.tar.gz) = 29854160 bytes
+SHA1 (patch-src_libraries_base_include_HsBase.h) = 
0b2becbdd320f9a0e303572063e24216a9dc94f3
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa    12 May 2005 17:53:29 -0000      1.7
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/05/12 17:53:29 kristerw Exp $
-
---- configure.orig     Fri Mar 11 10:32:56 2005
-+++ configure  Wed May 11 20:49:48 2005
-@@ -42,7 +42,7 @@
- USER=${USER-`whoami 2>/dev/null`}
- MACHINE=`script/harch`
- case $MACHINE in
--  powerpc-Darwin[56]) CCC=${CC-cc};;
-+  powerpc-Darwin*)    CCC=gcc;;
-   *)                  CCC=${CC-gcc};;
- esac
- PWD=`pwd`
-@@ -382,13 +382,13 @@
-       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"
-         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"
-           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
-@@ -405,10 +405,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)'
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab    24 Jun 2005 23:58:18 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/06/24 23:58:18 kristerw Exp $
-
---- src/prelude/BinArray/cLowUnboxedArray.c.orig       2005-06-04 
18:13:50.000000000 +0000
-+++ src/prelude/BinArray/cLowUnboxedArray.c    2005-06-04 18:14:03.000000000 
+0000
-@@ -1,5 +1,5 @@
--#include "cLowUnboxedArray.h"
- #include <stdlib.h>
-+#include "cLowUnboxedArray.h"
- 
- void finaliseUBA (UBA uba) {
-   free(uba->block);
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- patches/patch-ag    1 May 2005 22:55:07 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/05/01 22:55:07 kristerw Exp $
-
---- src/compiler98/RenameLib.hs        22 Dec 2004 12:58:35 -0000      1.31
-+++ src/compiler98/RenameLib.hs        11 Apr 2005 14:24:49 -0000
-@@ -216,7 +216,7 @@
-             (coni:_) ->
-                case (ntI . dropJust . lookupAT st ) coni of
-                  (NewType _ [] _ [NTcons c _ _,res]) -> 
(synType,(u,c):newType)
--                 (NewType _ [] _ [NTvar v _,res]) -> (synType,(u,v):newType)
-+                 (NewType _ [] _ [NTvar v _,res]) -> (synType,      newType)
-                  (NewType _ [] _ [NTapp v1 v2,res]) -> (synType,newType)
-                       -- ^ MW hack: omits potential circularity check!
-                  (NewType _ [] _ (_:_:_)) ->
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- patches/patch-ah    1 May 2005 22:55:07 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,117 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/05/01 22:55:07 kristerw Exp $
-
---- Makefile.orig      2005-04-21 22:10:31.000000000 +0200
-+++ Makefile   2005-04-21 22:16:30.000000000 +0200
-@@ -140,13 +140,13 @@
- 
- TARGDIR= targets
- TARGETS= runtime prelude libraries greencard hp2graph hsc2hs cpphs \
--       profruntime profprelude profprelude-$(CC) \
--       timeruntime timeprelude timeprelude-$(CC) \
--       proflibraries timelibraries proflibraries-$(CC) timelibraries-$(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) hsc2hs-$(CC) cpphs-$(CC)
-+       profruntime profprelude profprelude-gcc \
-+       timeruntime timeprelude timeprelude-gcc \
-+       proflibraries timelibraries proflibraries-gcc timelibraries-gcc \
-+       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 hsc2hs-gcc cpphs-gcc
- 
- .PHONY: default basic all compiler help config install
- 
-@@ -186,8 +186,8 @@
-                                               prelude hsc2hs libraries
- basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc cpphs \
-                                               prelude hsc2hs libraries
--basic-$(CC):   runtime prelude-$(CC) pragma-$(CC) cpphs-$(CC) compiler-$(CC) \
--               greencard-$(CC) hmake-$(CC) hsc2hs-$(CC) libraries-$(CC)
-+basic-gcc:   runtime prelude-gcc pragma-gcc cpphs-gcc compiler-gcc \
-+               greencard-gcc hmake-gcc hsc2hs-gcc libraries-gcc
- 
- all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile #hoodui
- 
-@@ -309,56 +309,56 @@
-       done && touch $(TARGDIR)/$(MACHINE)/timelibraries
- 
- 
--$(TARGDIR)/$(MACHINE)/prelude-$(CC): $(PRELUDEC)
-+$(TARGDIR)/$(MACHINE)/prelude-gcc: $(PRELUDEC)
-       cd src/prelude;        $(MAKE) fromC relink
--      touch $(TARGDIR)/$(MACHINE)/prelude-$(CC)
-+      touch $(TARGDIR)/$(MACHINE)/prelude-gcc
-       touch $(TARGDIR)/$(MACHINE)/prelude
--$(TARGDIR)/$(MACHINE)/timeprelude-$(CC): $(PRELUDEC)
-+$(TARGDIR)/$(MACHINE)/timeprelude-gcc: $(PRELUDEC)
-       cd src/prelude;        $(MAKE) CFG=z fromC
-       cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=z clean all
-       cd src/prelude;        $(MAKE) CFG=z relink
--      touch $(TARGDIR)/$(MACHINE)/timeprelude-$(CC)
-+      touch $(TARGDIR)/$(MACHINE)/timeprelude-gcc
-       touch $(TARGDIR)/$(MACHINE)/timeprelude
--$(TARGDIR)/$(MACHINE)/profprelude-$(CC): $(PRELUDEC)
-+$(TARGDIR)/$(MACHINE)/profprelude-gcc: $(PRELUDEC)
-       cd src/prelude;        $(MAKE) CFG=p fromC
-       cd src/prelude/$(MACHINE)/NHC; $(MAKE) CFG=p clean all
-       cd src/prelude;        $(MAKE) CFG=p relink
--      touch $(TARGDIR)/$(MACHINE)/profprelude-$(CC)
-+      touch $(TARGDIR)/$(MACHINE)/profprelude-gcc
-       touch $(TARGDIR)/$(MACHINE)/profprelude
--$(TARGDIR)/$(MACHINE)/compiler-$(CC): $(COMPILERC)
-+$(TARGDIR)/$(MACHINE)/compiler-gcc: $(COMPILERC)
-       cd src/compiler98;     $(MAKE) fromC
-       cd src/prelude/$(MACHINE)/NHC; $(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.hc
-+      touch $(TARGDIR)/$(MACHINE)/greencard 
$(TARGDIR)/$(MACHINE)/greencard-gcc
-+$(TARGDIR)/$(MACHINE)/pragma-gcc: script/hmake-PRAGMA.hc
-       script/nhc98 -o $(PRAGMA) script/hmake-PRAGMA.hc
--      touch $(TARGDIR)/$(MACHINE)/pragma-$(CC)
--$(TARGDIR)/$(MACHINE)/cpphs-$(CC): $(CPPHS)
-+      touch $(TARGDIR)/$(MACHINE)/pragma-gcc
-+$(TARGDIR)/$(MACHINE)/cpphs-gcc: $(CPPHS)
-       cd src/cpphs;          $(MAKE) -f Makefile.nhc98 fromC
--      touch $(TARGDIR)/$(MACHINE)/cpphs-$(CC)
--$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC)
-+      touch $(TARGDIR)/$(MACHINE)/cpphs-gcc
-+$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC)
-       cd src/hmake;          $(MAKE) BUILDCOMP=nhc fromC config
-       cd src/interpreter;    $(MAKE) BUILDCOMP=nhc fromC
--      touch $(TARGDIR)/$(MACHINE)/hmake-$(CC)
--$(TARGDIR)/$(MACHINE)/hsc2hs-$(CC): $(HSC2HS) $(HSC2HSC)
-+      touch $(TARGDIR)/$(MACHINE)/hmake-gcc
-+$(TARGDIR)/$(MACHINE)/hsc2hs-gcc: $(HSC2HS) $(HSC2HSC)
-       cd src/hsc2hs;         $(MAKE) -f Makefile.nhc98 fromC
--      touch $(TARGDIR)/$(MACHINE)/hsc2hs-$(CC)
--$(TARGDIR)/$(MACHINE)/libraries-$(CC): $(LIBRARIES)
-+      touch $(TARGDIR)/$(MACHINE)/hsc2hs-gcc
-+$(TARGDIR)/$(MACHINE)/libraries-gcc: $(LIBRARIES)
-       for pkg in ${PACKAGEBUILD};\
-       do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 fromC; ) ;\
--      done && touch $(TARGDIR)/$(MACHINE)/libraries-$(CC)
--$(TARGDIR)/$(MACHINE)/proflibraries-$(CC): $(LIBRARIES)
-+      done && touch $(TARGDIR)/$(MACHINE)/libraries-gcc
-+$(TARGDIR)/$(MACHINE)/proflibraries-gcc: $(LIBRARIES)
-       for pkg in ${PACKAGEBUILD};\
-       do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 CFG=p fromC; ) ;\
--      done && touch $(TARGDIR)/$(MACHINE)/proflibraries-$(CC)
--$(TARGDIR)/$(MACHINE)/timelibraries-$(CC): $(LIBRARIES)
-+      done && touch $(TARGDIR)/$(MACHINE)/proflibraries-gcc
-+$(TARGDIR)/$(MACHINE)/timelibraries-gcc: $(LIBRARIES)
-       for pkg in ${PACKAGEBUILD};\
-       do ( cd src/libraries/$$pkg; $(MAKE) -f Makefile.nhc98 CFG=z fromC; ) ;\
--      done && touch $(TARGDIR)/$(MACHINE)/timelibraries-$(CC)
-+      done && touch $(TARGDIR)/$(MACHINE)/timelibraries-gcc
- 
- 
- script/errnogen.c: script/GenerateErrNo.hs
Index: patches/patch-src_libraries_base_include_HsBase.h
===================================================================
RCS file: patches/patch-src_libraries_base_include_HsBase.h
diff -N patches/patch-src_libraries_base_include_HsBase.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libraries_base_include_HsBase.h   31 Aug 2011 12:23:49 
-0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+* Fix pre-processor syntax for modern gcc:s
+
+--- src/libraries/base/include/HsBase.h.orig   2009-08-09 03:02:00.000000000 
+0000
++++ src/libraries/base/include/HsBase.h
+@@ -72,7 +72,7 @@
+ #  if HAVE_SYS_TIME_H
+ #   include <sys/time.h>
+ #  endif
+-#elif HAVE_GETCLOCK
++#elif defined(HAVE_GETCLOCK)
+ # if HAVE_SYS_TIMERS_H
+ #  define POSIX_4D9 1
+ #  include <sys/timers.h>
+@@ -101,7 +101,7 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#elif HAVE_STDINT_H
++#elif defined(HAVE_STDINT_H)
+ # include <stdint.h>
+ #endif
+ 



Home | Main Index | Thread Index | Old Index