- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

45 files changed, 54 insertions, 84 deletions

diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 0d0559e4e512..df8fafa24b29 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	9menu
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ \
@@ -17,8 +17,8 @@ EXTRACT_SUFX=	.shar.gz
 MAINTAINER=	serge.gagnon.1@ulaval.ca
 COMMENT=	A simple menu patterened after plan9
 
+USE_XORG=	x11
 PLIST_FILES=		bin/9menu
-USE_XLIB=		yes
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 6d77e7854666..9dee1184677a 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	9term
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/matty/unicode/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -19,7 +19,7 @@ COMMENT=	An X11 program which emulates a plan9 window
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/editors/sam:build
 
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 MAKE_ENV=	SAMDIR=${WRKDIRPREFIX}${.CURDIR}/../../editors/sam/work
 MAN1=		9term.1
 PLIST_FILES=	bin/9term
diff --git a/x11/bbuname/Makefile b/x11/bbuname/Makefile
index 34c683029f44..ee440ad036f1 100644
--- a/x11/bbuname/Makefile
+++ b/x11/bbuname/Makefile
@@ -23,6 +23,6 @@ BROKEN=	Checksum mismatch
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 2e7333e5983b..b9c0cba37301 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blast
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/b/blast
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Blast blows holes through windows
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.1.orig
-USE_X_PREFIX=	yes
+USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xi xrandr
 MAN1=		blast.1
 PLIST_FILES=	bin/blast
 
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 9bfe61846be4..16cd71274730 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	buttonbox
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -20,7 +20,7 @@ DOCDIR=		share/doc/${PORTNAME}
 DOCS=		COPYING ChangeLog DEDICATION README TODO
 PLIST=		${WRKDIR}/pkg-plist
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${X11BASE}/lib \
diff --git a/x11/cnslock/Makefile b/x11/cnslock/Makefile
index 50abcf511455..e3cfb3bfb9ea 100644
--- a/x11/cnslock/Makefile
+++ b/x11/cnslock/Makefile
@@ -17,8 +17,7 @@ COMMENT=	A visual indicator of the states of the three "lock" buttons
 
 PLIST_FILES=	bin/cnslock
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
diff --git a/x11/docker/Makefile b/x11/docker/Makefile
index 0320b72b5c37..2321fd13cfd9 100644
--- a/x11/docker/Makefile
+++ b/x11/docker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	docker
 PORTVERSION=	1.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://www.kerneled.org/files/FreeBSD-ports/ \
 		http://icculus.org/openbox/2/docker/
@@ -17,7 +17,7 @@ COMMENT=	A dockapp with support for GNOME2 and KDE3 tray icons
 
 PLIST_FILES=	bin/docker
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GNOME=	glib20
 
 do-install:
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 004b3f4600b1..569274e3f1e0 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dxpc
 PORTVERSION=	3.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.vigor.nu/dxpc/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	Compressing X protocol proxy designed to support X11 over slow links
 
 LIB_DEPENDS=	lzo2.2:${PORTSDIR}/archivers/lzo2
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index aba9aeb95d85..9d369e28f91a 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbsd-icons
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -16,7 +16,6 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of icons related to the FreeBSD project
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index ad5f380ed89a..3505498d487c 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Background changer for fluxbox/blackbox
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
 
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 9fbbb9393362..00ae77a33076 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A mouse cursor theme selector for GNOME
 RUN_DEPENDS=	file-roller:${PORTSDIR}/archivers/file-roller
 
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 0d80cff74bcf..072cd135e566 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -18,7 +18,6 @@ COMMENT=	An anti-aliased font support for gtk+
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index c015589a58cb..c92c4c14d763 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A customizable program to run programs, with tab-completion
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_GCC=	3.4+
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index d23a71c23713..b4fe8d5ef101 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A program that keeps the content of your X clipboard in memory
 
 PLIST_FILES=	bin/gnome-clipboard-daemon
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 do-install:
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 8a38635d2868..3f1d2ed161ec 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www.muhri.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A command line tool for switching GTK+ themes
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 5d6a663a597c..38f55902e426 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	gtkterm
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple GTK-2 terminal with tabs
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget vte
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index d9c601830be0..32dfeb19586d 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	petef
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK frontend for xset(1)
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 34797b63bbf3..66e7e149222d 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imwheel
 PORTVERSION=	1.0.0.p12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://jcatki.no-ip.org/pub/imwheel/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,8 +17,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p12/pre12/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to translate mouse wheel actions into X keyboard events
 
+USE_XORG=	x11 xpm xtst xext xmu
 USE_GMAKE=	YES
-USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--disable-gpm
 
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index eb1d40346ef5..dbe0ac3e30a6 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libsx
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	libraries
@@ -19,7 +19,7 @@ COMMENT=	Simple X11 library
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 ALL_TARGET=	src freq
 
 do-install:
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 77f5bdfbdbc4..a9b0fa08cff9 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Matrox Powerdesk for *nix
 
 IGNORE=		needs an old XFree86/X.org header file to build
 
-USE_X_PREFIX=	YES
 USE_GNOME=	gtk12
 USE_GMAKE=	YES
 USE_AUTOTOOLS=	autoconf:213
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 95f40bd33035..18018c17f8ba 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	multi-aterm
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.nongnu.org/materm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A multi terminal based on aterm
 
