Update to 6.4.2

This build uses an unthreaded RTS, please see the GHC mailing lists for
details and report any problems you observe (eg. non-termination/segfaults in
compiled binaries).

Approved by: cabal

4 files changed, 33 insertions, 23 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 653bade60195..3469cb1cfdc7 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	6.4.1
-PORTREVISION=	1
+PORTVERSION=	6.4.2
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot
@@ -16,8 +15,8 @@ PATCHFILES=	patch-ghc-libraries_OpenAL.diff
 ONLY_FOR_ARCHS=	i386
 
 SRC_DIST=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
-BOOT_DIST=	ghc-${PORTVERSION}-i386-unknown-freebsd-boot${EXTRACT_SUFX}:boot
-BOOT_DIST5=	ghc-${PORTVERSION}-i386-unknown-freebsd5-boot${EXTRACT_SUFX}:boot
+BOOT_DIST4=	ghc-${PORTVERSION}-i386-unknown-freebsd4-boot${EXTRACT_SUFX}:boot
+BOOT_DIST=	ghc-${PORTVERSION}-i386-unknown-freebsd6-boot${EXTRACT_SUFX}:boot
 
 USE_BZIP2=	yes
 
@@ -28,9 +27,10 @@ OPTIONS=	PROFILE "Compile for profiling as well" on
 DISTFILES=	${SRC_DIST}
 
 .if ${OSVERSION} < 500000
-DISTFILES+=	${BOOT_DIST}
+DISTFILES+=	${BOOT_DIST4}
+IGNORE=		unsupported at the moment
 .else
-DISTFILES+=	${BOOT_DIST5}
+DISTFILES+=	${BOOT_DIST}
 .if ${OSVERSION} >= 600000
 LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
@@ -108,17 +108,9 @@ post-patch:
 		${WRKSRC}/ghc/rts/package.conf.in
 
 pre-configure:
-	@(cd ${WRKSRC}/libraries/OpenAL && ${AUTOCONF})
 	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 	@(cd ${BOOT_DIR} && ${MAKE} in-place)
 
-post-configure:
-.if defined(WITHOUT_X11)
-.for d in GLUT HGL OpenGL X11
-	${REINPLACE_CMD} -e 's/^\(.*BUILD_PACKAGE\)=yes/\1=no/' ${WRKSRC}/libraries/${d}/config.mk
-.endfor
-.endif
-
 pre-build:
 	@${MKDIR} ${TMPDIR}
 
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 026f8125d027..fee28913dc62 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,12 +1,9 @@
-MD5 (ghc-6.4.1-src.tar.bz2) = fd289bc7c3afa272ff831a71a50b5b00
-SHA256 (ghc-6.4.1-src.tar.bz2) = 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36
-SIZE (ghc-6.4.1-src.tar.bz2) = 6826112
-MD5 (ghc-6.4.1-i386-unknown-freebsd5-boot.tar.bz2) = b2fdcac54596d518ca46c6612287c5a9
-SHA256 (ghc-6.4.1-i386-unknown-freebsd5-boot.tar.bz2) = 85bf2b800c019d40b841f379d312aff43f99187e434a91ccd5729b9d32542548
-SIZE (ghc-6.4.1-i386-unknown-freebsd5-boot.tar.bz2) = 6697437
+MD5 (ghc-6.4.2-src.tar.bz2) = a394bf14e94c3bca5507d568fcc03375
+SHA256 (ghc-6.4.2-src.tar.bz2) = d517e52e0204a077c54cda11b67bf9b6ac3daa47ac7bccf1561afc7c572e6be0
+SIZE (ghc-6.4.2-src.tar.bz2) = 6954958
+MD5 (ghc-6.4.2-i386-unknown-freebsd6-boot.tar.bz2) = a13232e025aec4a843a7601597bb866e
+SHA256 (ghc-6.4.2-i386-unknown-freebsd6-boot.tar.bz2) = d2b545b6c782adf26d71ad700ff1ac32b95d2b3832d7d00117372aa98d4245e3
+SIZE (ghc-6.4.2-i386-unknown-freebsd6-boot.tar.bz2) = 6769904
 MD5 (patch-ghc-libraries_OpenAL.diff) = 327224640f535887d3b42001ad2e4f94
 SHA256 (patch-ghc-libraries_OpenAL.diff) = c89c43bf74249431910cd0b47a99a8b29ff77a9a446bd19b36dadac2754e6b20
 SIZE (patch-ghc-libraries_OpenAL.diff) = 683
-MD5 (ghc-6.4.1-i386-unknown-freebsd-boot.tar.bz2) = 8b2c7ff7610286e6fb16d27943c3f710
-SHA256 (ghc-6.4.1-i386-unknown-freebsd-boot.tar.bz2) = 2959b3f019506fa90cbc110d2d516ca46e9d64e0bb24c13a4d09c81d90196fca
-SIZE (ghc-6.4.1-i386-unknown-freebsd-boot.tar.bz2) = 6628698
diff --git a/lang/ghc/files/patch-ghc_compiler_Makefile b/lang/ghc/files/patch-ghc_compiler_Makefile
new file mode 100644
index 000000000000..6d52ab8bedc9
--- /dev/null
+++ b/lang/ghc/files/patch-ghc_compiler_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ghc/compiler/Makefile.orig
++++ ghc/compiler/Makefile
+@@ -395,7 +395,7 @@
+ SRC_HC_OPTS += -DGHCI -package template-haskell
+ 
+ # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
+-SRC_HC_OPTS += -threaded
++# SRC_HC_OPTS += -threaded
+ 
+ ALL_DIRS += ghci
+ 
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index 8f877be31145..7e2da43efea2 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -686,6 +686,8 @@ lib/ghc-%%GHC_VERSION%%/imports/Int.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Int.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Ix.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Ix.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/Extension.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/Extension.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/Lexer.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/Lexer.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/ParseMonad.hi
@@ -950,6 +952,8 @@ lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compat/RawSystem.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compat/RawSystem.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compat/ReadP.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compat/ReadP.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compiler.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Compiler.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/Extension.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Extension.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/GetOpt.hi
@@ -970,6 +974,8 @@ lib/ghc-%%GHC_VERSION%%/imports/Distribution/PreProcess/Unlit.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/PreProcess/Unlit.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/PreProcess.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/PreProcess.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Distribution/Program.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Program.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/Setup.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Distribution/Setup.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Distribution/Simple/Build.hi
@@ -1416,6 +1422,7 @@ lib/ghc-%%GHC_VERSION%%/libHSrts.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSrts_p.a
 lib/ghc-%%GHC_VERSION%%/libHSrts_debug.a
 lib/ghc-%%GHC_VERSION%%/libHSrts_thr.a
+lib/ghc-%%GHC_VERSION%%/libHSrts_thr_debug.a
 lib/ghc-%%GHC_VERSION%%/libHSrts_thr_p.a
 lib/ghc-%%GHC_VERSION%%/libHStext.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHStext_p.a