Update ghc to version 6.6.

This version represent >19 month of development since the version 6.4,
and the list of changes is far too big to include here.  See
  http://www.haskell.org/ghc/docs/6.6/html/users_guide/release-6-6.html
for the list of user visible changes.

12 files changed, 526 insertions, 359 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index f80cc584f84..d779661a9b5 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,37 +1,41 @@
-# $NetBSD: Makefile,v 1.33 2006/11/12 21:58:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.34 2007/03/24 17:57:19 kristerw Exp $
 
-DISTNAME=	ghc-6.4.2
-PKGREVISION=	3
+DISTNAME=	ghc-6.6
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/6.4.2/
-DISTFILES=	ghc-6.4.2-src.tar.bz2 \
+MASTER_SITES=	http://www.haskell.org/ghc/dist/6.6/
+DISTFILES=	ghc-6.6-src.tar.bz2 \
+		ghc-6.6-src-extralibs.tar.bz2 \
+		ghc-6.4.2-src.tar.bz2 \
 		ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz
 
 MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell
 
+SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/
 SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
 
 ONLY_FOR_PLATFORM= FreeBSD-*-i386 NetBSD-*-i386
 
+CHECK_PORTABILITY_SKIP=	distrib/prep-bin-dist-mingw
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ghc=${WRKDIR}/ghc-boot/ghc/compiler/ghc-inplace
+CONFIGURE_ARGS+=	--with-ghc=${WRKDIR}/ghc-6.4.2/ghc/compiler/ghc-inplace
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 USE_GNU_READLINE=	yes	# uses the UNDO_ constants
 USE_TOOLS+=		gmake perl:run
 
-SUBST_CLASSES+=		add_paths
-SUBST_STAGE.add_paths=	post-patch
-SUBST_FILES.add_paths=	mk/bootstrap.mk
-SUBST_FILES.add_paths+=	ghc/rts/package.conf.in
-SUBST_FILES.add_paths+=	libraries/readline/package.conf.in
-SUBST_SED.add_paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-patch
+SUBST_FILES.prefix=	libraries/readline/package.conf.in
+SUBST_FILES.prefix+=	rts/package.conf.in
+SUBST_FILES.prefix+=	../ghc-6.4.2/mk/bootstrap.mk
+SUBST_FILES.prefix+=	../ghc-6.4.2/ghc/rts/package.conf.in
+SUBST_FILES.prefix+=	../ghc-6.4.2/libraries/readline/package.conf.in
+SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
 
 pre-configure:
-	${MKDIR} ${WRKDIR}/ghc-boot \
-		&& cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/ghc-boot
-	cd ${WRKDIR}/ghc-boot && \
+	cd ${WRKDIR}/ghc-6.4.2 && \
 		./distrib/hc-build --enable-hc-boot-unregisterised
 
 # The ghc compiler does normally split the generated C files into small
diff --git a/lang/ghc/PLIST b/lang/ghc/PLIST
index 35d38bf4aa6..ca3adf8fe70 100644
--- a/lang/ghc/PLIST
+++ b/lang/ghc/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/27 23:45:08 kristerw Exp $
-bin/${PKGNAME}
+@comment $NetBSD: PLIST,v 1.7 2007/03/24 17:57:19 kristerw Exp $
 bin/ghc
+bin/${PKGNAME}
 bin/ghc-pkg
 bin/ghc-pkg-${PKGVERSION}
 bin/ghci
@@ -11,309 +11,290 @@ bin/hp2ps
 bin/hsc2hs
 bin/runghc
 bin/runhaskell
-bin/stat2resid
-lib/${PKGNAME}/${PKGNAME}
 lib/${PKGNAME}/HSCabal.o
 lib/${PKGNAME}/HSHUnit.o
 lib/${PKGNAME}/HSQuickCheck.o
 lib/${PKGNAME}/HSbase.o
 lib/${PKGNAME}/HSbase_cbits.o
-lib/${PKGNAME}/HSconcurrent.o
-lib/${PKGNAME}/HSdata.o
+lib/${PKGNAME}/HScgi.o
 lib/${PKGNAME}/HSfgl.o
+lib/${PKGNAME}/HSghc.o
 lib/${PKGNAME}/HShaskell-src.o
 lib/${PKGNAME}/HShaskell98.o
-lib/${PKGNAME}/HShssource.o
-lib/${PKGNAME}/HSlang.o
-lib/${PKGNAME}/HSlang_cbits.o
+lib/${PKGNAME}/HShtml.o
 lib/${PKGNAME}/HSmtl.o
-lib/${PKGNAME}/HSnet.o
 lib/${PKGNAME}/HSnetwork.o
 lib/${PKGNAME}/HSparsec.o
-lib/${PKGNAME}/HSposix.o
-lib/${PKGNAME}/HSposix_cbits.o
 lib/${PKGNAME}/HSreadline.o
+lib/${PKGNAME}/HSregex-base.o
+lib/${PKGNAME}/HSregex-compat.o
+lib/${PKGNAME}/HSregex-posix.o
 lib/${PKGNAME}/HSrts.o
 lib/${PKGNAME}/HSstm.o
 lib/${PKGNAME}/HStemplate-haskell.o
-lib/${PKGNAME}/HStext.o
+lib/${PKGNAME}/HStime.o
 lib/${PKGNAME}/HSunix.o
 lib/${PKGNAME}/HSunix_cbits.o
-lib/${PKGNAME}/HSutil.o
-lib/${PKGNAME}/HSutil_cbits.o
+lib/${PKGNAME}/HSxhtml.o
 lib/${PKGNAME}/cgprof
+lib/${PKGNAME}/${PKGNAME}
 lib/${PKGNAME}/ghc-asm
 lib/${PKGNAME}/ghc-pkg.bin
 lib/${PKGNAME}/ghc-split
 lib/${PKGNAME}/ghc-usage.txt
 lib/${PKGNAME}/ghci-usage.txt
 lib/${PKGNAME}/hsc2hs-bin
