Update ghc to 6.4.

See
  http://www.haskell.org/ghc/docs/6.4/html/users_guide/release-6-4.html
for the long list of changes since ghc-6.2.1.

In addition, GHCi and profiling support have been enabled in this
package.

10 files changed, 699 insertions, 60 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 169f3a58c5a..15629062889 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2005/05/04 19:02:33 kristerw Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/21 20:22:21 kristerw Exp $
 
-DISTNAME=	ghc-6.2.1
-PKGREVISION=	1
+DISTNAME=	ghc-6.4
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/6.2.1/
-DISTFILES=	ghc-6.2.1-src.tar.bz2 \
+MASTER_SITES=	http://www.haskell.org/ghc/dist/6.4/
+DISTFILES=	ghc-6.4-src.tar.bz2 \
+		ghc-6.2.1-src.tar.bz2 \
 		ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz
 
 MAINTAINER=	kristerw@NetBSD.org
@@ -16,34 +16,36 @@ SITES_ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
 ONLY_FOR_PLATFORM= NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 
 GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	./distrib/hc-build
-CONFIGURE_ARGS+=	--enable-hc-boot-unregisterised
-INSTALL_MAKE_FLAGS+=	stage=1
-
-
+CONFIGURE_ARGS+=	--with-ghc=${WRKDIR}/bootstrap/bin/ghc
+CONFIGURE_ENV+=		PerlCmd=${PERL5}
 USE_GNU_READLINE=	yes	# uses the UNDO_ constants
 USE_PERL5=		yes
 USE_GNU_TOOLS+=		make
 
-# Everything is done in the configure target.
-do-build:
-	@${DO_NADA}
-
 pre-configure:
-	${MV} ${WRKSRC}/mk/bootstrap.mk ${WRKSRC}/mk/bootstrap.mk.tmp
+	${MV} ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk \
+		${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk.tmp
 	${SED} -e 's,@PREFIX@,${PREFIX},g' \
-		< ${WRKSRC}/mk/bootstrap.mk.tmp \
-		> ${WRKSRC}/mk/bootstrap.mk
-	${MV} ${WRKSRC}/libraries/readline/package.conf.in \
-		${WRKSRC}/libraries/readline/package.conf.in.tmp
+		< ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk.tmp \
+		> ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk
+	${MV} ${WRKDIR}/ghc-6.2.1/libraries/readline/package.conf.in \
+		${WRKDIR}/ghc-6.2.1/libraries/readline/package.conf.in.tmp
 	${SED} -e 's,@PREFIX@,${PREFIX},g' \
-		< ${WRKSRC}/libraries/readline/package.conf.in.tmp \
-		> ${WRKSRC}/libraries/readline/package.conf.in
-	${MV} ${WRKSRC}/ghc/rts/package.conf.in \
-		${WRKSRC}/ghc/rts/package.conf.in.tmp
+		< ${WRKDIR}/ghc-6.2.1/libraries/readline/package.conf.in.tmp \
+		> ${WRKDIR}/ghc-6.2.1/libraries/readline/package.conf.in
+	${MV} ${WRKDIR}/ghc-6.2.1/ghc/rts/package.conf.in \
+		${WRKDIR}/ghc-6.2.1/ghc/rts/package.conf.in.tmp
 	${SED} -e 's,@PREFIX@,${PREFIX},g' \
-		< ${WRKSRC}/ghc/rts/package.conf.in.tmp \
-		> ${WRKSRC}/ghc/rts/package.conf.in
+		< ${WRKDIR}/ghc-6.2.1/ghc/rts/package.conf.in.tmp \
+		> ${WRKDIR}/ghc-6.2.1/ghc/rts/package.conf.in
+	cd ${WRKDIR}/ghc-6.2.1 && \
+		./distrib/hc-build \
+			--enable-hc-boot-unregisterised \
+			--prefix=${WRKDIR}/bootstrap
+	cd ${WRKDIR}/ghc-6.2.1 && ${GMAKE} stage=1 install
+
+pre-build:
+	${ECHO} "SplitObjs=NO" > ${WRKSRC}/mk/build.mk
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/lang/ghc/PLIST b/lang/ghc/PLIST
index e7a29789222..4248905cc3b 100644
--- a/lang/ghc/PLIST
+++ b/lang/ghc/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/29 14:28:43 kristerw Exp $
-bin/ghc
+@comment $NetBSD: PLIST,v 1.4 2005/05/21 20:22:21 kristerw Exp $
 bin/${PKGNAME}
+bin/ghc
 bin/ghc-pkg
 bin/ghc-pkg-${PKGVERSION}
 bin/ghci
@@ -9,9 +9,39 @@ bin/ghcprof
 bin/hasktags
 bin/hp2ps
 bin/hsc2hs
+bin/runghc
+bin/runhaskell
 bin/stat2resid
-lib/${PKGNAME}/cgprof
 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}/HSfgl.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}/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}/HSrts.o
+lib/${PKGNAME}/HSstm.o
+lib/${PKGNAME}/HStemplate-haskell.o
+lib/${PKGNAME}/HStext.o
+lib/${PKGNAME}/HSunix.o
+lib/${PKGNAME}/HSunix_cbits.o
+lib/${PKGNAME}/HSutil.o
+lib/${PKGNAME}/HSutil_cbits.o
+lib/${PKGNAME}/cgprof
 lib/${PKGNAME}/ghc-asm
 lib/${PKGNAME}/ghc-pkg.bin
 lib/${PKGNAME}/ghc-split
@@ -19,138 +49,271 @@ 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}/icons/absdelta.xbm
 lib/${PKGNAME}/icons/absolute.xbm
 lib/${PKGNAME}/icons/comm.xbm
@@ -175,263 +338,656 @@ lib/${PKGNAME}/icons/undo.xbm
 lib/${PKGNAME}/icons/wait.xbm
 lib/${PKGNAME}/icons/weightdelta.xbm
 lib/${PKGNAME}/imports/Array.hi
+lib/${PKGNAME}/imports/Array.p_hi
 lib/${PKGNAME}/imports/Bits.hi
+lib/${PKGNAME}/imports/Bits.p_hi
 lib/${PKGNAME}/imports/CError.hi
+lib/${PKGNAME}/imports/CError.p_hi
 lib/${PKGNAME}/imports/CForeign.hi
+lib/${PKGNAME}/imports/CForeign.p_hi
 lib/${PKGNAME}/imports/CPUTime.hi
+lib/${PKGNAME}/imports/CPUTime.p_hi
 lib/${PKGNAME}/imports/CString.hi
+lib/${PKGNAME}/imports/CString.p_hi
 lib/${PKGNAME}/imports/CTypes.hi
