[mv base to haskell-extras 
John Meacham <john@repetae.net>**20120307061504
 Ignore-this: acc62fbf85b246155f10055cf7228cd7
] move ./lib/base ./lib/haskell-extras
move ./lib/haskell-extras/base.yaml ./lib/haskell-extras/haskell-extras.yaml.m4
hunk ./Makefile.am 67
-             lib/jhc lib/jhc-prim lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \
+             lib/jhc lib/jhc-prim lib/haskell-extras lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \
hunk ./Makefile.am 282
-%: examples/%.hs jhc base-1.0.hl haskell98-1.0.hl
+%: examples/%.hs jhc $(JHC_LIBS)
hunk ./configure.ac 1
-AC_INIT([jhc],[0.8.0])
+AC_INIT([jhc],[0.8.1])
hunk ./lib/applicative/applicative.yaml 4
-Options: [ -pbase, --noauto ]
+Options: [ -phaskell2010, -phaskell-extras, --noauto ]
hunk ./lib/ext/safe.cabal 10
-Build-Depends:  base
+Build-Depends:  haskell-extras
hunk ./lib/ext/smallcheck.cabal 10
-Build-Depends: base, haskell98
+Build-Depends: haskell98
hunk ./lib/ext/xhtml.cabal 9
-build-depends: base
hunk ./lib/flat-foreign/flat-foreign.yaml 4
-build-depends: [base, jhc]
+build-depends: [haskell2010]
hunk ./lib/haskell-extras/haskell-extras.yaml.m4 1
-Name: base
-Version: 1.0
+Name: haskell-extras
+Version: __JHC_VERSION__
hunk ./lib/haskell-extras/haskell-extras.yaml.m4 5
-Options: [ -pjhc, --noauto ]
+build-depends: jhc
+Options: [ --noauto ]
hunk ./lib/haskell2010/haskell2010.yaml.m4 6
-build-depends: [ jhc, base ]
-#Options: [ --noauto ]
+build-depends: [ jhc, haskell-extras ]
+Options: [ --noauto ]
hunk ./lib/haskell98/haskell98.yaml 4
-build-depends: [ base, jhc ]
+build-depends: [ haskell2010, haskell-extras ]
hunk ./library_deps.make 1
-base-1.0.hl: lib/base/base.yaml lib/base/System/Info.hs lib/base/Data/Int.hs lib/base/Debug/Trace.hs lib/base/Data/Array.hs \
-    lib/base/Data/Typeable.hs lib/base/Text/Printf.hs lib/base/System/Directory.hs lib/base/Data/Word.hs lib/base/Data/Maybe.hs \
-    lib/base/System/IO/Error.hs lib/base/System/IO/Binary.hs lib/base/System/CPUTime.hs lib/base/System/IO/Pipe.hs lib/base/Control/Monad/Instances.hs \
-    lib/base/Foreign/Marshal/Error.hs lib/base/System/Exit.hs lib/base/System/Environment.hs lib/base/Data/Array/IO.hs lib/base/Data/Char.hs \
-    lib/base/Data/Version.hs lib/base/Text/Show/Functions.hs lib/base/Control/Monad.hs lib/base/Data/Functor.hs lib/base/Data/Monoid.hs \
-    lib/base/System/Locale.hs lib/base/System/IO.hs lib/base/Foreign/Marshal/Pool.hs lib/base/Prelude.hs lib/base/Control/Monad/Fix.hs \
-    lib/base/Data/Complex.hs lib/base/Data/IORef.hs lib/base/System/Console/GetOpt.hs lib/base/Data/List.hs lib/base/System/Cmd.hs \
-    lib/base/System/Random.hs lib/base/Data/Unicode.hs lib/base/Foreign/ForeignPtr.hs lib/base/System/Time.hs lib/base/Control/Exception.hs \
-    lib/base/Foreign/StablePtr.hs lib/base/Foreign/C.hs lib/base/Data/Bits.hs lib/base/Foreign/Marshal.hs lib/base/Foreign.hs \
-    lib/base/Data/Array/Unboxed.hs lib/base/Data/Function.hs lib/base/Data/Ix.hs jhc-prim-1.0.hl jhc-1.0.hl
-	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
-applicative-1.0.hl: lib/applicative/applicative.yaml lib/applicative/Control/Arrow.hs lib/applicative/Control/Applicative.hs lib/applicative/Data/Foldable.hs lib/applicative/Control/Category.hs \
-    lib/applicative/Data/Traversable.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
-	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
-flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs lib/flat-foreign/Storable.hs \
-    lib/flat-foreign/Ptr.hs lib/flat-foreign/MarshalArray.hs lib/flat-foreign/Int.hs lib/flat-foreign/CString.hs lib/flat-foreign/Word.hs \
-    lib/flat-foreign/CError.hs lib/flat-foreign/CTypes.hs lib/flat-foreign/MarshalError.hs lib/flat-foreign/MarshalUtils.hs lib/flat-foreign/Bits.hs \
-    lib/flat-foreign/ForeignPtr.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
-	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
-haskell98-1.0.hl: lib/haskell98/haskell98.yaml lib/haskell98/System.hs lib/haskell98/List.hs lib/haskell98/Time.hs lib/haskell98/Array.hs \
-    lib/haskell98/Random.hs lib/haskell98/Complex.hs lib/haskell98/Locale.hs lib/haskell98/CPUTime.hs lib/haskell98/Ratio.hs \
-    lib/haskell98/Monad.hs lib/haskell98/Directory.hs lib/haskell98/IO.hs lib/haskell98/Ix.hs lib/haskell98/Char.hs \
-    lib/haskell98/Maybe.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+jhc-prim-1.0.hl: lib/jhc-prim/jhc-prim.yaml lib/jhc-prim/Jhc/Prim/IO.hs lib/jhc-prim/Jhc/Prim/Prim.hs lib/jhc-prim/Jhc/Prim/Array.hs lib/jhc-prim/Jhc/Prim/Wrapper.hs \
+    lib/jhc-prim/Jhc/Prim/Rts.hs lib/jhc-prim/Jhc/Prim/Bits.hs
hunk ./library_deps.make 17
-jhc-prim-1.0.hl: lib/jhc-prim/jhc-prim.yaml lib/jhc-prim/Jhc/Prim/IO.hs lib/jhc-prim/Jhc/Prim/Prim.hs lib/jhc-prim/Jhc/Prim/Array.hs lib/jhc-prim/Jhc/Prim/Wrapper.hs \
-    lib/jhc-prim/Jhc/Prim/Rts.hs lib/jhc-prim/Jhc/Prim/Bits.hs
+haskell-extras-0.8.0.hl: lib/haskell-extras/haskell-extras.yaml.m4 lib/haskell-extras/System/Info.hs lib/haskell-extras/Data/Int.hs lib/haskell-extras/Debug/Trace.hs lib/haskell-extras/Data/Array.hs \
+    lib/haskell-extras/Data/Typeable.hs lib/haskell-extras/Text/Printf.hs lib/haskell-extras/System/Directory.hs lib/haskell-extras/Data/Word.hs lib/haskell-extras/Data/Maybe.hs \
+    lib/haskell-extras/System/IO/Error.hs lib/haskell-extras/System/IO/Binary.hs lib/haskell-extras/System/CPUTime.hs lib/haskell-extras/System/IO/Pipe.hs lib/haskell-extras/Control/Monad/Instances.hs \
+    lib/haskell-extras/Foreign/Marshal/Error.hs lib/haskell-extras/System/Exit.hs lib/haskell-extras/System/Environment.hs lib/haskell-extras/Data/Array/IO.hs lib/haskell-extras/Data/Char.hs \
+    lib/haskell-extras/Data/Version.hs lib/haskell-extras/Text/Show/Functions.hs lib/haskell-extras/Control/Monad.hs lib/haskell-extras/Data/Functor.hs lib/haskell-extras/Data/Monoid.hs \
+    lib/haskell-extras/System/Locale.hs lib/haskell-extras/System/IO.hs lib/haskell-extras/Foreign/Marshal/Pool.hs lib/haskell-extras/Prelude.hs lib/haskell-extras/Control/Monad/Fix.hs \
+    lib/haskell-extras/Data/Complex.hs lib/haskell-extras/Data/IORef.hs lib/haskell-extras/System/Console/GetOpt.hs lib/haskell-extras/Data/List.hs lib/haskell-extras/System/Cmd.hs \
+    lib/haskell-extras/System/Random.hs lib/haskell-extras/Data/Unicode.hs lib/haskell-extras/Foreign/ForeignPtr.hs lib/haskell-extras/System/Time.hs lib/haskell-extras/Control/Exception.hs \
+    lib/haskell-extras/Foreign/StablePtr.hs lib/haskell-extras/Foreign/C.hs lib/haskell-extras/Data/Bits.hs lib/haskell-extras/Foreign/Marshal.hs lib/haskell-extras/Foreign.hs \
+    lib/haskell-extras/Data/Array/Unboxed.hs lib/haskell-extras/Data/Function.hs lib/haskell-extras/Data/Ix.hs jhc-prim-1.0.hl jhc-1.0.hl
+	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
+haskell2010-0.8.0.hl: lib/haskell2010/haskell2010.yaml.m4 jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
+	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
+flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs lib/flat-foreign/Storable.hs \
+    lib/flat-foreign/Ptr.hs lib/flat-foreign/MarshalArray.hs lib/flat-foreign/Int.hs lib/flat-foreign/CString.hs lib/flat-foreign/Word.hs \
+    lib/flat-foreign/CError.hs lib/flat-foreign/CTypes.hs lib/flat-foreign/MarshalError.hs lib/flat-foreign/MarshalUtils.hs lib/flat-foreign/Bits.hs \
+    lib/flat-foreign/ForeignPtr.hs jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
+	./jhc $(LIB_OPTIONS) --build-hl $< -o $@
+haskell98-1.0.hl: lib/haskell98/haskell98.yaml lib/haskell98/System.hs lib/haskell98/List.hs lib/haskell98/Time.hs lib/haskell98/Array.hs \
+    lib/haskell98/Random.hs lib/haskell98/Complex.hs lib/haskell98/Locale.hs lib/haskell98/CPUTime.hs lib/haskell98/Ratio.hs \
+    lib/haskell98/Monad.hs lib/haskell98/Directory.hs lib/haskell98/IO.hs lib/haskell98/Ix.hs lib/haskell98/Char.hs \
+    lib/haskell98/Maybe.hs jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 40
-haskell2010-0.8.0.hl: lib/haskell2010/haskell2010.yaml.m4 jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+applicative-1.0.hl: lib/applicative/applicative.yaml lib/applicative/Control/Arrow.hs lib/applicative/Control/Applicative.hs lib/applicative/Data/Foldable.hs lib/applicative/Control/Category.hs \
+    lib/applicative/Data/Traversable.hs jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 43
-JHC_LIBS = base-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl haskell98-1.0.hl jhc-1.0.hl \
-    jhc-prim-1.0.hl haskell2010-0.8.0.hl
-containers-0.3.0.0.hl: lib/ext/containers.cabal jhc-prim-1.0.hl applicative-1.0.hl base-1.0.hl jhc-1.0.hl \
+JHC_LIBS = jhc-prim-1.0.hl jhc-1.0.hl haskell-extras-0.8.0.hl haskell2010-0.8.0.hl flat-foreign-1.0.hl \
+    haskell98-1.0.hl applicative-1.0.hl
+containers-0.3.0.0.hl: lib/ext/containers.cabal jhc-prim-1.0.hl applicative-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl \
hunk ./library_deps.make 48
-Diff-0.1.2.hl: lib/ext/Diff.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+Diff-0.1.2.hl: lib/ext/Diff.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 50
-html-1.0.1.2.hl: lib/ext/html.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+html-1.0.1.2.hl: lib/ext/html.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 52
-HUnit-1.2.2.1.hl: lib/ext/HUnit.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+HUnit-1.2.2.1.hl: lib/ext/HUnit.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 54
-parsec-2.1.0.1.hl: lib/ext/parsec.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+parsec-2.1.0.1.hl: lib/ext/parsec.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 56
-pretty-1.0.1.1.hl: lib/ext/pretty.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+pretty-1.0.1.1.hl: lib/ext/pretty.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 58
-QuickCheck-1.2.0.0.hl: lib/ext/QuickCheck.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+QuickCheck-1.2.0.0.hl: lib/ext/QuickCheck.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 60
-safe-0.2.hl: lib/ext/safe.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+safe-0.2.hl: lib/ext/safe.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 62
-smallcheck-0.4.hl: lib/ext/smallcheck.cabal jhc-prim-1.0.hl haskell98-1.0.hl base-1.0.hl jhc-1.0.hl \
+smallcheck-0.4.hl: lib/ext/smallcheck.cabal jhc-prim-1.0.hl haskell98-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl \
hunk ./library_deps.make 65
-xhtml-3000.2.0.1.hl: lib/ext/xhtml.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+xhtml-3000.2.0.1.hl: lib/ext/xhtml.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 67
-transformers-0.2.1.0.hl: lib/ext/transformers.cabal jhc-prim-1.0.hl applicative-1.0.hl base-1.0.hl jhc-1.0.hl
+transformers-0.2.1.0.hl: lib/ext/transformers.cabal jhc-prim-1.0.hl applicative-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 69
-filepath-1.2.0.0.hl: lib/ext/filepath.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl
+filepath-1.2.0.0.hl: lib/ext/filepath.cabal jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl
hunk ./library_deps.make 71
-deepseq-1.1.0.2.hl: lib/ext/deepseq.cabal jhc-prim-1.0.hl applicative-1.0.hl containers-0.3.0.0.hl base-1.0.hl \
+deepseq-1.1.0.2.hl: lib/ext/deepseq.cabal jhc-prim-1.0.hl applicative-1.0.hl containers-0.3.0.0.hl haskell-extras-0.8.0.hl \
hunk ./library_deps.make 74
-bytestring-0.9.2.0.hl: lib/ext/bytestring.yaml jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl lib/ext/bytestring.patch
+bytestring-0.9.2.0.hl: lib/ext/bytestring.yaml jhc-prim-1.0.hl haskell-extras-0.8.0.hl jhc-1.0.hl lib/ext/bytestring.patch
hunk ./library_deps.make 78
-    transformers-0.2.1.0.hl filepath-1.2.0.0.hl deepseq-1.1.0.2.hl bytestring-0.9.2.0.hl
+    transformers-0.2.1.0.hl filepath-1.2.0.0.hl deepseq-1.1.0.2.hl