- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump

  port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
  with GHC 6.10.4

PR:		ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
   		ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
   		ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
   		ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
   		ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
   		ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
   		ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
   		ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
   		ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
   		ports/137107, ports/137108, ports/137109, ports/137110, ports/137111

Submitted by:	Jacula Modyun (jacula (at) gmail (dot) com),
             	Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by:	wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by:	tabthorpe (mentor), respective maintainers

7 files changed, 53 insertions, 19 deletions

diff --git a/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure b/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure
new file mode 100644
index 000000000000..02d2bf9963fc
--- /dev/null
+++ b/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure
@@ -0,0 +1,11 @@
+--- ../ghc-6.10.4-boot/configure.orig
++++ ../ghc-6.10.4-boot/configure
+@@ -1989,6 +1989,8 @@
+         TargetPlatform=x86_64-unknown-linux;;
+ x86_64-*-freebsd*)
+ 	TargetPlatform=x86_64-unknown-freebsd;;
++amd64-*-freebsd*)
++	TargetPlatform=x86_64-unknown-freebsd;;
+ x86_64-*-openbsd*)
+ 	TargetPlatform=x86_64-unknown-openbsd;;
+ x86_64-*-netbsd*)
diff --git a/lang/ghc/files/patch-.._ghc-6.10.4-boot_rts_package.conf.in b/lang/ghc/files/patch-.._ghc-6.10.4-boot_rts_package.conf.in
new file mode 100644
index 000000000000..428014e57ff5
--- /dev/null
+++ b/lang/ghc/files/patch-.._ghc-6.10.4-boot_rts_package.conf.in
@@ -0,0 +1,11 @@
+--- ../ghc-6.10.4-boot/rts/package.conf.in.orig	2009-07-14 19:10:52.000000000 +0200
++++ ../ghc-6.10.4-boot/rts/package.conf.in	2009-08-13 22:09:35.000000000 +0200
+@@ -156,6 +156,8 @@
+ 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
+ #endif
+ 
++	 , "-L%%LOCALBASE%%/lib"
++
+ /*  Pick up static libraries in preference over dynamic if in earlier search
+  *  path.  This is important to use the static gmp in preference on Mac OS.
+  *  The used option is specific to the Darwin linker.
diff --git a/lang/ghc/files/patch-ghc-rts-package.conf.in b/lang/ghc/files/patch-ghc-rts-package.conf.in
deleted file mode 100644
index 2c5509016e2c..000000000000
--- a/lang/ghc/files/patch-ghc-rts-package.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- rts/package.conf.in.orig	2008-06-16 19:27:16.000000000 +0200
-+++ rts/package.conf.in	2008-06-21 21:46:49.000000000 +0200
-@@ -144,6 +144,7 @@
-          , "-u", "base_GHCziIOBase_NestedAtomically_closure"
-          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
- #endif
-+         , "-L/usr/local/lib"
- 
- #ifdef LEADING_UNDERSCORE
- 	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
diff --git a/lang/ghc/files/patch-libraries_Makefile b/lang/ghc/files/patch-libraries_Makefile
new file mode 100644
index 000000000000..5d5e84747f92
--- /dev/null
+++ b/lang/ghc/files/patch-libraries_Makefile
@@ -0,0 +1,11 @@
+--- libraries/Makefile.orig	2009-07-14 19:10:53.000000000 +0200
++++ libraries/Makefile	2009-08-14 02:48:44.000000000 +0200
+@@ -153,7 +153,7 @@
+ 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
+-	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=${BSD_PATH_TO_HSC2HS} --package-db=$(HERE_ABS)/$@.tmp --extra-include-dirs=%%LOCALBASE%%/include --extra-lib-dirs=%%LOCALBASE%%/lib
+ 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	mv $@.tmp $@
diff --git a/lang/ghc/files/patch-rts_package.conf.in b/lang/ghc/files/patch-rts_package.conf.in
new file mode 100644
index 000000000000..464064005f54
--- /dev/null
+++ b/lang/ghc/files/patch-rts_package.conf.in
@@ -0,0 +1,11 @@
+--- rts/package.conf.in.orig	2009-07-14 19:10:52.000000000 +0200
++++ rts/package.conf.in	2009-08-13 22:09:10.000000000 +0200
+@@ -156,6 +156,8 @@
+ 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
+ #endif
+ 
++	 , "-L%%LOCALBASE%%/lib"
++
+ /*  Pick up static libraries in preference over dynamic if in earlier search
+  *  path.  This is important to use the static gmp in preference on Mac OS.
+  *  The used option is specific to the Darwin linker.
diff --git a/lang/ghc/files/pkg-message.haddock.in b/lang/ghc/files/pkg-message.haddock.in
deleted file mode 100644
index e5d15a09244d..000000000000
--- a/lang/ghc/files/pkg-message.haddock.in
+++ /dev/null
@@ -1,9 +0,0 @@
-===============================================================
-
-  WARNING: Haddock doesn't like swimming in circles, so can't
-  handle mutually recursive modules currently, then the
-  documentation for the HSghc libraries isn't been compiled
-  and the paths haddock-interfaces and haddock-html about
-  ghc are fake (you can view ghc-pkg describe ghc).
-
-===============================================================
diff --git a/lang/ghc/files/testsuite.sh.in b/lang/ghc/files/testsuite.sh.in
new file mode 100644
index 000000000000..5c221e5e1b67
--- /dev/null
+++ b/lang/ghc/files/testsuite.sh.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Candy exit with Ctrl+C
+trap 'echo -e "\a"; echo -e "WoW! Bye.\n"; exit 2' 2
+
+sumtest="%%WRKDIR%%/sumtest.txt"
+testdir="%%WRKDIR%%/testsuite-%%GHC_VERSION%%/tests/ghc-regress"
+
+%%GMAKE%% -C ${testdir} EXTRA_RUNTEST_OPTS="--output-summary=${sumtest}" TEST_HC="%%PREFIX%%/bin/ghc" fast || echo -e "\aThe testsuite failed"