+lib/${PKGNAME}/imports/CTypes.p_hi
 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/Arrow.hi
+lib/${PKGNAME}/imports/Control/Arrow.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent.hi
+lib/${PKGNAME}/imports/Control/Concurrent.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/Chan.hi
+lib/${PKGNAME}/imports/Control/Concurrent/Chan.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/MVar.hi
+lib/${PKGNAME}/imports/Control/Concurrent/MVar.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/QSem.hi
+lib/${PKGNAME}/imports/Control/Concurrent/QSem.p_hi
 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/TChan.hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TChan.p_hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TMVar.hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TMVar.p_hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TVar.hi
+lib/${PKGNAME}/imports/Control/Concurrent/STM/TVar.p_hi
 lib/${PKGNAME}/imports/Control/Concurrent/SampleVar.hi
+lib/${PKGNAME}/imports/Control/Concurrent/SampleVar.p_hi
 lib/${PKGNAME}/imports/Control/Exception.hi
+lib/${PKGNAME}/imports/Control/Exception.p_hi
 lib/${PKGNAME}/imports/Control/Monad.hi
+lib/${PKGNAME}/imports/Control/Monad.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Cont.hi
+lib/${PKGNAME}/imports/Control/Monad/Cont.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Error.hi
+lib/${PKGNAME}/imports/Control/Monad/Error.p_hi
 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/List.hi
+lib/${PKGNAME}/imports/Control/Monad/List.p_hi
 lib/${PKGNAME}/imports/Control/Monad/RWS.hi
+lib/${PKGNAME}/imports/Control/Monad/RWS.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Reader.hi
+lib/${PKGNAME}/imports/Control/Monad/Reader.p_hi
 lib/${PKGNAME}/imports/Control/Monad/ST.hi
+lib/${PKGNAME}/imports/Control/Monad/ST.p_hi
 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/State.hi
+lib/${PKGNAME}/imports/Control/Monad/State.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Trans.hi
+lib/${PKGNAME}/imports/Control/Monad/Trans.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Writer.hi
+lib/${PKGNAME}/imports/Control/Monad/Writer.p_hi
 lib/${PKGNAME}/imports/Control/Parallel.hi
+lib/${PKGNAME}/imports/Control/Parallel.p_hi
+lib/${PKGNAME}/imports/Control/Parallel/Strategies.hi
+lib/${PKGNAME}/imports/Control/Parallel/Strategies.p_hi
 lib/${PKGNAME}/imports/Data/Array.hi
+lib/${PKGNAME}/imports/Data/Array.p_hi
 lib/${PKGNAME}/imports/Data/Array/Base.hi
+lib/${PKGNAME}/imports/Data/Array/Base.p_hi
 lib/${PKGNAME}/imports/Data/Array/Diff.hi
+lib/${PKGNAME}/imports/Data/Array/Diff.p_hi
 lib/${PKGNAME}/imports/Data/Array/IArray.hi
+lib/${PKGNAME}/imports/Data/Array/IArray.p_hi
 lib/${PKGNAME}/imports/Data/Array/IO.hi
+lib/${PKGNAME}/imports/Data/Array/IO.p_hi
 lib/${PKGNAME}/imports/Data/Array/IO/Internals.hi
+lib/${PKGNAME}/imports/Data/Array/IO/Internals.p_hi
 lib/${PKGNAME}/imports/Data/Array/MArray.hi
+lib/${PKGNAME}/imports/Data/Array/MArray.p_hi
 lib/${PKGNAME}/imports/Data/Array/ST.hi
+lib/${PKGNAME}/imports/Data/Array/ST.p_hi
 lib/${PKGNAME}/imports/Data/Array/Storable.hi
+lib/${PKGNAME}/imports/Data/Array/Storable.p_hi
 lib/${PKGNAME}/imports/Data/Array/Unboxed.hi
+lib/${PKGNAME}/imports/Data/Array/Unboxed.p_hi
 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/Char.hi
+lib/${PKGNAME}/imports/Data/Char.p_hi
 lib/${PKGNAME}/imports/Data/Complex.hi
+lib/${PKGNAME}/imports/Data/Complex.p_hi
 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/FunctorM.hi
+lib/${PKGNAME}/imports/Data/FunctorM.p_hi
 lib/${PKGNAME}/imports/Data/Generics.hi
+lib/${PKGNAME}/imports/Data/Generics.p_hi
 lib/${PKGNAME}/imports/Data/Generics/Aliases.hi
+lib/${PKGNAME}/imports/Data/Generics/Aliases.p_hi
 lib/${PKGNAME}/imports/Data/Generics/Basics.hi
-lib/${PKGNAME}/imports/Data/Generics/Reify.hi
+lib/${PKGNAME}/imports/Data/Generics/Basics.p_hi
+lib/${PKGNAME}/imports/Data/Generics/Instances.hi
+lib/${PKGNAME}/imports/Data/Generics/Instances.p_hi
 lib/${PKGNAME}/imports/Data/Generics/Schemes.hi
+lib/${PKGNAME}/imports/Data/Generics/Schemes.p_hi
 lib/${PKGNAME}/imports/Data/Generics/Text.hi
+lib/${PKGNAME}/imports/Data/Generics/Text.p_hi
 lib/${PKGNAME}/imports/Data/Generics/Twins.hi
+lib/${PKGNAME}/imports/Data/Generics/Twins.p_hi
 lib/${PKGNAME}/imports/Data/Graph.hi
+lib/${PKGNAME}/imports/Data/Graph.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Basic.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Basic.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Example.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Example.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Graph.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Graph.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Graphviz.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Graphviz.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/FiniteMap.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/FiniteMap.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Heap.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Heap.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Queue.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Queue.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/RootPath.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/RootPath.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Thread.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal/Thread.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad/IOArray.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad/IOArray.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/NodeMap.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/NodeMap.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/ArtPoint.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/ArtPoint.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/BCC.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/BCC.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/BFS.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/BFS.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/DFS.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/DFS.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Dominators.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Dominators.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/GVD.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/GVD.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Indep.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Indep.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MST.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MST.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MaxFlow.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MaxFlow.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MaxFlow2.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/MaxFlow2.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Monad.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/Monad.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/SP.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/SP.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/TransClos.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Query/TransClos.p_hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Tree.hi
+lib/${PKGNAME}/imports/Data/Graph/Inductive/Tree.p_hi
 lib/${PKGNAME}/imports/Data/HashTable.hi
+lib/${PKGNAME}/imports/Data/HashTable.p_hi
 lib/${PKGNAME}/imports/Data/IORef.hi
+lib/${PKGNAME}/imports/Data/IORef.p_hi
 lib/${PKGNAME}/imports/Data/Int.hi