-lib/${PKGNAME}/hslibs-imports/concurrent/CVar.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/CVar.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Chan.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Chan.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Channel.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Channel.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/ChannelVar.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/ChannelVar.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Concurrent.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Concurrent.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/MVar.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/MVar.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Merge.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Merge.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Parallel.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Parallel.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/QSem.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/QSem.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/QSemN.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/QSemN.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/SampleVar.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/SampleVar.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Semaphore.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Semaphore.p_hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Strategies.hi
-lib/${PKGNAME}/hslibs-imports/concurrent/Strategies.p_hi
-lib/${PKGNAME}/hslibs-imports/data/Assoc.hi
-lib/${PKGNAME}/hslibs-imports/data/Assoc.p_hi
-lib/${PKGNAME}/hslibs-imports/data/AssocDefaults.hi
-lib/${PKGNAME}/hslibs-imports/data/AssocDefaults.p_hi
-lib/${PKGNAME}/hslibs-imports/data/AssocList.hi
-lib/${PKGNAME}/hslibs-imports/data/AssocList.p_hi
-lib/${PKGNAME}/hslibs-imports/data/BankersQueue.hi
-lib/${PKGNAME}/hslibs-imports/data/BankersQueue.p_hi
-lib/${PKGNAME}/hslibs-imports/data/BinaryRandList.hi
-lib/${PKGNAME}/hslibs-imports/data/BinaryRandList.p_hi
-lib/${PKGNAME}/hslibs-imports/data/BraunSeq.hi
-lib/${PKGNAME}/hslibs-imports/data/BraunSeq.p_hi
-lib/${PKGNAME}/hslibs-imports/data/Collection.hi
-lib/${PKGNAME}/hslibs-imports/data/Collection.p_hi
-lib/${PKGNAME}/hslibs-imports/data/CollectionDefaults.hi
-lib/${PKGNAME}/hslibs-imports/data/CollectionDefaults.p_hi
-lib/${PKGNAME}/hslibs-imports/data/CollectionUtils.hi
-lib/${PKGNAME}/hslibs-imports/data/CollectionUtils.p_hi
-lib/${PKGNAME}/hslibs-imports/data/EdisonPrelude.hi
-lib/${PKGNAME}/hslibs-imports/data/EdisonPrelude.p_hi
-lib/${PKGNAME}/hslibs-imports/data/FiniteMap.hi
-lib/${PKGNAME}/hslibs-imports/data/FiniteMap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/JoinList.hi
-lib/${PKGNAME}/hslibs-imports/data/JoinList.p_hi
-lib/${PKGNAME}/hslibs-imports/data/LazyPairingHeap.hi
-lib/${PKGNAME}/hslibs-imports/data/LazyPairingHeap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/LeftistHeap.hi
-lib/${PKGNAME}/hslibs-imports/data/LeftistHeap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/ListSeq.hi
-lib/${PKGNAME}/hslibs-imports/data/ListSeq.p_hi
-lib/${PKGNAME}/hslibs-imports/data/MinHeap.hi
-lib/${PKGNAME}/hslibs-imports/data/MinHeap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/MyersStack.hi
-lib/${PKGNAME}/hslibs-imports/data/MyersStack.p_hi
-lib/${PKGNAME}/hslibs-imports/data/PatriciaLoMap.hi
-lib/${PKGNAME}/hslibs-imports/data/PatriciaLoMap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/RandList.hi
-lib/${PKGNAME}/hslibs-imports/data/RandList.p_hi
-lib/${PKGNAME}/hslibs-imports/data/RevSeq.hi
-lib/${PKGNAME}/hslibs-imports/data/RevSeq.p_hi
-lib/${PKGNAME}/hslibs-imports/data/Sequence.hi
-lib/${PKGNAME}/hslibs-imports/data/Sequence.p_hi
-lib/${PKGNAME}/hslibs-imports/data/SequenceDefaults.hi
-lib/${PKGNAME}/hslibs-imports/data/SequenceDefaults.p_hi
-lib/${PKGNAME}/hslibs-imports/data/Set.hi
-lib/${PKGNAME}/hslibs-imports/data/Set.p_hi
-lib/${PKGNAME}/hslibs-imports/data/SimpleQueue.hi
-lib/${PKGNAME}/hslibs-imports/data/SimpleQueue.p_hi
-lib/${PKGNAME}/hslibs-imports/data/SizedSeq.hi
-lib/${PKGNAME}/hslibs-imports/data/SizedSeq.p_hi
-lib/${PKGNAME}/hslibs-imports/data/SkewHeap.hi
-lib/${PKGNAME}/hslibs-imports/data/SkewHeap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/SplayHeap.hi
-lib/${PKGNAME}/hslibs-imports/data/SplayHeap.p_hi
-lib/${PKGNAME}/hslibs-imports/data/TestOrdBag.hi
-lib/${PKGNAME}/hslibs-imports/data/TestOrdBag.p_hi
-lib/${PKGNAME}/hslibs-imports/data/TestOrdSet.hi
-lib/${PKGNAME}/hslibs-imports/data/TestOrdSet.p_hi
-lib/${PKGNAME}/hslibs-imports/data/TestSeq.hi
-lib/${PKGNAME}/hslibs-imports/data/TestSeq.p_hi
-lib/${PKGNAME}/hslibs-imports/data/UnbalancedSet.hi
-lib/${PKGNAME}/hslibs-imports/data/UnbalancedSet.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsLexer.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsLexer.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParseMonad.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParseMonad.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParseUtils.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParseUtils.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParser.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsParser.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsPretty.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsPretty.p_hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsSyn.hi
-lib/${PKGNAME}/hslibs-imports/hssource/HsSyn.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Addr.hi
-lib/${PKGNAME}/hslibs-imports/lang/Addr.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/ArrayBase.hi
-lib/${PKGNAME}/hslibs-imports/lang/ArrayBase.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Arrow.hi
-lib/${PKGNAME}/hslibs-imports/lang/Arrow.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/ByteArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/ByteArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/CTypesISO.hi
-lib/${PKGNAME}/hslibs-imports/lang/CTypesISO.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/DiffArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/DiffArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/DirectoryExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/DirectoryExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Dynamic.hi
-lib/${PKGNAME}/hslibs-imports/lang/Dynamic.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Exception.hi
-lib/${PKGNAME}/hslibs-imports/lang/Exception.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/ForeignObj.hi
-lib/${PKGNAME}/hslibs-imports/lang/ForeignObj.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Generics.hi
-lib/${PKGNAME}/hslibs-imports/lang/Generics.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/GlaExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/GlaExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/IArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/IArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/IOExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/IOExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/IORef.hi
-lib/${PKGNAME}/hslibs-imports/lang/IORef.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/LazyST.hi
-lib/${PKGNAME}/hslibs-imports/lang/LazyST.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/MArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadCont.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadCont.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadEither.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadEither.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadError.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadError.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadFix.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadFix.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadIdentity.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadIdentity.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadList.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadList.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadRWS.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadRWS.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadReader.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadReader.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadState.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadState.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadTrans.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadTrans.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadWriter.hi
-lib/${PKGNAME}/hslibs-imports/lang/MonadWriter.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Monoid.hi
-lib/${PKGNAME}/hslibs-imports/lang/Monoid.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/MutableArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/MutableArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/NativeInfo.hi
-lib/${PKGNAME}/hslibs-imports/lang/NativeInfo.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/NumExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/NumExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/PackedString.hi
-lib/${PKGNAME}/hslibs-imports/lang/PackedString.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/PrelByteArr.hi
-lib/${PKGNAME}/hslibs-imports/lang/PrelByteArr.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/ST.hi
-lib/${PKGNAME}/hslibs-imports/lang/ST.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/ShowFunctions.hi
-lib/${PKGNAME}/hslibs-imports/lang/ShowFunctions.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Stable.hi
-lib/${PKGNAME}/hslibs-imports/lang/Stable.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/StableName.hi
-lib/${PKGNAME}/hslibs-imports/lang/StableName.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/StorableArray.hi
-lib/${PKGNAME}/hslibs-imports/lang/StorableArray.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/SystemExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/SystemExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/TimeExts.hi
-lib/${PKGNAME}/hslibs-imports/lang/TimeExts.p_hi
-lib/${PKGNAME}/hslibs-imports/lang/Weak.hi
-lib/${PKGNAME}/hslibs-imports/lang/Weak.p_hi
-lib/${PKGNAME}/hslibs-imports/net/BSD.hi
-lib/${PKGNAME}/hslibs-imports/net/BSD.p_hi
-lib/${PKGNAME}/hslibs-imports/net/CGI.hi
-lib/${PKGNAME}/hslibs-imports/net/CGI.p_hi
-lib/${PKGNAME}/hslibs-imports/net/Socket.hi
-lib/${PKGNAME}/hslibs-imports/net/Socket.p_hi
-lib/${PKGNAME}/hslibs-imports/net/SocketPrim.hi
-lib/${PKGNAME}/hslibs-imports/net/SocketPrim.p_hi
-lib/${PKGNAME}/hslibs-imports/net/URI.hi
-lib/${PKGNAME}/hslibs-imports/net/URI.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/DL.hi
-lib/${PKGNAME}/hslibs-imports/posix/DL.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/DLPrim.hi
-lib/${PKGNAME}/hslibs-imports/posix/DLPrim.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/POpen.hi
-lib/${PKGNAME}/hslibs-imports/posix/POpen.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/Posix.hi
-lib/${PKGNAME}/hslibs-imports/posix/Posix.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixDB.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixDB.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixErr.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixErr.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixFiles.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixFiles.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixIO.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixIO.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixProcEnv.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixProcEnv.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixProcPrim.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixProcPrim.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixTTY.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixTTY.p_hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixUtil.hi
-lib/${PKGNAME}/hslibs-imports/posix/PosixUtil.p_hi
-lib/${PKGNAME}/hslibs-imports/text/Html.hi
-lib/${PKGNAME}/hslibs-imports/text/Html.p_hi
-lib/${PKGNAME}/hslibs-imports/text/HtmlBlockTable.hi
-lib/${PKGNAME}/hslibs-imports/text/HtmlBlockTable.p_hi
-lib/${PKGNAME}/hslibs-imports/text/Parsec.hi
-lib/${PKGNAME}/hslibs-imports/text/Parsec.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecChar.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecChar.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecCombinator.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecCombinator.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecError.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecError.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecExpr.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecExpr.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecLanguage.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecLanguage.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPerm.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPerm.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPos.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPos.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPrim.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecPrim.p_hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecToken.hi
-lib/${PKGNAME}/hslibs-imports/text/ParsecToken.p_hi
-lib/${PKGNAME}/hslibs-imports/text/Pretty.hi
-lib/${PKGNAME}/hslibs-imports/text/Pretty.p_hi
-lib/${PKGNAME}/hslibs-imports/text/RegexString.hi
-lib/${PKGNAME}/hslibs-imports/text/RegexString.p_hi
-lib/${PKGNAME}/hslibs-imports/util/GetOpt.hi
-lib/${PKGNAME}/hslibs-imports/util/GetOpt.p_hi
-lib/${PKGNAME}/hslibs-imports/util/Memo.hi
-lib/${PKGNAME}/hslibs-imports/util/Memo.p_hi
-lib/${PKGNAME}/hslibs-imports/util/Observe.hi
-lib/${PKGNAME}/hslibs-imports/util/Observe.p_hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheck.hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheck.p_hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckBatch.hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckBatch.p_hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckPoly.hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckPoly.p_hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckUtils.hi
-lib/${PKGNAME}/hslibs-imports/util/QuickCheckUtils.p_hi
-lib/${PKGNAME}/hslibs-imports/util/Readline.hi
-lib/${PKGNAME}/hslibs-imports/util/Readline.p_hi
-lib/${PKGNAME}/hslibs-imports/util/Select.hi
-lib/${PKGNAME}/hslibs-imports/util/Select.p_hi
-lib/${PKGNAME}/hslibs-imports/util/Unique.hi
-lib/${PKGNAME}/hslibs-imports/util/Unique.p_hi
+lib/${PKGNAME}/hslibs-imports/ghc/AsmCodeGen.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Bag.hi
+lib/${PKGNAME}/hslibs-imports/ghc/BasicTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/BinIface.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Binary.hi
+lib/${PKGNAME}/hslibs-imports/ghc/BitSet.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Bitmap.hi
+lib/${PKGNAME}/hslibs-imports/ghc/BufWrite.hi
+lib/${PKGNAME}/hslibs-imports/ghc/BuildTyCl.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeAsm.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeFFI.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeGen.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeInstr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeItbls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ByteCodeLink.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CLabel.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CSE.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgBindery.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgCallConv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgCase.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgClosure.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgCon.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgExpr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgForeignCall.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgHeapery.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgInfoTbls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgLetNoEscape.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgParallel.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgPrimOp.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgProf.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgStackery.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgTailCall.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgTicky.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CgUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Check.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Class.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ClosureInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmdLineParser.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Cmm.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmmLex.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmmLint.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmmOpt.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmmParse.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CmmUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CodeGen.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CodeOutput.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Config.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Constants.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Convert.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreFVs.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreLint.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CorePrep.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreSubst.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreTidy.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreToStg.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreUnfold.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CoreUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CostCentre.hi
+lib/${PKGNAME}/hslibs-imports/ghc/CprAnalyse.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Ctype.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DataCon.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Demand.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Desugar.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Digraph.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DmdAnal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DriverMkDepend.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DriverPhases.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DriverPipeline.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsArrows.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsBinds.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsCCall.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsExpr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsForeign.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsGRHSs.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsListComp.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsMeta.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DsUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/DynFlags.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Encoding.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ErrUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ExternalCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FastMutInt.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FastString.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FastTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Finder.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FiniteMap.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FlattenInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FlattenMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Flattening.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FloatIn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FloatOut.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ForeignCall.hi
+lib/${PKGNAME}/hslibs-imports/ghc/FunDeps.hi
+lib/${PKGNAME}/hslibs-imports/ghc/GHC.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Generics.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HeaderInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsBinds.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsDecls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsExpr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsImpExp.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsLit.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsPat.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HsUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HscMain.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HscStats.hi
+lib/${PKGNAME}/hslibs-imports/ghc/HscTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/IOEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Id.hi
+lib/${PKGNAME}/hslibs-imports/ghc/IdInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/IfaceEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/IfaceSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/IfaceType.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Inst.hi
+lib/${PKGNAME}/hslibs-imports/ghc/InstEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/InteractiveUI.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Kind.hi
+lib/${PKGNAME}/hslibs-imports/ghc/LexCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Lexer.hi
+lib/${PKGNAME}/hslibs-imports/ghc/LiberateCase.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Linker.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ListSetOps.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Literal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/LoadIface.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MachCodeGen.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MachInstrs.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MachOp.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MachRegs.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Main.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Match.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MatchCon.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MatchLit.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Maybes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MkExternalCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MkId.hi
+lib/${PKGNAME}/hslibs-imports/ghc/MkIface.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Module.hi
+lib/${PKGNAME}/hslibs-imports/ghc/NCGMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/NDPCoreUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Name.hi
+lib/${PKGNAME}/hslibs-imports/ghc/NameEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/NameSet.hi
+lib/${PKGNAME}/hslibs-imports/ghc/NewDemand.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ObjLink.hi
+lib/${PKGNAME}/hslibs-imports/ghc/OccName.hi
+lib/${PKGNAME}/hslibs-imports/ghc/OccurAnal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/OrdList.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Outputable.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PArrAnal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PackageConfig.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Packages.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Panic.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ParsePkgConf.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Parser.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ParserCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/ParserCoreUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PositionIndependentCode.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprC.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprCmm.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprExternalCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprMach.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PprTyThing.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PrelInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PrelNames.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PrelRules.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Pretty.hi
+lib/${PKGNAME}/hslibs-imports/ghc/PrimOp.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RdrHsSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RdrName.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RegAllocInfo.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RegisterAlloc.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnBinds.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnExpr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnHsSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnNames.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnSource.hi
+lib/${PKGNAME}/hslibs-imports/ghc/RnTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Rules.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SAT.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SATMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SCCfinal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SMRep.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SRT.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SaAbsInt.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SaLib.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SetLevels.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SimplCore.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SimplEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SimplMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SimplStg.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SimplUtils.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Simplify.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SpecConstr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Specialise.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SrcLoc.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StaticFlags.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StgLint.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StgStats.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StgSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StrictAnal.hi
+lib/${PKGNAME}/hslibs-imports/ghc/StringBuffer.hi
+lib/${PKGNAME}/hslibs-imports/ghc/SysTools.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcArrows.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcBinds.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcClassDcl.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcDefaults.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcDeriv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcExpr.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcForeign.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcGenDeriv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcHsSyn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcHsType.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcIface.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcInstDcls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcMType.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcMatches.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcPat.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcRnDriver.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcRnMonad.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcRnTypes.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcRules.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcSimplify.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcSplice.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcTyClsDecls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcTyDecls.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcType.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TcUnify.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TidyPgm.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TyCon.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Type.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TypeRep.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TysPrim.hi
+lib/${PKGNAME}/hslibs-imports/ghc/TysWiredIn.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Unify.hi
+lib/${PKGNAME}/hslibs-imports/ghc/UniqFM.hi
+lib/${PKGNAME}/hslibs-imports/ghc/UniqSet.hi
+lib/${PKGNAME}/hslibs-imports/ghc/UniqSupply.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Unique.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Util.hi
+lib/${PKGNAME}/hslibs-imports/ghc/Var.hi
+lib/${PKGNAME}/hslibs-imports/ghc/VarEnv.hi
+lib/${PKGNAME}/hslibs-imports/ghc/VarSet.hi
+lib/${PKGNAME}/hslibs-imports/ghc/WorkWrap.hi
+lib/${PKGNAME}/hslibs-imports/ghc/WwLib.hi
 lib/${PKGNAME}/icons/absdelta.xbm
 lib/${PKGNAME}/icons/absolute.xbm
 lib/${PKGNAME}/icons/comm.xbm
