3 files changed, 110 insertions, 15 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index d9c45226fe40..c348727f808d 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	6.4
-PORTREVISION=	2
+PORTVERSION=	6.4.1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot
 PATCH_SITES=	http://www-i2.informatik.rwth-aachen.de/~stolz/FreeBSD/
-PATCHFILES=	patch-ghc-libraries_GLUT.diff patch-ghc-libraries_OpenAL.diff
+PATCHFILES=	patch-ghc-libraries_OpenAL.diff
 
 ONLY_FOR_ARCHS=	i386
 
@@ -36,10 +35,11 @@ LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
 .endif
 
-WANT_AUTOCONF_VER=259	# Need this to regenerate patched configure in GLUT
+WANT_AUTOCONF_VER=259	# Need this to regenerate patched configure in OpenAL
 LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4 \
 		glut.3:${PORTSDIR}/graphics/libglut \
-		openal.0:${PORTSDIR}/audio/openal
+		openal.0:${PORTSDIR}/audio/openal \
+		readline.5:${PORTSDIR}/devel/readline
 
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	A Compiler for the functional language Haskell
@@ -62,7 +62,8 @@ PLIST_SUB+=	PROFILE=""
 BOOT_DIR=	${WRKDIR}/ghc-${PORTVERSION}-boot
 BOOT_GHC=	${BOOT_DIR}/bin/i386-unknown-freebsd/ghc-${PORTVERSION}
 
-CONFIGURE_ARGS=	--with-ghc=${BOOT_GHC}  --with-gcc=${CC}
+CONFIGURE_ARGS=	--with-ghc=${BOOT_GHC}  --with-gcc=${CC} \
+		--enable-openal
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 # libgmp:
@@ -87,7 +88,6 @@ post-patch:
 		${WRKSRC}/ghc/rts/package.conf.in
 
 pre-configure:
-	@(cd ${WRKSRC}/libraries/GLUT && ${AUTOCONF})
 	@(cd ${WRKSRC}/libraries/OpenAL && ${AUTOCONF})
 	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 	@(cd ${BOOT_DIR} && ${MAKE} in-place)
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 3f2f7ffd0032..49817f1891b7 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,10 +1,8 @@
-MD5 (ghc-6.4-src.tar.bz2) = 45ea4e15f135698feb88d12c5000aaf8
-SIZE (ghc-6.4-src.tar.bz2) = 6899502
-MD5 (ghc-6.4-i386-unknown-freebsd5-boot.tar.bz2) = a242bb7f10daca29c449793a94de3a8c
-SIZE (ghc-6.4-i386-unknown-freebsd5-boot.tar.bz2) = 6278695
-MD5 (ghc-6.4-i386-unknown-freebsd-boot.tar.bz2) = 89466b400e0bad9c6fb62c25efa90892
-SIZE (ghc-6.4-i386-unknown-freebsd-boot.tar.bz2) = 6307768
-MD5 (patch-ghc-libraries_GLUT.diff) = db88b17120da91e9d3d32c564e848bf5
-SIZE (patch-ghc-libraries_GLUT.diff) = 1012
+MD5 (ghc-6.4.1-src.tar.bz2) = fd289bc7c3afa272ff831a71a50b5b00
+SIZE (ghc-6.4.1-src.tar.bz2) = 6826112
+MD5 (ghc-6.4.1-i386-unknown-freebsd-boot.tar.bz2) = 8b2c7ff7610286e6fb16d27943c3f710
+SIZE (ghc-6.4.1-i386-unknown-freebsd-boot.tar.bz2) = 6628698
+MD5 (ghc-6.4.1-i386-unknown-freebsd5-boot.tar.bz2) = a31cc05602e9b64a82fdf7fbd7ca6d1d
+SIZE (ghc-6.4.1-i386-unknown-freebsd5-boot.tar.bz2) = 6397690
 MD5 (patch-ghc-libraries_OpenAL.diff) = 327224640f535887d3b42001ad2e4f94
 SIZE (patch-ghc-libraries_OpenAL.diff) = 683
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index b280a8deeea9..55e649a32ef1 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -14,11 +14,14 @@ bin/stat2resid
 lib/ghc-%%GHC_VERSION%%/HSCabal.o
 lib/ghc-%%GHC_VERSION%%/HSGLUT.o
 lib/ghc-%%GHC_VERSION%%/HSGLUT_cbits.o