+lib/${PKGNAME}/imports/Data/Int.p_hi
+lib/${PKGNAME}/imports/Data/IntMap.hi
+lib/${PKGNAME}/imports/Data/IntMap.p_hi
+lib/${PKGNAME}/imports/Data/IntSet.hi
+lib/${PKGNAME}/imports/Data/IntSet.p_hi
 lib/${PKGNAME}/imports/Data/Ix.hi
+lib/${PKGNAME}/imports/Data/Ix.p_hi
 lib/${PKGNAME}/imports/Data/List.hi
+lib/${PKGNAME}/imports/Data/List.p_hi
+lib/${PKGNAME}/imports/Data/Map.hi
+lib/${PKGNAME}/imports/Data/Map.p_hi
 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/PackedString.hi
+lib/${PKGNAME}/imports/Data/PackedString.p_hi
+lib/${PKGNAME}/imports/Data/Queue.hi
+lib/${PKGNAME}/imports/Data/Queue.p_hi
 lib/${PKGNAME}/imports/Data/Ratio.hi
+lib/${PKGNAME}/imports/Data/Ratio.p_hi
 lib/${PKGNAME}/imports/Data/STRef.hi
+lib/${PKGNAME}/imports/Data/STRef.p_hi
 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/Set.hi
+lib/${PKGNAME}/imports/Data/Set.p_hi
 lib/${PKGNAME}/imports/Data/Tree.hi
+lib/${PKGNAME}/imports/Data/Tree.p_hi
 lib/${PKGNAME}/imports/Data/Tuple.hi
+lib/${PKGNAME}/imports/Data/Tuple.p_hi
 lib/${PKGNAME}/imports/Data/Typeable.hi
+lib/${PKGNAME}/imports/Data/Typeable.p_hi
 lib/${PKGNAME}/imports/Data/Unique.hi
+lib/${PKGNAME}/imports/Data/Unique.p_hi
+lib/${PKGNAME}/imports/Data/Version.hi
+lib/${PKGNAME}/imports/Data/Version.p_hi
 lib/${PKGNAME}/imports/Data/Word.hi
+lib/${PKGNAME}/imports/Data/Word.p_hi
 lib/${PKGNAME}/imports/Debug/QuickCheck.hi
+lib/${PKGNAME}/imports/Debug/QuickCheck.p_hi
 lib/${PKGNAME}/imports/Debug/QuickCheck/Batch.hi
+lib/${PKGNAME}/imports/Debug/QuickCheck/Batch.p_hi
 lib/${PKGNAME}/imports/Debug/QuickCheck/Poly.hi
+lib/${PKGNAME}/imports/Debug/QuickCheck/Poly.p_hi
 lib/${PKGNAME}/imports/Debug/QuickCheck/Utils.hi
+lib/${PKGNAME}/imports/Debug/QuickCheck/Utils.p_hi
 lib/${PKGNAME}/imports/Debug/Trace.hi
+lib/${PKGNAME}/imports/Debug/Trace.p_hi
 lib/${PKGNAME}/imports/Directory.hi
+lib/${PKGNAME}/imports/Directory.p_hi
+lib/${PKGNAME}/imports/Distribution/Compat/Directory.hi
+lib/${PKGNAME}/imports/Distribution/Compat/Directory.p_hi
+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/RawSystem.hi
+lib/${PKGNAME}/imports/Distribution/Compat/RawSystem.p_hi
+lib/${PKGNAME}/imports/Distribution/Compat/ReadP.hi
+lib/${PKGNAME}/imports/Distribution/Compat/ReadP.p_hi
+lib/${PKGNAME}/imports/Distribution/Extension.hi
+lib/${PKGNAME}/imports/Distribution/Extension.p_hi
+lib/${PKGNAME}/imports/Distribution/GetOpt.hi
+lib/${PKGNAME}/imports/Distribution/GetOpt.p_hi
+lib/${PKGNAME}/imports/Distribution/InstalledPackageInfo.hi
+lib/${PKGNAME}/imports/Distribution/InstalledPackageInfo.p_hi
+lib/${PKGNAME}/imports/Distribution/License.hi
+lib/${PKGNAME}/imports/Distribution/License.p_hi
+lib/${PKGNAME}/imports/Distribution/Make.hi
+lib/${PKGNAME}/imports/Distribution/Make.p_hi
+lib/${PKGNAME}/imports/Distribution/Package.hi
+lib/${PKGNAME}/imports/Distribution/Package.p_hi
+lib/${PKGNAME}/imports/Distribution/PackageDescription.hi
+lib/${PKGNAME}/imports/Distribution/PackageDescription.p_hi
+lib/${PKGNAME}/imports/Distribution/ParseUtils.hi
+lib/${PKGNAME}/imports/Distribution/ParseUtils.p_hi
+lib/${PKGNAME}/imports/Distribution/PreProcess.hi
+lib/${PKGNAME}/imports/Distribution/PreProcess.p_hi
+lib/${PKGNAME}/imports/Distribution/PreProcess/Unlit.hi
+lib/${PKGNAME}/imports/Distribution/PreProcess/Unlit.p_hi
+lib/${PKGNAME}/imports/Distribution/Setup.hi
+lib/${PKGNAME}/imports/Distribution/Setup.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple.hi
+lib/${PKGNAME}/imports/Distribution/Simple.p_hi
+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/GHCPackageConfig.hi
+lib/${PKGNAME}/imports/Distribution/Simple/GHCPackageConfig.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/Install.hi
+lib/${PKGNAME}/imports/Distribution/Simple/Install.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/LocalBuildInfo.hi
+lib/${PKGNAME}/imports/Distribution/Simple/LocalBuildInfo.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/Register.hi
+lib/${PKGNAME}/imports/Distribution/Simple/Register.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/SrcDist.hi
+lib/${PKGNAME}/imports/Distribution/Simple/SrcDist.p_hi
+lib/${PKGNAME}/imports/Distribution/Simple/Utils.hi
+lib/${PKGNAME}/imports/Distribution/Simple/Utils.p_hi
+lib/${PKGNAME}/imports/Distribution/Version.hi
+lib/${PKGNAME}/imports/Distribution/Version.p_hi
 lib/${PKGNAME}/imports/Foreign.hi
+lib/${PKGNAME}/imports/Foreign.p_hi
 lib/${PKGNAME}/imports/Foreign/C.hi
+lib/${PKGNAME}/imports/Foreign/C.p_hi
 lib/${PKGNAME}/imports/Foreign/C/Error.hi
+lib/${PKGNAME}/imports/Foreign/C/Error.p_hi
 lib/${PKGNAME}/imports/Foreign/C/String.hi
+lib/${PKGNAME}/imports/Foreign/C/String.p_hi
 lib/${PKGNAME}/imports/Foreign/C/Types.hi
