diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index e8218c6bf2f..68e8e41390e 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/21 12:50:33 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"set the root window to the image of earth"
 DISTNAME=	xearth-1.1
@@ -15,6 +15,7 @@ WANTLIB=		ICE SM X11 Xext Xt c m
 
 CONFIGURE_STYLE= imake
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 7d285ef97c0..cb86d1c9aea 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2006/10/12 15:16:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"interactive astronomical ephemeris"
 DISTNAME=	xephem-3.2.3
@@ -26,6 +26,7 @@ do-build:
 	@cd ${WRKSRC}/GUI/xephem && \
 	  ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 do-install:
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index cabef541d08..8150ada7073 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/11/21 12:50:33 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"set the root window to the moon in its current phase"
 DISTNAME=	xphoon
@@ -15,6 +15,7 @@ WANTLIB=		X11 Xext c m
 
 CONFIGURE_STYLE= imake
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 756106ed3db..558787f7bc1 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2006/10/28 10:30:41 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2006/11/13 10:08:12 steven Exp $
 
 CATEGORIES=	audio x11 x11/kde
 COMMENT=	'music player for kde'
@@ -31,6 +31,7 @@ SHARED_LIBS +=	amarok               0.0      # .0.0
 SHARED_LIBS +=	http11               0.0      # .0.0
 
 MODULES=	x11/kde
+USE_X11=		Yes
 USE_LIBTOOL=		Yes
 LIBTOOL_FLAGS=		--tag=disable-static
 MODKDE_VERSION=		3.5.3
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 8b30d5cf885..ab733393689 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2006/08/01 12:13:28 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"OpenLook-based CD player"
 DISTNAME=	WorkMan-1.3a
@@ -21,6 +21,7 @@ MAKE_ENV=	IMAKEINCLUDE=-I${LOCALBASE}/lib/X11/config
 
 WRKDIST=	${WRKDIR}/workman
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 980091c4338..25a804e4ae9 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2004/11/21 17:51:47 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"Motif CD player"
 
@@ -15,6 +15,7 @@ WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c curses termlib
 
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
+USE_X11=	Yes
 USE_MOTIF=	any
 CONFIGURE_STYLE= imake
 NO_REGRESS=	Yes
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 37a60ae2bfa..86f1b73b038 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2004/11/21 17:51:47 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"X11-based audio mixer"
 DISTNAME=	xmix-2.1
@@ -17,6 +17,7 @@ CONFIGURE_STYLE=	imake
 
 WRKDIST=	$(WRKDIR)/xmix
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 pre-build:
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 4c002bbe11c..b639fdfba64 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2006/02/03 20:34:14 steven Exp $
+# $OpenBSD: Makefile,v 1.24 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"Motif-based audio mixer"
 VERSION=	1.2.2
@@ -16,6 +16,7 @@ MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmmix/${VERSION}/src/
 
 CONFIGURE_STYLE=	imake
 USE_MOTIF=		any
+USE_X11=		Yes
 
 WRKDIST=	${WRKDIR}/xmmix-1.2
 NO_REGRESS=	Yes
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 38b561c2f57..ab83ecb62f2 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2004/11/21 18:01:04 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"reciprocating engine for X11"
 PKGNAME=	xengine-1.0.1
@@ -21,6 +21,7 @@ PATCH_DIST_STRIP=	-p1	# no ${PATCHFILES} but used below
 WRKDIST=	${WRKDIR}
 CONFIGURE_STYLE=	imake
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 do-distpatch:
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 46870eb3497..4290ff6e373 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2006/11/04 19:19:15 kili Exp $
+# $OpenBSD: Makefile,v 1.13 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=		"Qt-based 2D CAD system"
 
@@ -21,6 +21,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=qcad/}
 
 MODULES=	x11/qt3
 MODQT_MT=	Yes
+USE_X11=	Yes
 
 MAKE_FLAGS= \
 	CXX='${CXX}' \
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index bab3ed4318f..3141f9e0c1d 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/11/21 22:29:51 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"communication package for X11"
 
@@ -20,6 +20,7 @@ CONFIGURE_STYLE=imake
 
 WRKDIST=	${WRKDIR}/seyon
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index b208606e2c5..e2066bff0cf 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/09/18 11:50:39 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2006/11/13 10:08:12 steven Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	"graphical debugger for KDE"
@@ -22,6 +22,7 @@ MODULES=	x11/kde
 
 LIB_DEPENDS=	kdecore.>=4,DCOP,kdefx,kdesu,kdeui,kio,kwalletclient::x11/kde/libs3
 
