- Update X.org ports to 7.4+ (few ports are more recent than the katamari).

- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).

64 files changed, 86 insertions, 86 deletions

diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index 08e6092a1b8b..1433f32c980e 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		BillardGL
 PORTVERSION=		1.75
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	billardgl
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 341d83e854a2..afc3284f05ee 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knightcap
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.samba.org/pub/KnightCap/
 DISTNAME=	KnightCap-${PORTVERSION}
@@ -15,11 +15,9 @@ DISTNAME=	KnightCap-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chess program with 3D interface for X Window System
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 WRKSRC=		${WRKDIR}/Export
 
-USE_GL=		yes
+USE_GL=		glut
 ALL_TARGET=	KnightCap
 
 DOCSDIR=	${PREFIX}/share/doc/KnightCap
diff --git a/games/actx/Makefile b/games/actx/Makefile
index a60e5e474a8f..ab953e809f6d 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	actx
 PORTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/ActX/
 
diff --git a/games/airrox/Makefile b/games/airrox/Makefile
index 8cb0d9b49dda..80e3d3afe5b3 100644
--- a/games/airrox/Makefile
+++ b/games/airrox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	airrox
 PORTVERSION=	0.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-0.04
@@ -15,11 +15,9 @@ DISTNAME=	${PORTNAME}-0.04
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	An 3D Air Hockey, which uses SDL & OpenGL
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_GMAKE=	yes
 USE_SDL=	mixer net sdl
-USE_GL=		yes
+USE_GL=		glut
 REINPLACE_ARGS=	-i ''
 ALL_TARGET=	linux
 WRKSRC=		${WRKDIR}/${PORTNAME}/source
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index f4da14418e87..14ac1de581be 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index f48ab6f9cc5c..085d6161eec7 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		brutalchess
 PORTVERSION=		0.5.2
-PORTREVISION=	3
+PORTREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ MAINTAINER=		gustau.perez@gmail.com
 COMMENT=		Nice looking OpenGL chess game
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XORG=	x11
+USE_XORG=		x11 xext xt xmu xi
 
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool:15
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index 5c0a78d384f3..769a65f7043f 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	burrtools
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -19,6 +20,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		xmlwrapp.5:${PORTSDIR}/textproc/xmlwrapp
 
 USE_GL=		yes
