Update lang/ghc to 6.6.1.

Many, many bugs have been fixed relative to 6.6. Far too many to list here.

The other changes in this release are:
* GHC works on Windows Vista.
* GHC can now be used to compile C++ files.
* There is an --install-signal-handlers=<yes|no> RTS flag. The main use is
  to stop GHC installing signal handlers when you are putting your code in
   a DLL.
* Newtypes can now be defined using GADT syntax.
* Linear implicit parameters are no longer accepted.
* There is a manpage for ghc and ghci.
* The building guide has been moved to the wiki.
* GHC now comes with the filepath library.

4 files changed, 63 insertions, 22 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index d779661a9b5..f93cc02a74f 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2007/03/24 17:57:19 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2007/04/29 22:12:02 kristerw Exp $
 
-DISTNAME=	ghc-6.6
+DISTNAME=	ghc-6.6.1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/6.6/
-DISTFILES=	ghc-6.6-src.tar.bz2 \
-		ghc-6.6-src-extralibs.tar.bz2 \
+MASTER_SITES=	http://www.haskell.org/ghc/dist/6.6.1/
+DISTFILES=	ghc-6.6.1-src.tar.bz2 \
+		ghc-6.6.1-src-extralibs.tar.bz2 \
 		ghc-6.4.2-src.tar.bz2 \
 		ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz
 
diff --git a/lang/ghc/PLIST b/lang/ghc/PLIST
index ca3adf8fe70..8573f2568de 100644
--- a/lang/ghc/PLIST
+++ b/lang/ghc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/03/24 17:57:19 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/04/29 22:12:02 kristerw Exp $
 bin/ghc
 bin/${PKGNAME}
 bin/ghc-pkg
@@ -18,6 +18,7 @@ lib/${PKGNAME}/HSbase.o
 lib/${PKGNAME}/HSbase_cbits.o
 lib/${PKGNAME}/HScgi.o
 lib/${PKGNAME}/HSfgl.o
+lib/${PKGNAME}/HSfilepath.o
 lib/${PKGNAME}/HSghc.o
 lib/${PKGNAME}/HShaskell-src.o
 lib/${PKGNAME}/HShaskell98.o
@@ -368,8 +369,12 @@ 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/Cont/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/Cont/Class.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Error.hi
 lib/${PKGNAME}/imports/Control/Monad/Error.p_hi
+lib/${PKGNAME}/imports/Control/Monad/Error/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/Error/Class.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Fix.hi
 lib/${PKGNAME}/imports/Control/Monad/Fix.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Identity.hi
@@ -380,8 +385,16 @@ 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/RWS/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/RWS/Class.p_hi
+lib/${PKGNAME}/imports/Control/Monad/RWS/Lazy.hi
+lib/${PKGNAME}/imports/Control/Monad/RWS/Lazy.p_hi
+lib/${PKGNAME}/imports/Control/Monad/RWS/Strict.hi
+lib/${PKGNAME}/imports/Control/Monad/RWS/Strict.p_hi
 lib/${PKGNAME}/imports/Control/Monad/Reader.hi
 lib/${PKGNAME}/imports/Control/Monad/Reader.p_hi
+lib/${PKGNAME}/imports/Control/Monad/Reader/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/Reader/Class.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
@@ -392,10 +405,22 @@ lib/${PKGNAME}/imports/Control/Monad/STM.hi
 lib/${PKGNAME}/imports/Control/Monad/STM.p_hi
 lib/${PKGNAME}/imports/Control/Monad/State.hi
 lib/${PKGNAME}/imports/Control/Monad/State.p_hi
+lib/${PKGNAME}/imports/Control/Monad/State/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/State/Class.p_hi
+lib/${PKGNAME}/imports/Control/Monad/State/Lazy.hi
+lib/${PKGNAME}/imports/Control/Monad/State/Lazy.p_hi
+lib/${PKGNAME}/imports/Control/Monad/State/Strict.hi
+lib/${PKGNAME}/imports/Control/Monad/State/Strict.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/Monad/Writer/Class.hi
+lib/${PKGNAME}/imports/Control/Monad/Writer/Class.p_hi
+lib/${PKGNAME}/imports/Control/Monad/Writer/Lazy.hi
+lib/${PKGNAME}/imports/Control/Monad/Writer/Lazy.p_hi
+lib/${PKGNAME}/imports/Control/Monad/Writer/Strict.hi
+lib/${PKGNAME}/imports/Control/Monad/Writer/Strict.p_hi
 lib/${PKGNAME}/imports/Control/Parallel.hi
 lib/${PKGNAME}/imports/Control/Parallel.p_hi
 lib/${PKGNAME}/imports/Control/Parallel/Strategies.hi