+lib/${PKGNAME}/imports/Foreign/C/Types.p_hi
 lib/${PKGNAME}/imports/Foreign/Concurrent.hi
+lib/${PKGNAME}/imports/Foreign/Concurrent.p_hi
 lib/${PKGNAME}/imports/Foreign/ForeignPtr.hi
+lib/${PKGNAME}/imports/Foreign/ForeignPtr.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal.hi
+lib/${PKGNAME}/imports/Foreign/Marshal.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal/Alloc.hi
+lib/${PKGNAME}/imports/Foreign/Marshal/Alloc.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal/Array.hi
+lib/${PKGNAME}/imports/Foreign/Marshal/Array.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal/Error.hi
+lib/${PKGNAME}/imports/Foreign/Marshal/Error.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal/Pool.hi
+lib/${PKGNAME}/imports/Foreign/Marshal/Pool.p_hi
 lib/${PKGNAME}/imports/Foreign/Marshal/Utils.hi
+lib/${PKGNAME}/imports/Foreign/Marshal/Utils.p_hi
 lib/${PKGNAME}/imports/Foreign/Ptr.hi
+lib/${PKGNAME}/imports/Foreign/Ptr.p_hi
 lib/${PKGNAME}/imports/Foreign/StablePtr.hi
+lib/${PKGNAME}/imports/Foreign/StablePtr.p_hi
 lib/${PKGNAME}/imports/Foreign/Storable.hi
+lib/${PKGNAME}/imports/Foreign/Storable.p_hi
 lib/${PKGNAME}/imports/ForeignPtr.hi
+lib/${PKGNAME}/imports/ForeignPtr.p_hi
 lib/${PKGNAME}/imports/GHC/Arr.hi
+lib/${PKGNAME}/imports/GHC/Arr.p_hi
 lib/${PKGNAME}/imports/GHC/Base.hi
+lib/${PKGNAME}/imports/GHC/Base.p_hi
 lib/${PKGNAME}/imports/GHC/Conc.hi
+lib/${PKGNAME}/imports/GHC/Conc.p_hi
+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/Enum.hi
+lib/${PKGNAME}/imports/GHC/Enum.p_hi
 lib/${PKGNAME}/imports/GHC/Err.hi
+lib/${PKGNAME}/imports/GHC/Err.p_hi
 lib/${PKGNAME}/imports/GHC/Exception.hi
+lib/${PKGNAME}/imports/GHC/Exception.p_hi
 lib/${PKGNAME}/imports/GHC/Exts.hi
+lib/${PKGNAME}/imports/GHC/Exts.p_hi
 lib/${PKGNAME}/imports/GHC/Float.hi
+lib/${PKGNAME}/imports/GHC/Float.p_hi
 lib/${PKGNAME}/imports/GHC/ForeignPtr.hi
+lib/${PKGNAME}/imports/GHC/ForeignPtr.p_hi
 lib/${PKGNAME}/imports/GHC/Handle.hi
+lib/${PKGNAME}/imports/GHC/Handle.p_hi
 lib/${PKGNAME}/imports/GHC/IO.hi
+lib/${PKGNAME}/imports/GHC/IO.p_hi
 lib/${PKGNAME}/imports/GHC/IOBase.hi
+lib/${PKGNAME}/imports/GHC/IOBase.p_hi
 lib/${PKGNAME}/imports/GHC/Int.hi
+lib/${PKGNAME}/imports/GHC/Int.p_hi
 lib/${PKGNAME}/imports/GHC/List.hi
+lib/${PKGNAME}/imports/GHC/List.p_hi
 lib/${PKGNAME}/imports/GHC/Num.hi
+lib/${PKGNAME}/imports/GHC/Num.p_hi
 lib/${PKGNAME}/imports/GHC/PArr.hi
+lib/${PKGNAME}/imports/GHC/PArr.p_hi
 lib/${PKGNAME}/imports/GHC/Pack.hi
+lib/${PKGNAME}/imports/GHC/Pack.p_hi
 lib/${PKGNAME}/imports/GHC/PrimopWrappers.hi
+lib/${PKGNAME}/imports/GHC/PrimopWrappers.p_hi
 lib/${PKGNAME}/imports/GHC/Ptr.hi
+lib/${PKGNAME}/imports/GHC/Ptr.p_hi
 lib/${PKGNAME}/imports/GHC/Read.hi
+lib/${PKGNAME}/imports/GHC/Read.p_hi
 lib/${PKGNAME}/imports/GHC/Real.hi
+lib/${PKGNAME}/imports/GHC/Real.p_hi
 lib/${PKGNAME}/imports/GHC/ST.hi
+lib/${PKGNAME}/imports/GHC/ST.p_hi
 lib/${PKGNAME}/imports/GHC/STRef.hi
+lib/${PKGNAME}/imports/GHC/STRef.p_hi
 lib/${PKGNAME}/imports/GHC/Show.hi
+lib/${PKGNAME}/imports/GHC/Show.p_hi
 lib/${PKGNAME}/imports/GHC/Stable.hi
+lib/${PKGNAME}/imports/GHC/Stable.p_hi
 lib/${PKGNAME}/imports/GHC/Storable.hi
+lib/${PKGNAME}/imports/GHC/Storable.p_hi
 lib/${PKGNAME}/imports/GHC/TopHandler.hi
+lib/${PKGNAME}/imports/GHC/TopHandler.p_hi
 lib/${PKGNAME}/imports/GHC/Unicode.hi
+lib/${PKGNAME}/imports/GHC/Unicode.p_hi
 lib/${PKGNAME}/imports/GHC/Weak.hi
+lib/${PKGNAME}/imports/GHC/Weak.p_hi
 lib/${PKGNAME}/imports/GHC/Word.hi
+lib/${PKGNAME}/imports/GHC/Word.p_hi
 lib/${PKGNAME}/imports/IO.hi
+lib/${PKGNAME}/imports/IO.p_hi
 lib/${PKGNAME}/imports/Int.hi
+lib/${PKGNAME}/imports/Int.p_hi
 lib/${PKGNAME}/imports/Ix.hi
+lib/${PKGNAME}/imports/Ix.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/Lexer.hi
+lib/${PKGNAME}/imports/Language/Haskell/Lexer.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/ParseMonad.hi
+lib/${PKGNAME}/imports/Language/Haskell/ParseMonad.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/ParseUtils.hi
+lib/${PKGNAME}/imports/Language/Haskell/ParseUtils.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/Parser.hi
+lib/${PKGNAME}/imports/Language/Haskell/Parser.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/Pretty.hi
+lib/${PKGNAME}/imports/Language/Haskell/Pretty.p_hi
 lib/${PKGNAME}/imports/Language/Haskell/Syntax.hi
