Switch from libglut to freeglut and retire libglut. Libglut hasn't been

developed in years and has been dropped from the MESA 8.0 distribution.
Freeglut is a rewrite of glut and is actively developed and is used by
many linux distributions instead of libglut.

Bump all ports that directly depend on libglut because of the shlib version
change.

There are some extra items in this patch.

*) Because freeglut doesn't have the same dependancies as libglut, some ports
	need extra dependencies added to USE_XORG to make them build.
*) Mark graphics/f90gl broken, f90gl depends on a header that is only shipped
	with libglut.
*) Remove option for libglut/freeglut selection in games/cake, only freeglut
	remains now.
*) While here fix a png related build issue games/vegastrike.

Thanks to miwi for running the exp-run.

Approved by:	portmgr (miwi)

Collaboration with:	zeising@
Obtained from:	xorg-dev staging area.

28 files changed, 49 insertions, 38 deletions

diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index 9675746a71cc..a6c388d8ca0e 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		BillardGL
 PORTVERSION=		1.75
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		games
 MASTER_SITES=		SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
 
@@ -17,6 +17,7 @@ COMMENT=	OpenGL billiards simulator
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_GMAKE=	yes
+USE_XORG=	xmu xext x11 xi
 USE_GL=		gl glut
 
 post-patch:
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index afc3284f05ee..a89d9c9efafa 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knightcap
 PORTVERSION=	3.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.samba.org/pub/KnightCap/
 DISTNAME=	KnightCap-${PORTVERSION}
@@ -17,6 +17,7 @@ COMMENT=	Chess program with 3D interface for X Window System
 
 WRKSRC=		${WRKDIR}/Export
 
+USE_XORG=	xmu xt xext x11 xi
 USE_GL=		glut
 ALL_TARGET=	KnightCap
 
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index c1aceb4fd15e..8a69d571a7ad 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 943863503e44..f153410eec85 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubble-chains
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://bubble-chains.sintegrial.com/files/
 DISTNAME=	chains-${DISTVERSION}
diff --git a/games/cake/Makefile b/games/cake/Makefile
index 841a396dbb9c..3e8df7182280 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cake
 PORTVERSION=	2005.12.26
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.calodox.scene.org/morbac/cake/download/ \
 		${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/
@@ -29,15 +29,8 @@ WRKSRC=		${WRKDIR}/cake_src
 
 PLIST_FILES=	bin/cake
 
-OPTIONS=	FREEGLUT "Build with alternative GLUT library, FreeGLUT" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_FREEGLUT)
-LIB_DEPENDS=	glut.12:${PORTSDIR}/graphics/freeglut
-.else
+USE_XORG=	x11 xext xmu xt xi sm ice
 USE_GL=		glut
-.endif
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 post-patch: .SILENT
@@ -60,4 +53,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 5090d2bbb76e..3c51b12c75eb 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	construo
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	construo
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_XORG=	sm ice x11 xext xxf86vm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lGLU
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
 
 OPTIONS=	GLUT "Use glut" on
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 6d06be2031ba..12dd3931a43c 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	crack-attack
 PORTVERSION=	1.1.14
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	OpenGL game based on Super Nintendo classic Tetris Attack
 
+USE_XORG=	x11 xi xmu sm ice
 USE_GL=		glut
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index ccbe21c8d915..4aee3585bdae 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cultivation
 PORTVERSION=	8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
@@ -17,6 +17,7 @@ COMMENT=	Unique game of conflict and cooperation in a gardening community
 
 LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
 
+USE_XORG=	x11 xi xext xmu
 USE_GL=		glut
 USE_GMAKE=	yes
 
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index dae4d220be1c..39d24bd57ceb 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	d2x
 PORTVERSION=	0.2.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://offload2.icculus.org:9090/d2x/src/
 
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 76d62661088d..5c56b77add3e 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod \
 		png15:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
+USE_XORG=	xmu
 USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"
 
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 94cd8dd98666..14f871edf143 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		etracer
 PORTVERSION=		0.4