@@ -598,10 +623,12 @@ lib/${PKGNAME}/imports/Data/Time/Clock/UTC.hi
 lib/${PKGNAME}/imports/Data/Time/Clock/UTC.p_hi
 lib/${PKGNAME}/imports/Data/Time/Clock/UTCDiff.hi
 lib/${PKGNAME}/imports/Data/Time/Clock/UTCDiff.p_hi
+lib/${PKGNAME}/imports/Data/Time/Format.hi
+lib/${PKGNAME}/imports/Data/Time/Format.p_hi
+lib/${PKGNAME}/imports/Data/Time/Format/Parse.hi
+lib/${PKGNAME}/imports/Data/Time/Format/Parse.p_hi
 lib/${PKGNAME}/imports/Data/Time/LocalTime.hi
 lib/${PKGNAME}/imports/Data/Time/LocalTime.p_hi
-lib/${PKGNAME}/imports/Data/Time/LocalTime/Format.hi
-lib/${PKGNAME}/imports/Data/Time/LocalTime/Format.p_hi
 lib/${PKGNAME}/imports/Data/Time/LocalTime/LocalTime.hi
 lib/${PKGNAME}/imports/Data/Time/LocalTime/LocalTime.p_hi
 lib/${PKGNAME}/imports/Data/Time/LocalTime/TimeOfDay.hi
@@ -852,8 +879,6 @@ lib/${PKGNAME}/imports/Network/BSD.hi
 lib/${PKGNAME}/imports/Network/BSD.p_hi
 lib/${PKGNAME}/imports/Network/CGI.hi
 lib/${PKGNAME}/imports/Network/CGI.p_hi
-lib/${PKGNAME}/imports/Network/CGI/Compat.hi
-lib/${PKGNAME}/imports/Network/CGI/Compat.p_hi
 lib/${PKGNAME}/imports/Network/CGI/Cookie.hi
 lib/${PKGNAME}/imports/Network/CGI/Cookie.p_hi
 lib/${PKGNAME}/imports/Network/CGI/Monad.hi
@@ -878,8 +903,6 @@ lib/${PKGNAME}/imports/Random.hi
 lib/${PKGNAME}/imports/Random.p_hi
 lib/${PKGNAME}/imports/Ratio.hi
 lib/${PKGNAME}/imports/Ratio.p_hi
-lib/${PKGNAME}/imports/Setup.hi
-lib/${PKGNAME}/imports/Setup.p_hi
 lib/${PKGNAME}/imports/StablePtr.hi
 lib/${PKGNAME}/imports/StablePtr.p_hi
 lib/${PKGNAME}/imports/Storable.hi
@@ -904,6 +927,12 @@ 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/FilePath.hi
+lib/${PKGNAME}/imports/System/FilePath.p_hi
+lib/${PKGNAME}/imports/System/FilePath/Posix.hi
+lib/${PKGNAME}/imports/System/FilePath/Posix.p_hi
+lib/${PKGNAME}/imports/System/FilePath/Windows.hi
+lib/${PKGNAME}/imports/System/FilePath/Windows.p_hi
 lib/${PKGNAME}/imports/System/IO.hi
 lib/${PKGNAME}/imports/System/IO.p_hi
 lib/${PKGNAME}/imports/System/IO/Error.hi
@@ -1101,6 +1130,8 @@ lib/${PKGNAME}/include/HsNet.h
 lib/${PKGNAME}/include/HsNetworkConfig.h
 lib/${PKGNAME}/include/HsReadline.h
 lib/${PKGNAME}/include/HsReadlineConfig.h
+lib/${PKGNAME}/include/HsTime.h
+lib/${PKGNAME}/include/HsTimeConfig.h
 lib/${PKGNAME}/include/HsUnix.h
 lib/${PKGNAME}/include/HsUnixConfig.h
 lib/${PKGNAME}/include/InfoTables.h
@@ -1162,6 +1193,8 @@ lib/${PKGNAME}/libHScgi.a
 lib/${PKGNAME}/libHScgi_p.a
 lib/${PKGNAME}/libHSfgl.a
 lib/${PKGNAME}/libHSfgl_p.a