+USE_XORG=	x11 xt xext xmu xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/cake/Makefile b/games/cake/Makefile
index b6ec34866145..d115b3fd54fe 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cake
 PORTVERSION=	2005.12.26
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.calodox.scene.org/morbac/cake/download/ \
 		${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/
@@ -36,7 +36,7 @@ OPTIONS=	FREEGLUT "Build with alternative GLUT library, FreeGLUT" off
 .if defined(WITH_FREEGLUT)
 LIB_DEPENDS=	glut.11:${PORTSDIR}/graphics/freeglut
 .else
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glut
 .endif
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile
index 7869f625347e..742366e05621 100644
--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	connectfive
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/connectfive
 DISTNAME=	connectFive
@@ -22,6 +22,7 @@ ALL_TARGET=	default
 
 USE_SDL=	sdl
 USE_GL=		gl
+USE_XORG=	xmu xext x11
 USE_GMAKE=	yes
 
 WRKSRC=	${WRKDIR}/connectFive
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 02bb2fc4ac97..f074c8819086 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	construo
 PORTVERSION=	0.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	construo
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index b79db21a9118..7ec5e3ac47c0 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	crack-attack
 PORTVERSION=	1.1.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index a0f268f3ad4c..5bf4ea8d32c6 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crossfire
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		ftp://ftp.real-time.com/pub/games/crossfire/
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index 304b8865993e..097a3da05b8f 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cultivation
 PORTVERSION=	8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
@@ -14,9 +15,9 @@ DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Unique game of conflict and cooperation in a gardening community
 
-LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio \
-		glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
 
+USE_GL=		glut
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/game2
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 678054ab5d16..214a7c88ab88 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	d2x
 PORTVERSION=	0.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/d2x/src/
 
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 01d1dad928e3..ab622fef412a 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assemble given shapes from primitives
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
-		mikmod.2:${PORTSDIR}/audio/libmikmod \
+LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
-USE_GL=		gl
+USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"
 
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index d9e2fdbba2f4..4ee2b16c6b98 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		etracer
 PORTVERSION=		0.4
+PORTREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		SF/extremetuxracer
 DISTNAME=		extremetuxracer-${PORTVERSION}
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index cd5a1a1180f5..5d0bec63e2dd 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxracer
 PORTVERSION=	0.61
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxracer
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
@@ -20,6 +20,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_SDL=	mixer sdl
 USE_GL=		gl
+USE_XORG=	x11 xt xmu xi
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:262
 AUTOMAKE_ARGS=	-a
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index a898c8589060..0432ea8e563a 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	falconseye
 PORTVERSION=	1.9.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/falconseye
 DISTNAME=	nethack_source_331_jtp_${PORTVERSION:S/.//g}
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index e8a3dd1d1c8c..e10a1c3dcbc2 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fgsd
 DISTVERSION=	0.3.1a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 220a3bd2191e..38ed90db1c54 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flightgear-atlas
 PORTVERSION=	0.3.0.20080504
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://contribs.martymac.com/FreeBSD-ports/distfiles/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index c56979bd2242..e110f63a6d3e 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	FlightGear
 PORTVERSION?=	${FGVERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 2c36253ce243..22fa175b986b 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	foobillard
 PORTVERSION=	3.0a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
@@ -35,7 +36,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
 USE_SDL=	yes
 CONFIGURE_ARGS+=	--enable-SDL
 .else
-LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glut
 CONFIGURE_ARGS+=	--enable-glut
 .endif
 
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 983d7eeb2783..190fc9fc910a 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -31,6 +31,7 @@ GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
 USE_PYTHON=	yes
 USE_SDL=	mixer
+USE_DISPLAY=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui pygnome2
 CONFIGURE_ARGS=	--enable-gnet
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -42,14 +43,6 @@ INFO=		gcompris
 
 .include <bsd.port.pre.mk>
 
-.if !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.if !defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+=	DISPLAY="localhost:1001"
-.endif
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 		${WRKSRC}/configure
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index f6159dc24b87..7d3b46de05d3 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTVERSIONSUFFIX=	-src
diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile
index 8fa233172030..2199b0993a0e 100644
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glasteroids
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.honors.montana.edu/~jjc/Glasteroids/
 DISTNAME=	Glasteriods
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 6f38e82e2732..e4d0938ff91c 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/games/glsfcave/Makefile b/games/glsfcave/Makefile
index f6e0ea42a0cd..9ff723b9b0a3 100644
--- a/games/glsfcave/Makefile
+++ b/games/glsfcave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glsfcave
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \
 		http://mirror.amdmi3.ru/
@@ -15,10 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Control a ribbon to avoid hitting walls
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_BZIP2=	yes
-USE_GL=		yes
+USE_GL=		glut
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index c226fcaef7d9..6c6c31413149 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index fe35b86d2bfa..6fb4230fd2aa 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kiki
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,11 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Kiki the nanobot is a 3-D puzzle game
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_PYTHON=	2.3
 USE_GMAKE=	yes
-USE_GL=		gl
+USE_GL=		glut
 USE_SDL=	sdl mixer image
 USE_DOS2UNIX=	kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h
 
diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile
index 686c2b60e7d8..862ab2e755a7 100644
--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	magiccube4d
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.superliminal.com/cube/
 DISTNAME=	mc4d-src-${PORTVERSION:S/./_/}
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index e88ec2c44ed1..90b7c35e06bb 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index f1065a5b9152..a65c74b15848 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nethack
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index a3462c940ec1..5e897e80b88b 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/netherearth/Makefile b/games/netherearth/Makefile
index 13e1c644db74..0a21148f830a 100644
--- a/games/netherearth/Makefile
+++ b/games/netherearth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netherearth
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/
 
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 989d6d845650..8002759e13b3 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index d615d09c046b..e3ceb48f8c60 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nighthawk
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 1d9342b300c4..35324f7f5093 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quakeforge
 PORTVERSION=	0.5.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
 MASTER_SITE_SUBDIR=	quake/:sf
@@ -51,6 +51,7 @@ DATADIR=	${Q1DIR}
 
 .if !defined(WITHOUT_CLIENTS)
 USE_GL=		yes
+USE_XORG=	x11 xt
 PLIST_SUB+=	CLIENTS=""
 
 .if defined(WITH_SDL)
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index cf831f03d836..e5c610aedf94 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quetoo
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
 		http://tastyspleen.net/~jdolan/ \
diff --git a/games/race/Makefile b/games/race/Makefile
index 21c2f6095c34..1e28ecf4ddee 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	race
 PORTVERSION=	0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	ftp://users.freebsd.org.uk/pub/foobar2k/
 
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 940d9290d86f..a6640123de6c 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sol
 PORTVERSION=	1.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 8c6e4e2ad4a3..0d1385219d97 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -15,11 +15,10 @@ MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simulated obstacle course for automobiles
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
 
-USE_GL=		yes
+USE_GL=		glut
 
 MAKE_ENV=	DATADIR="${DATADIR}"
 
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 2b6c86fe9573..58c7733c4ae2 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	torcs
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -53,8 +54,7 @@ BASH2FIX=	src/linux/torcs.in src/tools/accc/accc.in \
 .if defined(WITH_FREEGLUT)
 LIB_DEPENDS+=	glut.11:${PORTSDIR}/graphics/freeglut
 .else
-USE_GL=		yes
-LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glut
 .endif
 
 EMPTYDIR=	champ dtmrace endrace ncrace practice quickrace
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index 6d56190e345c..477de2a78e7c 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tux_aqfh
 PORTVERSION=	1.0.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://tuxaqfh.sourceforge.net/dist/
 
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index cd5a1a1180f5..5d0bec63e2dd 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxracer
 PORTVERSION=	0.61
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxracer
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
@@ -20,6 +20,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_SDL=	mixer sdl
 USE_GL=		gl
+USE_XORG=	x11 xt xmu xi
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:262
 AUTOMAKE_ARGS=	-a
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index d9546ee80da8..ebb5b2df508e 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vamos
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 4992d79eb4fd..d8146acf3451 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vegastrike
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	vegastrike-source-${PORTVERSION}
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index f79898b5a324..0ae8f2b348f9 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xbill
 PORTVERSION=	2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.xbill.org/download/ \
 		http://mirror.amdmi3.ru/
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 5b3b5678c57a..6fa76a3c0311 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xboard
 PORTVERSION=	4.2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.tim-mann.org/xboard/ \
 		${MASTER_SITE_GNU}
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 0d6259197100..92834a2f58a7 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbomb
 PORTVERSION=	2.2
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Minesweeper with a couple of grid types
 
-USE_XORG=	xaw
+USE_XORG=	xaw7
 
 MAN6=		xbomb.6
 PLIST_FILES=	bin/xbomb \
@@ -26,8 +27,8 @@ PLIST_DIRS=	lib/X11/xbomb
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DLOCALBASE=\"${LOCALBASE}\" \
-		`pkg-config --cflags xaw8` *.c -o xbomb \
-		`pkg-config --libs xaw8`
+		`pkg-config --cflags xaw7` *.c -o xbomb \
+		`pkg-config --libs xaw7`
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${PREFIX}/bin/xbomb
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 4f034b39fd99..55e6a2f4b744 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xconq
 PORTVERSION=	7.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games tcl tk
 MASTER_SITES=	ftp://sources.redhat.com/pub/xconq/ \
 		ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index d9a048121c05..8aa024dbfddc 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfrisk
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://tuxick.net/xfrisk/files/
 DISTNAME=	XFrisk-${PORTVERSION}
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 05398fea4d20..791fd43e9de1 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xinvaders
 PORTVERSION=	2.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/invaders
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 60364e1b68e7..5f69367a4d3f 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xjump
 PORTVERSION=	2.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile
index d6a4b03ce235..2a44c62f5cf4 100644
--- a/games/xjumpx/Makefile
+++ b/games/xjumpx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xjumpx
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://fenix.ne.jp/~cdrtk/soft/dl/
 
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index f54f79b9db3e..4b5fce6a65a2 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xoj
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/demos
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 1425a8b15ec9..5d76f19c7b7d 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xonix
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 989d6d845650..8002759e13b3 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index f738e4fa96e5..a0fd765ab6fa 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpat2
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index ee495b90acd1..ace1c19e80b7 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xquarto
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 18d8f52ab921..a6ac9b4bce4b 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xracer
 PORTVERSION=	0.94
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=	distfiles
@@ -16,9 +16,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data${EXTRACT_SUFX}
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Awesome WipeOut clone for OpenGL and X11!
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_GL=		glut
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 988bed5bc437..f18824d960f7 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscrabble
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/educational_games/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index a4a0233d64a4..db8ca1287566 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xshogi
 PORTVERSION=	${GNUSHOGI_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 58d96f1997e2..de89209ebe4d 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtic
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index 7fbc6c07ae8d..e528c9a51f4d 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtrojka
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
 DISTNAME=	${PORTNAME}