Update to 4.08

PR:		ports/19936
Submitted by:	Simon Marlow <simonmar@microsoft.com> (maintainer)

12 files changed, 771 insertions, 42 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 0aea65a4afe3..c1e181c16e1c 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.06
+PORTVERSION=	4.08
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
-DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
+MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08/
+DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
+		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 498f4cd2dcda..3a8e0f44598c 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.06-src.tar.gz) = 61921dadbe8d0969cd783a01a4ba14fa
-MD5 (ghc-4.06-x86-hc.tar.gz) = 2755da691718ed247d63f8d2f10510dd
+MD5 (ghc-4.08-src.tar.gz) = 624af8e537fdaacb12719c0e5af080b5
+MD5 (ghc-4.08-x86-hc.tar.gz) = 3fc776f3963a6821720e7ae203b80529
diff --git a/lang/ghc/files/build.mk b/lang/ghc/files/build.mk
index 04d306bc4848..af3ed3e53007 100644
--- a/lang/ghc/files/build.mk
+++ b/lang/ghc/files/build.mk
@@ -1,5 +1,5 @@
 ProjectsToBuild = glafp-utils hslibs ghc
-GhcLibHcOpts = -O -split-objs -odir $*
+GhcLibHcOpts = -O -split-objs -H32m
 SRC_HAPPY_OPTS += -c
-GhcLibWays=
+GhcLibWays=p
 GhcLibsWithReadline = YES
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index d34c904235d4..116bc1882ba0 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -1,160 +1,392 @@
 bin/ghc
-bin/ghc-4.06
+bin/ghc-4.08
 bin/hp2ps
 bin/stat2resid
+bin/DrIFT
+bin/DtdToHaskell
+bin/Xtract
+lib/ghc/cgprof
 lib/ghc/ghc-asm.prl
 lib/ghc/ghc-consist.prl
 lib/ghc/ghc-iface.prl
 lib/ghc/ghc-split.prl
 lib/ghc/hsc
 lib/ghc/hscpp
+lib/ghc/icons/absdelta.xbm
+lib/ghc/icons/absolute.xbm
+lib/ghc/icons/comm.xbm
+lib/ghc/icons/commslack.xbm
+lib/ghc/icons/comp.xbm
+lib/ghc/icons/compress.xbm
+lib/ghc/icons/compslack.xbm
+lib/ghc/icons/delete.xbm
+lib/ghc/icons/help.xbm
+lib/ghc/icons/hrel.xbm
+lib/ghc/icons/hrelslack.xbm
+lib/ghc/icons/jump.xbm
+lib/ghc/icons/mycomm.xbm
+lib/ghc/icons/oxpara.xbm
+lib/ghc/icons/percent.xbm
+lib/ghc/icons/reldelta.xbm
+lib/ghc/icons/sync.xbm
+lib/ghc/icons/time.xbm
+lib/ghc/icons/time1.xbm
+lib/ghc/icons/uncompress.xbm
+lib/ghc/icons/undo.xbm
+lib/ghc/icons/wait.xbm
+lib/ghc/icons/weightdelta.xbm
+lib/ghc/imports/concurrent/CVar.hi
+lib/ghc/imports/concurrent/CVar.p_hi
+lib/ghc/imports/concurrent/Chan.hi
+lib/ghc/imports/concurrent/Chan.p_hi
 lib/ghc/imports/concurrent/Channel.hi
+lib/ghc/imports/concurrent/Channel.p_hi
 lib/ghc/imports/concurrent/ChannelVar.hi
+lib/ghc/imports/concurrent/ChannelVar.p_hi
 lib/ghc/imports/concurrent/Concurrent.hi
+lib/ghc/imports/concurrent/Concurrent.p_hi
+lib/ghc/imports/concurrent/MVar.hi
+lib/ghc/imports/concurrent/MVar.p_hi
 lib/ghc/imports/concurrent/Merge.hi
+lib/ghc/imports/concurrent/Merge.p_hi
 lib/ghc/imports/concurrent/Parallel.hi
+lib/ghc/imports/concurrent/Parallel.p_hi
+lib/ghc/imports/concurrent/QSem.hi
+lib/ghc/imports/concurrent/QSem.p_hi
+lib/ghc/imports/concurrent/QSemN.hi
+lib/ghc/imports/concurrent/QSemN.p_hi
 lib/ghc/imports/concurrent/SampleVar.hi
+lib/ghc/imports/concurrent/SampleVar.p_hi
 lib/ghc/imports/concurrent/Semaphore.hi
+lib/ghc/imports/concurrent/Semaphore.p_hi
 lib/ghc/imports/concurrent/Strategies.hi
+lib/ghc/imports/concurrent/Strategies.p_hi
 lib/ghc/imports/data/Assoc.hi
+lib/ghc/imports/data/Assoc.p_hi
 lib/ghc/imports/data/AssocDefaults.hi
+lib/ghc/imports/data/AssocDefaults.p_hi
 lib/ghc/imports/data/AssocList.hi
+lib/ghc/imports/data/AssocList.p_hi
 lib/ghc/imports/data/BankersQueue.hi
+lib/ghc/imports/data/BankersQueue.p_hi
 lib/ghc/imports/data/BinaryRandList.hi
+lib/ghc/imports/data/BinaryRandList.p_hi
 lib/ghc/imports/data/BraunSeq.hi
+lib/ghc/imports/data/BraunSeq.p_hi
 lib/ghc/imports/data/Collection.hi
+lib/ghc/imports/data/Collection.p_hi
 lib/ghc/imports/data/CollectionDefaults.hi
+lib/ghc/imports/data/CollectionDefaults.p_hi
 lib/ghc/imports/data/CollectionUtils.hi
+lib/ghc/imports/data/CollectionUtils.p_hi
 lib/ghc/imports/data/EdisonPrelude.hi
+lib/ghc/imports/data/EdisonPrelude.p_hi
 lib/ghc/imports/data/FiniteMap.hi
+lib/ghc/imports/data/FiniteMap.p_hi
 lib/ghc/imports/data/JoinList.hi
+lib/ghc/imports/data/JoinList.p_hi
 lib/ghc/imports/data/LazyPairingHeap.hi
+lib/ghc/imports/data/LazyPairingHeap.p_hi
 lib/ghc/imports/data/LeftistHeap.hi
+lib/ghc/imports/data/LeftistHeap.p_hi
 lib/ghc/imports/data/ListSeq.hi
+lib/ghc/imports/data/ListSeq.p_hi
 lib/ghc/imports/data/MinHeap.hi
+lib/ghc/imports/data/MinHeap.p_hi
 lib/ghc/imports/data/MyersStack.hi
+lib/ghc/imports/data/MyersStack.p_hi
 lib/ghc/imports/data/PatriciaLoMap.hi
-lib/ghc/imports/data/QuickCheck.hi
+lib/ghc/imports/data/PatriciaLoMap.p_hi
 lib/ghc/imports/data/RandList.hi
+lib/ghc/imports/data/RandList.p_hi
 lib/ghc/imports/data/RevSeq.hi
+lib/ghc/imports/data/RevSeq.p_hi
 lib/ghc/imports/data/Sequence.hi
+lib/ghc/imports/data/Sequence.p_hi
 lib/ghc/imports/data/SequenceDefaults.hi
+lib/ghc/imports/data/SequenceDefaults.p_hi
 lib/ghc/imports/data/Set.hi
+lib/ghc/imports/data/Set.p_hi
 lib/ghc/imports/data/SimpleQueue.hi
+lib/ghc/imports/data/SimpleQueue.p_hi
 lib/ghc/imports/data/SizedSeq.hi
+lib/ghc/imports/data/SizedSeq.p_hi
 lib/ghc/imports/data/SkewHeap.hi
+lib/ghc/imports/data/SkewHeap.p_hi
 lib/ghc/imports/data/SplayHeap.hi
+lib/ghc/imports/data/SplayHeap.p_hi
 lib/ghc/imports/data/TestOrdBag.hi
+lib/ghc/imports/data/TestOrdBag.p_hi
 lib/ghc/imports/data/TestOrdSet.hi
+lib/ghc/imports/data/TestOrdSet.p_hi
 lib/ghc/imports/data/TestSeq.hi
+lib/ghc/imports/data/TestSeq.p_hi
 lib/ghc/imports/data/UnbalancedSet.hi
+lib/ghc/imports/data/UnbalancedSet.p_hi
 lib/ghc/imports/lang/Addr.hi
+lib/ghc/imports/lang/Addr.p_hi
+lib/ghc/imports/lang/ArrayBase.hi
+lib/ghc/imports/lang/ArrayBase.p_hi
 lib/ghc/imports/lang/Bits.hi
+lib/ghc/imports/lang/Bits.p_hi
 lib/ghc/imports/lang/ByteArray.hi
+lib/ghc/imports/lang/ByteArray.p_hi
 lib/ghc/imports/lang/CCall.hi
+lib/ghc/imports/lang/CCall.p_hi
 lib/ghc/imports/lang/CString.hi
+lib/ghc/imports/lang/CString.p_hi
+lib/ghc/imports/lang/CTypes.hi
+lib/ghc/imports/lang/CTypes.p_hi
+lib/ghc/imports/lang/CTypesISO.hi
+lib/ghc/imports/lang/CTypesISO.p_hi
 lib/ghc/imports/lang/Dynamic.hi
+lib/ghc/imports/lang/Dynamic.p_hi
 lib/ghc/imports/lang/Exception.hi
-lib/ghc/imports/lang/FFI.hi
+lib/ghc/imports/lang/Exception.p_hi
 lib/ghc/imports/lang/Foreign.hi
+lib/ghc/imports/lang/Foreign.p_hi
 lib/ghc/imports/lang/ForeignObj.hi
+lib/ghc/imports/lang/ForeignObj.p_hi
 lib/ghc/imports/lang/GlaExts.hi
+lib/ghc/imports/lang/GlaExts.p_hi
+lib/ghc/imports/lang/IArray.hi
+lib/ghc/imports/lang/IArray.p_hi
 lib/ghc/imports/lang/IOExts.hi