+lib/${PKGNAME}/libHSfilepath.a
+lib/${PKGNAME}/libHSfilepath_p.a
 lib/${PKGNAME}/libHSghc.a
 lib/${PKGNAME}/libHShaskell-src.a
 lib/${PKGNAME}/libHShaskell-src_p.a
@@ -1229,6 +1262,7 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/System/Posix
 @dirrm lib/${PKGNAME}/imports/System/Mem
 @dirrm lib/${PKGNAME}/imports/System/IO
+@dirrm lib/${PKGNAME}/imports/System/FilePath
 @dirrm lib/${PKGNAME}/imports/System/Directory
 @dirrm lib/${PKGNAME}/imports/System/Console
 @dirrm lib/${PKGNAME}/imports/System
@@ -1248,6 +1282,7 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Debug/QuickCheck
 @dirrm lib/${PKGNAME}/imports/Debug
 @dirrm lib/${PKGNAME}/imports/Data/Time/LocalTime
+@dirrm lib/${PKGNAME}/imports/Data/Time/Format
 @dirrm lib/${PKGNAME}/imports/Data/Time/Clock
 @dirrm lib/${PKGNAME}/imports/Data/Time/Calendar
 @dirrm lib/${PKGNAME}/imports/Data/Time
@@ -1264,7 +1299,13 @@ lib/${PKGNAME}/unlit
 @dirrm lib/${PKGNAME}/imports/Data/Array
 @dirrm lib/${PKGNAME}/imports/Data
 @dirrm lib/${PKGNAME}/imports/Control/Parallel
+@dirrm lib/${PKGNAME}/imports/Control/Monad/Writer
+@dirrm lib/${PKGNAME}/imports/Control/Monad/State
 @dirrm lib/${PKGNAME}/imports/Control/Monad/ST
+@dirrm lib/${PKGNAME}/imports/Control/Monad/Reader
+@dirrm lib/${PKGNAME}/imports/Control/Monad/RWS
+@dirrm lib/${PKGNAME}/imports/Control/Monad/Error
+@dirrm lib/${PKGNAME}/imports/Control/Monad/Cont
 @dirrm lib/${PKGNAME}/imports/Control/Monad
 @dirrm lib/${PKGNAME}/imports/Control/Concurrent/STM
 @dirrm lib/${PKGNAME}/imports/Control/Concurrent
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index 3bceb96261c..86e5ed403ec 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/03/24 17:57:19 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/04/29 22:12:02 kristerw Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GHC_BUILDLINK3_MK:=	${GHC_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	ghc
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc
 
 .if !empty(GHC_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.6
-BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.6
+BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.6.1
+BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.6.1
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc
 
 BUILDLINK_DEPMETHOD.ghc?=	build
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 549a14211f4..4ca0b218876 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/03/24 17:57:19 kristerw Exp $
+$NetBSD: distinfo,v 1.18 2007/04/29 22:12:02 kristerw Exp $
 
 SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
 RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@@ -6,12 +6,12 @@ Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes
 SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42
 RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38
 Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes
-SHA1 (ghc-6.6-src-extralibs.tar.bz2) = b94974e255165703d882bb522ec44c5bdc4b0aec
-RMD160 (ghc-6.6-src-extralibs.tar.bz2) = 63d87d02f42efc032c20de7394f3b29431fd8eed
-Size (ghc-6.6-src-extralibs.tar.bz2) = 2015443 bytes
-SHA1 (ghc-6.6-src.tar.bz2) = 9876dbc46ef22684c2cc95e8dce49b2a1f47017e
-RMD160 (ghc-6.6-src.tar.bz2) = 0d8d5cdde21e5ad86fba1023872be316316d14e7
-Size (ghc-6.6-src.tar.bz2) = 4345587 bytes
+SHA1 (ghc-6.6.1-src-extralibs.tar.bz2) = 1398f6c35191d52410a2e066b382635dff0d8d6d
+RMD160 (ghc-6.6.1-src-extralibs.tar.bz2) = 1c18c85d978c4b3369132e247c823aaa90ea8530
+Size (ghc-6.6.1-src-extralibs.tar.bz2) = 1928527 bytes
+SHA1 (ghc-6.6.1-src.tar.bz2) = eaa385f68ffe7806c4145e2944c3e4216d01f160
+RMD160 (ghc-6.6.1-src.tar.bz2) = 30cc43ad30b545228cb303b17be59d632856333e
+Size (ghc-6.6.1-src.tar.bz2) = 4340777 bytes
 SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63
 SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051
 SHA1 (patch-ac) = 07415eb0df840cb10e0d7c33c2dc365349b7e67a