+USE_X11=	Yes
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf autoheader
 CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 6986b9f041b..ff689e21916 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/11/24 11:08:02 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=		"simple to use text editor for X11"
 
@@ -16,7 +16,7 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
 EXTRACT_SUFX=		.tar.Z
 
 CONFIGURE_STYLE=	imake
-
+USE_X11=		Yes
 NO_REGRESS=		Yes
 
 .include <bsd.port.mk>
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index 84d7f12adee..fd790883179 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/08/01 23:39:08 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"standard OpenLook text editor for X11"
 
@@ -23,6 +23,7 @@ CONFIGURE_STYLE=imake
 
 MAKE_ENV=	IMAKEINCLUDE=-I${LOCALBASE}/lib/X11/config
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 032d1707220..700250be88e 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/28 22:41:15 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"X11 Go Toolset"
 
@@ -20,6 +20,7 @@ CONFIGURE_STYLE=	gnu
 ALL_TARGET=
 
 NO_REGRESS=	Yes
+USE_X11=	Yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cgoban ${PREFIX}/bin
diff --git a/games/circuit/Makefile b/games/circuit/Makefile
index 6efc6505073..093ceedf5bc 100644
--- a/games/circuit/Makefile
+++ b/games/circuit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2006/08/02 09:36:20 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"finish-the-cycle logic puzzle"
 CATEGORIES=	games
@@ -18,6 +18,8 @@ WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m
 
 LIB_DEPENDS=	gtk.>=1.2,gdk.>=1.2::x11/gtk+
 
+USE_X11=	Yes
+
 do-build:
 	cd ${WRKBUILD} && $(CC) $(CFLAGS) `gtk-config --cflags --libs` circuit.c -o circuit
 
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index e664b1243e3..27e1f57727e 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2006/08/02 09:36:20 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2006/11/13 10:08:12 steven Exp $
 COMMENT=	"computer simulation game"
 
 DISTNAME=	corewars-0.9.12
@@ -20,5 +20,6 @@ LIB_DEPENDS=	gtk.>=1.2,gdk::x11/gtk+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=corewars/}
 
 CONFIGURE_STYLE=gnu
+USE_X11=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 9d7b8a4ab01..5b13eb55084 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2006/11/07 15:14:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.36 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"game where you deal drugs on the streets of NY"
 
@@ -40,6 +40,7 @@ FLAVOR?=
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --disable-gui-client
 .else
+USE_X11=	Yes
 LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 WANTLIB+=	X11 fontconfig freetype m cairo \
 		gmodule-2.0 gobject-2.0 atk-1.0 pango-1.0 \
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index bfb5091d120..47ba0a8e367 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2006/09/18 11:50:40 espie Exp $
+# $OpenBSD: Makefile,v 1.60 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"Civilization clone for X11; multiplayer; game server"
 COMMENT-client=	"Freeciv client"
@@ -34,6 +34,7 @@ MODULES=	devel/gettext
 WANTLIB=	c m z ncurses readline
 
 .if !${FLAVOR:L:Mno_x11}
+USE_X11=	Yes
 MULTI_PACKAGES+=-client
 
 BUILD_DEPENDS+=	:pkgconfig-*:devel/pkgconfig
diff --git a/games/glutton/Makefile b/games/glutton/Makefile
index 4e9fbeccb99..32e535d1bb9 100644
--- a/games/glutton/Makefile
+++ b/games/glutton/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/11/28 22:41:17 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/13 10:08:12 steven Exp $
 
 COMMENT= 	"Pac-Man clone"
 
@@ -26,6 +26,7 @@ ALL_TARGET=	enablesound
 MAKE_FLAGS=	DATA_DIR=${PREFIX}/share/glutton
 
 NO_REGRESS=	Yes
+USE_X11=	Yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/glutton ${PREFIX}/bin
diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index 7d53ba152f1..2bfab84d263 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2006/09/18 11:50:40 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2006/11/13 10:08:12 steven Exp $
 
 COMMENT= 		"billiard game"
 CATEGORIES=		x11 x11/kde games
@@ -26,6 +26,7 @@ MODCONFIG_GUESS_DIRS+=	${MODKDE_CONFIG_GUESS_DIRS}
 AUTOCONF_VERSION=	2.59
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
+USE_X11=		Yes
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/games/life/Makefile b/games/life/Makefile
index d00e9adf05a..66f23c1187f 100644
--- a/games/life/Makefile
+++ b/games/life/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/11/28 23:32:07 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"SDL clone of the popular Game of Life"
 
@@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext c m pthread stdc++ usbhid
 
 NO_REGRESS=	Yes