+lib/ghc/imports/lang/IOExts.p_hi
 lib/ghc/imports/lang/Int.hi
+lib/ghc/imports/lang/Int.p_hi
 lib/ghc/imports/lang/LazyST.hi
+lib/ghc/imports/lang/LazyST.p_hi
+lib/ghc/imports/lang/MArray.hi
+lib/ghc/imports/lang/MArray.p_hi
 lib/ghc/imports/lang/MonadEither.hi
+lib/ghc/imports/lang/MonadEither.p_hi
+lib/ghc/imports/lang/MonadError.hi
+lib/ghc/imports/lang/MonadError.p_hi
 lib/ghc/imports/lang/MonadFix.hi
+lib/ghc/imports/lang/MonadFix.p_hi
 lib/ghc/imports/lang/MonadIdentity.hi
+lib/ghc/imports/lang/MonadIdentity.p_hi
 lib/ghc/imports/lang/MonadRWS.hi
+lib/ghc/imports/lang/MonadRWS.p_hi
 lib/ghc/imports/lang/MonadReader.hi
+lib/ghc/imports/lang/MonadReader.p_hi
 lib/ghc/imports/lang/MonadState.hi
+lib/ghc/imports/lang/MonadState.p_hi
 lib/ghc/imports/lang/MonadTrans.hi
+lib/ghc/imports/lang/MonadTrans.p_hi
 lib/ghc/imports/lang/MonadWriter.hi
+lib/ghc/imports/lang/MonadWriter.p_hi
 lib/ghc/imports/lang/Monoid.hi
+lib/ghc/imports/lang/Monoid.p_hi
 lib/ghc/imports/lang/MutableArray.hi
+lib/ghc/imports/lang/MutableArray.p_hi
 lib/ghc/imports/lang/NativeInfo.hi
+lib/ghc/imports/lang/NativeInfo.p_hi
 lib/ghc/imports/lang/NumExts.hi
+lib/ghc/imports/lang/NumExts.p_hi
 lib/ghc/imports/lang/PackedString.hi
+lib/ghc/imports/lang/PackedString.p_hi
 lib/ghc/imports/lang/ST.hi
+lib/ghc/imports/lang/ST.p_hi
 lib/ghc/imports/lang/ShowFunctions.hi
+lib/ghc/imports/lang/ShowFunctions.p_hi
 lib/ghc/imports/lang/Stable.hi
+lib/ghc/imports/lang/Stable.p_hi
+lib/ghc/imports/lang/StableName.hi
+lib/ghc/imports/lang/StableName.p_hi
 lib/ghc/imports/lang/StablePtr.hi
+lib/ghc/imports/lang/StablePtr.p_hi
+lib/ghc/imports/lang/Storable.hi
+lib/ghc/imports/lang/Storable.p_hi
 lib/ghc/imports/lang/TimeExts.hi
+lib/ghc/imports/lang/TimeExts.p_hi
 lib/ghc/imports/lang/Weak.hi
+lib/ghc/imports/lang/Weak.p_hi
 lib/ghc/imports/lang/Word.hi
+lib/ghc/imports/lang/Word.p_hi
 lib/ghc/imports/net/BSD.hi
+lib/ghc/imports/net/BSD.p_hi
 lib/ghc/imports/net/Socket.hi
+lib/ghc/imports/net/Socket.p_hi
 lib/ghc/imports/net/SocketPrim.hi
+lib/ghc/imports/net/SocketPrim.p_hi
 lib/ghc/imports/net/URI.hi
+lib/ghc/imports/net/URI.p_hi
 lib/ghc/imports/posix/Posix.hi
+lib/ghc/imports/posix/Posix.p_hi
 lib/ghc/imports/posix/PosixDB.hi
+lib/ghc/imports/posix/PosixDB.p_hi
 lib/ghc/imports/posix/PosixErr.hi
+lib/ghc/imports/posix/PosixErr.p_hi
 lib/ghc/imports/posix/PosixFiles.hi
+lib/ghc/imports/posix/PosixFiles.p_hi
 lib/ghc/imports/posix/PosixIO.hi
+lib/ghc/imports/posix/PosixIO.p_hi
 lib/ghc/imports/posix/PosixProcEnv.hi
+lib/ghc/imports/posix/PosixProcEnv.p_hi
 lib/ghc/imports/posix/PosixProcPrim.hi
+lib/ghc/imports/posix/PosixProcPrim.p_hi
 lib/ghc/imports/posix/PosixTTY.hi
+lib/ghc/imports/posix/PosixTTY.p_hi
 lib/ghc/imports/posix/PosixUtil.hi
+lib/ghc/imports/posix/PosixUtil.p_hi
 lib/ghc/imports/std/Array.hi
+lib/ghc/imports/std/Array.p_hi
 lib/ghc/imports/std/CPUTime.hi
+lib/ghc/imports/std/CPUTime.p_hi
 lib/ghc/imports/std/Char.hi
+lib/ghc/imports/std/Char.p_hi
 lib/ghc/imports/std/Complex.hi
+lib/ghc/imports/std/Complex.p_hi
 lib/ghc/imports/std/Directory.hi
+lib/ghc/imports/std/Directory.p_hi
 lib/ghc/imports/std/IO.hi
+lib/ghc/imports/std/IO.p_hi
 lib/ghc/imports/std/Ix.hi
+lib/ghc/imports/std/Ix.p_hi
 lib/ghc/imports/std/List.hi
+lib/ghc/imports/std/List.p_hi
 lib/ghc/imports/std/Locale.hi
+lib/ghc/imports/std/Locale.p_hi
 lib/ghc/imports/std/Maybe.hi
+lib/ghc/imports/std/Maybe.p_hi
 lib/ghc/imports/std/Monad.hi
+lib/ghc/imports/std/Monad.p_hi
 lib/ghc/imports/std/Numeric.hi
+lib/ghc/imports/std/Numeric.p_hi
 lib/ghc/imports/std/PrelAddr.hi
+lib/ghc/imports/std/PrelAddr.p_hi
 lib/ghc/imports/std/PrelArr.hi
+lib/ghc/imports/std/PrelArr.p_hi
 lib/ghc/imports/std/PrelArrExtra.hi
+lib/ghc/imports/std/PrelArrExtra.p_hi
 lib/ghc/imports/std/PrelBase.hi
+lib/ghc/imports/std/PrelBase.p_hi
 lib/ghc/imports/std/PrelByteArr.hi
+lib/ghc/imports/std/PrelByteArr.p_hi
 lib/ghc/imports/std/PrelConc.hi
+lib/ghc/imports/std/PrelConc.p_hi
 lib/ghc/imports/std/PrelDynamic.hi
+lib/ghc/imports/std/PrelDynamic.p_hi
 lib/ghc/imports/std/PrelEnum.hi
+lib/ghc/imports/std/PrelEnum.p_hi
 lib/ghc/imports/std/PrelErr.hi
+lib/ghc/imports/std/PrelErr.p_hi
 lib/ghc/imports/std/PrelException.hi
+lib/ghc/imports/std/PrelException.p_hi
 lib/ghc/imports/std/PrelFloat.hi
+lib/ghc/imports/std/PrelFloat.p_hi
 lib/ghc/imports/std/PrelForeign.hi
+lib/ghc/imports/std/PrelForeign.p_hi
 lib/ghc/imports/std/PrelGHC.hi
+lib/ghc/imports/std/PrelGHC.p_hi
 lib/ghc/imports/std/PrelHandle.hi
+lib/ghc/imports/std/PrelHandle.p_hi
 lib/ghc/imports/std/PrelHugs.hi
+lib/ghc/imports/std/PrelHugs.p_hi
+lib/ghc/imports/std/PrelIO.hi
+lib/ghc/imports/std/PrelIO.p_hi
 lib/ghc/imports/std/PrelIOBase.hi
+lib/ghc/imports/std/PrelIOBase.p_hi
 lib/ghc/imports/std/PrelList.hi
+lib/ghc/imports/std/PrelList.p_hi
 lib/ghc/imports/std/PrelMain.hi
+lib/ghc/imports/std/PrelMain.p_hi
 lib/ghc/imports/std/PrelMaybe.hi
+lib/ghc/imports/std/PrelMaybe.p_hi
 lib/ghc/imports/std/PrelNum.hi
+lib/ghc/imports/std/PrelNum.p_hi
 lib/ghc/imports/std/PrelPack.hi
+lib/ghc/imports/std/PrelPack.p_hi
 lib/ghc/imports/std/PrelRead.hi
+lib/ghc/imports/std/PrelRead.p_hi
 lib/ghc/imports/std/PrelReal.hi
+lib/ghc/imports/std/PrelReal.p_hi
 lib/ghc/imports/std/PrelST.hi
+lib/ghc/imports/std/PrelST.p_hi
 lib/ghc/imports/std/PrelShow.hi
+lib/ghc/imports/std/PrelShow.p_hi
 lib/ghc/imports/std/PrelStable.hi
+lib/ghc/imports/std/PrelStable.p_hi
 lib/ghc/imports/std/PrelTup.hi
+lib/ghc/imports/std/PrelTup.p_hi
 lib/ghc/imports/std/PrelWeak.hi
+lib/ghc/imports/std/PrelWeak.p_hi
 lib/ghc/imports/std/Prelude.hi
+lib/ghc/imports/std/Prelude.p_hi
 lib/ghc/imports/std/Random.hi
+lib/ghc/imports/std/Random.p_hi
 lib/ghc/imports/std/Ratio.hi
+lib/ghc/imports/std/Ratio.p_hi
 lib/ghc/imports/std/System.hi
+lib/ghc/imports/std/System.p_hi
 lib/ghc/imports/std/Time.hi
+lib/ghc/imports/std/Time.p_hi
+lib/ghc/imports/text/Haskell2Xml.hi
+lib/ghc/imports/text/Haskell2Xml.p_hi
 lib/ghc/imports/text/Html.hi
