- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

9 files changed, 11 insertions, 16 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 4eae14a91afa..4d68298b6081 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bomberclone
 PORTVERSION=	0.11.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT=	Reimplementation of Atomic Bomber Man
 USE_SDL=	image mixer sdl
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=""
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index a666d4f71a5f..dec22233392e 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	circuslinux
 PORTVERSION=	1.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/circus-linux/src/
 
@@ -16,7 +16,6 @@ COMMENT=	"Circus Linux!" is a clone of the Atari 2600 game "Circus Atari"
 
 USE_SDL=	image mixer sdl
 GNU_CONFIGURE=	yes
-USE_XLIB=	yes
 CONFIGURE_ARGS=	--target=""
 
 .include <bsd.port.mk>
diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index f0305d1baafa..fa7f9476c312 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		dodgindiamond2
 PORTVERSION=		0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		games
 MASTER_SITES=		http://www.usebox.net/jjm/dd2/releases/
 DISTNAME=		dd2-${PORTVERSION}
@@ -15,7 +15,6 @@ DISTNAME=		dd2-${PORTVERSION}
 MAINTAINER=		chinsan@FreeBSD.org
 COMMENT=		An old school shoot'em up game
 
-USE_XLIB=		yes
 USE_SDL=		sdl image mixer
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--localstatedir=/var/games
diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile
index b351cf8d4088..a21c917a202f 100644
--- a/games/fgkicker/Makefile
+++ b/games/fgkicker/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A launcher frontend for FlightGear
 
 RUN_DEPENDS=	fgfs:${PORTSDIR}/games/flightgear
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 3be3aed8d332..3f7e717fdb71 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -25,7 +25,7 @@ COMMENT=	A cat chasing a mouse all over the screen
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xpm
+USE_XORG=	x11 xpm xmu
 MAN6=		oneko.6
 MANLANG=	"" ja
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 00c1dede9806..10b35b678be5 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sol
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
@@ -22,7 +22,7 @@ LIB_DEPENDS=	shhopt.1:${PORTSDIR}/devel/libshhopt \
 CONFLICTS=	gnome-games-*
 
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN6=		sol.6
 
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 9498213cc67c..1ec3d66ccca7 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tank
 PORTVERSION=	0.4a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 EXTRACT_SUFX=	-src.tar.gz
@@ -17,7 +17,6 @@ COMMENT=	A 3-D network tank game that uses OpenGL/Mesa
 
 BUILD_DEPENDS=	${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=	linux-mesa-elf
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index f8bfaeca2c15..090d198453f0 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xrally
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xrally
@@ -21,9 +21,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GCC=	2.95
 PTHREAD_LIBS=	-lc_r
 HAS_CONFIGURE=	yes
+USE_XORG=	x11 xi xpm
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
 		CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
 MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index c370cc66c1d8..68a1572767c4 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xroads
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://math.missouristate.edu/~erik/files/fbsd/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	erik@smluc.org
 COMMENT=	Commodore 64 "Crossroads"-like video game for X Window System
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm xext
 
 .include <bsd.port.pre.mk>