-PORTREVISION=	7
+PORTREVISION=		8
 CATEGORIES=		games
 MASTER_SITES=		SF/extremetuxracer/extreme-tuxracer/${PORTVERSION}
 DISTNAME=		extremetuxracer-${PORTVERSION}
@@ -19,6 +19,7 @@ LIB_DEPENDS=		png15:${PORTSDIR}/graphics/png \
 			freetype.9:${PORTSDIR}/print/freetype2
 
 USE_SDL=		mixer sdl
+USE_XORG=		x11 xi xext xmu xt
 USE_GL=			gl glu glut
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 70176f4b5d19..04bc4c2b5f9c 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foobillard
 PORTVERSION=	3.0a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index ce06650928d6..a4c78102494d 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/GL-117%20Source
 
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 83c78cf25bd6..9618b9dbe587 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/games/glsfcave/Makefile b/games/glsfcave/Makefile
index b9a40935afeb..9e0bc954ab57 100644
--- a/games/glsfcave/Makefile
+++ b/games/glsfcave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glsfcave
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 335e07d81df7..903f87fb7c09 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index 29b8b1d2015d..9955e1f6cef6 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kiki
 PORTVERSION=	1.0.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 EXTRACT_SUFX=	-src.tgz
diff --git a/games/netherearth/Makefile b/games/netherearth/Makefile
index e5411f766cc1..728cbd1c52f8 100644
--- a/games/netherearth/Makefile
+++ b/games/netherearth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netherearth
 PORTVERSION=	0.51
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/
 
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 86d54102aafc..a4158cc3ce1d 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.5.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \
 		SF/${PORTNAME}/mappack/nexmappack_r2:mappack
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 477bb7425bb6..d74e9a4da594 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nighthawk
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index 1260cedde9d8..e1d31ec70601 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quetoo
 PORTVERSION=	0.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
 		http://tastyspleen.net/~jdolan/ \
diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 362ad2b00434..7fd6962796db 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stormbaancoureur
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index e4525314c190..302059d68658 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	supertuxkart
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.bz2
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 2bced7fb5141..b7245e602553 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torcs
 DISTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/all-in-one/${PORTVERSION}
 
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index 8f8fcc549250..5bbb65261c05 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tux_aqfh
 PORTVERSION=	1.0.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxaqfh/tuxaqfh/${PORTVERSION}-classic
 
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index df7671a70f9c..736c6d1ef196 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vamos
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -20,6 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_OPENAL=	al alut
+USE_XORG=	sm ice x11 xi xext xmu
 USE_GL=		glut
 USE_SDL=	sdl
 USE_GMAKE=	yes
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index d0b851be1b51..d76a9818fd50 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vegastrike
 PORTVERSION=	0.5.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	vegastrike-source-${PORTVERSION}
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_SDL=	sdl
+USE_XORG=	sm ice xi x11 xext xrender xinerama xi xrandr xcursor \
+		xcomposite xdamage xfixes 
 USE_GL=		gl glu glut
 USE_GNOME=	gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/games/vegastrike/files/patch-src-gfx-vsimage.cpp b/games/vegastrike/files/patch-src-gfx-vsimage.cpp
index 7ce8c9d06513..75a529293995 100644
--- a/games/vegastrike/files/patch-src-gfx-vsimage.cpp
+++ b/games/vegastrike/files/patch-src-gfx-vsimage.cpp
@@ -1,5 +1,5 @@
 --- src/gfx/vsimage.cpp.orig	2008-04-24 14:12:37.000000000 +0200
-+++ src/gfx/vsimage.cpp	2010-03-31 16:39:55.000000000 +0200
++++ src/gfx/vsimage.cpp	2012-06-15 21:20:32.000000000 +0200
 @@ -147,7 +147,7 @@
  	unsigned char sig[8];
  	file->Begin();
@@ -18,3 +18,12 @@
  
  	png_set_expand (png_ptr);
  	png_read_update_info (png_ptr,info_ptr);
+@@ -865,7 +865,7 @@
+     png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+     return BadFormat;
+   }
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf( png_ptr ))) {
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     return BadFormat;
+   }