@@ -355,6 +336,8 @@ lib/${PKGNAME}/imports/Char.hi
 lib/${PKGNAME}/imports/Char.p_hi
 lib/${PKGNAME}/imports/Complex.hi
 lib/${PKGNAME}/imports/Complex.p_hi
+lib/${PKGNAME}/imports/Control/Applicative.hi
+lib/${PKGNAME}/imports/Control/Applicative.p_hi
 lib/${PKGNAME}/imports/Control/Arrow.hi
 lib/${PKGNAME}/imports/Control/Arrow.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent.hi
@@ -369,6 +352,8 @@ lib/${PKGNAME}/imports/Control/Concurrent/QSemN.hi
 lib/${PKGNAME}/imports/Control/Concurrent/QSemN.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/STM.hi
 lib/${PKGNAME}/imports/Control/Concurrent/STM.p_hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TArray.hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TArray.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/STM/TChan.hi
 lib/${PKGNAME}/imports/Control/Concurrent/STM/TChan.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/STM/TMVar.hi
@@ -389,6 +374,8 @@ lib/${PKGNAME}/imports/Control/Monad/Fix.hi
 lib/${PKGNAME}/imports/Control/Monad/Fix.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Identity.hi
 lib/${PKGNAME}/imports/Control/Monad/Identity.p_hi
