Add off-site patches partially obtained from CVS to enable libglut (fixes to include-path)

and OpenAL (needs -pthread). This requires running $AUTOCONF after patching the
autoconf-files. Bump PORTREVISION.

Requested by:	Ron de Bruijn
Approved by:	maintainer (Haskell cabal)

3 files changed, 120 insertions, 11 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 00c9fd7e5e40..0c5c68b08ee8 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -6,10 +6,12 @@
 
 PORTNAME=	ghc
 PORTVERSION=	6.4
-PORTREVISION=	1
+PORTREVISION=	2
 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
 
 ONLY_FOR_ARCHS=	i386
 
@@ -18,6 +20,9 @@ BOOT_DIST=	ghc-${PORTVERSION}-i386-unknown-freebsd-boot${EXTRACT_SUFX}:boot
 BOOT_DIST5=	ghc-${PORTVERSION}-i386-unknown-freebsd5-boot${EXTRACT_SUFX}:boot
 
 USE_BZIP2=	yes
+
+OPTIONS=	PROFILE "Compile for profiling as well" on
+
 .include <bsd.port.pre.mk>
 
 DISTFILES=	${SRC_DIST}
@@ -28,7 +33,10 @@ DISTFILES+=	${BOOT_DIST}
 DISTFILES+=	${BOOT_DIST5}
 .endif
 
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+WANT_AUTOCONF_VER=259	# Need this to regenerate patched configure in GLUT
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
+		glut.3:${PORTSDIR}/graphics/libglut \
+		openal.0:${PORTSDIR}/audio/openal
 
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	A Compiler for the functional language Haskell
@@ -66,15 +74,6 @@ MAKE_ENV+=	TMPDIR=${TMPDIR}
 ALL_TARGET=	stage1
 MAKE_ENV += stage=1
 
-pre-everything::
-.if !defined(WITHOUT_PROFILE)
-	@${ECHO_CMD} "To build GHC without profiling libraries,"
-	@${ECHO_CMD} "hit Ctrl-C now and restart with 'make"
-	@${ECHO_CMD} "WITHOUT_PROFILE=YES'."
-.else
-	@${ECHO_CMD} "Building GHC without profiling libraries."
-.endif
-
 .if defined(WITHOUT_PROFILE)
 post-extract:
 	@${ECHO} >>${WRKSRC}/mk/build.mk GhcLibWays=
@@ -85,6 +84,8 @@ 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 c3005d52a667..3f2f7ffd0032 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -4,3 +4,7 @@ MD5 (ghc-6.4-i386-unknown-freebsd5-boot.tar.bz2) = a242bb7f10daca29c449793a94de3
 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 (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 ec81271643ec..b280a8deeea9 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -12,7 +12,10 @@ bin/runghc
 bin/runhaskell
 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%%/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
@@ -1070,6 +1073,48 @@ lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GLU.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GLU.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Begin.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Begin.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Global.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Global.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Registration.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Registration.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Window.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Callbacks/Window.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Colormap.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Colormap.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Constants.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Constants.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Debugging.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Debugging.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/DeviceControl.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/DeviceControl.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Extensions.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Extensions.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Fonts.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Fonts.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/GameMode.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/GameMode.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Initialization.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Initialization.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Menu.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Menu.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Objects.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Objects.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Overlay.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Overlay.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/QueryUtils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/QueryUtils.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/State.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/State.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Types.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Window.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Graphics/UI/GLUT/Window.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH/Lib.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH/Lib.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH/Ppr.hi
@@ -1080,6 +1125,48 @@ lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH/Syntax.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH/Syntax.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/ALboolean.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/ALboolean.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/BasicTypes.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/BasicTypes.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Buffer.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Buffer.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Format.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Format.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Listener.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Listener.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/PeekPoke.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/PeekPoke.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/QueryUtils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/QueryUtils.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Source.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL/Source.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/BasicTypes.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/BasicTypes.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Context.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Context.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Device.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Device.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Errors.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Errors.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Extensions.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Extensions.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Queries.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC/Queries.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/Exception.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/Exception.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/Initialization.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/Initialization.p_hi
+lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/WAV.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT/WAV.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/System/Directory/Internals.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/imports/System/Directory/Internals.p_hi
 lib/ghc-%%GHC_VERSION%%/imports/System/Posix/Error.hi
@@ -1113,7 +1200,11 @@ lib/ghc-%%GHC_VERSION%%/imports/Text/Printf.hi
 lib/ghc-%%GHC_VERSION%%/include/Cmm.h
 lib/ghc-%%GHC_VERSION%%/include/GHCConstants.h
 lib/ghc-%%GHC_VERSION%%/include/HsBaseConfig.h
+lib/ghc-%%GHC_VERSION%%/include/HsGLUT.h
+lib/ghc-%%GHC_VERSION%%/include/HsGLUTConfig.h
+lib/ghc-%%GHC_VERSION%%/include/HsGLUTExt.h
 lib/ghc-%%GHC_VERSION%%/include/HsNetworkConfig.h
+lib/ghc-%%GHC_VERSION%%/include/HsOpenAL.h
 lib/ghc-%%GHC_VERSION%%/include/HsOpenGL.h
 lib/ghc-%%GHC_VERSION%%/include/HsOpenGLExt.h
 lib/ghc-%%GHC_VERSION%%/include/HsOpenGLTypes.h
@@ -1132,11 +1223,16 @@ lib/ghc-%%GHC_VERSION%%/libHSCabal.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSCabal_p.a
 lib/ghc-%%GHC_VERSION%%/libHSHUnit.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSHUnit_p.a
+lib/ghc-%%GHC_VERSION%%/libHSOpenAL.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSOpenAL_p.a
 lib/ghc-%%GHC_VERSION%%/libHSOpenGL.a
 lib/ghc-%%GHC_VERSION%%/libHSOpenGL_cbits.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSOpenGL_p.a
 lib/ghc-%%GHC_VERSION%%/libHSfgl.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSfgl_p.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%%/libHSmtl.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSmtl_p.a
 lib/ghc-%%GHC_VERSION%%/libHSstm.a
@@ -1264,6 +1360,11 @@ lib/ghc-%%GHC_VERSION%%/unlit
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/System/Directory
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/System/Console
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/System
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALUT
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/ALC
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL/AL
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Sound/OpenAL
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/Sound
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Network
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell/TH
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Language/Haskell
@@ -1274,6 +1375,9 @@ lib/ghc-%%GHC_VERSION%%/unlit
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL/GL
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering/OpenGL
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Graphics/Rendering
+@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
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/GHC
 @dirrm lib/ghc-%%GHC_VERSION%%/imports/Foreign/Marshal