-lib/${PKGNAME}/imports/Language/Haskell/THSyntax.hi
+lib/${PKGNAME}/imports/Language/Haskell/Syntax.p_hi
+lib/${PKGNAME}/imports/Language/Haskell/TH.hi
+lib/${PKGNAME}/imports/Language/Haskell/TH.p_hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Lib.hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Lib.p_hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Ppr.hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Ppr.p_hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/PprLib.hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/PprLib.p_hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Syntax.hi
+lib/${PKGNAME}/imports/Language/Haskell/TH/Syntax.p_hi
 lib/${PKGNAME}/imports/List.hi
+lib/${PKGNAME}/imports/List.p_hi
 lib/${PKGNAME}/imports/Locale.hi
+lib/${PKGNAME}/imports/Locale.p_hi
 lib/${PKGNAME}/imports/MarshalAlloc.hi
+lib/${PKGNAME}/imports/MarshalAlloc.p_hi
 lib/${PKGNAME}/imports/MarshalArray.hi
+lib/${PKGNAME}/imports/MarshalArray.p_hi
 lib/${PKGNAME}/imports/MarshalError.hi
+lib/${PKGNAME}/imports/MarshalError.p_hi
 lib/${PKGNAME}/imports/MarshalUtils.hi
+lib/${PKGNAME}/imports/MarshalUtils.p_hi
 lib/${PKGNAME}/imports/Maybe.hi
+lib/${PKGNAME}/imports/Maybe.p_hi
 lib/${PKGNAME}/imports/Monad.hi
+lib/${PKGNAME}/imports/Monad.p_hi
 lib/${PKGNAME}/imports/Network.hi
+lib/${PKGNAME}/imports/Network.p_hi
 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/Socket.hi
+lib/${PKGNAME}/imports/Network/Socket.p_hi
 lib/${PKGNAME}/imports/Network/URI.hi
+lib/${PKGNAME}/imports/Network/URI.p_hi
 lib/${PKGNAME}/imports/Numeric.hi
+lib/${PKGNAME}/imports/Numeric.p_hi
 lib/${PKGNAME}/imports/Prelude.hi
+lib/${PKGNAME}/imports/Prelude.p_hi
 lib/${PKGNAME}/imports/Ptr.hi
+lib/${PKGNAME}/imports/Ptr.p_hi
 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/StablePtr.hi
+lib/${PKGNAME}/imports/StablePtr.p_hi
 lib/${PKGNAME}/imports/Storable.hi
+lib/${PKGNAME}/imports/Storable.p_hi
 lib/${PKGNAME}/imports/System.hi
+lib/${PKGNAME}/imports/System.p_hi
 lib/${PKGNAME}/imports/System/CPUTime.hi
+lib/${PKGNAME}/imports/System/CPUTime.p_hi
 lib/${PKGNAME}/imports/System/Cmd.hi
+lib/${PKGNAME}/imports/System/Cmd.p_hi
 lib/${PKGNAME}/imports/System/Console/GetOpt.hi
+lib/${PKGNAME}/imports/System/Console/GetOpt.p_hi
 lib/${PKGNAME}/imports/System/Console/Readline.hi
+lib/${PKGNAME}/imports/System/Console/Readline.p_hi
 lib/${PKGNAME}/imports/System/Console/SimpleLineEditor.hi
+lib/${PKGNAME}/imports/System/Console/SimpleLineEditor.p_hi
 lib/${PKGNAME}/imports/System/Directory.hi
+lib/${PKGNAME}/imports/System/Directory.p_hi
+lib/${PKGNAME}/imports/System/Directory/Internals.hi
+lib/${PKGNAME}/imports/System/Directory/Internals.p_hi
 lib/${PKGNAME}/imports/System/Environment.hi
+lib/${PKGNAME}/imports/System/Environment.p_hi
 lib/${PKGNAME}/imports/System/Exit.hi
+lib/${PKGNAME}/imports/System/Exit.p_hi
 lib/${PKGNAME}/imports/System/IO.hi
+lib/${PKGNAME}/imports/System/IO.p_hi
 lib/${PKGNAME}/imports/System/IO/Error.hi
+lib/${PKGNAME}/imports/System/IO/Error.p_hi
 lib/${PKGNAME}/imports/System/IO/Unsafe.hi
+lib/${PKGNAME}/imports/System/IO/Unsafe.p_hi
 lib/${PKGNAME}/imports/System/Info.hi
+lib/${PKGNAME}/imports/System/Info.p_hi
 lib/${PKGNAME}/imports/System/Locale.hi
+lib/${PKGNAME}/imports/System/Locale.p_hi
 lib/${PKGNAME}/imports/System/Mem.hi
+lib/${PKGNAME}/imports/System/Mem.p_hi
 lib/${PKGNAME}/imports/System/Mem/StableName.hi
+lib/${PKGNAME}/imports/System/Mem/StableName.p_hi
 lib/${PKGNAME}/imports/System/Mem/Weak.hi
+lib/${PKGNAME}/imports/System/Mem/Weak.p_hi
 lib/${PKGNAME}/imports/System/Posix.hi
+lib/${PKGNAME}/imports/System/Posix.p_hi
 lib/${PKGNAME}/imports/System/Posix/Directory.hi
+lib/${PKGNAME}/imports/System/Posix/Directory.p_hi
 lib/${PKGNAME}/imports/System/Posix/DynamicLinker.hi
+lib/${PKGNAME}/imports/System/Posix/DynamicLinker.p_hi
 lib/${PKGNAME}/imports/System/Posix/DynamicLinker/Module.hi
+lib/${PKGNAME}/imports/System/Posix/DynamicLinker/Module.p_hi
 lib/${PKGNAME}/imports/System/Posix/DynamicLinker/Prim.hi
+lib/${PKGNAME}/imports/System/Posix/DynamicLinker/Prim.p_hi
 lib/${PKGNAME}/imports/System/Posix/Env.hi
+lib/${PKGNAME}/imports/System/Posix/Env.p_hi
+lib/${PKGNAME}/imports/System/Posix/Error.hi
+lib/${PKGNAME}/imports/System/Posix/Error.p_hi
 lib/${PKGNAME}/imports/System/Posix/Files.hi
+lib/${PKGNAME}/imports/System/Posix/Files.p_hi
 lib/${PKGNAME}/imports/System/Posix/IO.hi
+lib/${PKGNAME}/imports/System/Posix/IO.p_hi
 lib/${PKGNAME}/imports/System/Posix/Internals.hi
+lib/${PKGNAME}/imports/System/Posix/Internals.p_hi
 lib/${PKGNAME}/imports/System/Posix/Process.hi