+lib/${PKGNAME}/imports/Control/Monad/Instances.hi
+lib/${PKGNAME}/imports/Control/Monad/Instances.p_hi
 lib/${PKGNAME}/imports/Control/Monad/List.hi
 lib/${PKGNAME}/imports/Control/Monad/List.p_hi
 lib/${PKGNAME}/imports/Control/Monad/RWS.hi
@@ -401,6 +388,8 @@ lib/${PKGNAME}/imports/Control/Monad/ST/Lazy.hi
 lib/${PKGNAME}/imports/Control/Monad/ST/Lazy.p_hi
 lib/${PKGNAME}/imports/Control/Monad/ST/Strict.hi
 lib/${PKGNAME}/imports/Control/Monad/ST/Strict.p_hi
+lib/${PKGNAME}/imports/Control/Monad/STM.hi
+lib/${PKGNAME}/imports/Control/Monad/STM.p_hi
 lib/${PKGNAME}/imports/Control/Monad/State.hi
 lib/${PKGNAME}/imports/Control/Monad/State.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Trans.hi
@@ -435,6 +424,18 @@ lib/${PKGNAME}/imports/Data/Bits.hi
 lib/${PKGNAME}/imports/Data/Bits.p_hi
 lib/${PKGNAME}/imports/Data/Bool.hi
 lib/${PKGNAME}/imports/Data/Bool.p_hi
+lib/${PKGNAME}/imports/Data/ByteString.hi
+lib/${PKGNAME}/imports/Data/ByteString.p_hi
+lib/${PKGNAME}/imports/Data/ByteString/Base.hi
+lib/${PKGNAME}/imports/Data/ByteString/Base.p_hi
+lib/${PKGNAME}/imports/Data/ByteString/Char8.hi
+lib/${PKGNAME}/imports/Data/ByteString/Char8.p_hi
+lib/${PKGNAME}/imports/Data/ByteString/Fusion.hi
+lib/${PKGNAME}/imports/Data/ByteString/Fusion.p_hi
+lib/${PKGNAME}/imports/Data/ByteString/Lazy.hi
+lib/${PKGNAME}/imports/Data/ByteString/Lazy.p_hi
+lib/${PKGNAME}/imports/Data/ByteString/Lazy/Char8.hi
+lib/${PKGNAME}/imports/Data/ByteString/Lazy/Char8.p_hi
 lib/${PKGNAME}/imports/Data/Char.hi
 lib/${PKGNAME}/imports/Data/Char.p_hi
 lib/${PKGNAME}/imports/Data/Complex.hi
@@ -443,8 +444,12 @@ lib/${PKGNAME}/imports/Data/Dynamic.hi
 lib/${PKGNAME}/imports/Data/Dynamic.p_hi
 lib/${PKGNAME}/imports/Data/Either.hi
 lib/${PKGNAME}/imports/Data/Either.p_hi
-lib/${PKGNAME}/imports/Data/FiniteMap.hi
-lib/${PKGNAME}/imports/Data/FiniteMap.p_hi
+lib/${PKGNAME}/imports/Data/Eq.hi
+lib/${PKGNAME}/imports/Data/Eq.p_hi
+lib/${PKGNAME}/imports/Data/Fixed.hi
+lib/${PKGNAME}/imports/Data/Fixed.p_hi
+lib/${PKGNAME}/imports/Data/Foldable.hi
+lib/${PKGNAME}/imports/Data/Foldable.p_hi
 lib/${PKGNAME}/imports/Data/FunctorM.hi
 lib/${PKGNAME}/imports/Data/FunctorM.p_hi
 lib/${PKGNAME}/imports/Data/Generics.hi