+USE_X11=	Yes
 
 LIB_DEPENDS=	SDL::devel/sdl
 
diff --git a/games/spatial/Makefile b/games/spatial/Makefile
index 745a587878d..084d5fbc19a 100644
--- a/games/spatial/Makefile
+++ b/games/spatial/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2005/09/10 17:23:08 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/13 10:08:12 steven Exp $
 #
 
 COMMENT=	"3d tetris"
@@ -28,6 +28,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/spatial
 	${INSTALL_DATA} ${WRKBUILD}/spatial.shp ${PREFIX}/share/spatial/spatial.shp
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 WANTLIB=	c m X11
 
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 9fd154f21ed..a60bf078fe5 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2006/07/04 21:15:41 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"strategy game with fantasy theme"
 DISTNAME=	wesnoth-1.0.2
@@ -28,6 +28,8 @@ LIB_DEPENDS=	SDL::devel/sdl \
 
 MODULES=	devel/gettext
 
+USE_X11=	Yes
+
 CONFIGURE_STYLE=gnu
 FLAVORS=	lite tinygui
 FLAVOR?=
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 10e36e5ac13..2cbda8af2ac 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2004/11/28 22:41:22 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"X11-based asteroids-style arcade"
 
@@ -20,6 +20,7 @@ CONFIGURE_STYLE=	imake
 WRKDIST=	${WRKDIR}
 
 NO_REGRESS=	Yes
+USE_X11=	Yes
 
 post-extract:
 	@cp ${FILESDIR}/Imakefile ${WRKSRC}
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index 05363c3a8f3..495d96ba5e4 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2006/11/10 17:07:18 steven Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:12 steven Exp $
 #
 
 COMMENT=	"XEVIOUS-like shooting game"
@@ -20,7 +20,7 @@ MASTER_SITES=   http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 CONFIGURE_STYLE=imake
 WRKDIST=	${WRKDIR}/Xev111
 ALL_TARGET=	xbat
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index f3f7894ad54..3ff1ff3e62b 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/11/28 22:41:22 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"concurrent multi-player battle strategy game"
 
@@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext c m
 
 CONFIGURE_STYLE=imake
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index b80dea85681..ce5e30c49c2 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:22 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"save your computers from the evil clutches of Bill"
 
@@ -14,8 +14,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xaw Xext Xmu Xpm Xt c m stdc++
 
-CONFIGURE_STYLE=	imake
-
+CONFIGURE_STYLE=imake
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 18bd2c521e5..0dd722849e8 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/07/05 07:24:27 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"Pac-man-like game under X11"
 
@@ -21,6 +21,7 @@ CONFIGURE_STYLE=imake noman
 # Change -DFRAME_DELAY=40000 in patchfile/Imakefile value to adjust
 # speed of play depending on X server.
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index 66f10e24bb3..bbd247d4a61 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:25 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:12 steven Exp $
 #
 
 COMMENT=	"cube puzzle for X11"
@@ -16,8 +16,8 @@ WANTLIB=		ICE SM X11 Xext Xt c
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/xpuzzles/}
 
 WRKDIST=	${WRKDIR}/xcubes
-CONFIGURE_STYLE=	imake
-
+CONFIGURE_STYLE=imake
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index dcb2a66eb29..69fa2ba5ccf 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2006/11/02 10:56:56 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"block action game"
 
@@ -19,6 +19,7 @@ WANTLIB=		X11 Xext Xpm c
 CONFIGURE_STYLE=	imake noman
 WRKDIST=		${WRKDIR}/xdeblo_v1.0
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 pre-configure:
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 84a4f1a0644..194fd83f9b0 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:25 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:12 steven Exp $
 #
 
 COMMENT=	"dino puzzle game for X11"
@@ -18,6 +18,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/xpuzzles/}
 WRKDIST=	${WRKDIR}/xdino
 CONFIGURE_STYLE=	imake	
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xgolgo/Makefile b/games/xgolgo/Makefile
index f7825b6fe22..d26c65e6cc5 100644
--- a/games/xgolgo/Makefile
+++ b/games/xgolgo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/11/28 22:41:25 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2006/11/13 10:08:12 steven Exp $
 #
 
 COMMENT=	"watch what you are doing -- are you hostile"
@@ -20,6 +20,7 @@ CONFIGURE_STYLE=imake noman
 
 WRKDIST=	${WRKDIR}/xeyes
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 7a913af6b28..0cfefbb5d3c 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2004/11/28 22:41:25 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2006/11/13 10:08:12 steven Exp $
 
 NOT_FOR_ARCHS=	${LP64_ARCHS}
 