+lib/${PKGNAME}/imports/System/Posix/Process.p_hi
 lib/${PKGNAME}/imports/System/Posix/Resource.hi
+lib/${PKGNAME}/imports/System/Posix/Resource.p_hi
 lib/${PKGNAME}/imports/System/Posix/Signals.hi
+lib/${PKGNAME}/imports/System/Posix/Signals.p_hi
+lib/${PKGNAME}/imports/System/Posix/Signals/Exts.hi
+lib/${PKGNAME}/imports/System/Posix/Signals/Exts.p_hi
 lib/${PKGNAME}/imports/System/Posix/Temp.hi
+lib/${PKGNAME}/imports/System/Posix/Temp.p_hi
 lib/${PKGNAME}/imports/System/Posix/Terminal.hi
+lib/${PKGNAME}/imports/System/Posix/Terminal.p_hi
 lib/${PKGNAME}/imports/System/Posix/Time.hi
+lib/${PKGNAME}/imports/System/Posix/Time.p_hi
 lib/${PKGNAME}/imports/System/Posix/Types.hi
+lib/${PKGNAME}/imports/System/Posix/Types.p_hi
 lib/${PKGNAME}/imports/System/Posix/Unistd.hi
+lib/${PKGNAME}/imports/System/Posix/Unistd.p_hi
 lib/${PKGNAME}/imports/System/Posix/User.hi
+lib/${PKGNAME}/imports/System/Posix/User.p_hi
+lib/${PKGNAME}/imports/System/Process.hi
+lib/${PKGNAME}/imports/System/Process.p_hi
+lib/${PKGNAME}/imports/System/Process/Internals.hi
+lib/${PKGNAME}/imports/System/Process/Internals.p_hi
 lib/${PKGNAME}/imports/System/Random.hi
+lib/${PKGNAME}/imports/System/Random.p_hi
 lib/${PKGNAME}/imports/System/Time.hi
+lib/${PKGNAME}/imports/System/Time.p_hi
+lib/${PKGNAME}/imports/Test/HUnit.hi
+lib/${PKGNAME}/imports/Test/HUnit.p_hi
+lib/${PKGNAME}/imports/Test/HUnit/Base.hi
+lib/${PKGNAME}/imports/Test/HUnit/Base.p_hi
+lib/${PKGNAME}/imports/Test/HUnit/Lang.hi
+lib/${PKGNAME}/imports/Test/HUnit/Lang.p_hi
+lib/${PKGNAME}/imports/Test/HUnit/Terminal.hi
+lib/${PKGNAME}/imports/Test/HUnit/Terminal.p_hi
+lib/${PKGNAME}/imports/Test/HUnit/Text.hi
+lib/${PKGNAME}/imports/Test/HUnit/Text.p_hi
+lib/${PKGNAME}/imports/Test/QuickCheck.hi
+lib/${PKGNAME}/imports/Test/QuickCheck.p_hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Batch.hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Batch.p_hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Poly.hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Poly.p_hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Utils.hi
+lib/${PKGNAME}/imports/Test/QuickCheck/Utils.p_hi
 lib/${PKGNAME}/imports/Text/Html.hi
+lib/${PKGNAME}/imports/Text/Html.p_hi
 lib/${PKGNAME}/imports/Text/Html/BlockTable.hi
+lib/${PKGNAME}/imports/Text/Html/BlockTable.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Char.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Char.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Combinator.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Combinator.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Error.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Error.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Expr.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Expr.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Language.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Language.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Perm.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Perm.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Pos.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Pos.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Prim.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Prim.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Token.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/Parsec/Token.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/ReadP.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/ReadP.p_hi
 lib/${PKGNAME}/imports/Text/ParserCombinators/ReadPrec.hi
+lib/${PKGNAME}/imports/Text/ParserCombinators/ReadPrec.p_hi
 lib/${PKGNAME}/imports/Text/PrettyPrint.hi
+lib/${PKGNAME}/imports/Text/PrettyPrint.p_hi
 lib/${PKGNAME}/imports/Text/PrettyPrint/HughesPJ.hi
+lib/${PKGNAME}/imports/Text/PrettyPrint/HughesPJ.p_hi
+lib/${PKGNAME}/imports/Text/Printf.hi
+lib/${PKGNAME}/imports/Text/Printf.p_hi
 lib/${PKGNAME}/imports/Text/Read.hi
+lib/${PKGNAME}/imports/Text/Read.p_hi
 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/Posix.hi
+lib/${PKGNAME}/imports/Text/Regex/Posix.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/Time.hi
+lib/${PKGNAME}/imports/Time.p_hi
 lib/${PKGNAME}/imports/Word.hi
+lib/${PKGNAME}/imports/Word.p_hi
 lib/${PKGNAME}/include/Block.h
 lib/${PKGNAME}/include/Bytecodes.h
-lib/${PKGNAME}/include/CCall.h
 lib/${PKGNAME}/include/CTypes.h
 lib/${PKGNAME}/include/ClosureMacros.h
 lib/${PKGNAME}/include/ClosureTypes.h
 lib/${PKGNAME}/include/Closures.h
+lib/${PKGNAME}/include/Cmm.h
 lib/${PKGNAME}/include/Constants.h
 lib/${PKGNAME}/include/DNInvoke.h
-lib/${PKGNAME}/include/Derived.h
 lib/${PKGNAME}/include/DerivedConstants.h
-lib/${PKGNAME}/include/DietHEP.h
 lib/${PKGNAME}/include/Dotnet.h
+lib/${PKGNAME}/include/GHCConstants.h
 lib/${PKGNAME}/include/GranSim.h
 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/HsUnix.h
+lib/${PKGNAME}/include/HsUnixConfig.h
 lib/${PKGNAME}/include/HsUtil.h
-lib/${PKGNAME}/include/InfoMacros.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/NativeDefs.h
 lib/${PKGNAME}/include/Parallel.h
-lib/${PKGNAME}/include/PosixSource.h
-lib/${PKGNAME}/include/PrimOps.h
 lib/${PKGNAME}/include/Regs.h
 lib/${PKGNAME}/include/Rts.h
 lib/${PKGNAME}/include/RtsAPI.h
+lib/${PKGNAME}/include/RtsConfig.h
+lib/${PKGNAME}/include/RtsExternal.h
 lib/${PKGNAME}/include/RtsFlags.h
+lib/${PKGNAME}/include/RtsMessages.h
 lib/${PKGNAME}/include/RtsTypes.h
 lib/${PKGNAME}/include/SMP.h
+lib/${PKGNAME}/include/STM.h
 lib/${PKGNAME}/include/SchedAPI.h
 lib/${PKGNAME}/include/Signals.h
 lib/${PKGNAME}/include/Stable.h