@@ -539,6 +544,8 @@ lib/${PKGNAME}/imports/Data/Maybe.hi
 lib/${PKGNAME}/imports/Data/Maybe.p_hi
 lib/${PKGNAME}/imports/Data/Monoid.hi
 lib/${PKGNAME}/imports/Data/Monoid.p_hi
+lib/${PKGNAME}/imports/Data/Ord.hi
+lib/${PKGNAME}/imports/Data/Ord.p_hi
 lib/${PKGNAME}/imports/Data/PackedString.hi
 lib/${PKGNAME}/imports/Data/PackedString.p_hi
 lib/${PKGNAME}/imports/Data/Queue.hi
@@ -551,8 +558,58 @@ lib/${PKGNAME}/imports/Data/STRef/Lazy.hi
 lib/${PKGNAME}/imports/Data/STRef/Lazy.p_hi
 lib/${PKGNAME}/imports/Data/STRef/Strict.hi
 lib/${PKGNAME}/imports/Data/STRef/Strict.p_hi
+lib/${PKGNAME}/imports/Data/Sequence.hi
+lib/${PKGNAME}/imports/Data/Sequence.p_hi
 lib/${PKGNAME}/imports/Data/Set.hi
 lib/${PKGNAME}/imports/Data/Set.p_hi
+lib/${PKGNAME}/imports/Data/Time.hi
+lib/${PKGNAME}/imports/Data/Time.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Days.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Days.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Easter.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Easter.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Gregorian.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Gregorian.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Julian.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Julian.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/JulianYearDay.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/JulianYearDay.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/MonthDay.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/MonthDay.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/OrdinalDate.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/OrdinalDate.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Private.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/Private.p_hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/WeekDate.hi
+lib/${PKGNAME}/imports/Data/Time/Calendar/WeekDate.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock.hi
+lib/${PKGNAME}/imports/Data/Time/Clock.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/CTimeval.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/CTimeval.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/POSIX.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/POSIX.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/Scale.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/Scale.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/TAI.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/TAI.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/UTC.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/UTC.p_hi
+lib/${PKGNAME}/imports/Data/Time/Clock/UTCDiff.hi
+lib/${PKGNAME}/imports/Data/Time/Clock/UTCDiff.p_hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime.hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime.p_hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/Format.hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/Format.p_hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/LocalTime.hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/LocalTime.p_hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/TimeOfDay.hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/TimeOfDay.p_hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/TimeZone.hi
+lib/${PKGNAME}/imports/Data/Time/LocalTime/TimeZone.p_hi
+lib/${PKGNAME}/imports/Data/Traversable.hi
+lib/${PKGNAME}/imports/Data/Traversable.p_hi
 lib/${PKGNAME}/imports/Data/Tree.hi
 lib/${PKGNAME}/imports/Data/Tree.p_hi
 lib/${PKGNAME}/imports/Data/Tuple.hi
@@ -583,6 +640,8 @@ lib/${PKGNAME}/imports/Distribution/Compat/Exception.hi
 lib/${PKGNAME}/imports/Distribution/Compat/Exception.p_hi
 lib/${PKGNAME}/imports/Distribution/Compat/FilePath.hi
 lib/${PKGNAME}/imports/Distribution/Compat/FilePath.p_hi
+lib/${PKGNAME}/imports/Distribution/Compat/Map.hi
+lib/${PKGNAME}/imports/Distribution/Compat/Map.p_hi
 lib/${PKGNAME}/imports/Distribution/Compat/RawSystem.hi
 lib/${PKGNAME}/imports/Distribution/Compat/RawSystem.p_hi
 lib/${PKGNAME}/imports/Distribution/Compat/ReadP.hi
@@ -619,12 +678,20 @@ lib/${PKGNAME}/imports/Distribution/Simple/Build.hi
 lib/${PKGNAME}/imports/Distribution/Simple/Build.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/Configure.hi
 lib/${PKGNAME}/imports/Distribution/Simple/Configure.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/GHC.hi
+lib/${PKGNAME}/imports/Distribution/Simple/GHC.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/GHCPackageConfig.hi
 lib/${PKGNAME}/imports/Distribution/Simple/GHCPackageConfig.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/Hugs.hi
+lib/${PKGNAME}/imports/Distribution/Simple/Hugs.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/Install.hi
 lib/${PKGNAME}/imports/Distribution/Simple/Install.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/JHC.hi
+lib/${PKGNAME}/imports/Distribution/Simple/JHC.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/LocalBuildInfo.hi
 lib/${PKGNAME}/imports/Distribution/Simple/LocalBuildInfo.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/NHC.hi
+lib/${PKGNAME}/imports/Distribution/Simple/NHC.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/Register.hi
 lib/${PKGNAME}/imports/Distribution/Simple/Register.p_hi
 lib/${PKGNAME}/imports/Distribution/Simple/SrcDist.hi
@@ -677,6 +744,8 @@ lib/${PKGNAME}/imports/GHC/ConsoleHandler.hi
 lib/${PKGNAME}/imports/GHC/ConsoleHandler.p_hi
 lib/${PKGNAME}/imports/GHC/Dotnet.hi
 lib/${PKGNAME}/imports/GHC/Dotnet.p_hi
+lib/${PKGNAME}/imports/GHC/Dynamic.hi
+lib/${PKGNAME}/imports/GHC/Dynamic.p_hi
 lib/${PKGNAME}/imports/GHC/Enum.hi
 lib/${PKGNAME}/imports/GHC/Enum.p_hi
 lib/${PKGNAME}/imports/GHC/Err.hi
@@ -783,6 +852,18 @@ lib/${PKGNAME}/imports/Network/BSD.hi
 lib/${PKGNAME}/imports/Network/BSD.p_hi
 lib/${PKGNAME}/imports/Network/CGI.hi
 lib/${PKGNAME}/imports/Network/CGI.p_hi
+lib/${PKGNAME}/imports/Network/CGI/Compat.hi
+lib/${PKGNAME}/imports/Network/CGI/Compat.p_hi
+lib/${PKGNAME}/imports/Network/CGI/Cookie.hi
+lib/${PKGNAME}/imports/Network/CGI/Cookie.p_hi
+lib/${PKGNAME}/imports/Network/CGI/Monad.hi
+lib/${PKGNAME}/imports/Network/CGI/Monad.p_hi
+lib/${PKGNAME}/imports/Network/CGI/Multipart.hi
+lib/${PKGNAME}/imports/Network/CGI/Multipart.p_hi
+lib/${PKGNAME}/imports/Network/CGI/Protocol.hi
+lib/${PKGNAME}/imports/Network/CGI/Protocol.p_hi
+lib/${PKGNAME}/imports/Network/CGI/RFC822Headers.hi
+lib/${PKGNAME}/imports/Network/CGI/RFC822Headers.p_hi
 lib/${PKGNAME}/imports/Network/Socket.hi
 lib/${PKGNAME}/imports/Network/Socket.p_hi
 lib/${PKGNAME}/imports/Network/URI.hi
@@ -797,6 +878,8 @@ lib/${PKGNAME}/imports/Random.hi
 lib/${PKGNAME}/imports/Random.p_hi
 lib/${PKGNAME}/imports/Ratio.hi
 lib/${PKGNAME}/imports/Ratio.p_hi
