- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

15 files changed, 21 insertions, 28 deletions

diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 4de5a2e6ddee..fe89fcbd804b 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubbros
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bub-n-bros
@@ -20,7 +20,6 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
diff --git a/games/doom/Makefile b/games/doom/Makefile
index 39ad082d4cb9..ac5bdd274773 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	doom
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	source
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 4eca9143b590..18fee9d8c430 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	falconseye
 PORTVERSION=	1.9.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= falconseye
@@ -23,9 +23,8 @@ MAKE_ENV=	NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
 NETHACKCONFIG=	${FILESDIR}/x-config
 USE_SDL=	sdl
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	Yes
 USE_ZIP=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAKE_ENV+=	CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" X11BASE="${X11BASE}"
 WRKSRC=		${WRKDIR}
 
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index fe7641129ab5..2073e04c7c81 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -28,7 +28,6 @@ LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
 		png:${PORTSDIR}/graphics/png \
 		glut:${PORTSDIR}/graphics/libglut
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 41c15d140dbc..f073c3400e20 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
 		${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GL=		yes
 
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 629fd676528f..600d7372a1ad 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 
 FGVERSION=	0.9.10
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 478083cbc9f3..804378a6c972 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	golddig
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTNAME=	golddig2
@@ -16,8 +16,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	Getting the Gold and Avoiding Death
 
-USE_XLIB=	yes
 MAN6=		golddig.6
+USE_XORG=	x11
 
 pre-patch:
 	@(cd ${WRKSRC}; for i in 245 244 246 247; do \
diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile
index c66e5e384551..ca58b168a14d 100644
--- a/games/gtklife/Makefile
+++ b/games/gtklife/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	gtklife
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://ironphoenix.org/tril/gtklife/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A GTK+ implementation of Conway's Game of Life
 
-USE_XLIB=	yes
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile
index 9360b786b410..686c2b60e7d8 100644
--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	magiccube4d
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.superliminal.com/cube/
 DISTNAME=	mc4d-src-${PORTVERSION:S/./_/}
@@ -16,8 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	karlj000@unbc.ca
 COMMENT=	MagicCube4D is a four-dimensional analog of Rubik's cube
 
-USE_X_PREFIX=	yes
-
+USE_XORG=	x11 xext xt sm ice xaw
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION:S/./_/}
 DOCS=		ChangeLog Intro.txt MagicCube4D-unix.txt \
diff --git a/games/nadar/Makefile b/games/nadar/Makefile
index 934635a39dda..4662e7242a5c 100644
--- a/games/nadar/Makefile
+++ b/games/nadar/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	nadar
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/game/action/
 
 MAINTAINER=	hsakai@m8.ffn.ne.jp
 COMMENT=	A network tank battle game
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		nadars.1 nadar.1
 MANCOMPRESSED=	yes
diff --git a/games/openarena/Makefile b/games/openarena/Makefile
index 68202b83a205..d6541593cf98 100644
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openarena
 PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://openarena.ws/rel/070/:src \
 		http://download.tuxfamily.net/cooker/openarena/rel070/:data \
@@ -82,7 +82,7 @@ USE_SDL=	sdl
 MAKE_ENV+=	USE_SDL_VIDEO=1
 .   else
 USE_GL=		yes
-USE_XLIB=	yes
+USE_XORG=	x11 xxf86dga
 .   endif
 .endif
 
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 63389443bd18..3e837b2e11e2 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	seahaven
 PORTVERSION=	1.44
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://seahaven.sourceforge.net/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,8 +17,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	The classic, lightweight version of Seahaven Towers
 
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext
 MAN6?=		seahaven.6
 PLIST_FILES=	bin/seahaven
 
diff --git a/games/tetrons/Makefile b/games/tetrons/Makefile
index a877cfec692e..07c760b33e41 100644
--- a/games/tetrons/Makefile
+++ b/games/tetrons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tetrons
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.mammothcheese.ca/
 
@@ -14,8 +15,8 @@ MAINTAINER=	jimmy@mammothcheese.ca
 COMMENT=	Tetris(TM) clone for X11
 
 MAKE_ARGS+=	-DRANDOM
-USE_XLIB=	yes
 
+USE_XORG=	x11 xext xi
 PLIST_FILES=	bin/tetrons
 
 .include <bsd.port.mk>
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index d4fb5f497710..98f79e9b78a7 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xmahjongg
 PORTVERSION=	3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.lcdf.org/xmahjongg/
 
 MAINTAINER=	joerg@freebsd.org
 COMMENT=	The Chinese game of Mahjongg for X11
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/games/xtet42/Makefile b/games/xtet42/Makefile
index 225882b1d700..d6df5c63d4ef 100644
--- a/games/xtet42/Makefile
+++ b/games/xtet42/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	xtet42
 PORTVERSION=	2.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://utenti.gufi.org/~gmarco/files/distfiles/
 
 MAINTAINER=	gmarco@gufi.org
 COMMENT=	A one or two player t*tris game
 
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-setgid=games
+USE_XORG=	x11
 
 MAN6=	xtet42.6