-USE_X_PREFIX=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--with-xpm=${X11BASE}
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 82dce4324a84..589e756a79b6 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -20,8 +20,7 @@ CONFIGURE_ENV=	GTKCONFIG=${GTK_CONFIG}
 USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 78b3f45a9fd7..9b190ca9f46a 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	rxvt
 PORTVERSION=	2.7.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	x11
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -20,8 +20,7 @@ COMMENT=	A low memory usage xterm replacement that supports color
 
 USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp --enable-languages \
 		--with-xpm --enable-xpm-background --enable-transparency \
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index a711590a8056..a9d596e40af2 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -10,15 +10,14 @@
 
 PORTNAME=	rxvt
 PORTVERSION=	2.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A low memory usage xterm replacement that supports color
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency \
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 418b37d3df10..deb35de4dbc9 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	temperature.app
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.fukt.bth.se/~per/temperature/
 DISTNAME=	Temperature.app-${PORTVERSION}
@@ -17,8 +17,7 @@ COMMENT=	A dockable WindowMaker applet which displays the local temperature
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/Temperature.app ${PREFIX}/bin
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index c510461a7cc6..097c255c3358 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Lightweight GTK2-based systray for UNIX desktop
 
 USE_GNOME=	gtk20 glib20 pango atk
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
 
 USE_GMAKE=	yes
 MAKE_ARGS=	"PREFIX=${X11BASE}"
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 0f37c098d2d1..61a8c858de45 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -22,8 +22,8 @@ PLIST_FILES=	bin/vdesk
 PLIST_FILES+=	share/doc/vdesk/${ii}
 .endfor
 .endif
-USE_X_PREFIX=		yes
 USE_AUTOTOOLS=	autoconf:261
+USE_XORG=	x11
 
 post-extract:
 # Avoid having to read this lengthy file.
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index a9a3ee5b9c55..6dc355146b21 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -22,8 +22,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An application launcher dockapp similar to wmbutton
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAKE_ENV=	DATADIR="${DATADIR}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index 568e9c3dc150..5b4f25c0d78a 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://dockapps.org/files/155/541/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Showing moving blobs
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index ae4e6c589936..27dd0eac8a0a 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	wmbutton
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://greek0.net/~greek0/wmbutton/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockapp that displays 9 buttons to run apps of your choice
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 SUB_FILES=	pkg-message
 
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 65689b3fba51..9c102d930d7e 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clipboard history management dockapp for Window Maker
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gtk12
 
 do-install:
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index f11d83096333..30efd09be12b 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	wmdrawer
 PORTVERSION=	0.10.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
 		http://wikitest.freebsd.org/wiki/common/:pixmap
@@ -20,7 +20,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockapp which provides a drawer to launch applications
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 CONFIGURE_ENV+=	DOCSDIR=${DOCSDIR}
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 03b6a04a8d90..77d7827a9ddd 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfstatus
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.finik.net/files/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose LCD display for the WindowMaker dock
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 PLIST_FILES=	bin/wmfstatus
 
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 2c1b0cabf6d4..6261f7e3ac5f 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A DockApp that runs a version of the xmatrix screenhack
 
 PLIST_FILES=	bin/wmmatrix
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 ALL_TARGET=	clean all
 
 do-install:
diff --git a/x11/wmoldmenu2new/Makefile b/x11/wmoldmenu2new/Makefile
index 4b43de499195..e77f35b9fff7 100644
--- a/x11/wmoldmenu2new/Makefile
+++ b/x11/wmoldmenu2new/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmoldmenu2new
 PORTVERSION=	20020609
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://largo.windowmaker.org/files/
 DISTNAME=	wm-oldmenu2new
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Script to convert WindowMaker RootMenu menus to new PropList format
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index 2cd3cda27394..3896955df3da 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	wmxss
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Run xscreensaver modules inside a WindowMaker dock
 
+USE_XORG=	x11 xpm
 PLIST_FILES=	bin/wmxss
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/Src
 
 post-extract:
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 4d44cdb3f2e3..4ae5cb383056 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wrapper
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 DISTNAME=	# intentionally left blank
 EXTRACT_SUFX=	# intentionally left blank
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 CONFLICTS=	XFree86-3.3.6*
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/Xwrapper
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 21dba0a6ba66..da1f81c6adc2 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	xballoon
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Balloons move on root window
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm xmu xaw
 ALL_TARGET=	xballoon
 
 MAN1=		xballoon.1
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 47d78ad3de38..93fccde40276 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -16,9 +16,7 @@ DISTNAME=	XBanner${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Make your XDM login screen look beautiful
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-#USE_IMAKE=	yes
+USE_XORG=	xpm x11
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index eada73cfa136..480c2eaae95c 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -29,7 +29,7 @@ CFLAGS+=	-I${KRB5_HOME}/include
 KRB5LIB=	-L${KRB5_HOME}/lib
 .endif
 USE_GNOME=	#
-USE_XPM=	yes
+USE_XORG=	x11
 
 MAN1=		xlock.1
 PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 4e9e985c855d..6101d039e0b2 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -17,8 +17,7 @@ COMMENT=	A kaleidoscope on X
 
 ALL_TARGET=	xmangekyou
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm xaw
 
 MAN1=		xmangekyou.1
 MANCOMPRESSED=	yes
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index 71e376087ff7..cb4f931a2d6e 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtermcontrol
 PORTVERSION=	2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.thrysoee.dk/xtermcontrol/
 
@@ -16,7 +16,6 @@ COMMENT=	Tool for dynamic control of xterm properties
 
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index 09b6679254b5..b22443d03c48 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtermset
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clts
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 MAN1=		xtermset.1
 MAN5=		terms.5
 
-USE_X_PREFIX=	yes
 MANCOMPRESSED=	no
 
 post-install:
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index 2d88e468350c..1d898064bf97 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtrlock
 PORTVERSION=	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/x/xtrlock/
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}_2.0-${PORTVERSION:E}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Transparent Lock
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.0
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 61e6bc134d1a..3c699cb0232b 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Getting and setting Xv attributes
 
-USE_X_PREFIX=		yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=		gtk12
 GNU_CONFIGURE=		yes