62 files changed, 135 insertions, 76 deletions

diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 37b5de4073dc..e8c133cd26d2 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -5,22 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=		3dc
-PORTVERSION=		0.8.1
-PORTREVISION=	2
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+PORTNAME=	3dc
+PORTVERSION=	0.8.1
+PORTREVISION=	3
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-DISTNAME=		3Dc-${PORTVERSION}
+DISTNAME=	3Dc-${PORTVERSION}
 
-MAINTAINER=		adam-ports@blacktabby.org
+MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	3-Dimensional Chess for X Window System
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_PERL5_BUILD=yes
-USE_XORG=		xpm
-WRKSRC=			${WRKDIR}/3Dc/src
+USE_XORG=	x11 xaw xext xmu xpm xt
+WRKSRC=		${WRKDIR}/3Dc/src
 
 post-patch:
 .for file in init.c main.c piece.c stack.c xif.c
diff --git a/games/antipolix/Makefile b/games/antipolix/Makefile
index 46275ae2f62a..9a63cdde0b86 100644
--- a/games/antipolix/Makefile
+++ b/games/antipolix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	antipolix
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
@@ -18,6 +18,7 @@ COMMENT=	Simple multiplayer game for X Window System
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11
 NO_INSTALL_MANPAGES=	yes
 
 pre-build:
diff --git a/games/awele/Makefile b/games/awele/Makefile
index ee60f7975898..7f27c41d5272 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	awele
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games tk
 MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/ \
 		${MASTER_SITE_XCONTRIB}
@@ -21,6 +21,7 @@ USE_TCL_BUILD=	84
 USE_TK_BUILD=	${USE_TCL_BUILD}
 WRKSRC=		${WRKDIR}/awele
 USE_IMAKE=	yes
+USE_XORG=	x11
 MAN6=		xawele.6
 PLIST_FILES=	bin/awelewish bin/xawele
 
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 4cf032807851..cccbd776f069 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugsx
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Breed bugs using genetic algorithims
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/bugsx
 # isn't really gzipped
 EXTRACT_CMD=		${TAR}
diff --git a/games/cosmo/Makefile b/games/cosmo/Makefile
index 9f4ace828ecd..bb05fc4dfee0 100644
--- a/games/cosmo/Makefile
+++ b/games/cosmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cosmo
 PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://133.25.251.9/pub/linux/Vine/VinePlus/1.1/JG-0.9.1/other-sources/jp/ \
 		ftp://ftp.uni-erlangen.de/.mirrors/ftpbsd/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/cosmo/
@@ -22,6 +22,7 @@ NO_CDROM=	Possible copyright infringement
 WRKSRC=		${WRKDIR}/cosmo2
 DIST_SUBDIR=	cosmo
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 XMKMF=		xmkmf
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/games/editss/Makefile b/games/editss/Makefile
index 43e86407cd6e..5c3d2f355ccc 100644
--- a/games/editss/Makefile
+++ b/games/editss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	editss
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An editor for XPilot shipshapes
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xmu xt
 ALL_TARGET=	editss
 MAN6=		editss.6
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/flying/Makefile b/games/flying/Makefile
index a20a1b8dc47e..c9cf9dc5672c 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flying
 PORTVERSION=	6.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pool/snooker/billiards/carrom/etc game
 
 USE_IMAKE=	yes
+USE_XORG=	x11
 MAN1=		flying.1
 PLIST_FILES=	bin/flying
 
diff --git a/games/gru/Makefile b/games/gru/Makefile
index dfc4bb9b6545..3dbcccebfa25 100644
--- a/games/gru/Makefile
+++ b/games/gru/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gru
 PORTVERSION=	8087
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.bsddiary.net/gru/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gru makes your eyes happy
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xmu xpm xaw xt sm ice
 
 MAN1=		gru.1
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index ce62776583e8..ac3ae46398fc 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imaze
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://home.tu-clausthal.de/student/iMaze/files/
 PKGNAMESUFFIX=	-${TOOLKIT}