+lib/ghc/imports/text/Html.p_hi
 lib/ghc/imports/text/HtmlBlockTable.hi
+lib/ghc/imports/text/HtmlBlockTable.p_hi
 lib/ghc/imports/text/MatchPS.hi
+lib/ghc/imports/text/MatchPS.p_hi
+lib/ghc/imports/text/ParseSTLib.hi
+lib/ghc/imports/text/ParseSTLib.p_hi
+lib/ghc/imports/text/Parsec.hi
+lib/ghc/imports/text/Parsec.p_hi
+lib/ghc/imports/text/ParsecError.hi
+lib/ghc/imports/text/ParsecError.p_hi
+lib/ghc/imports/text/ParsecExpr.hi
+lib/ghc/imports/text/ParsecExpr.p_hi
+lib/ghc/imports/text/ParsecLanguage.hi
+lib/ghc/imports/text/ParsecLanguage.p_hi
+lib/ghc/imports/text/ParsecToken.hi
+lib/ghc/imports/text/ParsecToken.p_hi
 lib/ghc/imports/text/Pretty.hi
+lib/ghc/imports/text/Pretty.p_hi
 lib/ghc/imports/text/Regex.hi
+lib/ghc/imports/text/Regex.p_hi
 lib/ghc/imports/text/RegexString.hi
+lib/ghc/imports/text/RegexString.p_hi
+lib/ghc/imports/text/Xml2Haskell.hi
+lib/ghc/imports/text/Xml2Haskell.p_hi
+lib/ghc/imports/text/XmlCombinators.hi
+lib/ghc/imports/text/XmlCombinators.p_hi
+lib/ghc/imports/text/XmlHtmlGen.hi
+lib/ghc/imports/text/XmlHtmlGen.p_hi
+lib/ghc/imports/text/XmlHtmlPP.hi
+lib/ghc/imports/text/XmlHtmlPP.p_hi
+lib/ghc/imports/text/XmlHtmlParse.hi
+lib/ghc/imports/text/XmlHtmlParse.p_hi
+lib/ghc/imports/text/XmlLex.hi
+lib/ghc/imports/text/XmlLex.p_hi
+lib/ghc/imports/text/XmlLib.hi
+lib/ghc/imports/text/XmlLib.p_hi
+lib/ghc/imports/text/XmlPP.hi
+lib/ghc/imports/text/XmlPP.p_hi
+lib/ghc/imports/text/XmlParse.hi
+lib/ghc/imports/text/XmlParse.p_hi
+lib/ghc/imports/text/XmlTypes.hi
+lib/ghc/imports/text/XmlTypes.p_hi
 lib/ghc/imports/util/GetOpt.hi
+lib/ghc/imports/util/GetOpt.p_hi
 lib/ghc/imports/util/MD5.hi
+lib/ghc/imports/util/MD5.p_hi
 lib/ghc/imports/util/Memo.hi
+lib/ghc/imports/util/Memo.p_hi
 lib/ghc/imports/util/QuickCheck.hi
+lib/ghc/imports/util/QuickCheck.p_hi
 lib/ghc/imports/util/QuickCheckBatch.hi
+lib/ghc/imports/util/QuickCheckBatch.p_hi
 lib/ghc/imports/util/QuickCheckPoly.hi
+lib/ghc/imports/util/QuickCheckPoly.p_hi
 lib/ghc/imports/util/QuickCheckUtils.hi
+lib/ghc/imports/util/QuickCheckUtils.p_hi
 lib/ghc/imports/util/Readline.hi
+lib/ghc/imports/util/Readline.p_hi
 lib/ghc/imports/util/Select.hi
+lib/ghc/imports/util/Select.p_hi
 lib/ghc/includes/Assembler.h
 lib/ghc/includes/Block.h
 lib/ghc/includes/CCall.h
@@ -162,17 +394,17 @@ lib/ghc/includes/ClosureMacros.h
 lib/ghc/includes/ClosureTypes.h
 lib/ghc/includes/Closures.h
 lib/ghc/includes/Constants.h
+lib/ghc/includes/DietHEP.h
 lib/ghc/includes/GranSim.h
 lib/ghc/includes/Hooks.h
+lib/ghc/includes/HsFFI.h
 lib/ghc/includes/InfoMacros.h
 lib/ghc/includes/InfoTables.h
 lib/ghc/includes/MachDeps.h
 lib/ghc/includes/MachRegs.h
 lib/ghc/includes/NativeDefs.h
 lib/ghc/includes/Parallel.h
-lib/ghc/includes/Prelude.h
 lib/ghc/includes/PrimOps.h
-lib/ghc/includes/Profiling.h
 lib/ghc/includes/Regs.h
 lib/ghc/includes/Rts.h
 lib/ghc/includes/RtsAPI.h
@@ -201,25 +433,35 @@ lib/ghc/includes/sainteger.h
 lib/ghc/includes/stgerror.h
 lib/ghc/includes/stgio.h
 lib/ghc/includes/timezone.h
-lib/ghc/libHS.a
-lib/ghc/libHS_cbits.a
 lib/ghc/libHSconcurrent.a
+lib/ghc/libHSconcurrent_p.a
 lib/ghc/libHSdata.a
+lib/ghc/libHSdata_p.a
 lib/ghc/libHSlang.a
 lib/ghc/libHSlang_cbits.a
+lib/ghc/libHSlang_p.a
 lib/ghc/libHSnet.a
 lib/ghc/libHSnet_cbits.a
+lib/ghc/libHSnet_p.a
 lib/ghc/libHSposix.a
 lib/ghc/libHSposix_cbits.a
+lib/ghc/libHSposix_p.a
 lib/ghc/libHSrts.a
+lib/ghc/libHSrts_p.a
+lib/ghc/libHSstd.a
+lib/ghc/libHSstd_cbits.a
+lib/ghc/libHSstd_p.a
 lib/ghc/libHStext.a
 lib/ghc/libHStext_cbits.a
+lib/ghc/libHStext_p.a
 lib/ghc/libHSutil.a
 lib/ghc/libHSutil_cbits.a
+lib/ghc/libHSutil_p.a
 lib/ghc/mkdependHS
 lib/ghc/parse-gcstats.prl
 lib/ghc/process-gcstats.prl
 lib/ghc/unlit
+@dirrm lib/ghc/icons
 @dirrm lib/ghc/imports/concurrent
 @dirrm lib/ghc/imports/data
 @dirrm lib/ghc/imports/lang
diff --git a/lang/ghc5/Makefile b/lang/ghc5/Makefile
index 0aea65a4afe3..c1e181c16e1c 100644
--- a/lang/ghc5/Makefile
+++ b/lang/ghc5/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.06
+PORTVERSION=	4.08
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
-DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
+MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08/
+DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
+		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
diff --git a/lang/ghc5/distinfo b/lang/ghc5/distinfo
index 498f4cd2dcda..3a8e0f44598c 100644
--- a/lang/ghc5/distinfo
+++ b/lang/ghc5/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.06-src.tar.gz) = 61921dadbe8d0969cd783a01a4ba14fa
-MD5 (ghc-4.06-x86-hc.tar.gz) = 2755da691718ed247d63f8d2f10510dd
+MD5 (ghc-4.08-src.tar.gz) = 624af8e537fdaacb12719c0e5af080b5
+MD5 (ghc-4.08-x86-hc.tar.gz) = 3fc776f3963a6821720e7ae203b80529
diff --git a/lang/ghc5/files/build.mk b/lang/ghc5/files/build.mk
index 04d306bc4848..af3ed3e53007 100644
--- a/lang/ghc5/files/build.mk
+++ b/lang/ghc5/files/build.mk
@@ -1,5 +1,5 @@
 ProjectsToBuild = glafp-utils hslibs ghc
-GhcLibHcOpts = -O -split-objs -odir $*
+GhcLibHcOpts = -O -split-objs -H32m
 SRC_HAPPY_OPTS += -c
-GhcLibWays=
+GhcLibWays=p
 GhcLibsWithReadline = YES
diff --git a/lang/ghc5/pkg-plist b/lang/ghc5/pkg-plist
index d34c904235d4..116bc1882ba0 100644
--- a/lang/ghc5/pkg-plist
+++ b/lang/ghc5/pkg-plist
@@ -1,160 +1,392 @@
 bin/ghc
-bin/ghc-4.06
+bin/ghc-4.08
 bin/hp2ps
 bin/stat2resid
+bin/DrIFT
+bin/DtdToHaskell
+bin/Xtract
+lib/ghc/cgprof
 lib/ghc/ghc-asm.prl
 lib/ghc/ghc-consist.prl
 lib/ghc/ghc-iface.prl
 lib/ghc/ghc-split.prl
 lib/ghc/hsc
 lib/ghc/hscpp
+lib/ghc/icons/absdelta.xbm
+lib/ghc/icons/absolute.xbm
+lib/ghc/icons/comm.xbm
+lib/ghc/icons/commslack.xbm
+lib/ghc/icons/comp.xbm
+lib/ghc/icons/compress.xbm
+lib/ghc/icons/compslack.xbm
+lib/ghc/icons/delete.xbm
+lib/ghc/icons/help.xbm
+lib/ghc/icons/hrel.xbm
+lib/ghc/icons/hrelslack.xbm
+lib/ghc/icons/jump.xbm
+lib/ghc/icons/mycomm.xbm
+lib/ghc/icons/oxpara.xbm
+lib/ghc/icons/percent.xbm
+lib/ghc/icons/reldelta.xbm
+lib/ghc/icons/sync.xbm
+lib/ghc/icons/time.xbm
+lib/ghc/icons/time1.xbm
+lib/ghc/icons/uncompress.xbm
+lib/ghc/icons/undo.xbm
+lib/ghc/icons/wait.xbm
+lib/ghc/icons/weightdelta.xbm
+lib/ghc/imports/concurrent/CVar.hi
+lib/ghc/imports/concurrent/CVar.p_hi
+lib/ghc/imports/concurrent/Chan.hi
+lib/ghc/imports/concurrent/Chan.p_hi
 lib/ghc/imports/concurrent/Channel.hi