@@ -439,12 +995,11 @@ lib/${PKGNAME}/include/Stg.h
 lib/${PKGNAME}/include/StgDLL.h
 lib/${PKGNAME}/include/StgFun.h
 lib/${PKGNAME}/include/StgLdvProf.h
-lib/${PKGNAME}/include/StgMacros.h
 lib/${PKGNAME}/include/StgMiscClosures.h
 lib/${PKGNAME}/include/StgProf.h
-lib/${PKGNAME}/include/StgStorage.h
 lib/${PKGNAME}/include/StgTicky.h
 lib/${PKGNAME}/include/StgTypes.h
+lib/${PKGNAME}/include/Storage.h
 lib/${PKGNAME}/include/TSO.h
 lib/${PKGNAME}/include/TailCalls.h
 lib/${PKGNAME}/include/Typeable.h
@@ -452,35 +1007,68 @@ lib/${PKGNAME}/include/Updates.h
 lib/${PKGNAME}/include/config.h
 lib/${PKGNAME}/include/consUtils.h
 lib/${PKGNAME}/include/dirUtils.h
+lib/${PKGNAME}/include/ghcautoconf.h
+lib/${PKGNAME}/include/ghcconfig.h
+lib/${PKGNAME}/include/ghcplatform.h
 lib/${PKGNAME}/include/gmp.h
 lib/${PKGNAME}/include/ieee-flpt.h
 lib/${PKGNAME}/include/lockFile.h
+lib/${PKGNAME}/include/runProcess.h
 lib/${PKGNAME}/include/timeUtils.h
+lib/${PKGNAME}/libHSCabal.a
+lib/${PKGNAME}/libHSCabal_p.a
+lib/${PKGNAME}/libHSHUnit.a
+lib/${PKGNAME}/libHSHUnit_p.a
 lib/${PKGNAME}/libHSQuickCheck.a
+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}/libHSfgl.a
+lib/${PKGNAME}/libHSfgl_p.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}/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}/libHSrts.a
 lib/${PKGNAME}/libHSrts_debug.a
+lib/${PKGNAME}/libHSrts_p.a
 lib/${PKGNAME}/libHSrts_thr.a
 lib/${PKGNAME}/libHSrts_thr_p.a
+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}/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}/package.conf
 lib/${PKGNAME}/parse-gcstats.prl
 lib/${PKGNAME}/process-gcstats.prl
@@ -495,28 +1083,46 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Text/ParserCombinators
 @dirrm lib/${PKGNAME}/imports/Text/Html
 @dirrm lib/${PKGNAME}/imports/Text
+@dirrm lib/${PKGNAME}/imports/Test/QuickCheck
+@dirrm lib/${PKGNAME}/imports/Test/HUnit
+@dirrm lib/${PKGNAME}/imports/Test
+@dirrm lib/${PKGNAME}/imports/System/Process
+@dirrm lib/${PKGNAME}/imports/System/Posix/Signals
 @dirrm lib/${PKGNAME}/imports/System/Posix/DynamicLinker
 @dirrm lib/${PKGNAME}/imports/System/Posix
 @dirrm lib/${PKGNAME}/imports/System/Mem
 @dirrm lib/${PKGNAME}/imports/System/IO
+@dirrm lib/${PKGNAME}/imports/System/Directory
 @dirrm lib/${PKGNAME}/imports/System/Console
 @dirrm lib/${PKGNAME}/imports/System
 @dirrm lib/${PKGNAME}/imports/Network
+@dirrm lib/${PKGNAME}/imports/Language/Haskell/TH
 @dirrm lib/${PKGNAME}/imports/Language/Haskell
 @dirrm lib/${PKGNAME}/imports/Language
 @dirrm lib/${PKGNAME}/imports/GHC
 @dirrm lib/${PKGNAME}/imports/Foreign/Marshal
 @dirrm lib/${PKGNAME}/imports/Foreign/C
 @dirrm lib/${PKGNAME}/imports/Foreign
+@dirrm lib/${PKGNAME}/imports/Distribution/Simple
+@dirrm lib/${PKGNAME}/imports/Distribution/PreProcess
+@dirrm lib/${PKGNAME}/imports/Distribution/Compat
+@dirrm lib/${PKGNAME}/imports/Distribution
 @dirrm lib/${PKGNAME}/imports/Debug/QuickCheck
 @dirrm lib/${PKGNAME}/imports/Debug
 @dirrm lib/${PKGNAME}/imports/Data/STRef
+@dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive/Query
+@dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive/Monad
+@dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive/Internal
+@dirrm lib/${PKGNAME}/imports/Data/Graph/Inductive
+@dirrm lib/${PKGNAME}/imports/Data/Graph
 @dirrm lib/${PKGNAME}/imports/Data/Generics
 @dirrm lib/${PKGNAME}/imports/Data/Array/IO
 @dirrm lib/${PKGNAME}/imports/Data/Array
 @dirrm lib/${PKGNAME}/imports/Data
+@dirrm lib/${PKGNAME}/imports/Control/Parallel
 @dirrm lib/${PKGNAME}/imports/Control/Monad/ST
 @dirrm lib/${PKGNAME}/imports/Control/Monad
+@dirrm lib/${PKGNAME}/imports/Control/Concurrent/STM
 @dirrm lib/${PKGNAME}/imports/Control/Concurrent
 @dirrm lib/${PKGNAME}/imports/Control
 @dirrm lib/${PKGNAME}/imports
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index eca22d6ca24..f2943b31fc0 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/05/21 20:22:21 kristerw Exp $
 
+SHA1 (ghc-6.4-src.tar.bz2) = d799730abe021a9af3c85da26ed585eb0ccc9c37
+RMD160 (ghc-6.4-src.tar.bz2) = 23a0f07887d2ccd0df909592f3a3b40ef5bea2f5
+Size (ghc-6.4-src.tar.bz2) = 6899502 bytes
 SHA1 (ghc-6.2.1-src.tar.bz2) = 84343ff06ee5645ee3f8b428635525e5ebdfcc65
 RMD160 (ghc-6.2.1-src.tar.bz2) = 9f041e207379715fcb7ee378743baa42d3be0311
 Size (ghc-6.2.1-src.tar.bz2) = 5367409 bytes
 SHA1 (ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz) = 422a0e6865517f7d5e5adbd6c13537391358020b
 RMD160 (ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz) = 9701efd3e184e97a4a68667a7551884c9dc9074f
 Size (ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz) = 7780890 bytes