@@ -20,9 +20,11 @@ USE_MOTIF=	yes
 TOOLKIT=	motif
 .elif defined(WITH_ATHENA)
 TOOLKIT=	athena
+USE_XORG+=	xaw
 .else
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 TOOLKIT=	xview
+USE_XORG+=	xaw
 .endif
 
 HAS_CONFIGURE=	yes
@@ -32,6 +34,7 @@ BUILD_WRKSRC=	${WRKSRC}/source
 MAKE_ENV=	SOUNDDIR=${SOUNDDIR}
 MAN6=		genlab.6 imaze.6 imazesrv.6 imazestat.6 ninja.6 xlabed.6
 MANCOMPRESSED=	no
+USE_XORG+=	x11 xt
 
 .if defined(WITHOUT_AUDIO)
 CONFIGURE_ARGS+=noaudio
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 52777f66f1d9..461b1f7a9402 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jetpack
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTNAME=	${PORTNAME}
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Arcade action game for X11
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAKE_FLAGS=	PREFIX=${PREFIX} -f
 MAN6=		jetpack.6
 
diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile
index d84124abeccf..c855ae5a29e6 100644
--- a/games/oneko-sakura/Makefile
+++ b/games/oneko-sakura/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oneko
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.daidouji.com/oneko/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.sakura.5
@@ -16,6 +16,7 @@ MAINTAINER=	hotaru@tail.net
 COMMENT=	A cat, Sakura or Tomoyo chasing a mouse all over the screen
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		oneko.6
 PLIST_FILES=	bin/oneko
 NO_CDROM=	"Including derivatives from CARDCAPTOR SAKURA. See http://www.clamp-net.com/ -> INFORMATION"
diff --git a/games/spider/Makefile b/games/spider/Makefile
index b1ed4ffbfd64..381c865fd0f3 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spider
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A challenging double decked solitaire game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt sm ice xpm
 INSTALL_TARGET=	install install.doc
 MAN1=		spider.1
 
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index bd23d4a8eb9a..62b7b9620e06 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmtimebomb
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games windowmaker
 MASTER_SITES=	ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
 DISTNAME=	wmtimebomb.20
@@ -18,6 +18,7 @@ LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 
 WRKSRC=		${WRKDIR}/wmtimebomb.app
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index cc53ddd1333f..76ac53b1ef09 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xasteroids
 PORTVERSION=	5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.opengroup.org/pub/ftp.x.org/R5contrib/
 DISTFILES=	xasteroids.sh.Z
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 based asteroids style arcade game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	( cd ${WRKDIR}; zcat | sh -s )
 EXTRACT_BEFORE_ARGS=	<
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index d89908f8f99c..8b38d7d11579 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xataxx
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Strategy game of position and movement for X Window System
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		xataxx.6
 
 post-install:
diff --git a/games/xbaby/Makefile b/games/xbaby/Makefile
index 37a1ba522de0..a1b5054346ee 100644
--- a/games/xbaby/Makefile
+++ b/games/xbaby/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbaby
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://hpux.cs.utah.edu/ftp/hpux/X11/Misc/xbaby-1.2/ \
 		http://hpux.its.tudelft.nl/ftp/hpux/X11/Misc/xbaby-1.2/ \
@@ -23,6 +23,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Babies hide under your windows
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 MAN1=		xbaby.1
 PLIST_FILES=	bin/xbaby
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index 4eb0110c7505..5f7862d3e576 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbat
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 DISTNAME=	xev111
@@ -18,6 +18,7 @@ COMMENT=	XEVIOUS like shooting game
 NO_CDROM=	Possible copyright infringement
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/Xev111
 ALL_TARGET=	xbat
 
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index 8c819622f1fd..806a13bce1f6 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbattle
 PORTVERSION=	5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A concurrent multi-player battle strategy game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xbattle.1
 
 post-install:
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index e96dd4a000f7..2b879dfa2fdf 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xblackjack
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11/Motif blackjack game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xp xt xmu
 LIB_DEPENDS+=	Xm.2:${PORTSDIR}/x11-toolkits/lesstif
 MAN1=		xblackjack.1
 
diff --git a/games/xbloody/Makefile b/games/xbloody/Makefile
index 866fe0e80f3c..007f25862e57 100644
--- a/games/xbloody/Makefile
+++ b/games/xbloody/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbloody
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.kazu.kz/freebsd/
 DISTNAME=	${PORTNAME}
@@ -17,6 +17,7 @@ COMMENT=	Knife on X
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/xcheckers/Makefile b/games/xcheckers/Makefile
index f2d19b28cbfc..5997157e793d 100644
--- a/games/xcheckers/Makefile
+++ b/games/xcheckers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcheckers
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://arton.cunst.net/xcheckers/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A checkers game for X11
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xpm
 
 MAN6=		xcheckers.6 simplech.6
 
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 373b7d2efadf..2ddbc4100d9a 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xchomp
 PORTVERSION=	pl1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 
@@ -17,5 +17,6 @@ COMMENT=	Pac-man-like game under X11
 PLIST_FILES=	bin/xchomp
 WRKSRC=		${WRKDIR}/xchomp
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 .include <bsd.port.mk>
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index 49c0acc5c36c..b361413f0bbe 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcubes
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Cube puzzle for X11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xcubes.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 087421154612..8f7ef00fd89c 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdigger
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Boulderdash-like KC85 Digger for X Window System
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		xdigger.6
 
 post-patch:
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 2d01d99fcf9c..d6143f482b4c 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdino
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Dino puzzle game for X11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xdino.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index 795d63d0af79..a15a085e24f7 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xflame
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
@@ -16,6 +16,7 @@ MAINTAINER=	kris@FreeBSD.org
 COMMENT=	A cool animated flame
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=		bin/xflame
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index 614b8cec6bbe..1738bf8819e7 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgammon
 PORTVERSION=	0.98a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A backgammon program for X11
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt sm ice
 
 MAN6=		xgammon.6
 PLIST_FILES=	bin/xgammon lib/X11/app-defaults/XGammon \
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index f186f3ebec0d..18551526207e 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xgospel
 PORTVERSION=	1.12d
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.teaser.fr/~jlgailly/
 
@@ -15,13 +15,11 @@ COMMENT=	An X11 Go (weiqi, baduk) client for the Internet Go Server
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XORG=	xpm x11 ice
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-x --with-xpm --with-xaw3d
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e "s,#ifndef _POSIX_SOURCE,#if 0," \
 		${WRKSRC}/connect.c ${WRKSRC}/relay.c ${WRKSRC}/relog.c \
@@ -40,4 +38,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 2e0d05f84b69..8a1adf95c1ae 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xhexagons
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
 
 WRKSRC=		${WRKDIR}/xhexagons
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xhexagons.1
 XFREE86_HTML_MAN=	no
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 9d8f5135cb3a..e9bd9659deba 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xhime
 PORTVERSION=	1.51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.tcp-ip.or.jp/~shochan/linux/
 DISTFILES=	xhime151.tgz
@@ -17,6 +17,7 @@ COMMENT=	Resident Himechan for X Window System
 
 WRKSRC=		${WRKDIR}/xhime1.51
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MANCOMPRESSED=	yes
 MANLANG=	. ja
 MAN6=		xhime.6
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index 0a3585f9f875..8e0e9246ee63 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xisola
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -17,6 +17,7 @@ COMMENT=	Simple board game for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt sm ice
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index dad0a7ee1b19..b1184637cb5a 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xjewel
 PORTVERSION=	1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/ \
 		ftp://ftp.x.org/R5contrib/
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 MAN6=		xjewel.6
 
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 1e5b88456767..24b6f54aa3c0 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkobo
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://ftp.uoknor.edu/mirrors/X/contrib/games/
@@ -17,6 +17,7 @@ MAINTAINER=	will@FreeBSD.org
 COMMENT=	Multi-way scrolling shoot 'em up game for X.  Strangely addictive
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 ALL_TARGET=	xkobo
 MAN1=		xkobo.1
 
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 9c4c8d230a1e..b4fee1c0c214 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkoules
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/koules
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast action arcade-style game for X Window
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		xkoules.6
 
 post-extract:
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index d516a36e1f77..033e01a405b9 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlaby
 PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://quatramaran.ens.fr/pub/madore/xlaby/