+lib/ghc/imports/concurrent/Channel.p_hi
 lib/ghc/imports/concurrent/ChannelVar.hi
+lib/ghc/imports/concurrent/ChannelVar.p_hi
 lib/ghc/imports/concurrent/Concurrent.hi
+lib/ghc/imports/concurrent/Concurrent.p_hi
+lib/ghc/imports/concurrent/MVar.hi
+lib/ghc/imports/concurrent/MVar.p_hi
 lib/ghc/imports/concurrent/Merge.hi
+lib/ghc/imports/concurrent/Merge.p_hi
 lib/ghc/imports/concurrent/Parallel.hi
+lib/ghc/imports/concurrent/Parallel.p_hi
+lib/ghc/imports/concurrent/QSem.hi
+lib/ghc/imports/concurrent/QSem.p_hi
+lib/ghc/imports/concurrent/QSemN.hi
+lib/ghc/imports/concurrent/QSemN.p_hi
 lib/ghc/imports/concurrent/SampleVar.hi
+lib/ghc/imports/concurrent/SampleVar.p_hi
 lib/ghc/imports/concurrent/Semaphore.hi
+lib/ghc/imports/concurrent/Semaphore.p_hi
 lib/ghc/imports/concurrent/Strategies.hi
+lib/ghc/imports/concurrent/Strategies.p_hi
 lib/ghc/imports/data/Assoc.hi
+lib/ghc/imports/data/Assoc.p_hi
 lib/ghc/imports/data/AssocDefaults.hi
+lib/ghc/imports/data/AssocDefaults.p_hi
 lib/ghc/imports/data/AssocList.hi
+lib/ghc/imports/data/AssocList.p_hi
 lib/ghc/imports/data/BankersQueue.hi
+lib/ghc/imports/data/BankersQueue.p_hi
 lib/ghc/imports/data/BinaryRandList.hi
+lib/ghc/imports/data/BinaryRandList.p_hi
 lib/ghc/imports/data/BraunSeq.hi
+lib/ghc/imports/data/BraunSeq.p_hi
 lib/ghc/imports/data/Collection.hi
+lib/ghc/imports/data/Collection.p_hi
 lib/ghc/imports/data/CollectionDefaults.hi
+lib/ghc/imports/data/CollectionDefaults.p_hi
 lib/ghc/imports/data/CollectionUtils.hi
+lib/ghc/imports/data/CollectionUtils.p_hi
 lib/ghc/imports/data/EdisonPrelude.hi
+lib/ghc/imports/data/EdisonPrelude.p_hi
 lib/ghc/imports/data/FiniteMap.hi
+lib/ghc/imports/data/FiniteMap.p_hi
 lib/ghc/imports/data/JoinList.hi
+lib/ghc/imports/data/JoinList.p_hi
 lib/ghc/imports/data/LazyPairingHeap.hi
+lib/ghc/imports/data/LazyPairingHeap.p_hi
 lib/ghc/imports/data/LeftistHeap.hi
+lib/ghc/imports/data/LeftistHeap.p_hi
 lib/ghc/imports/data/ListSeq.hi
+lib/ghc/imports/data/ListSeq.p_hi
 lib/ghc/imports/data/MinHeap.hi
+lib/ghc/imports/data/MinHeap.p_hi
 lib/ghc/imports/data/MyersStack.hi
+lib/ghc/imports/data/MyersStack.p_hi
 lib/ghc/imports/data/PatriciaLoMap.hi
-lib/ghc/imports/data/QuickCheck.hi
+lib/ghc/imports/data/PatriciaLoMap.p_hi
 lib/ghc/imports/data/RandList.hi
+lib/ghc/imports/data/RandList.p_hi
 lib/ghc/imports/data/RevSeq.hi
+lib/ghc/imports/data/RevSeq.p_hi
 lib/ghc/imports/data/Sequence.hi
+lib/ghc/imports/data/Sequence.p_hi
 lib/ghc/imports/data/SequenceDefaults.hi
+lib/ghc/imports/data/SequenceDefaults.p_hi
 lib/ghc/imports/data/Set.hi
+lib/ghc/imports/data/Set.p_hi
 lib/ghc/imports/data/SimpleQueue.hi
+lib/ghc/imports/data/SimpleQueue.p_hi
 lib/ghc/imports/data/SizedSeq.hi
+lib/ghc/imports/data/SizedSeq.p_hi
 lib/ghc/imports/data/SkewHeap.hi
+lib/ghc/imports/data/SkewHeap.p_hi
 lib/ghc/imports/data/SplayHeap.hi
+lib/ghc/imports/data/SplayHeap.p_hi
 lib/ghc/imports/data/TestOrdBag.hi
+lib/ghc/imports/data/TestOrdBag.p_hi
 lib/ghc/imports/data/TestOrdSet.hi
+lib/ghc/imports/data/TestOrdSet.p_hi
 lib/ghc/imports/data/TestSeq.hi
+lib/ghc/imports/data/TestSeq.p_hi
 lib/ghc/imports/data/UnbalancedSet.hi
+lib/ghc/imports/data/UnbalancedSet.p_hi
 lib/ghc/imports/lang/Addr.hi
+lib/ghc/imports/lang/Addr.p_hi
+lib/ghc/imports/lang/ArrayBase.hi
+lib/ghc/imports/lang/ArrayBase.p_hi
 lib/ghc/imports/lang/Bits.hi
+lib/ghc/imports/lang/Bits.p_hi
 lib/ghc/imports/lang/ByteArray.hi
+lib/ghc/imports/lang/ByteArray.p_hi
 lib/ghc/imports/lang/CCall.hi
+lib/ghc/imports/lang/CCall.p_hi
 lib/ghc/imports/lang/CString.hi
+lib/ghc/imports/lang/CString.p_hi
+lib/ghc/imports/lang/CTypes.hi
+lib/ghc/imports/lang/CTypes.p_hi
+lib/ghc/imports/lang/CTypesISO.hi
+lib/ghc/imports/lang/CTypesISO.p_hi
 lib/ghc/imports/lang/Dynamic.hi
+lib/ghc/imports/lang/Dynamic.p_hi
 lib/ghc/imports/lang/Exception.hi
-lib/ghc/imports/lang/FFI.hi
+lib/ghc/imports/lang/Exception.p_hi
 lib/ghc/imports/lang/Foreign.hi
+lib/ghc/imports/lang/Foreign.p_hi
 lib/ghc/imports/lang/ForeignObj.hi
+lib/ghc/imports/lang/ForeignObj.p_hi
 lib/ghc/imports/lang/GlaExts.hi
+lib/ghc/imports/lang/GlaExts.p_hi
+lib/ghc/imports/lang/IArray.hi
+lib/ghc/imports/lang/IArray.p_hi
 lib/ghc/imports/lang/IOExts.hi
+lib/ghc/imports/lang/IOExts.p_hi
 lib/ghc/imports/lang/Int.hi
+lib/ghc/imports/lang/Int.p_hi
 lib/ghc/imports/lang/LazyST.hi
+lib/ghc/imports/lang/LazyST.p_hi
+lib/ghc/imports/lang/MArray.hi
+lib/ghc/imports/lang/MArray.p_hi
 lib/ghc/imports/lang/MonadEither.hi
+lib/ghc/imports/lang/MonadEither.p_hi
+lib/ghc/imports/lang/MonadError.hi
+lib/ghc/imports/lang/MonadError.p_hi
 lib/ghc/imports/lang/MonadFix.hi
+lib/ghc/imports/lang/MonadFix.p_hi
 lib/ghc/imports/lang/MonadIdentity.hi
+lib/ghc/imports/lang/MonadIdentity.p_hi
 lib/ghc/imports/lang/MonadRWS.hi
+lib/ghc/imports/lang/MonadRWS.p_hi
 lib/ghc/imports/lang/MonadReader.hi
+lib/ghc/imports/lang/MonadReader.p_hi
 lib/ghc/imports/lang/MonadState.hi
+lib/ghc/imports/lang/MonadState.p_hi
 lib/ghc/imports/lang/MonadTrans.hi
+lib/ghc/imports/lang/MonadTrans.p_hi
 lib/ghc/imports/lang/MonadWriter.hi
+lib/ghc/imports/lang/MonadWriter.p_hi
 lib/ghc/imports/lang/Monoid.hi
+lib/ghc/imports/lang/Monoid.p_hi
 lib/ghc/imports/lang/MutableArray.hi
+lib/ghc/imports/lang/MutableArray.p_hi
 lib/ghc/imports/lang/NativeInfo.hi
+lib/ghc/imports/lang/NativeInfo.p_hi
 lib/ghc/imports/lang/NumExts.hi
+lib/ghc/imports/lang/NumExts.p_hi
 lib/ghc/imports/lang/PackedString.hi
+lib/ghc/imports/lang/PackedString.p_hi
 lib/ghc/imports/lang/ST.hi
+lib/ghc/imports/lang/ST.p_hi
 lib/ghc/imports/lang/ShowFunctions.hi
+lib/ghc/imports/lang/ShowFunctions.p_hi
 lib/ghc/imports/lang/Stable.hi
+lib/ghc/imports/lang/Stable.p_hi
+lib/ghc/imports/lang/StableName.hi
+lib/ghc/imports/lang/StableName.p_hi
 lib/ghc/imports/lang/StablePtr.hi
+lib/ghc/imports/lang/StablePtr.p_hi
+lib/ghc/imports/lang/Storable.hi
+lib/ghc/imports/lang/Storable.p_hi
 lib/ghc/imports/lang/TimeExts.hi
+lib/ghc/imports/lang/TimeExts.p_hi
 lib/ghc/imports/lang/Weak.hi
+lib/ghc/imports/lang/Weak.p_hi
 lib/ghc/imports/lang/Word.hi
+lib/ghc/imports/lang/Word.p_hi
 lib/ghc/imports/net/BSD.hi
+lib/ghc/imports/net/BSD.p_hi
 lib/ghc/imports/net/Socket.hi
+lib/ghc/imports/net/Socket.p_hi
 lib/ghc/imports/net/SocketPrim.hi
+lib/ghc/imports/net/SocketPrim.p_hi
 lib/ghc/imports/net/URI.hi
+lib/ghc/imports/net/URI.p_hi
 lib/ghc/imports/posix/Posix.hi
+lib/ghc/imports/posix/Posix.p_hi
 lib/ghc/imports/posix/PosixDB.hi
+lib/ghc/imports/posix/PosixDB.p_hi
 lib/ghc/imports/posix/PosixErr.hi
+lib/ghc/imports/posix/PosixErr.p_hi
 lib/ghc/imports/posix/PosixFiles.hi
+lib/ghc/imports/posix/PosixFiles.p_hi
 lib/ghc/imports/posix/PosixIO.hi
+lib/ghc/imports/posix/PosixIO.p_hi
 lib/ghc/imports/posix/PosixProcEnv.hi
+lib/ghc/imports/posix/PosixProcEnv.p_hi
 lib/ghc/imports/posix/PosixProcPrim.hi
+lib/ghc/imports/posix/PosixProcPrim.p_hi
 lib/ghc/imports/posix/PosixTTY.hi
+lib/ghc/imports/posix/PosixTTY.p_hi
 lib/ghc/imports/posix/PosixUtil.hi
+lib/ghc/imports/posix/PosixUtil.p_hi
 lib/ghc/imports/std/Array.hi
+lib/ghc/imports/std/Array.p_hi
 lib/ghc/imports/std/CPUTime.hi
+lib/ghc/imports/std/CPUTime.p_hi
 lib/ghc/imports/std/Char.hi
+lib/ghc/imports/std/Char.p_hi
 lib/ghc/imports/std/Complex.hi
+lib/ghc/imports/std/Complex.p_hi
 lib/ghc/imports/std/Directory.hi
+lib/ghc/imports/std/Directory.p_hi
 lib/ghc/imports/std/IO.hi
+lib/ghc/imports/std/IO.p_hi
 lib/ghc/imports/std/Ix.hi
+lib/ghc/imports/std/Ix.p_hi
 lib/ghc/imports/std/List.hi
+lib/ghc/imports/std/List.p_hi
 lib/ghc/imports/std/Locale.hi
+lib/ghc/imports/std/Locale.p_hi
 lib/ghc/imports/std/Maybe.hi
+lib/ghc/imports/std/Maybe.p_hi
 lib/ghc/imports/std/Monad.hi
+lib/ghc/imports/std/Monad.p_hi
 lib/ghc/imports/std/Numeric.hi
+lib/ghc/imports/std/Numeric.p_hi
 lib/ghc/imports/std/PrelAddr.hi
+lib/ghc/imports/std/PrelAddr.p_hi
 lib/ghc/imports/std/PrelArr.hi
+lib/ghc/imports/std/PrelArr.p_hi
 lib/ghc/imports/std/PrelArrExtra.hi
+lib/ghc/imports/std/PrelArrExtra.p_hi
 lib/ghc/imports/std/PrelBase.hi
+lib/ghc/imports/std/PrelBase.p_hi
 lib/ghc/imports/std/PrelByteArr.hi
+lib/ghc/imports/std/PrelByteArr.p_hi
 lib/ghc/imports/std/PrelConc.hi
+lib/ghc/imports/std/PrelConc.p_hi
 lib/ghc/imports/std/PrelDynamic.hi
+lib/ghc/imports/std/PrelDynamic.p_hi
 lib/ghc/imports/std/PrelEnum.hi
+lib/ghc/imports/std/PrelEnum.p_hi
 lib/ghc/imports/std/PrelErr.hi
+lib/ghc/imports/std/PrelErr.p_hi
 lib/ghc/imports/std/PrelException.hi
+lib/ghc/imports/std/PrelException.p_hi
 lib/ghc/imports/std/PrelFloat.hi
+lib/ghc/imports/std/PrelFloat.p_hi
 lib/ghc/imports/std/PrelForeign.hi
+lib/ghc/imports/std/PrelForeign.p_hi
 lib/ghc/imports/std/PrelGHC.hi
+lib/ghc/imports/std/PrelGHC.p_hi
 lib/ghc/imports/std/PrelHandle.hi
+lib/ghc/imports/std/PrelHandle.p_hi
 lib/ghc/imports/std/PrelHugs.hi
+lib/ghc/imports/std/PrelHugs.p_hi
+lib/ghc/imports/std/PrelIO.hi
+lib/ghc/imports/std/PrelIO.p_hi
 lib/ghc/imports/std/PrelIOBase.hi
+lib/ghc/imports/std/PrelIOBase.p_hi
 lib/ghc/imports/std/PrelList.hi
+lib/ghc/imports/std/PrelList.p_hi
 lib/ghc/imports/std/PrelMain.hi
+lib/ghc/imports/std/PrelMain.p_hi
 lib/ghc/imports/std/PrelMaybe.hi
+lib/ghc/imports/std/PrelMaybe.p_hi
 lib/ghc/imports/std/PrelNum.hi
+lib/ghc/imports/std/PrelNum.p_hi
 lib/ghc/imports/std/PrelPack.hi
+lib/ghc/imports/std/PrelPack.p_hi
 lib/ghc/imports/std/PrelRead.hi
+lib/ghc/imports/std/PrelRead.p_hi
 lib/ghc/imports/std/PrelReal.hi
+lib/ghc/imports/std/PrelReal.p_hi
 lib/ghc/imports/std/PrelST.hi
+lib/ghc/imports/std/PrelST.p_hi
 lib/ghc/imports/std/PrelShow.hi
+lib/ghc/imports/std/PrelShow.p_hi
 lib/ghc/imports/std/PrelStable.hi
+lib/ghc/imports/std/PrelStable.p_hi
 lib/ghc/imports/std/PrelTup.hi
+lib/ghc/imports/std/PrelTup.p_hi
 lib/ghc/imports/std/PrelWeak.hi
+lib/ghc/imports/std/PrelWeak.p_hi
 lib/ghc/imports/std/Prelude.hi
+lib/ghc/imports/std/Prelude.p_hi
 lib/ghc/imports/std/Random.hi
+lib/ghc/imports/std/Random.p_hi
 lib/ghc/imports/std/Ratio.hi
+lib/ghc/imports/std/Ratio.p_hi
 lib/ghc/imports/std/System.hi
+lib/ghc/imports/std/System.p_hi
 lib/ghc/imports/std/Time.hi
+lib/ghc/imports/std/Time.p_hi
+lib/ghc/imports/text/Haskell2Xml.hi
+lib/ghc/imports/text/Haskell2Xml.p_hi
 lib/ghc/imports/text/Html.hi
+lib/ghc/imports/text/Html.p_hi
 lib/ghc/imports/text/HtmlBlockTable.hi
+lib/ghc/imports/text/HtmlBlockTable.p_hi
 lib/ghc/imports/text/MatchPS.hi
+lib/ghc/imports/text/MatchPS.p_hi
+lib/ghc/imports/text/ParseSTLib.hi
+lib/ghc/imports/text/ParseSTLib.p_hi
+lib/ghc/imports/text/Parsec.hi
+lib/ghc/imports/text/Parsec.p_hi
+lib/ghc/imports/text/ParsecError.hi
+lib/ghc/imports/text/ParsecError.p_hi
+lib/ghc/imports/text/ParsecExpr.hi
+lib/ghc/imports/text/ParsecExpr.p_hi
+lib/ghc/imports/text/ParsecLanguage.hi
+lib/ghc/imports/text/ParsecLanguage.p_hi
+lib/ghc/imports/text/ParsecToken.hi
+lib/ghc/imports/text/ParsecToken.p_hi
 lib/ghc/imports/text/Pretty.hi
+lib/ghc/imports/text/Pretty.p_hi
 lib/ghc/imports/text/Regex.hi
+lib/ghc/imports/text/Regex.p_hi
 lib/ghc/imports/text/RegexString.hi
+lib/ghc/imports/text/RegexString.p_hi
+lib/ghc/imports/text/Xml2Haskell.hi
+lib/ghc/imports/text/Xml2Haskell.p_hi
+lib/ghc/imports/text/XmlCombinators.hi
+lib/ghc/imports/text/XmlCombinators.p_hi
+lib/ghc/imports/text/XmlHtmlGen.hi
+lib/ghc/imports/text/XmlHtmlGen.p_hi
+lib/ghc/imports/text/XmlHtmlPP.hi
+lib/ghc/imports/text/XmlHtmlPP.p_hi
+lib/ghc/imports/text/XmlHtmlParse.hi
+lib/ghc/imports/text/XmlHtmlParse.p_hi
+lib/ghc/imports/text/XmlLex.hi
+lib/ghc/imports/text/XmlLex.p_hi
+lib/ghc/imports/text/XmlLib.hi
+lib/ghc/imports/text/XmlLib.p_hi
+lib/ghc/imports/text/XmlPP.hi
+lib/ghc/imports/text/XmlPP.p_hi
+lib/ghc/imports/text/XmlParse.hi
+lib/ghc/imports/text/XmlParse.p_hi
+lib/ghc/imports/text/XmlTypes.hi
+lib/ghc/imports/text/XmlTypes.p_hi
 lib/ghc/imports/util/GetOpt.hi
+lib/ghc/imports/util/GetOpt.p_hi
 lib/ghc/imports/util/MD5.hi
+lib/ghc/imports/util/MD5.p_hi
 lib/ghc/imports/util/Memo.hi
+lib/ghc/imports/util/Memo.p_hi
 lib/ghc/imports/util/QuickCheck.hi
+lib/ghc/imports/util/QuickCheck.p_hi
 lib/ghc/imports/util/QuickCheckBatch.hi
+lib/ghc/imports/util/QuickCheckBatch.p_hi
 lib/ghc/imports/util/QuickCheckPoly.hi
+lib/ghc/imports/util/QuickCheckPoly.p_hi
 lib/ghc/imports/util/QuickCheckUtils.hi
+lib/ghc/imports/util/QuickCheckUtils.p_hi
 lib/ghc/imports/util/Readline.hi
+lib/ghc/imports/util/Readline.p_hi
 lib/ghc/imports/util/Select.hi
+lib/ghc/imports/util/Select.p_hi
 lib/ghc/includes/Assembler.h
 lib/ghc/includes/Block.h
 lib/ghc/includes/CCall.h
@@ -162,17 +394,17 @@ lib/ghc/includes/ClosureMacros.h
 lib/ghc/includes/ClosureTypes.h
 lib/ghc/includes/Closures.h
 lib/ghc/includes/Constants.h
+lib/ghc/includes/DietHEP.h
 lib/ghc/includes/GranSim.h
 lib/ghc/includes/Hooks.h
+lib/ghc/includes/HsFFI.h
 lib/ghc/includes/InfoMacros.h
 lib/ghc/includes/InfoTables.h
 lib/ghc/includes/MachDeps.h
 lib/ghc/includes/MachRegs.h
 lib/ghc/includes/NativeDefs.h
 lib/ghc/includes/Parallel.h
-lib/ghc/includes/Prelude.h
 lib/ghc/includes/PrimOps.h
-lib/ghc/includes/Profiling.h
 lib/ghc/includes/Regs.h
 lib/ghc/includes/Rts.h
 lib/ghc/includes/RtsAPI.h
@@ -201,25 +433,35 @@ lib/ghc/includes/sainteger.h
 lib/ghc/includes/stgerror.h
 lib/ghc/includes/stgio.h
 lib/ghc/includes/timezone.h
-lib/ghc/libHS.a
-lib/ghc/libHS_cbits.a
 lib/ghc/libHSconcurrent.a
+lib/ghc/libHSconcurrent_p.a
 lib/ghc/libHSdata.a
+lib/ghc/libHSdata_p.a
 lib/ghc/libHSlang.a
 lib/ghc/libHSlang_cbits.a
+lib/ghc/libHSlang_p.a
 lib/ghc/libHSnet.a
 lib/ghc/libHSnet_cbits.a
+lib/ghc/libHSnet_p.a
 lib/ghc/libHSposix.a
 lib/ghc/libHSposix_cbits.a
+lib/ghc/libHSposix_p.a
 lib/ghc/libHSrts.a
+lib/ghc/libHSrts_p.a
+lib/ghc/libHSstd.a
+lib/ghc/libHSstd_cbits.a
+lib/ghc/libHSstd_p.a
 lib/ghc/libHStext.a
 lib/ghc/libHStext_cbits.a
+lib/ghc/libHStext_p.a
 lib/ghc/libHSutil.a
 lib/ghc/libHSutil_cbits.a
+lib/ghc/libHSutil_p.a
 lib/ghc/mkdependHS
 lib/ghc/parse-gcstats.prl
 lib/ghc/process-gcstats.prl
 lib/ghc/unlit
+@dirrm lib/ghc/icons
 @dirrm lib/ghc/imports/concurrent
 @dirrm lib/ghc/imports/data
 @dirrm lib/ghc/imports/lang
diff --git a/lang/ghc6/Makefile b/lang/ghc6/Makefile
index 0aea65a4afe3..c1e181c16e1c 100644
--- a/lang/ghc6/Makefile
+++ b/lang/ghc6/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.06
+PORTVERSION=	4.08
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
-DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
+MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08/
+DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
+		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
diff --git a/lang/ghc6/distinfo b/lang/ghc6/distinfo
index 498f4cd2dcda..3a8e0f44598c 100644
--- a/lang/ghc6/distinfo
+++ b/lang/ghc6/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.06-src.tar.gz) = 61921dadbe8d0969cd783a01a4ba14fa
-MD5 (ghc-4.06-x86-hc.tar.gz) = 2755da691718ed247d63f8d2f10510dd
+MD5 (ghc-4.08-src.tar.gz) = 624af8e537fdaacb12719c0e5af080b5
+MD5 (ghc-4.08-x86-hc.tar.gz) = 3fc776f3963a6821720e7ae203b80529
diff --git a/lang/ghc6/files/build.mk b/lang/ghc6/files/build.mk
index 04d306bc4848..af3ed3e53007 100644
--- a/lang/ghc6/files/build.mk
+++ b/lang/ghc6/files/build.mk
@@ -1,5 +1,5 @@
 ProjectsToBuild = glafp-utils hslibs ghc
-GhcLibHcOpts = -O -split-objs -odir $*
+GhcLibHcOpts = -O -split-objs -H32m
 SRC_HAPPY_OPTS += -c
-GhcLibWays=
+GhcLibWays=p
 GhcLibsWithReadline = YES
diff --git a/lang/ghc6/pkg-plist b/lang/ghc6/pkg-plist
index d34c904235d4..116bc1882ba0 100644
--- a/lang/ghc6/pkg-plist
+++ b/lang/ghc6/pkg-plist
@@ -1,160 +1,392 @@
 bin/ghc
-bin/ghc-4.06
+bin/ghc-4.08
 bin/hp2ps
 bin/stat2resid
+bin/DrIFT
+bin/DtdToHaskell
+bin/Xtract
+lib/ghc/cgprof
 lib/ghc/ghc-asm.prl
 lib/ghc/ghc-consist.prl
 lib/ghc/ghc-iface.prl
 lib/ghc/ghc-split.prl
 lib/ghc/hsc
 lib/ghc/hscpp
+lib/ghc/icons/absdelta.xbm
+lib/ghc/icons/absolute.xbm
+lib/ghc/icons/comm.xbm
+lib/ghc/icons/commslack.xbm
+lib/ghc/icons/comp.xbm
+lib/ghc/icons/compress.xbm
+lib/ghc/icons/compslack.xbm
+lib/ghc/icons/delete.xbm
+lib/ghc/icons/help.xbm
+lib/ghc/icons/hrel.xbm
+lib/ghc/icons/hrelslack.xbm
+lib/ghc/icons/jump.xbm
+lib/ghc/icons/mycomm.xbm
+lib/ghc/icons/oxpara.xbm
+lib/ghc/icons/percent.xbm
+lib/ghc/icons/reldelta.xbm
+lib/ghc/icons/sync.xbm
+lib/ghc/icons/time.xbm
+lib/ghc/icons/time1.xbm
+lib/ghc/icons/uncompress.xbm
+lib/ghc/icons/undo.xbm
+lib/ghc/icons/wait.xbm
+lib/ghc/icons/weightdelta.xbm
+lib/ghc/imports/concurrent/CVar.hi
+lib/ghc/imports/concurrent/CVar.p_hi
+lib/ghc/imports/concurrent/Chan.hi
+lib/ghc/imports/concurrent/Chan.p_hi
 lib/ghc/imports/concurrent/Channel.hi
+lib/ghc/imports/concurrent/Channel.p_hi
 lib/ghc/imports/concurrent/ChannelVar.hi
+lib/ghc/imports/concurrent/ChannelVar.p_hi
 lib/ghc/imports/concurrent/Concurrent.hi
+lib/ghc/imports/concurrent/Concurrent.p_hi
+lib/ghc/imports/concurrent/MVar.hi
+lib/ghc/imports/concurrent/MVar.p_hi
 lib/ghc/imports/concurrent/Merge.hi
+lib/ghc/imports/concurrent/Merge.p_hi
 lib/ghc/imports/concurrent/Parallel.hi
+lib/ghc/imports/concurrent/Parallel.p_hi
+lib/ghc/imports/concurrent/QSem.hi
+lib/ghc/imports/concurrent/QSem.p_hi
+lib/ghc/imports/concurrent/QSemN.hi
+lib/ghc/imports/concurrent/QSemN.p_hi
 lib/ghc/imports/concurrent/SampleVar.hi
+lib/ghc/imports/concurrent/SampleVar.p_hi
 lib/ghc/imports/concurrent/Semaphore.hi
+lib/ghc/imports/concurrent/Semaphore.p_hi
 lib/ghc/imports/concurrent/Strategies.hi
+lib/ghc/imports/concurrent/Strategies.p_hi
 lib/ghc/imports/data/Assoc.hi
+lib/ghc/imports/data/Assoc.p_hi
 lib/ghc/imports/data/AssocDefaults.hi
+lib/ghc/imports/data/AssocDefaults.p_hi
 lib/ghc/imports/data/AssocList.hi
+lib/ghc/imports/data/AssocList.p_hi
 lib/ghc/imports/data/BankersQueue.hi
+lib/ghc/imports/data/BankersQueue.p_hi
 lib/ghc/imports/data/BinaryRandList.hi
+lib/ghc/imports/data/BinaryRandList.p_hi
 lib/ghc/imports/data/BraunSeq.hi
+lib/ghc/imports/data/BraunSeq.p_hi
 lib/ghc/imports/data/Collection.hi
+lib/ghc/imports/data/Collection.p_hi
 lib/ghc/imports/data/CollectionDefaults.hi
+lib/ghc/imports/data/CollectionDefaults.p_hi
 lib/ghc/imports/data/CollectionUtils.hi
+lib/ghc/imports/data/CollectionUtils.p_hi
 lib/ghc/imports/data/EdisonPrelude.hi
+lib/ghc/imports/data/EdisonPrelude.p_hi
 lib/ghc/imports/data/FiniteMap.hi
+lib/ghc/imports/data/FiniteMap.p_hi
 lib/ghc/imports/data/JoinList.hi
+lib/ghc/imports/data/JoinList.p_hi
 lib/ghc/imports/data/LazyPairingHeap.hi
+lib/ghc/imports/data/LazyPairingHeap.p_hi
 lib/ghc/imports/data/LeftistHeap.hi
+lib/ghc/imports/data/LeftistHeap.p_hi
 lib/ghc/imports/data/ListSeq.hi