@@ -25,6 +25,7 @@ EXTRACT_CASES=	*.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_PERL_FIX_SHAR}
 
 CONFIGURE_STYLE=	imake
 
+USE_X11=	Yes
 WRKDIST=	${WRKDIR}
 
 pre-patch:
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 86c0a87c999..30934252a10 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2006/11/02 10:54:15 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"dropping jewels game for X11"
 
@@ -23,7 +23,7 @@ MAKE_FLAGS=		HSCORE_FILE=/var/games/xjewel.scores \
 FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 
 CONFIGURE_STYLE=imake
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 pre-install:
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 9878f922d8f..07d0c1071ba 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/11/28 22:41:26 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:12 steven Exp $
 
 COMMENT=	"multi-way scrolling shoot'em up for X11, addictive"
 
@@ -28,7 +28,7 @@ WANTLIB=		X11 Xext c m stdc++
 CONFIGURE_STYLE=	imake
 
 ALL_TARGET=	xkobo
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-install: 
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 5b44a22836d..a5644f5c4f8 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2006/04/05 09:49:59 bernd Exp $
+# $OpenBSD: Makefile,v 1.20 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"John Horton Conway's Game of Life"
 
@@ -23,6 +23,7 @@ MAKE_FLAGS=XLIFEPATSDIR=${PREFIX}/share/xlife
 FAKE_FLAGS=XLIFEPATSDIR=${TRUEPREFIX}/share/xlife
 
 NO_REGRESS=	Yes
+USE_X11=	Yes
 
 post-build:
 	cd ${WRKDIST}/lifesrc-3.5 && ${MAKE} CFLAGS="${CFLAGS}"
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 165c04258d3..9bee8175227 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2006/02/04 11:13:17 steven Exp $
+# $OpenBSD: Makefile,v 1.20 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"Athena port of xminesweeper"
 
@@ -18,7 +18,7 @@ WANTLIB=		ICE SM X11 Xext Xmu Xp Xpm Xt c
 LIB_DEPENDS=    Xaw3d.::x11/Xaw3d
 
 CONFIGURE_STYLE=imake
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index 07130e75529..0736783dedf 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2006/02/04 11:20:45 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"Windows minesweeper"
 
@@ -15,8 +15,8 @@ PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c
 
-CONFIGURE_STYLE=	imake
-
+CONFIGURE_STYLE=imake
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index 0879f539026..9fa9c23c1f2 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/28 22:41:27 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"Mahjongg"
 
@@ -15,8 +15,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext c
 
-CONFIGURE_STYLE=	imake noman
-
+CONFIGURE_STYLE=imake noman
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index db7e447ceec..b1ebcec8b35 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/11/28 22:41:27 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"Mr Do video arcade game for X11"
 
@@ -28,7 +28,7 @@ MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults \
 ALL_TARGET=	xmris xmred xmris.0 xmred.0
 
 NO_REGRESS=	Yes
-
+USE_X11=	Yes
 FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 
 .include <bsd.port.mk>
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index c20483fdb2a..9ad84df47e7 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/11/28 22:41:27 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"win land without colliding with 'flyers' and 'eaters'"
 
@@ -14,8 +14,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c m
 
-CONFIGURE_STYLE=	imake
-
+CONFIGURE_STYLE=imake
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index d34ff91a1f1..c687d8db435 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2006/02/04 11:50:38 steven Exp $
+# $OpenBSD: Makefile,v 1.13 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"screen bottom ripples like a pool of water"
 
@@ -18,7 +18,7 @@ WANTLIB=		X11 Xext c m
 
 CONFIGURE_STYLE=imake
 ALL_TARGET=	xripple
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 post-configure:
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index ef3c89b6bf9..4607c1cd500 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2006/02/08 04:54:49 david Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"X11 version of the popular board game"
 
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c
 
 CONFIGURE_STYLE=imake noman
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 pre-configure:
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 298dcea08fd..209d3fc8470 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:27 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"skat card game"
 
@@ -15,7 +15,7 @@ WANTLIB=		X11 c
 MASTER_SITES=	http://www.xskat.de/
 
 CONFIGURE_STYLE=imake
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index f0e17a32eca..27cc76b15b7 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:28 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"solitaire"
 
@@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext c oldX
 
 CONFIGURE_STYLE=imake
-
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 5086f32cb58..59a30e6eb31 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2006/08/02 10:10:35 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2006/11/13 10:08:13 steven Exp $
 
 COMMENT=	"cuddlesome teddy for the X11 desktop"
 
@@ -19,6 +19,7 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=  CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
 pre-configure: