37 files changed, 78 insertions, 40 deletions

diff --git a/x11/dynamag/Makefile b/x11/dynamag/Makefile
index e0691f4e7370..609780b1656c 100644
--- a/x11/dynamag/Makefile
+++ b/x11/dynamag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dynamag
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	ftp://trace.wisc.edu/pub/access_utils/unix/
 DISTNAME=	unwindows
@@ -20,6 +20,7 @@ ALL_TARGET=	dynamag
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/dynamag
 USE_IMAKE=	yes
+USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 5a9b2f80d820..0a6e29ae0ea1 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emu
 PORTVERSION=	1.31
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 USE_DISPLAY=	yes
 
 WRKSRC=		${WRKDIR}/emu
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index e071004f115d..eefb4c745b44 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kb2mb2
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 
@@ -16,5 +16,6 @@ COMMENT=	Redirect any key to second mouse button
 
 PLIST_FILES=	bin/kb2mb2
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xtst
 
 .include <bsd.port.mk>
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 5d155a961406..3724329e5f92 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libsx
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	libraries
@@ -19,8 +19,9 @@ COMMENT=	Simple X11 library
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XORG=	x11 xext xmu xt
+USE_XORG=	x11 xaw xext xmu xt
 ALL_TARGET=	src freq
+MAKE_JOBS_UNSAFE=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/libsx.a  ${PREFIX}/lib
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index e103d4edfcb5..07ab5b8ad8e9 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lupe
 PORTVERSION=	0.08
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/
 DISTNAME=	lupe008	
@@ -17,6 +17,7 @@ COMMENT=	Real-time magnifying glass for X11
 
 WRKSRC=		${WRKDIR}/lupe
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 XMKMF=		xmkmf
 MAN1=		lupe.1
 
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index 580cda88b601..d36a880a2d61 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mxico
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://people.freebsd.org/~maho/mxico/
 
@@ -17,6 +17,7 @@ MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Rotating Object on the screen (Zalgaller polyhedra)
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN6=		mxico.6
 
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 8ca258127742..d2b348db3d99 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	props
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
@@ -19,6 +19,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/props
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAKE_ARGS=	INFOFILES=""
 
 post-install:
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index c1d6fe3a6bcd..2e53e0bff912 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sxpc
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index fba768642148..c18fbc0b6104 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x3270
 PORTVERSION=	3.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 net
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-pr3287 --with-fontdir=local --disable-dbcs
 .if defined(WITHOUT_OPENSSL)
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 1cf58baddb45..394b67161729 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -7,16 +7,17 @@
 
 PORTNAME=	xaniroc
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.42.org/pub/orphan/
-DISTNAME=	${PORTNAME}	
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.src.tar.Z
 
 MAINTAINER=	sec@42.org
 COMMENT=	Animate your root-cursor
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xaniroc.1
 PLIST_FILES=	bin/xaniroc
 
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 4841ffa5df58..0e8b20c257b2 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xantfarm
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.acme.com/software/xantfarm/
 DISTNAME=	${PORTNAME}_23oct1991
@@ -17,6 +17,7 @@ COMMENT=	Ant hill simulation on X11 root window
 
 WRKSRC=		${WRKDIR}/xantfarm
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt
 MAN1=		xantfarm.1
 PLIST_FILES=	bin/xantfarm
 
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index e7f877f18b17..a8fa4620c805 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xautolock
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/screensavers
@@ -18,6 +19,7 @@ COMMENT=	Used to activate xlock after a user defined time of inactivity
 RUN_DEPENDS=	xlock:${PORTSDIR}/x11/xlockmore
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xscrnsaver
 MAN1=		xautolock.1
 PLIST_FILES=	bin/xautolock
 
diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile
index 8755679b6385..5bfb4cffb551 100644
--- a/x11/xbelld/Makefile
+++ b/x11/xbelld/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbelld
 PORTVERSION=	0.2b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.meowfishies.com/code/
 DISTNAME=	${PORTNAME}-0.2beta2
@@ -19,6 +19,7 @@ COMMENT=	XBellD is a small daemon for replacing the standard X terminal bell
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm xtrap xmu xt
 USE_GNOME=	esound
 
 PLIST_FILES=	bin/xbelld \
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 09a28e20b652..37a2eb07d1f2 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcb
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for managing x11 cut-buffers
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 MAN1=		xcb.1
 
 .include <bsd.port.mk>
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index 4f4580d7aa2b..1891bbfea5bd 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcmd
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.breuninger.org/files/distfiles/
@@ -17,6 +17,7 @@ MAINTAINER=	ob@breuninger.org
 COMMENT=	Xcmd is a front-end for starting programs under X11
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xmu xt
 
 MANCOMPRESSED=	yes
 MAN1=		xcmd.1
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index c1108c6d0ea2..bdfaaf903ac1 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xco
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 DISTNAME=	${PORTNAME}
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display X11 color names and colors
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xco.1
 MANCOMPRESSED=	yes
 DOCDIR=		${PREFIX}/share/doc/xco
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index d3cf70c17370..d43b00a3beaf 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcoloredit
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Find colour values by graphical colour mixing
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xcoloredit.1
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/xcoloredit
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 1e57403b8f40..8879cd65ddde 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	xcut
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://acsys.anu.edu.au/~tpot/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -17,6 +17,7 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manipulate X cut buffers from the commandline
 
 USE_IMAKE=	YES
+USE_XORG=	x11
 MAN1=		xcut.1
 PLIST_FILES=	bin/xcut
 
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index a6473cff281d..c89b077401eb 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfishtank
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
@@ -16,6 +16,7 @@ COMMENT=	Make fish swim in the background of your screen
 
 PLIST_FILES=	bin/xfishtank
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/xfishtank2.0
 
 post-patch:
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index d81112bd99b7..18e3fc912a2e 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkbctrl
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	unsupported/test/Xkb/programs
@@ -19,6 +19,7 @@ COMMENT=	Display and manipulate XKB keyboard controls from the commandline
 DIST_SUBDIR=	xkbctrl
 PLIST_FILES=	bin/xkbctrl
 USE_IMAKE=	yes
+USE_XORG=	x11 xkbfile
 NO_WRKSUBDIR=	yes
 
 do-extract:
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index def42569c778..52a170d986e6 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlogout
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tu-darmstadt.de/pub/X11/other/
 EXTRACT_SUFX=	.tar.Z
@@ -17,6 +17,7 @@ COMMENT=	Simple logout button
 
 WRKSRC=		${WRKDIR}/xlogout
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAKE_JOBS_SAFE=	yes
 MAN1=		xlogout.1
 
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 337248b0fd2d..0ffe4a230eed 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmascot
 PORTVERSION=	2.6a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://cclub-flying.dsl.gr.jp/products/xmascot/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Moving mascot on your X11 screen
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xmascot.1
 
 post-install:
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index 92f3f5cdd7d0..f87c34108656 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmold
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://cclub.cc.tut.ac.jp/pub/xwin/
 DISTNAME=	${PORTNAME}
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mold spreading over your X11 screen
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xmold
 
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 67a16d10cf41..6a386cd2194e 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmon
 PORTVERSION=	1.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	devel_tools
@@ -18,6 +18,7 @@ COMMENT=	Raw X11 protocol analyser
 
 WRKSRC=		${WRKDIR}/xmon.${PORTVERSION}
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 
 MAN1=		xmon.1 xmond.1 xmonui.1
 MANCOMPRESSED=	yes
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index e5ac66af1bd1..109ac7f56fda 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmotd
 DISTVERSION=	1.17.3b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A message-of-the-day browser for X11 and dumb-terminals
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 NO_INSTALL_MANPAGES=	yes
 XFREE86_HTML_MAN=	no
 
@@ -29,6 +30,7 @@ OPTIONS+=	XPM "Allows colour XPM pixmaps" off
 
 .if defined(WITH_HTML)
 MAKE_ARGS+=	-DHAVE_HTML
+BROKEN=		Does not compile when WITH_HTML is set
 .endif
 
 .if defined(WITH_MOTIF)
@@ -37,7 +39,7 @@ USE_MOTIF=	yes
 .endif
 
 .if defined(WITH_XPM)
-USE_XORG=	xpm
+USE_XORG+=	xpm
 .endif
 
 post-extract:
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index ba90479f4bc4..192da732e44f 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmove
 PORTVERSION=	2.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/b/beta/}
@@ -18,6 +18,7 @@ COMMENT=	Pseudoserver to support mobile X11 clients
 WRKSRC=		${WRKDIR}/xmove
 
 USE_IMAKE=	yes
+USE_XORG=	x11
 
 MAN1=		xmove.1 xmovectrl.1
 
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index 8e1a00bec249..a9da63966c2b 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmsg
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
@@ -18,5 +18,6 @@ MAN1=		xmsg.1
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/xmsg
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xaw xmu xt sm ice
 
 .include <bsd.port.mk>
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 48761548c8c7..3eaefe217bce 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xprompt
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mph
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays a dialog box and prompts user for text
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 
 MAN1=		xprompt.1
 MANCOMPRESSED=	yes
diff --git a/x11/xrsh/Makefile b/x11/xrsh/Makefile
index 6a9b7ab133b0..2ca9677a6a10 100644
--- a/x11/xrsh/Makefile
+++ b/x11/xrsh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrsh
 PORTVERSION=	5.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://jjd.com/
 DISTNAME=	${PORTNAME}
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index a345fab1f7b3..626cf2bf17cd 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xskyroot
 PORTVERSION=	920428
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/news/fj.sources/V10/
 DISTFILES=	1079.gz
@@ -22,6 +22,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} -e "/^...bin.sh/,/exit 0/!d" | ${SH}
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xskyroot
 
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index e985a66f1e11..a68424635ac0 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtacy
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ultranet.com/~jjohnson/ \
 		${MASTER_SITE_SUNSITE}
@@ -18,6 +18,7 @@ MAINTAINER=	matt@bdd.net
 COMMENT=	An X11 trippy color-cycling toy
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xtacy.1
 PLIST_FILES=	bin/xtacy
 
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index f79f74dfcf51..1d2a8b8085dc 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtestpicture
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
@@ -15,6 +15,7 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Create a full-screen image to adjust your monitor
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xtestpicture.1
 PLIST_FILES=	bin/xtestpicture
 
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index b3c41c993a29..37d571dd2693 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtoolwait
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool startup utility for X11
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xtoolwait.1
 PLIST_FILES=	bin/xtoolwait
 
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 4bd7d83ec4c5..dd3a5cb50c6b 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xvkbd
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://homepage3.nifty.com/tsato/xvkbd/
 
@@ -21,6 +21,7 @@ OPTIONS=	XAW3D	"Xaw3d support" off \
 		I18N	"internationalization" on
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +34,7 @@ XK_DEFSUBST +=	-e 's/XCOMM define XAW3D/\#define XAW3D/;'
 .endif
 .if	defined(WITH_XTEST)
 XK_DEFSUBST +=	-e 's/XCOMM define XTEST/\#define XTEST/;'
+USE_XORG+=	xtst
 .endif
 .if	defined(WITH_I18N)
 XK_DEFSUBST +=	-e 's/XCOMM define I18N/\#define I18N/;'
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index d79e1e1e8791..b4e43deccabd 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xwatchwin
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -20,5 +20,6 @@ MAN1=		xwatchwin.1
 PLIST_FILES=	bin/xwatchwin
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 .include <bsd.port.mk>
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 2c761020d51a..ac1172278a7e 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xwit
 PORTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR = utilities
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X interface tool
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xwit.1
 PLIST_FILES=	bin/xwit
 
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 0eabd5434b15..8b3f4d81d095 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xzoom
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/X
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnify, rotate, mirror the image on the X screen
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		xzoom.1
 PLIST_FILES=	bin/xzoom