+lib/ghc/imports/data/ListSeq.p_hi
 lib/ghc/imports/data/MinHeap.hi
+lib/ghc/imports/data/MinHeap.p_hi
 lib/ghc/imports/data/MyersStack.hi
+lib/ghc/imports/data/MyersStack.p_hi
 lib/ghc/imports/data/PatriciaLoMap.hi
-lib/ghc/imports/data/QuickCheck.hi
+lib/ghc/imports/data/PatriciaLoMap.p_hi
 lib/ghc/imports/data/RandList.hi
+lib/ghc/imports/data/RandList.p_hi
 lib/ghc/imports/data/RevSeq.hi
+lib/ghc/imports/data/RevSeq.p_hi
 lib/ghc/imports/data/Sequence.hi
+lib/ghc/imports/data/Sequence.p_hi
 lib/ghc/imports/data/SequenceDefaults.hi
+lib/ghc/imports/data/SequenceDefaults.p_hi
 lib/ghc/imports/data/Set.hi
+lib/ghc/imports/data/Set.p_hi
 lib/ghc/imports/data/SimpleQueue.hi
+lib/ghc/imports/data/SimpleQueue.p_hi
 lib/ghc/imports/data/SizedSeq.hi
+lib/ghc/imports/data/SizedSeq.p_hi
 lib/ghc/imports/data/SkewHeap.hi
+lib/ghc/imports/data/SkewHeap.p_hi
 lib/ghc/imports/data/SplayHeap.hi
+lib/ghc/imports/data/SplayHeap.p_hi
 lib/ghc/imports/data/TestOrdBag.hi
+lib/ghc/imports/data/TestOrdBag.p_hi
 lib/ghc/imports/data/TestOrdSet.hi
+lib/ghc/imports/data/TestOrdSet.p_hi
 lib/ghc/imports/data/TestSeq.hi
+lib/ghc/imports/data/TestSeq.p_hi
 lib/ghc/imports/data/UnbalancedSet.hi
+lib/ghc/imports/data/UnbalancedSet.p_hi
 lib/ghc/imports/lang/Addr.hi
+lib/ghc/imports/lang/Addr.p_hi
+lib/ghc/imports/lang/ArrayBase.hi
+lib/ghc/imports/lang/ArrayBase.p_hi
 lib/ghc/imports/lang/Bits.hi
+lib/ghc/imports/lang/Bits.p_hi
 lib/ghc/imports/lang/ByteArray.hi
+lib/ghc/imports/lang/ByteArray.p_hi
 lib/ghc/imports/lang/CCall.hi
+lib/ghc/imports/lang/CCall.p_hi
 lib/ghc/imports/lang/CString.hi
+lib/ghc/imports/lang/CString.p_hi
+lib/ghc/imports/lang/CTypes.hi
+lib/ghc/imports/lang/CTypes.p_hi
+lib/ghc/imports/lang/CTypesISO.hi
+lib/ghc/imports/lang/CTypesISO.p_hi
 lib/ghc/imports/lang/Dynamic.hi
+lib/ghc/imports/lang/Dynamic.p_hi
 lib/ghc/imports/lang/Exception.hi
-lib/ghc/imports/lang/FFI.hi
+lib/ghc/imports/lang/Exception.p_hi
 lib/ghc/imports/lang/Foreign.hi
+lib/ghc/imports/lang/Foreign.p_hi
 lib/ghc/imports/lang/ForeignObj.hi
+lib/ghc/imports/lang/ForeignObj.p_hi
 lib/ghc/imports/lang/GlaExts.hi
+lib/ghc/imports/lang/GlaExts.p_hi
+lib/ghc/imports/lang/IArray.hi
+lib/ghc/imports/lang/IArray.p_hi
 lib/ghc/imports/lang/IOExts.hi
+lib/ghc/imports/lang/IOExts.p_hi
 lib/ghc/imports/lang/Int.hi
+lib/ghc/imports/lang/Int.p_hi
 lib/ghc/imports/lang/LazyST.hi
+lib/ghc/imports/lang/LazyST.p_hi
+lib/ghc/imports/lang/MArray.hi
+lib/ghc/imports/lang/MArray.p_hi
 lib/ghc/imports/lang/MonadEither.hi
+lib/ghc/imports/lang/MonadEither.p_hi
+lib/ghc/imports/lang/MonadError.hi
+lib/ghc/imports/lang/MonadError.p_hi
 lib/ghc/imports/lang/MonadFix.hi
+lib/ghc/imports/lang/MonadFix.p_hi
 lib/ghc/imports/lang/MonadIdentity.hi
+lib/ghc/imports/lang/MonadIdentity.p_hi
 lib/ghc/imports/lang/MonadRWS.hi
+lib/ghc/imports/lang/MonadRWS.p_hi
 lib/ghc/imports/lang/MonadReader.hi
+lib/ghc/imports/lang/MonadReader.p_hi
 lib/ghc/imports/lang/MonadState.hi
+lib/ghc/imports/lang/MonadState.p_hi
 lib/ghc/imports/lang/MonadTrans.hi
+lib/ghc/imports/lang/MonadTrans.p_hi
 lib/ghc/imports/lang/MonadWriter.hi
+lib/ghc/imports/lang/MonadWriter.p_hi
 lib/ghc/imports/lang/Monoid.hi
+lib/ghc/imports/lang/Monoid.p_hi
 lib/ghc/imports/lang/MutableArray.hi
+lib/ghc/imports/lang/MutableArray.p_hi
 lib/ghc/imports/lang/NativeInfo.hi
+lib/ghc/imports/lang/NativeInfo.p_hi
 lib/ghc/imports/lang/NumExts.hi
+lib/ghc/imports/lang/NumExts.p_hi
 lib/ghc/imports/lang/PackedString.hi
+lib/ghc/imports/lang/PackedString.p_hi
 lib/ghc/imports/lang/ST.hi
+lib/ghc/imports/lang/ST.p_hi
 lib/ghc/imports/lang/ShowFunctions.hi
+lib/ghc/imports/lang/ShowFunctions.p_hi
 lib/ghc/imports/lang/Stable.hi
+lib/ghc/imports/lang/Stable.p_hi
+lib/ghc/imports/lang/StableName.hi
+lib/ghc/imports/lang/StableName.p_hi
 lib/ghc/imports/lang/StablePtr.hi
+lib/ghc/imports/lang/StablePtr.p_hi
+lib/ghc/imports/lang/Storable.hi
+lib/ghc/imports/lang/Storable.p_hi
 lib/ghc/imports/lang/TimeExts.hi
+lib/ghc/imports/lang/TimeExts.p_hi
 lib/ghc/imports/lang/Weak.hi
+lib/ghc/imports/lang/Weak.p_hi
 lib/ghc/imports/lang/Word.hi
+lib/ghc/imports/lang/Word.p_hi
 lib/ghc/imports/net/BSD.hi
+lib/ghc/imports/net/BSD.p_hi
 lib/ghc/imports/net/Socket.hi
+lib/ghc/imports/net/Socket.p_hi
 lib/ghc/imports/net/SocketPrim.hi
+lib/ghc/imports/net/SocketPrim.p_hi
 lib/ghc/imports/net/URI.hi
+lib/ghc/imports/net/URI.p_hi
 lib/ghc/imports/posix/Posix.hi
+lib/ghc/imports/posix/Posix.p_hi
 lib/ghc/imports/posix/PosixDB.hi
+lib/ghc/imports/posix/PosixDB.p_hi
 lib/ghc/imports/posix/PosixErr.hi
+lib/ghc/imports/posix/PosixErr.p_hi
 lib/ghc/imports/posix/PosixFiles.hi
+lib/ghc/imports/posix/PosixFiles.p_hi
 lib/ghc/imports/posix/PosixIO.hi
+lib/ghc/imports/posix/PosixIO.p_hi
 lib/ghc/imports/posix/PosixProcEnv.hi
+lib/ghc/imports/posix/PosixProcEnv.p_hi
 lib/ghc/imports/posix/PosixProcPrim.hi
+lib/ghc/imports/posix/PosixProcPrim.p_hi
 lib/ghc/imports/posix/PosixTTY.hi
+lib/ghc/imports/posix/PosixTTY.p_hi
 lib/ghc/imports/posix/PosixUtil.hi
+lib/ghc/imports/posix/PosixUtil.p_hi
 lib/ghc/imports/std/Array.hi
+lib/ghc/imports/std/Array.p_hi
 lib/ghc/imports/std/CPUTime.hi
+lib/ghc/imports/std/CPUTime.p_hi
 lib/ghc/imports/std/Char.hi
+lib/ghc/imports/std/Char.p_hi
 lib/ghc/imports/std/Complex.hi
+lib/ghc/imports/std/Complex.p_hi
 lib/ghc/imports/std/Directory.hi
+lib/ghc/imports/std/Directory.p_hi
 lib/ghc/imports/std/IO.hi
+lib/ghc/imports/std/IO.p_hi
 lib/ghc/imports/std/Ix.hi
+lib/ghc/imports/std/Ix.p_hi
 lib/ghc/imports/std/List.hi
+lib/ghc/imports/std/List.p_hi
 lib/ghc/imports/std/Locale.hi
+lib/ghc/imports/std/Locale.p_hi
 lib/ghc/imports/std/Maybe.hi
+lib/ghc/imports/std/Maybe.p_hi
 lib/ghc/imports/std/Monad.hi
+lib/ghc/imports/std/Monad.p_hi
 lib/ghc/imports/std/Numeric.hi
+lib/ghc/imports/std/Numeric.p_hi
 lib/ghc/imports/std/PrelAddr.hi
+lib/ghc/imports/std/PrelAddr.p_hi
 lib/ghc/imports/std/PrelArr.hi
+lib/ghc/imports/std/PrelArr.p_hi
 lib/ghc/imports/std/PrelArrExtra.hi
+lib/ghc/imports/std/PrelArrExtra.p_hi
 lib/ghc/imports/std/PrelBase.hi
+lib/ghc/imports/std/PrelBase.p_hi
 lib/ghc/imports/std/PrelByteArr.hi