-SHA1 (patch-aa) = d93f473b429d5002c83745c1b50d12144351e68b
-SHA1 (patch-ab) = 24aa32529796b13bd7e2c3060a946bd6a79f88b4
-SHA1 (patch-ac) = 2dc0cba195b9f7ad58fefb179bf33b838dfb6cfa
-SHA1 (patch-ad) = bad30d0dacb2010db877f9ad33cf3d60b98adced
-SHA1 (patch-ae) = 3ee6b6b8731c03a5157ce5bf1144af3035985abd
+SHA1 (patch-aa) = 3765860d28975bca503468dab65cdb16e956dcdf
+SHA1 (patch-ab) = 623f5917bd1b9ffa5415a27c90f94b685fddd962
+SHA1 (patch-ac) = 76412be08baf638d526f568adf224627d09ba72b
+SHA1 (patch-ad) = 73f5593587d20ad8f6bab5b6586c043c838e83a8
+SHA1 (patch-ae) = 994e5c93c93e82c6c375f21ae172eac5a887d756
+SHA1 (patch-af) = a0c44c8b43b4ca7489a4e14a247ca959764e7bc5
+SHA1 (patch-ag) = 9d9e39fbb97c516fcd9d8775cfe4f88d0ecbdb43
diff --git a/lang/ghc/patches/patch-aa b/lang/ghc/patches/patch-aa
index 4ff0397df5f..e4147d4498f 100644
--- a/lang/ghc/patches/patch-aa
+++ b/lang/ghc/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2004/05/29 14:28:43 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2005/05/21 20:22:21 kristerw Exp $
 
---- mk/bootstrap.mk.orig	Tue May 25 22:00:52 2004
-+++ mk/bootstrap.mk	Tue May 25 22:01:59 2004
+--- ../ghc-6.2.1/mk/bootstrap.mk.orig	Tue May 25 22:00:52 2004
++++ ../ghc-6.2.1/mk/bootstrap.mk	Tue May 25 22:01:59 2004
 @@ -136,6 +136,7 @@
     -u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \
     -u "$(UNDERSCORE)__stginit_Prelude"
diff --git a/lang/ghc/patches/patch-ab b/lang/ghc/patches/patch-ab
index 4bd74caf1c2..77c11762e09 100644
--- a/lang/ghc/patches/patch-ab
+++ b/lang/ghc/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2004/05/29 14:28:43 kristerw Exp $
+$NetBSD: patch-ab,v 1.6 2005/05/21 20:22:21 kristerw Exp $
 
---- ghc/includes/PosixSource.h.orig	Sat May 22 19:36:17 2004
-+++ ghc/includes/PosixSource.h	Sat May 22 19:36:30 2004
+--- ../ghc-6.2.1/ghc/includes/PosixSource.h.orig	Sat May 22 19:36:17 2004
++++ ../ghc-6.2.1/ghc/includes/PosixSource.h	Sat May 22 19:36:30 2004
 @@ -10,9 +10,11 @@
  #ifndef POSIXSOURCE_H
  #define POSIXSOURCE_H
diff --git a/lang/ghc/patches/patch-ac b/lang/ghc/patches/patch-ac
index 4719e3e92bb..60075b964d4 100644
--- a/lang/ghc/patches/patch-ac
+++ b/lang/ghc/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2004/05/29 14:28:43 kristerw Exp $
+$NetBSD: patch-ac,v 1.4 2005/05/21 20:22:21 kristerw Exp $
 
---- ghc/rts/package.conf.in.orig	Mon Mar  1 16:26:29 2004
-+++ ghc/rts/package.conf.in	Fri May 28 17:20:27 2004
+--- ../ghc-6.2.1/ghc/rts/package.conf.in.orig	Mon Mar  1 16:26:29 2004
++++ ../ghc-6.2.1/ghc/rts/package.conf.in	Fri May 28 17:20:27 2004
 @@ -131,6 +131,8 @@
           , "-u", "GHCziWeak_runFinalizzerBatch_closure"
           , "-u", "__stginit_Prelude"
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
index 7ed8450fde0..5ee7d8dae7d 100644
--- a/lang/ghc/patches/patch-ad
+++ b/lang/ghc/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2004/05/29 14:28:43 kristerw Exp $
+$NetBSD: patch-ad,v 1.6 2005/05/21 20:22:21 kristerw Exp $
 
---- distrib/hc-build.orig	Sat May 29 03:20:17 2004
-+++ distrib/hc-build	Sat May 29 03:21:31 2004
+--- ../ghc-6.2.1/distrib/hc-build.orig	Sat May 29 03:20:17 2004
++++ ../ghc-6.2.1/distrib/hc-build	Sat May 29 03:21:31 2004
 @@ -95,6 +95,6 @@
  # The reconfigure step updates a few files, which can lead to
  # unnecessary recompilations.  Touch a bunch of things here to avoid
diff --git a/lang/ghc/patches/patch-ae b/lang/ghc/patches/patch-ae
index c532a35b086..457cdfdb989 100644
--- a/lang/ghc/patches/patch-ae
+++ b/lang/ghc/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.4 2004/05/29 14:28:43 kristerw Exp $
+$NetBSD: patch-ae,v 1.5 2005/05/21 20:22:21 kristerw Exp $
 
---- libraries/readline/package.conf.in.orig	Fri May 28 17:22:30 2004
-+++ libraries/readline/package.conf.in	Fri May 28 17:24:06 2004
+--- ../ghc-6.2.1/libraries/readline/package.conf.in.orig	Fri May 28 17:22:30 2004
++++ ../ghc-6.2.1/libraries/readline/package.conf.in	Fri May 28 17:24:06 2004
 @@ -29,5 +29,9 @@
  	package_deps	= [ "base" ],
  	extra_ghc_opts	= [],
diff --git a/lang/ghc/patches/patch-af b/lang/ghc/patches/patch-af
new file mode 100644
index 00000000000..79e1cdb795c
--- /dev/null
+++ b/lang/ghc/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.5 2005/05/21 20:22:21 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
+@@ -65,7 +65,7 @@
+ hugs-options:
+ cc-options:
+ 
+-ld-options:
++ld-options: "-Wl","-R/usr/pkg/lib","-L","/usr/pkg/lib",
+ #ifdef LEADING_UNDERSCORE
+            "-u", "_GHCziBase_Izh_static_info"
+          , "-u", "_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ag b/lang/ghc/patches/patch-ag
new file mode 100644
index 00000000000..2d7bd26a501
--- /dev/null
+++ b/lang/ghc/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2005/05/21 20:22:21 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
+@@ -27,7 +27,7 @@
+ depends:	base
+ hugs-options:
+ cc-options:
+-ld-options:
++ld-options:	"-Wl","-R/usr/pkg/lib","-L","/usr/pkg/lib"
+ framework-dirs:
+ frameworks:
+ haddock-interfaces:	HADDOCK_IFACE