[resolve conflicts with library support patch.
John Meacham <john@repetae.net>**20060425025955] addfile ./lib/haskell98.cabal
hunk ./Ho/Build.hs 9
-    checkForHoFile,
-    checkForHoModule
+    checkForHoFile
hunk ./Ho/Build.hs 36
-import Name.Name(Name())
hunk ./Ho/Build.hs 51
-import Info.Types
hunk ./Ho/Build.hs 54
-import PrimitiveOperators
hunk ./Ho/Build.hs 56
-import Support.CanType
hunk ./Ho/Build.hs 112
-    | m `Map.member` (hoExports have) = return have
-    | m `Map.member` (hoExports lhave) = return mempty
+    | m `mmember` (hoExports have) = return have
+    | m `mmember` (hoExports lhave) = return have
hunk ./Ho/Build.hs 130
-                ldeps = Map.unions [ Map.singleton ln cs | m <- mods', Right (ln,cs) <- Map.lookup m (hoModules ho)]
+                ldeps = Map.fromList [ x | m <- mods', Right x <- Map.lookup m (hoModules lhave)]
hunk ./Ho/Build.hs 142
+{-
hunk ./Ho/Build.hs 148
+-}
hunk ./Ho/Library.hs 22
-import Util.Gen
-import Util.MD5(md5file)
+import Util.SHA1(sha1file)
hunk ./Ho/Library.hs 58
+    wdump FD.Progress $ putErrLn $ "Loading libraries: " ++ show (optHls options)
hunk ./Ho/Library.hs 118
-    wdump FD.Progress $ putStrLn $ "Reading: " ++ show fp
+    wdump FD.Progress $ putErrLn $ "Reading: " ++ show fp
hunk ./Ho/Library.hs 129
-    pkgCS <- md5file fp
+    wdump FD.Progress $ putErrLn $ "Loading library: " ++ show lname ++ " @ " ++ show fp
+    pkgCS <- sha1file fp
hunk ./Makefile 48
-	./jhc $(JHC_TEST) -ilib/base --noauto --build-hl lib/base/base.cabal -o $@ 2>&1 | tee base.log
+	./jhc -v $(JHC_TEST)  -ilib/base --noauto --build-hl lib/base/base.cabal -o $@ 2>&1 | tee base.log
hunk ./Makefile 50
-install: jhc base-1.0.hl
+base-1.0.prof.hl: jhc lib/base/base.cabal
+	-[ -e base.prof.log ] && mv -f base.prof.log base.prof.log.bak
+	./jhcp -v $(JHC_TEST) -ilib/base --noauto --build-hl lib/base/base.cabal -o base-1.0.prof.hl +RTS $(PROF_OPTS)  2>&1 | tee base.log
+
+#install: jhc base-1.0.hl
+
+haskell98-1.0.hl: jhc lib/haskell98/haskell98.cabal base-1.0.hl
+	./jhc -v $(JHC_TEST) -ilib/haskell98 --noauto -L- -L. -p base --build-hl lib/haskell98.cabal -o $@
+
+QuickCheck-1.0.hl: jhc base-1.0.hl
+	./jhc -v -d progress $(JHC_TEST) -ilib/QuickCheck -L- -L. -f cpp --build-hl lib/QuickCheck/QuickCheck.cabal -o $@
+
+install: jhc $(LIBPACKAGES)
hunk ./lib/base/base.cabal 14
+                 Data.Int,
hunk ./lib/base/base.cabal 16
+                 Data.Ix,
+                 Data.Maybe,
+--                 Data.IORef,
hunk ./lib/base/base.cabal 39
-                 Jhc.Inspection,
+--                 Jhc.Inspection,
hunk ./lib/haskell98.cabal 1
+-- This is a modified version of the cabal file from ghc.
+
+name:		haskell98
+version:	1.0
+license:	BSD3
+license-file:	LICENSE
+maintainer:	libraries@haskell.org
+synopsis:	Compatibility with Haskell 98
+description:
+  This package provides compatibility with the modules of Haskell 98 by
+  means of wrappers around modules from the base package.  However Prelude and
+  Numeric are provided directly by the base package.
+
+homepage:	http://www.haskell.org/definition/
+build-depends:	base
+exposed-modules:
+	-- Haskell 98 (Prelude and Numeric are in the base package)
+	Array, CPUTime, Char, Complex, Directory, IO, Ix, List, Locale,
+	Maybe, Monad, Random, Ratio, System, Time,