+lib/ghc/imports/std/PrelByteArr.p_hi
 lib/ghc/imports/std/PrelConc.hi
+lib/ghc/imports/std/PrelConc.p_hi
 lib/ghc/imports/std/PrelDynamic.hi
+lib/ghc/imports/std/PrelDynamic.p_hi
 lib/ghc/imports/std/PrelEnum.hi
+lib/ghc/imports/std/PrelEnum.p_hi
 lib/ghc/imports/std/PrelErr.hi
+lib/ghc/imports/std/PrelErr.p_hi
 lib/ghc/imports/std/PrelException.hi
+lib/ghc/imports/std/PrelException.p_hi
 lib/ghc/imports/std/PrelFloat.hi
+lib/ghc/imports/std/PrelFloat.p_hi
 lib/ghc/imports/std/PrelForeign.hi
+lib/ghc/imports/std/PrelForeign.p_hi
 lib/ghc/imports/std/PrelGHC.hi
+lib/ghc/imports/std/PrelGHC.p_hi
 lib/ghc/imports/std/PrelHandle.hi
+lib/ghc/imports/std/PrelHandle.p_hi
 lib/ghc/imports/std/PrelHugs.hi
+lib/ghc/imports/std/PrelHugs.p_hi
+lib/ghc/imports/std/PrelIO.hi
+lib/ghc/imports/std/PrelIO.p_hi
 lib/ghc/imports/std/PrelIOBase.hi
+lib/ghc/imports/std/PrelIOBase.p_hi
 lib/ghc/imports/std/PrelList.hi
+lib/ghc/imports/std/PrelList.p_hi
 lib/ghc/imports/std/PrelMain.hi
+lib/ghc/imports/std/PrelMain.p_hi
 lib/ghc/imports/std/PrelMaybe.hi
+lib/ghc/imports/std/PrelMaybe.p_hi
 lib/ghc/imports/std/PrelNum.hi
+lib/ghc/imports/std/PrelNum.p_hi
 lib/ghc/imports/std/PrelPack.hi
+lib/ghc/imports/std/PrelPack.p_hi
 lib/ghc/imports/std/PrelRead.hi
+lib/ghc/imports/std/PrelRead.p_hi
 lib/ghc/imports/std/PrelReal.hi
+lib/ghc/imports/std/PrelReal.p_hi
 lib/ghc/imports/std/PrelST.hi
+lib/ghc/imports/std/PrelST.p_hi
 lib/ghc/imports/std/PrelShow.hi
+lib/ghc/imports/std/PrelShow.p_hi
 lib/ghc/imports/std/PrelStable.hi
+lib/ghc/imports/std/PrelStable.p_hi
 lib/ghc/imports/std/PrelTup.hi
+lib/ghc/imports/std/PrelTup.p_hi
 lib/ghc/imports/std/PrelWeak.hi
+lib/ghc/imports/std/PrelWeak.p_hi
 lib/ghc/imports/std/Prelude.hi
+lib/ghc/imports/std/Prelude.p_hi
 lib/ghc/imports/std/Random.hi
+lib/ghc/imports/std/Random.p_hi
 lib/ghc/imports/std/Ratio.hi
+lib/ghc/imports/std/Ratio.p_hi
 lib/ghc/imports/std/System.hi
+lib/ghc/imports/std/System.p_hi
 lib/ghc/imports/std/Time.hi
+lib/ghc/imports/std/Time.p_hi
+lib/ghc/imports/text/Haskell2Xml.hi
+lib/ghc/imports/text/Haskell2Xml.p_hi
 lib/ghc/imports/text/Html.hi
+lib/ghc/imports/text/Html.p_hi
 lib/ghc/imports/text/HtmlBlockTable.hi
+lib/ghc/imports/text/HtmlBlockTable.p_hi
 lib/ghc/imports/text/MatchPS.hi
+lib/ghc/imports/text/MatchPS.p_hi
+lib/ghc/imports/text/ParseSTLib.hi
+lib/ghc/imports/text/ParseSTLib.p_hi
+lib/ghc/imports/text/Parsec.hi
+lib/ghc/imports/text/Parsec.p_hi
+lib/ghc/imports/text/ParsecError.hi
+lib/ghc/imports/text/ParsecError.p_hi
+lib/ghc/imports/text/ParsecExpr.hi
+lib/ghc/imports/text/ParsecExpr.p_hi
+lib/ghc/imports/text/ParsecLanguage.hi
+lib/ghc/imports/text/ParsecLanguage.p_hi
+lib/ghc/imports/text/ParsecToken.hi
+lib/ghc/imports/text/ParsecToken.p_hi
 lib/ghc/imports/text/Pretty.hi
+lib/ghc/imports/text/Pretty.p_hi
 lib/ghc/imports/text/Regex.hi
+lib/ghc/imports/text/Regex.p_hi
 lib/ghc/imports/text/RegexString.hi
+lib/ghc/imports/text/RegexString.p_hi
+lib/ghc/imports/text/Xml2Haskell.hi
+lib/ghc/imports/text/Xml2Haskell.p_hi
+lib/ghc/imports/text/XmlCombinators.hi
+lib/ghc/imports/text/XmlCombinators.p_hi
+lib/ghc/imports/text/XmlHtmlGen.hi
+lib/ghc/imports/text/XmlHtmlGen.p_hi
+lib/ghc/imports/text/XmlHtmlPP.hi
+lib/ghc/imports/text/XmlHtmlPP.p_hi
+lib/ghc/imports/text/XmlHtmlParse.hi
+lib/ghc/imports/text/XmlHtmlParse.p_hi
+lib/ghc/imports/text/XmlLex.hi
+lib/ghc/imports/text/XmlLex.p_hi
+lib/ghc/imports/text/XmlLib.hi
+lib/ghc/imports/text/XmlLib.p_hi
+lib/ghc/imports/text/XmlPP.hi
+lib/ghc/imports/text/XmlPP.p_hi
+lib/ghc/imports/text/XmlParse.hi
+lib/ghc/imports/text/XmlParse.p_hi
+lib/ghc/imports/text/XmlTypes.hi
+lib/ghc/imports/text/XmlTypes.p_hi
 lib/ghc/imports/util/GetOpt.hi
+lib/ghc/imports/util/GetOpt.p_hi
 lib/ghc/imports/util/MD5.hi
+lib/ghc/imports/util/MD5.p_hi
 lib/ghc/imports/util/Memo.hi
+lib/ghc/imports/util/Memo.p_hi
 lib/ghc/imports/util/QuickCheck.hi
+lib/ghc/imports/util/QuickCheck.p_hi
 lib/ghc/imports/util/QuickCheckBatch.hi
+lib/ghc/imports/util/QuickCheckBatch.p_hi
 lib/ghc/imports/util/QuickCheckPoly.hi
+lib/ghc/imports/util/QuickCheckPoly.p_hi
 lib/ghc/imports/util/QuickCheckUtils.hi
+lib/ghc/imports/util/QuickCheckUtils.p_hi
 lib/ghc/imports/util/Readline.hi
+lib/ghc/imports/util/Readline.p_hi
 lib/ghc/imports/util/Select.hi
+lib/ghc/imports/util/Select.p_hi
 lib/ghc/includes/Assembler.h
 lib/ghc/includes/Block.h
 lib/ghc/includes/CCall.h
@@ -162,17 +394,17 @@ lib/ghc/includes/ClosureMacros.h
 lib/ghc/includes/ClosureTypes.h
 lib/ghc/includes/Closures.h
 lib/ghc/includes/Constants.h
+lib/ghc/includes/DietHEP.h
 lib/ghc/includes/GranSim.h
 lib/ghc/includes/Hooks.h
+lib/ghc/includes/HsFFI.h
 lib/ghc/includes/InfoMacros.h
 lib/ghc/includes/InfoTables.h
 lib/ghc/includes/MachDeps.h
 lib/ghc/includes/MachRegs.h
 lib/ghc/includes/NativeDefs.h
 lib/ghc/includes/Parallel.h
-lib/ghc/includes/Prelude.h
 lib/ghc/includes/PrimOps.h
-lib/ghc/includes/Profiling.h
 lib/ghc/includes/Regs.h
 lib/ghc/includes/Rts.h
 lib/ghc/includes/RtsAPI.h
@@ -201,25 +433,35 @@ lib/ghc/includes/sainteger.h
 lib/ghc/includes/stgerror.h
 lib/ghc/includes/stgio.h
 lib/ghc/includes/timezone.h
-lib/ghc/libHS.a
-lib/ghc/libHS_cbits.a
 lib/ghc/libHSconcurrent.a
+lib/ghc/libHSconcurrent_p.a
 lib/ghc/libHSdata.a
+lib/ghc/libHSdata_p.a
 lib/ghc/libHSlang.a
 lib/ghc/libHSlang_cbits.a
+lib/ghc/libHSlang_p.a
 lib/ghc/libHSnet.a
 lib/ghc/libHSnet_cbits.a
+lib/ghc/libHSnet_p.a
 lib/ghc/libHSposix.a
 lib/ghc/libHSposix_cbits.a
+lib/ghc/libHSposix_p.a
 lib/ghc/libHSrts.a
+lib/ghc/libHSrts_p.a
+lib/ghc/libHSstd.a
+lib/ghc/libHSstd_cbits.a
+lib/ghc/libHSstd_p.a
 lib/ghc/libHStext.a
 lib/ghc/libHStext_cbits.a
+lib/ghc/libHStext_p.a
 lib/ghc/libHSutil.a
 lib/ghc/libHSutil_cbits.a
+lib/ghc/libHSutil_p.a
 lib/ghc/mkdependHS
 lib/ghc/parse-gcstats.prl
 lib/ghc/process-gcstats.prl
 lib/ghc/unlit
+@dirrm lib/ghc/icons
 @dirrm lib/ghc/imports/concurrent
 @dirrm lib/ghc/imports/data
 @dirrm lib/ghc/imports/lang