+lib/${PKGNAME}/imports/Setup.hi
+lib/${PKGNAME}/imports/Setup.p_hi
 lib/${PKGNAME}/imports/StablePtr.hi
 lib/${PKGNAME}/imports/StablePtr.p_hi
 lib/${PKGNAME}/imports/Storable.hi
@@ -943,12 +1026,56 @@ lib/${PKGNAME}/imports/Text/Read/Lex.hi
 lib/${PKGNAME}/imports/Text/Read/Lex.p_hi
 lib/${PKGNAME}/imports/Text/Regex.hi
 lib/${PKGNAME}/imports/Text/Regex.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Base.hi
+lib/${PKGNAME}/imports/Text/Regex/Base.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Base/Context.hi
+lib/${PKGNAME}/imports/Text/Regex/Base/Context.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Base/Impl.hi
+lib/${PKGNAME}/imports/Text/Regex/Base/Impl.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Base/RegexLike.hi
+lib/${PKGNAME}/imports/Text/Regex/Base/RegexLike.p_hi
 lib/${PKGNAME}/imports/Text/Regex/Posix.hi
 lib/${PKGNAME}/imports/Text/Regex/Posix.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/ByteString.hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/ByteString.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/String.hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/String.p_hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/Wrap.hi
+lib/${PKGNAME}/imports/Text/Regex/Posix/Wrap.p_hi
 lib/${PKGNAME}/imports/Text/Show.hi
 lib/${PKGNAME}/imports/Text/Show.p_hi
 lib/${PKGNAME}/imports/Text/Show/Functions.hi
 lib/${PKGNAME}/imports/Text/Show/Functions.p_hi
+lib/${PKGNAME}/imports/Text/XHtml.hi
+lib/${PKGNAME}/imports/Text/XHtml.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/BlockTable.hi
+lib/${PKGNAME}/imports/Text/XHtml/BlockTable.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Debug.hi
+lib/${PKGNAME}/imports/Text/XHtml/Debug.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Extras.hi
+lib/${PKGNAME}/imports/Text/XHtml/Extras.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset.hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset/Attributes.hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset/Attributes.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset/Elements.hi
+lib/${PKGNAME}/imports/Text/XHtml/Frameset/Elements.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Internals.hi
+lib/${PKGNAME}/imports/Text/XHtml/Internals.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict.hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict/Attributes.hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict/Attributes.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict/Elements.hi
+lib/${PKGNAME}/imports/Text/XHtml/Strict/Elements.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Table.hi
+lib/${PKGNAME}/imports/Text/XHtml/Table.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional.hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional/Attributes.hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional/Attributes.p_hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional/Elements.hi
+lib/${PKGNAME}/imports/Text/XHtml/Transitional/Elements.p_hi
 lib/${PKGNAME}/imports/Time.hi
 lib/${PKGNAME}/imports/Time.p_hi
 lib/${PKGNAME}/imports/Word.hi
@@ -970,19 +1097,18 @@ lib/${PKGNAME}/include/Hooks.h
 lib/${PKGNAME}/include/HsBase.h
 lib/${PKGNAME}/include/HsBaseConfig.h
 lib/${PKGNAME}/include/HsFFI.h
-lib/${PKGNAME}/include/HsLang.h
 lib/${PKGNAME}/include/HsNet.h
 lib/${PKGNAME}/include/HsNetworkConfig.h
-lib/${PKGNAME}/include/HsPosix.h
 lib/${PKGNAME}/include/HsReadline.h
+lib/${PKGNAME}/include/HsReadlineConfig.h
 lib/${PKGNAME}/include/HsUnix.h
 lib/${PKGNAME}/include/HsUnixConfig.h
-lib/${PKGNAME}/include/HsUtil.h
 lib/${PKGNAME}/include/InfoTables.h
 lib/${PKGNAME}/include/Linker.h
 lib/${PKGNAME}/include/Liveness.h
 lib/${PKGNAME}/include/MachDeps.h
 lib/${PKGNAME}/include/MachRegs.h
+lib/${PKGNAME}/include/OSThreads.h
 lib/${PKGNAME}/include/Parallel.h
 lib/${PKGNAME}/include/Regs.h
 lib/${PKGNAME}/include/Rts.h
@@ -991,6 +1117,7 @@ lib/${PKGNAME}/include/RtsConfig.h
 lib/${PKGNAME}/include/RtsExternal.h
 lib/${PKGNAME}/include/RtsFlags.h
 lib/${PKGNAME}/include/RtsMessages.h
+lib/${PKGNAME}/include/RtsTypeable.h
 lib/${PKGNAME}/include/RtsTypes.h
 lib/${PKGNAME}/include/SMP.h
 lib/${PKGNAME}/include/STM.h
@@ -1009,11 +1136,11 @@ lib/${PKGNAME}/include/Storage.h
 lib/${PKGNAME}/include/TSO.h
 lib/${PKGNAME}/include/TailCalls.h
 lib/${PKGNAME}/include/Typeable.h
-lib/${PKGNAME}/include/Updates.h
 lib/${PKGNAME}/include/WCsubst.h
 lib/${PKGNAME}/include/config.h
 lib/${PKGNAME}/include/consUtils.h
 lib/${PKGNAME}/include/dirUtils.h
+lib/${PKGNAME}/include/fpstring.h
 lib/${PKGNAME}/include/ghcautoconf.h
 lib/${PKGNAME}/include/ghcconfig.h
 lib/${PKGNAME}/include/ghcplatform.h
@@ -1031,34 +1158,31 @@ lib/${PKGNAME}/libHSQuickCheck_p.a
 lib/${PKGNAME}/libHSbase.a
 lib/${PKGNAME}/libHSbase_cbits.a
 lib/${PKGNAME}/libHSbase_p.a
-lib/${PKGNAME}/libHSconcurrent.a
-lib/${PKGNAME}/libHSconcurrent_p.a
-lib/${PKGNAME}/libHSdata.a
-lib/${PKGNAME}/libHSdata_p.a
+lib/${PKGNAME}/libHScgi.a
+lib/${PKGNAME}/libHScgi_p.a
 lib/${PKGNAME}/libHSfgl.a
 lib/${PKGNAME}/libHSfgl_p.a
+lib/${PKGNAME}/libHSghc.a
 lib/${PKGNAME}/libHShaskell-src.a
 lib/${PKGNAME}/libHShaskell-src_p.a
 lib/${PKGNAME}/libHShaskell98.a
 lib/${PKGNAME}/libHShaskell98_p.a
-lib/${PKGNAME}/libHShssource.a
-lib/${PKGNAME}/libHShssource_p.a
-lib/${PKGNAME}/libHSlang.a
-lib/${PKGNAME}/libHSlang_cbits.a
-lib/${PKGNAME}/libHSlang_p.a
+lib/${PKGNAME}/libHShtml.a
+lib/${PKGNAME}/libHShtml_p.a
 lib/${PKGNAME}/libHSmtl.a
 lib/${PKGNAME}/libHSmtl_p.a
-lib/${PKGNAME}/libHSnet.a
-lib/${PKGNAME}/libHSnet_p.a
 lib/${PKGNAME}/libHSnetwork.a
 lib/${PKGNAME}/libHSnetwork_p.a
 lib/${PKGNAME}/libHSparsec.a
 lib/${PKGNAME}/libHSparsec_p.a