@@ -19,6 +19,7 @@ COMMENT=	Daemonic X Labyrinth played directly with the mouse pointer
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11
 MAN6=		xlaby.6
 PLIST_FILES=	bin/xlaby
 
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index f5e10f97c90d..be4b4e9c7c5b 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlife
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	xlife
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	John Horton Conway's Game of Life
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 INSTALL_TARGET=	install install.patterns
 MAN1=		xlife.1
 
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 1d09e1aa86b2..5a669dde2839 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmball
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Masterball puzzle for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xmball.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile
index c5cb48dff26e..10de8deece3d 100644
--- a/games/xmemory/Makefile
+++ b/games/xmemory/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmemory
 PORTVERSION=	3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player memory game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xmemory.1
 
 post-install:
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index df8154aa5329..5eb2639f0e1f 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmille
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -19,6 +19,7 @@ COMMENT=	X window mille bourne game
 WRKSRC=		${WRKDIR}/Mille
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xmille.1
 PLIST_FILES=	bin/xmille
 
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 651b26f26f19..193995adef95 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmine
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sw.ru/pub/x11/ \
 		${MASTER_SITE_LOCAL}
@@ -20,6 +20,7 @@ COMMENT=	The `Athena' port of the xminesweeper game
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 MAN6=		xmine.6
 MANCOMPRESSED=	no
 
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index c26587d414ff..ccccd1a70bcb 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xminesweep
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.netlab.is.tsukuba.ac.jp/pub/X/our_collections/games/ \
 		ftp://ftp.uni-halle.de/pub/X11/contrib/games/ \
@@ -20,6 +20,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 minesweeper game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xmu xaw xt xpm sm ice
 MAN1=		xminesweep.1
 PLIST_FILES=	bin/xminesweep
 
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 04249738e091..e97bf31e2228 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlink
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Missing Link puzzle for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xmlink.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index f8002547fd5e..4d2bbcaa7508 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmris
 PORTVERSION=	4.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A version of the Mr Do video arcade game for X11
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt sm ice
 MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
 ALL_TARGET=	xmris xmred
 MAN6=		xmred.6 xmris.6 xmsit.6
diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile
index 4341de38869d..450ffd00ebd3 100644
--- a/games/xmulti/Makefile
+++ b/games/xmulti/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmulti
 PORTVERSION=	2.00b4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.denpa.org/~go/xmulti/
 DISTFILES=	xmul200b4.tgz
@@ -18,6 +18,7 @@ COMMENT=	A X11 mascot based on gal-game "To Heart"
 WRKSRC=		${WRKDIR}/xmulti200beta4
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt xpm sm ice
 
 MAN1=		xmaid.1
 NOMANCOMPRESS=	yes
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index 10ff3e144a58..c0559b8ccb9c 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xoct
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Oct puzzle for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xoct.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 801045ede5ea..a19e2fb88f6a 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpacman
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nvg.unit.no/pub/pacman/
 DISTNAME=	pacman10
@@ -18,6 +18,7 @@ COMMENT=	An old action game
 NO_WRKSUBDIR=	Does not unpack into subdir.
 USE_ZIP=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		pacman.1
 PLIST_FILES=	bin/pacman
 
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index 6a649437f78a..2869bf6032d0 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpanex
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Panex puzzle for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xpanex.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index b617a7455932..7fd0f716abea 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	xpilot
 PORTVERSION=	4.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xpilotgame
+MASTER_SITES=	SF/xpilotgame
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Xpilot(client) and xpilots(server)
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		xpilot.6 xpilots.6 xp-mapedit.6 xp-replay.6
 
 .include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 86d3889a4b6b..22fccc5868bd 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpipeman
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
@@ -21,6 +21,7 @@ COMMENT=	Connect the pipes to stop the leaks
 ONLY_FOR_ARCHS=	i386
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt sm ice
 MAN6=		xpipeman.6
 
 post-install:
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index a83ff9227d98..be21d8eb876f 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpyraminx
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Pyraminx puzzle for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xpyraminx.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index 69379c734663..c89a3fb391f0 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xripple
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
 		ftp://ftp.cin.nihon-u.ac.jp/pub/X11/enlightenment/misc/ \
@@ -24,6 +24,7 @@ COMMENT=	X program to make bottom of screen ripple like a pool of water
 
 PLIST_FILES=	bin/xripple
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 ALL_TARGET=	xripple
 
 post-configure:
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 683362548be1..58df57ea454b 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrisk
 PORTVERSION=	2.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://my.pages.de/pub/comp/unix/games/xrisk/old/
 
@@ -15,6 +15,7 @@ MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	A game for X11, much like the popular board game
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt
 MAN6=		xrisk.6
 
 RESTRICTED=	"Possible trademark infringement"
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index bb6aec22a300..a895cb7b3cdc 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrobots
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-ss-10.20
@@ -16,6 +16,7 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Fight off villainous robots (X version)
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt sm ice
 WRKSRC=		${WRKDIR}/xrobots-1.0
 MAN6=		xrobots.6
 
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 70d74415e37b..f2bc0f5dd03c 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscavenger
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
@@ -18,6 +18,7 @@ COMMENT=	A Lode Runner clone for X11
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		scavenger.6
 
 pre-configure:
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 66d20366c6ec..3ab92664f857 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xskat
 PORTVERSION=	4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.xskat.de/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -21,6 +21,7 @@ RESTRICTED=	"The altenburger card file is NOT freely redistributable!"
 .endif
 
 USE_IMAKE=	yes
+USE_XORG=	x11
 MAN1=		xskat.1 xskat-de.1
 PLIST_FILES=	bin/xskat
 
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 6d8071f40b33..4d5a9040ae8d 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xskewb
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Skewb puzzle (similar to Rubik's Cube) for X Window
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xskewb.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xspacewarp/Makefile b/games/xspacewarp/Makefile
index fb77240c9847..c6769d9c758f 100644
--- a/games/xspacewarp/Makefile
+++ b/games/xspacewarp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xspacewarp
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Time Trek - like game for X Window System
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 NO_INSTALL_MANPAGES=	yes
 
 post-extract:
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 9dc17b607eec..c0c0d11b7ff9 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xspringies
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
 DISTFILES=	xspringies.1.1.tar.Z
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mass and spring simulation system
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xspringies.1
 
 .include <bsd.port.mk>
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index c6061e4c44b4..1bf8d7fd7e20 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtriangles
 PORTVERSION=	5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
@@ -17,6 +17,7 @@ COMMENT=	Triangles puzzle
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt sm ice
 MAN1=		xtriangles.1
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 2ba7517e4bac..1da034ba77e2 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xvier
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
@@ -19,6 +19,7 @@ COMMENT=	Throw stones into free columns
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN6=		xvier.6
 
 post-install:
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index 1a5623bb775c..f1f1e19da962 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xvmines
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
@@ -18,6 +18,7 @@ COMMENT=	Simple minesweeper game for X Window System
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 USE_IMAKE=	yes
+USE_XORG=	x11
 MAN6=		xvmines.6
 MANCOMPRESSED=	no
 
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index 4754d45cde0a..38d238f595ff 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yamsweeper
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.hanzubon.org/mirrors/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
 		http://ftp.jaist.ac.jp/pub/Linux/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Mine Sweeper
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 MAN1=		yamsweeper.1
 
 pre-configure: