- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

11 files changed, 13 insertions, 19 deletions

diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index f4958b7556b6..70c262a510a8 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -20,9 +20,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Multiplayer graphical arcade and adventure game made for X11
 
-USE_X_PREFIX=	yes
 USE_PERL5=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 08955f8f161e..fe8597b46fae 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ember
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 GNU_CONFIGURE=	YES
 USE_LDCONFIG=	YES
 USE_LUA=	5.0
-USE_XLIB=	YES
 USE_GNOME=	gnomehack
 USE_BZIP2=	YES
 CPPFLAGS=	-DBR_NO_MACROS
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index 187b5c0ba0ec..4b49b560fe5d 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -16,7 +16,6 @@ COMMENT=	GNOME version of Kisekae Set System
 
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index b22d1d4e9247..38b763d33f5c 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	gl${PORTNAME}-${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Unix source-port of the famous Heretic game by id Software
 
-USE_XLIB=	yes
+USE_XORG=	x11 xi xpm xau
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index 896545da25c1..cc144ce70b6d 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	holotz-castle
 PORTVERSION=	1.3.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.mainreactor.net/holotzcastle/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -19,7 +19,6 @@ MAKE_ARGS=	HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/ CXX=${
 
 USE_GL=		gl
 USE_SDL=	image mixer sdl ttf
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
 BROKEN=		Does not run (No video mode large enough for 676550817x676551540)
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index b4b18245992b..9b961714d0c2 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ishido
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	obrien
 MAINTAINER=	samorodi@NUXI.com
 COMMENT=	Tile placement game
 
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN6=		ishido.6
 
 do-install:
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index fccd9a3ca5ab..65255c599115 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://clay.ll.pl/download/
 MAINTAINER=	shanali@yahoo.com
 COMMENT=	A simple hiragana/katakana drill tool
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 02a7892ebc2d..eb2600eefef5 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyching
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 PLIST_SUB+=	LIB_TARGET=${LIB_TARGET:S,^${PREFIX}/,,g} \
 		DOC_TARGET=${DOC_TARGET:S,^${PREFIX}/,,g}
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index 390451d0259b..7ba58c93a6ba 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xchadance
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -19,8 +19,8 @@ COMMENT=	Display a dancing girl "ChaCha."
 
 EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha
 
+USE_XORG=	x11
 MAKEFILE=	makefile
-USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 EXTRACT_CMD=	lha
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index 1d69e6a38add..a397006a3045 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -20,8 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg png.5:${PORTSDIR}/graphics/png
 
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 MAKE_ENV+=	AR=${AR} RANLIB=${RANLIB} ECHO=${ECHO} RM=${RM}
 
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 415bfc229444..7b38f1e67913 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	xsoldier
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.interq.or.jp/libra/oohara/xsoldier/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Space-based shoot-em up game for X11
 
-USE_XLIB=	Yes
 GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS=	--localstatedir=/var
 MAKE_ARGS=	CC_OPTIMIZE="${CFLAGS}"
 
+USE_XORG=	x11 ice xpm
 MAN6=		xsoldier.6
 
 SCOREFILE=	/var/games/xsoldier.scores