-lib/${PKGNAME}/libHSposix.a
-lib/${PKGNAME}/libHSposix_cbits.a
-lib/${PKGNAME}/libHSposix_p.a
 lib/${PKGNAME}/libHSreadline.a
 lib/${PKGNAME}/libHSreadline_p.a
+lib/${PKGNAME}/libHSregex-base.a
+lib/${PKGNAME}/libHSregex-base_p.a
+lib/${PKGNAME}/libHSregex-compat.a
+lib/${PKGNAME}/libHSregex-compat_p.a
+lib/${PKGNAME}/libHSregex-posix.a
+lib/${PKGNAME}/libHSregex-posix_p.a
 lib/${PKGNAME}/libHSrts.a
 lib/${PKGNAME}/libHSrts_debug.a
 lib/${PKGNAME}/libHSrts_p.a
@@ -1069,21 +1193,26 @@ lib/${PKGNAME}/libHSstm.a
 lib/${PKGNAME}/libHSstm_p.a
 lib/${PKGNAME}/libHStemplate-haskell.a
 lib/${PKGNAME}/libHStemplate-haskell_p.a
-lib/${PKGNAME}/libHStext.a
-lib/${PKGNAME}/libHStext_p.a
+lib/${PKGNAME}/libHStime.a
+lib/${PKGNAME}/libHStime_p.a
 lib/${PKGNAME}/libHSunix.a
 lib/${PKGNAME}/libHSunix_cbits.a
 lib/${PKGNAME}/libHSunix_p.a
-lib/${PKGNAME}/libHSutil.a
-lib/${PKGNAME}/libHSutil_cbits.a
-lib/${PKGNAME}/libHSutil_p.a
+lib/${PKGNAME}/libHSxhtml.a
+lib/${PKGNAME}/libHSxhtml_p.a
 lib/${PKGNAME}/package.conf
-lib/${PKGNAME}/parse-gcstats.prl
-lib/${PKGNAME}/process-gcstats.prl
 lib/${PKGNAME}/template-hsc.h
 lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/include
+@exec ${MKDIR} %D/lib/${PKGNAME}/imports/cbits
+@dirrm lib/${PKGNAME}/imports/cbits
+@dirrm lib/${PKGNAME}/imports/Text/XHtml/Transitional
+@dirrm lib/${PKGNAME}/imports/Text/XHtml/Strict
+@dirrm lib/${PKGNAME}/imports/Text/XHtml/Frameset
+@dirrm lib/${PKGNAME}/imports/Text/XHtml
 @dirrm lib/${PKGNAME}/imports/Text/Show
+@dirrm lib/${PKGNAME}/imports/Text/Regex/Posix
+@dirrm lib/${PKGNAME}/imports/Text/Regex/Base
 @dirrm lib/${PKGNAME}/imports/Text/Regex
 @dirrm lib/${PKGNAME}/imports/Text/Read
 @dirrm lib/${PKGNAME}/imports/Text/PrettyPrint
@@ -1103,6 +1232,7 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/System/Directory
 @dirrm lib/${PKGNAME}/imports/System/Console
 @dirrm lib/${PKGNAME}/imports/System
+@dirrm lib/${PKGNAME}/imports/Network/CGI
 @dirrm lib/${PKGNAME}/imports/Network
 @dirrm lib/${PKGNAME}/imports/Language/Haskell/TH
 @dirrm lib/${PKGNAME}/imports/Language/Haskell
@@ -1117,6 +1247,10 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Distribution
 @dirrm lib/${PKGNAME}/imports/Debug/QuickCheck
 @dirrm lib/${PKGNAME}/imports/Debug
+@dirrm lib/${PKGNAME}/imports/Data/Time/LocalTime
+@dirrm lib/${PKGNAME}/imports/Data/Time/Clock
+@dirrm lib/${PKGNAME}/imports/Data/Time/Calendar
+@dirrm lib/${PKGNAME}/imports/Data/Time
 @dirrm lib/${PKGNAME}/imports/Data/STRef
 @dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive/Query
 @dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad
@@ -1124,6 +1258,8 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive
 @dirrm lib/${PKGNAME}/imports/Data/Graph
 @dirrm lib/${PKGNAME}/imports/Data/Generics
+@dirrm lib/${PKGNAME}/imports/Data/ByteString/Lazy
+@dirrm lib/${PKGNAME}/imports/Data/ByteString
 @dirrm lib/${PKGNAME}/imports/Data/Array/IO
 @dirrm lib/${PKGNAME}/imports/Data/Array
 @dirrm lib/${PKGNAME}/imports/Data
@@ -1135,13 +1271,6 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Control
 @dirrm lib/${PKGNAME}/imports
 @dirrm lib/${PKGNAME}/icons
-@dirrm lib/${PKGNAME}/hslibs-imports/util
-@dirrm lib/${PKGNAME}/hslibs-imports/text
-@dirrm lib/${PKGNAME}/hslibs-imports/posix
-@dirrm lib/${PKGNAME}/hslibs-imports/net
-@dirrm lib/${PKGNAME}/hslibs-imports/lang
-@dirrm lib/${PKGNAME}/hslibs-imports/hssource
-@dirrm lib/${PKGNAME}/hslibs-imports/data
-@dirrm lib/${PKGNAME}/hslibs-imports/concurrent
+@dirrm lib/${PKGNAME}/hslibs-imports/ghc
 @dirrm lib/${PKGNAME}/hslibs-imports
 @dirrm lib/${PKGNAME}
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index 05da58109e7..3bceb96261c 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/03/24 17:57:19 kristerw Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GHC_BUILDLINK3_MK:=	${GHC_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	ghc
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc
 
 .if !empty(GHC_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.2.1nb1
-BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.4.1nb1
+BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.6
+BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.6
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc
 
 BUILDLINK_DEPMETHOD.ghc?=	build
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 2aca4783790..549a14211f4 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/10/14 02:45:10 rillig Exp $
+$NetBSD: distinfo,v 1.17 2007/03/24 17:57:19 kristerw Exp $
 
 SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
 RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@@ -6,9 +6,17 @@ Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes
 SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42
 RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38
 Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes
-SHA1 (patch-aa) = 7d0890361fb7642ab8c2e8066e546dc543cd5d62
-SHA1 (patch-ab) = ae5fea00aad1f524fe4d26f614873c6e42a26603
-SHA1 (patch-af) = e7432183001727b5c4b56260d0404fd782ad59af
-SHA1 (patch-ag) = 2b51360567c3742e1c9f57b3e01a5cc45f04d436
-SHA1 (patch-ah) = 243b1b98ce48873ded6c45dd0ff3541e8284bf00
-SHA1 (patch-ai) = 0bb721b104608f5274e08d7afd4e835e9cebbf37
+SHA1 (ghc-6.6-src-extralibs.tar.bz2) = b94974e255165703d882bb522ec44c5bdc4b0aec
+RMD160 (ghc-6.6-src-extralibs.tar.bz2) = 63d87d02f42efc032c20de7394f3b29431fd8eed
+Size (ghc-6.6-src-extralibs.tar.bz2) = 2015443 bytes
+SHA1 (ghc-6.6-src.tar.bz2) = 9876dbc46ef22684c2cc95e8dce49b2a1f47017e
+RMD160 (ghc-6.6-src.tar.bz2) = 0d8d5cdde21e5ad86fba1023872be316316d14e7
+Size (ghc-6.6-src.tar.bz2) = 4345587 bytes
+SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63
+SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051
+SHA1 (patch-ac) = 07415eb0df840cb10e0d7c33c2dc365349b7e67a
+SHA1 (patch-ad) = 40252f691cc920ba7684d24f4a9599b4fc40243d
+SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb
+SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e
+SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad
+SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269
diff --git a/lang/ghc/patches/patch-aa b/lang/ghc/patches/patch-aa
index 8ba05dff3ad..e517d8c10a7 100644
--- a/lang/ghc/patches/patch-aa
+++ b/lang/ghc/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2006/07/31 02:07:13 kristerw Exp $
+$NetBSD: patch-aa,v 1.8 2007/03/24 17:57:20 kristerw Exp $
 
---- ghc/Makefile.orig	2006-07-30 14:26:56.000000000 +0200
-+++ ghc/Makefile	2006-07-30 14:27:26.000000000 +0200
+--- ../ghc-6.4.2/ghc/Makefile.orig	2006-07-30 14:26:56.000000000 +0200
++++ ../ghc-6.4.2/ghc/Makefile	2006-07-30 14:27:26.000000000 +0200
 @@ -22,7 +22,7 @@
  # we descend into subdirs - to boot utils must be before driver.
  #
diff --git a/lang/ghc/patches/patch-ab b/lang/ghc/patches/patch-ab
index e55923c92f4..5c4ac1849d6 100644
--- a/lang/ghc/patches/patch-ab
+++ b/lang/ghc/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2006/07/31 02:07:13 kristerw Exp $
+$NetBSD: patch-ab,v 1.8 2007/03/24 17:57:20 kristerw Exp $
 
---- mk/bootstrap.mk.orig	2006-07-29 01:11:13.000000000 +0200
-+++ mk/bootstrap.mk	2006-07-29 01:12:31.000000000 +0200
+--- ../ghc-6.4.2/mk/bootstrap.mk.orig	2006-07-29 01:11:13.000000000 +0200
++++ ../ghc-6.4.2/mk/bootstrap.mk	2006-07-29 01:12:31.000000000 +0200
 @@ -149,7 +149,7 @@
  HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits
  endif
diff --git a/lang/ghc/patches/patch-ac b/lang/ghc/patches/patch-ac
new file mode 100644
index 00000000000..65549f390e8
--- /dev/null
+++ b/lang/ghc/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2007/03/24 17:57:20 kristerw Exp $
+
+--- rts/package.conf.in.orig	2007-02-25 00:05:44.000000000 +0100
++++ rts/package.conf.in	2007-02-25 00:06:23.000000000 +0100
+@@ -68,7 +68,7 @@
+ hugs-options:
+ cc-options:
+ 
+-ld-options:
++ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib",
+ #ifdef LEADING_UNDERSCORE
+            "-u", "_base_GHCziBase_Izh_static_info"
+          , "-u", "_base_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
new file mode 100644
index 00000000000..b0bb4420484
--- /dev/null
+++ b/lang/ghc/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.8 2007/03/24 17:57:20 kristerw Exp $
+
+--- libraries/readline/package.conf.in.orig	2007-02-25 00:07:25.000000000 +0100
++++ libraries/readline/package.conf.in	2007-02-25 00:07:47.000000000 +0100
+@@ -27,7 +27,7 @@
+ depends:	base
+ hugs-options:
+ cc-options:
+-ld-options:
++ld-options:	"-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
+ framework-dirs:
+ frameworks:
+ haddock-interfaces:	HADDOCK_IFACE
diff --git a/lang/ghc/patches/patch-af b/lang/ghc/patches/patch-af
index 2e71fdf2605..4f4b6b07ad1 100644
--- a/lang/ghc/patches/patch-af
+++ b/lang/ghc/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2006/07/31 02:07:13 kristerw Exp $
+$NetBSD: patch-af,v 1.7 2007/03/24 17:57:20 kristerw Exp $
 
---- ghc/rts/package.conf.in.orig	2005-05-20 21:07:55.000000000 +0200
-+++ ghc/rts/package.conf.in	2005-05-20 21:08:58.000000000 +0200
+--- ../ghc-6.4.2/ghc/rts/package.conf.in.orig	2005-05-20 21:07:55.000000000 +0200
++++ ../ghc-6.4.2/ghc/rts/package.conf.in	2005-05-20 21:08:58.000000000 +0200
 @@ -65,7 +65,7 @@
  hugs-options:
  cc-options:
diff --git a/lang/ghc/patches/patch-ag b/lang/ghc/patches/patch-ag
index 80fc78db3a7..34cec76b659 100644
--- a/lang/ghc/patches/patch-ag
+++ b/lang/ghc/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.4 2006/07/31 02:07:13 kristerw Exp $
+$NetBSD: patch-ag,v 1.5 2007/03/24 17:57:20 kristerw Exp $
 
---- libraries/readline/package.conf.in.orig	2005-05-20 20:59:44.000000000 +0200
-+++ libraries/readline/package.conf.in	2005-05-20 21:07:43.000000000 +0200
+--- ../ghc-6.4.2/libraries/readline/package.conf.in.orig	2005-05-20 20:59:44.000000000 +0200
++++ ../ghc-6.4.2/libraries/readline/package.conf.in	2005-05-20 21:07:43.000000000 +0200
 @@ -27,7 +27,7 @@
  depends:	base
  hugs-options:
diff --git a/lang/ghc/patches/patch-ah b/lang/ghc/patches/patch-ah
index 9e71b74edee..d30feac81a6 100644
--- a/lang/ghc/patches/patch-ah
+++ b/lang/ghc/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.3 2005/06/14 11:02:43 kristerw Exp $
+$NetBSD: patch-ah,v 1.4 2007/03/24 17:57:20 kristerw Exp $
 
---- ghc/rts/PosixSource.h.orig	Tue Jun 14 01:55:53 2005
-+++ ghc/rts/PosixSource.h	Fri Aug 13 15:39:29 2004
+--- ../ghc-6.4.2/ghc/rts/PosixSource.h.orig	Tue Jun 14 01:55:53 2005
++++ ../ghc-6.4.2/ghc/rts/PosixSource.h	Fri Aug 13 15:39:29 2004
 @@ -9,9 +9,11 @@
  #ifndef POSIXSOURCE_H
  #define POSIXSOURCE_H
diff --git a/lang/ghc/patches/patch-ai b/lang/ghc/patches/patch-ai
index 5e0819774d6..c0b95427e78 100644
--- a/lang/ghc/patches/patch-ai
+++ b/lang/ghc/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.5 2006/10/14 02:45:10 rillig Exp $
+$NetBSD: patch-ai,v 1.6 2007/03/24 17:57:20 kristerw Exp $
 
---- distrib/prep-bin-dist-mingw.orig	2006-03-19 04:26:18.000000000 +0100
-+++ distrib/prep-bin-dist-mingw	2006-10-14 04:43:55.000000000 +0200
+--- ../ghc-6.4.2/distrib/prep-bin-dist-mingw.orig	2006-03-19 04:26:18.000000000 +0100
++++ ../ghc-6.4.2/distrib/prep-bin-dist-mingw	2006-10-14 04:43:55.000000000 +0200
 @@ -27,25 +27,25 @@
  #    - gcc_version -- what gcc version your mingw tree uses.
  #