+lib/ghc-%%GHC_VERSION%%/HSHGL.o
 lib/ghc-%%GHC_VERSION%%/HSHUnit.o
 lib/ghc-%%GHC_VERSION%%/HSOpenAL.o
 lib/ghc-%%GHC_VERSION%%/HSOpenGL.o
 lib/ghc-%%GHC_VERSION%%/HSOpenGL_cbits.o
 lib/ghc-%%GHC_VERSION%%/HSQuickCheck.o
+lib/ghc-%%GHC_VERSION%%/HSX11.o
+lib/ghc-%%GHC_VERSION%%/HSX11_cbits.o
 lib/ghc-%%GHC_VERSION%%/HSbase.o
 lib/ghc-%%GHC_VERSION%%/HSbase_cbits.o
 lib/ghc-%%GHC_VERSION%%/HSconcurrent.o
@@ -597,6 +600,86 @@ lib/ghc-%%GHC_VERSION%%/imports/GHC/Weak.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/GHC/Weak.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/GHC/Word.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/GHC/Word.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Core.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Core.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Brush.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Brush.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Font.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Font.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Monad.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Monad.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Pen.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Pen.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Picture.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Picture.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Region.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Region.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Text.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw/Text.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Draw.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Draw.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Event.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Event.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Events.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Events.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Flag.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Flag.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Types.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Utilities.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals/Utilities.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Key.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Key.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Run.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Run.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Units.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Units.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Utils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Utils.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Window.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Window.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/DC.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/DC.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Display.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Display.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Timer.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Timer.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Types.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Window.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11/Window.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/SOE.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/SOE.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Types.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Atom.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Atom.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Color.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Color.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Context.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Context.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Display.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Display.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Event.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Event.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Font.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Font.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Misc.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Misc.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Region.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Region.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Screen.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Screen.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Types.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Window.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib/Window.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/IO.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/IO.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Int.hi
@@ -1209,18 +1292,23 @@ lib/ghc-%%GHC_VERSION%%/include/HsOpenGL.h
 lib/ghc-%%GHC_VERSION%%/include/HsOpenGLExt.h
 lib/ghc-%%GHC_VERSION%%/include/HsOpenGLTypes.h
 lib/ghc-%%GHC_VERSION%%/include/HsUnixConfig.h
+lib/ghc-%%GHC_VERSION%%/include/HsX11Config.h
+lib/ghc-%%GHC_VERSION%%/include/HsXlib.h
 lib/ghc-%%GHC_VERSION%%/include/Liveness.h
 lib/ghc-%%GHC_VERSION%%/include/RtsConfig.h
 lib/ghc-%%GHC_VERSION%%/include/RtsExternal.h
 lib/ghc-%%GHC_VERSION%%/include/RtsMessages.h
 lib/ghc-%%GHC_VERSION%%/include/STM.h
 lib/ghc-%%GHC_VERSION%%/include/Storage.h
+lib/ghc-%%GHC_VERSION%%/include/WCsubst.h
 lib/ghc-%%GHC_VERSION%%/include/ghcautoconf.h
 lib/ghc-%%GHC_VERSION%%/include/ghcconfig.h
 lib/ghc-%%GHC_VERSION%%/include/ghcplatform.h
 lib/ghc-%%GHC_VERSION%%/include/runProcess.h
 lib/ghc-%%GHC_VERSION%%/libHSCabal.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSCabal_p.a
+lib/ghc-%%GHC_VERSION%%/libHSHGL.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSHGL_p.a
 lib/ghc-%%GHC_VERSION%%/libHSHUnit.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSHUnit_p.a
 lib/ghc-%%GHC_VERSION%%/libHSOpenAL.a
@@ -1233,6 +1321,9 @@ lib/ghc-%%GHC_VERSION%%/libHSfgl.a
 lib/ghc-%%GHC_VERSION%%/libHSGLUT.a
 lib/ghc-%%GHC_VERSION%%/libHSGLUT_cbits.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSGLUT_p.a
+lib/ghc-%%GHC_VERSION%%/libHSX11.a
+lib/ghc-%%GHC_VERSION%%/libHSX11_cbits.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSX11_p.a
 lib/ghc-%%GHC_VERSION%%/libHSmtl.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSmtl_p.a
 lib/ghc-%%GHC_VERSION%%/libHSstm.a
@@ -1369,6 +1460,8 @@ lib/ghc-%%GHC_VERSION%%/unlit
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Language
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11/Xlib
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/X11
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GLU
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GL/Texturing
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GL/PixelRectangles
@@ -1378,6 +1471,10 @@ lib/ghc-%%GHC_VERSION%%/unlit
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/X11
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Internals
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL/Draw
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/HGL
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/GHC
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Foreign/Marshal