- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

11 files changed, 16 insertions, 21 deletions

diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 0ff1b6c5a432..0a06ec4a4e68 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -19,7 +19,7 @@ COMMENT=	3-Dimensional Chess for X Window System
 LIB_DEPENDS=		Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_PERL5_BUILD=yes
-USE_XPM=		xpm
+USE_XORG=		xpm
 WRKSRC=			${WRKDIR}/3Dc/src
 
 post-patch:
diff --git a/games/bfm/Makefile b/games/bfm/Makefile
index eb42c29b73fe..877ab7af1fb9 100644
--- a/games/bfm/Makefile
+++ b/games/bfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bfm
 PORTVERSION=	0.0.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/battle4mandicor
 EXTRACT_SUFX=	-src.tar.gz
@@ -21,7 +21,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 USE_GMAKE=	yes
 USE_LUA=	5.0
 USE_SDL=	sdl
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LUA_INCDIR}" LDFLAGS="-L${LUA_LIBDIR}"
 
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 0f38c54cb164..80ac2e5cbbe1 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evq3
 PORTVERSION=	1.0a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://evolution.quakedev.com/dev/evq3/
 DISTNAME=	${PORTNAME}-final-src
@@ -24,7 +24,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GL=		yes
-USE_XLIB=	yes
+USE_XORG=	xxf86dga
 USE_SCONS=	yes
 SCONS_ARGS=	warnings=0
 NO_WRKSUBDIR=	yes
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 08d4521e0c58..fee0e972c10a 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ezquake
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF:ezquake \
@@ -54,7 +55,7 @@ PLIST_SUB+=	GLX="@comment "
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	xxf86dga	
 ALL_TARGET+=	x11
 PLIST_SUB+=	X11=""
 .else
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index a6c2d34702cd..423b45503e44 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freedroid
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	freedroid
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Freedroid is a clone of the classic game "Paradroid"
 
-USE_XLIB=	yes
 USE_SDL=	mixer image sdl
 
 GNU_CONFIGURE=	yes
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 5a894a863a8b..db9abc8d8c3b 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ioquake3
 DISTVERSION=	1.34-rc3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://ioquake3.org/files/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -78,7 +78,7 @@ USE_SDL=	sdl
 MAKE_ENV+=	USE_SDL_VIDEO=1
 .   else
 USE_GL=		yes
-USE_XLIB=	yes
+USE_XORG=	xxf86dga
 .   endif
 # Vorbis
 .   if defined(WITH_VORBIS)
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 0e6b2012cbf0..d5594e2ccd02 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	joequake
 PORTVERSION=	0.15b1329
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://runecentral.com/joequake/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}-source
@@ -81,7 +81,7 @@ MAKE_ENV+=	USE_${f}=NO
 .endfor
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	xxf86dga
 ALL_TARGET+=	x11
 PLIST_SUB+=	X11=""
 .else
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index ce578d9b6f1e..9944e0a8284b 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mangband
 PORTVERSION=	0.7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://mangband.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -16,8 +16,7 @@ MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	Multiplayer rogue-like game with color, X11 support
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
-
-USE_XLIB=	yes
+USE_XORG=	x11
 ALL_TARGET=	install
 
 MALIB=		${PREFIX}/lib/mangband
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 77e3add125bc..87ddd08d5204 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	scid
 PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
 
 USE_PYTHON=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 
 ALL_TARGET=	all strip
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index ce8b66d4b653..63addabbefd2 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	uqm
 PORTVERSION=	0.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sc2
@@ -27,7 +27,6 @@ COMMENT=	A port of the original Star Control 2 for 3DO consoles
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		mikmod.2:${PORTSDIR}/audio/libmikmod
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_SDL=	image sdl
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index dc6278765041..b6575e991fd3 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xphotohunter
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://ghs.tongi.org/ \
 		http://micro.ee.nthu.edu.tw/~tomcat/Xphotohunter/
@@ -16,7 +16,6 @@ MAINTAINER=	clive@FreeBSD.org
 COMMENT=	A game looking for the difference between two pictures
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib