- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION Approved by: portmgr (xorg cleanup)
author: Martin Wilke <miwi@FreeBSD.org> 2008-03-25 22:44:48 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2008-03-25 22:44:48 +0000
commit: cda30a295fd474159658e5a43f99f4441d06682f (patch)
tree: 2007491b9bfa70afd7bf89bf4d2324df2200b1b2
parent: Repocopy linux_base-f7 -> linux_base-f8 is completed. (diff)
212 files changed, 199 insertions, 360 deletions
diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile
index a92cd6c8f25d..5a7bc29240ee 100644
--- a/arabic/kacst_fonts/Makefile
+++ b/arabic/kacst_fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kacst_fonts
 PORTVERSION=		1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		arabic
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
@@ -18,7 +18,6 @@ COMMENT=	Truetype Arabic fonts created by KACST
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 WRKSRC=	${WRKDIR}/KacstArabicFonts-${PORTVERSION}
 
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 1a004ef8634c..9edae0d80a78 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	protomol
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
-USE_XLIB=	yes
 USE_GCC=	3.4+
 
 # Hack to cure a misbehavior of the configure script
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index f98c275a5ca6..7d271ffd476d 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pypanel
@@ -21,7 +21,6 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 
-USE_X_PREFIX=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_EFL=	imlib2
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 379f4bff2f57..713e6fd61222 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A lightweight, configurable sticky notes utility
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-USE_X_PREFIX=	yes
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR="${QT_PREFIX}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index c71c8c6c40f0..db01bf43e11d 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -21,7 +21,6 @@ QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index ea0ed28ad1f2..48422158f964 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.13
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
@@ -139,7 +140,7 @@ DISPLAY_MSG=	${CAT} ${PKGMESSAGE}
 PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--disable-video-x11
 .else
-USE_XLIB=	yes
+USE_XORG=	x11 xrender xrandr xextproto
 .endif
 
 post-install:
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index fcf61670b8f7..ffa1eed119cd 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wily
 PORTVERSION=	0.13.42
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors plan9
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	A clone of the Plan9 editor `acme'
 RUN_DEPENDS=	${LOCALBASE}/bin/rc:${PORTSDIR}/shells/rc \
 		${X11BASE}/lib/X11/fonts/Xg/unicode.9.font:${PORTSDIR}/x11-fonts/Xg
 
-USE_XLIB=	YES
+USE_XORG=	x11 ice xt
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 MAN1=		wgoto.1 win.1 wreplace.1 Tag.1 mktags.1 Man.1
diff --git a/games/acm/Makefile b/games/acm/Makefile
index e3145f063f32..b34daa4243f6 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	acm
 PORTVERSION=	5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.websimulations.com/download/
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	A flight simulator for X11
 
-USE_XLIB=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 4a08ea8086a8..1a0c4b694f2b 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	rhino
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	GRhino Othello/Reversi Program
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 USE_GCC=	3.4+
 USE_PERL5_BUILD=yes
diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index dd93fc33a539..d7bf219aab6c 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -28,7 +28,6 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec
 .endif # defined(PYVERSION) && ${PYVERSION:S/.//} < 24
 
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index e21265678f20..a794bddb9870 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -28,7 +28,6 @@ PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/kawari-${PORTVERSION:S/.//g}
 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index 18b4f97bfc3f..cb91babeb2a3 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 BUILD_DEPENDS=	guichan>=0.7.1:${PORTSDIR}/devel/guichan
 RUN_DEPENDS=	guichan>=0.7.1:${PORTSDIR}/devel/guichan
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl image mixer net
 USE_GCC=	3.2+
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN6=		tmw.6
 
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 4bf7d4659eec..00d2ada72e19 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtris
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games ipv6
 MASTER_SITES=	http://www.iagora.com/~espel/xtris/ \
 		ftp://quatramaran.ens.fr/pub/orabidoo/
@@ -21,8 +21,8 @@ COMMENT=	A multi-player version of a popular game for the X Window system
 
 RESTRICTED=	"Possible trademark infringement"
 WRKSRC=		${WRKDIR}/xtris
+USE_XORG=	x11 xext
 
-USE_X_PREFIX=	yes
 MAN6=		xtris.6 xtserv.6 xtbot.6
 
 MAKE_ENV=	IPV6_CFLAGS="-DINET6"
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index e469fa0db978..2c549074791a 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A 2D graphics library
 
 USE_GCC=	3.4
 USE_GMAKE=	yes
+USE_XORG=	x11
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \
 		--with-x11-base=${X11BASE}
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 525e358f8060..4de395687545 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -20,7 +20,6 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_GL=		glu
 
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx
 
 pre-patch:
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 2082d97cb37f..2101170562a1 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		kasumi:${PORTSDIR}/japanese/kasumi
 
 USE_GNOME=	lthack
-USE_XLIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 2f4659ffc0a8..e8ec16a7f5a0 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
 
 USE_GNOME=	lthack intlhack
-USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index e771a43b8ea8..4b60a5b84d06 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		uim.5:${PORTSDIR}/textproc/uim
 
 USE_GNOME=	lthack gtk20
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile
index 2152eddf8d86..19feab7f2a47 100644
--- a/misc/gkrellmfmonitor/Makefile
+++ b/misc/gkrellmfmonitor/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 PLIST_FILES=	libexec/gkrellm/plugins/fmonitor.so
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 ALL_TARGET=	fmonitor.so
 CFLAGS+=	-fPIC `${GTK_CONFIG} --cflags` `imlib-config --cflags-gdk`
diff --git a/misc/gkrellmfmonitor2/Makefile b/misc/gkrellmfmonitor2/Makefile
index d5b11d7f116e..1ff41a0c177f 100644
--- a/misc/gkrellmfmonitor2/Makefile
+++ b/misc/gkrellmfmonitor2/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 LATEST_LINK=	gkrellmfmonitor2
 
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -fPIC"
 ALL_TARGET=	fmonitor.so
 
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index f3ab32119710..03059b98f2f3 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 PLIST_FILES=	libexec/gkrellm/plugins/gkrellmlaunch.so
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 ALL_TARGET=	${PORTNAME}.so
 
diff --git a/misc/gkrellscore/Makefile b/misc/gkrellscore/Makefile
index 5bdf52a25b49..8ce3838024ff 100644
--- a/misc/gkrellscore/Makefile
+++ b/misc/gkrellscore/Makefile
@@ -16,12 +16,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to GKrellM that displays current sports scores
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm \
 		wget:${PORTSDIR}/ftp/wget
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index b1f561a9e15e..358d3439f661 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellshoot
 PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +16,12 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A screen locking and screen capture plugin for GKrellM 2
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2 \
 		import:${PORTSDIR}/graphics/ImageMagick
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkrellshoot.so
 WRKSRC=		${WRKDIR}/gkrellShoot-${PORTVERSION}
-USE_X_PREFIX=	yes
 
 ALL_TARGET=	${PORTNAME}.so
 
diff --git a/misc/gkx86info/Makefile b/misc/gkx86info/Makefile
index ee18bb5f155d..58c2150ce6d1 100644
--- a/misc/gkx86info/Makefile
+++ b/misc/gkx86info/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 imlib
 
 PLIST_FILES=	libexec/gkrellm/plugins/gkx86info.so
diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile
index c173b7b966ad..da7583075ae4 100644
--- a/misc/wmjulia/Makefile
+++ b/misc/wmjulia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmjulia
 PORTVERSION=	0.40
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://web.novalis.org/programs/
 
@@ -17,8 +17,7 @@ COMMENT=	A dockapp that creates an animated Julia set
 PLIST_FILES=	bin/wmjulia
 WRKSRC=	${WRKDIR}/${PORTNAME}.app/${PORTNAME}
 USE_GMAKE=	yes
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XPM=	xpm xext
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/misc/wmx10/Makefile b/misc/wmx10/Makefile
index 1471935e5273..e0f09f0a0b80 100644
--- a/misc/wmx10/Makefile
+++ b/misc/wmx10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmx10
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://www.cs.uml.edu/~jhawkins/wmx10/
 
@@ -16,8 +16,7 @@ COMMENT=	Remote control for X10 devices
 
 WRKSRC=		${WRKDIR}/wmx10.app/wmx10
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XPM=	xpm x11 ice
 USE_GMAKE=	yes
 
 PLIST_FILES=	bin/wmx10
diff --git a/multimedia/xmms-skins/Makefile b/multimedia/xmms-skins/Makefile
index bd31762508a3..ecc17662af77 100644
--- a/multimedia/xmms-skins/Makefile
+++ b/multimedia/xmms-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-skins
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xmms.org/files/Skins/
 DISTFILES=	AbsoluteE_Xmms.zip \
@@ -99,7 +99,7 @@ COMMENT=	Skins for X Multimedia System (XMMS)
 
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 42b65f710f59..27514cde7b5a 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	xmms-status-plugin
 PORTVERSION=	1.0
-PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.hellion.org.uk/source/
 
@@ -15,8 +14,9 @@ COMMENT=	XMMS control applet for GNOME 2 panel / KDE tray
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 5d44b57643ed..976889fda406 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -25,7 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_BZIP2=	yes
 USE_GCC=	3.4
-USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gdkpixbuf gnometarget
 USE_OPENSSL=	yes
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index c5218534cd8a..93d3eb0b3d75 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -19,7 +19,6 @@ COMMENT=	GTK based ICQ program
 LIB_DEPENDS=	icq.0:${PORTSDIR}/net-im/libicq
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12 gnomehack gnomeprefix
 WANT_GNOME=	yes
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 3fa84d3d5fab..71edc9d9c797 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	gtkyahoo
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yahoo Messenger Client using GTK
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_BISON=	build
 GNU_CONFIGURE=	yes
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index da669f23ace3..be246aec0991 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -19,7 +19,6 @@ COMMENT=	ICQ2000 protocol implementation
 LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
 		icq2000.5:${PORTSDIR}/net-im/libicq2000
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 6dfa9dd44b83..ece0e3276cd2 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	qca.1:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls
 
 HAS_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	3
 
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index e67b97e5d583..5c6e7b044fe0 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -17,7 +17,6 @@ COMMENT=	LAN chat client compatible with quickChat and Vypress Chat (TM)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 8ed826972259..fd78611fc846 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -16,7 +16,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME client for Hotline
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index 80821022218b..d9c4a02bf25b 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A gnutella client
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index a5a6797f39d4..dd9e19b2460a 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -20,7 +20,6 @@ COMMENT=	GTK+2 viewer and editor for BitTorrent meta files
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 gnomehier intlhack
-USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index c8cc3fec4e38..736cb4481d67 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -19,7 +19,6 @@ COMMENT=	GTK+ client for Napster
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
 CONFIGURE_ARGS=	--with-pthread=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 1af05db8b331..33156ee3ca44 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	napshare
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK based Gnutella client
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile
index 23ab829ac9e1..a5120aed174d 100644
--- a/net/gkrellmwireless/Makefile
+++ b/net/gkrellmwireless/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwireless
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
@@ -19,7 +19,6 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 NO_LATEST_LINK=	yes
 
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 
 PLIST_FILES=	libexec/gkrellm/plugins/wireless.so
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index afad5e060acd..1c869452a851 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -18,7 +18,6 @@ USE_RUBY=	yes
 USE_RUBY_FEATURES=	ruby18
 
 USE_GNOME=	gnomeprefix gtksourceview libglade2 libgnomeui vte
-USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 01c7a9d30126..ff4cf794700e 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based MUD client with triggers, aliases, colors, etc
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget gnomeprefix intlhack libgnomeui \
 		pygtk2 vte
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 56713a176264..a917a156669b 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometelnet
 PORTVERSION=	2.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cyest.org/downloads/
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
@@ -19,7 +19,6 @@ BROKEN=		Size mismatch
 
 USE_AUTOTOOLS=	automake:15:env libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index 409046996fb7..aaf26a420683 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Samba configuration tool for X Window System
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 PLIST_FILES=	bin/gnosamba
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 5e827a013e8e..d39a5b645970 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -18,7 +18,7 @@ COMMENT=	JAGS - Just Another GTK+ Samba Client
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gtk12
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index fba80a929f6a..56ed415d9ef0 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtr
 PORTVERSION=	0.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/mtr/ \
@@ -31,7 +31,7 @@ PKGNAMESUFFIX=	-gtk1
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=--enable-gtk2
 .endif
-USE_XLIB=	yes
+USE_XORG=	x11
 CONFIGURE_ARGS+=--with-gtk-prefix=${X11BASE}
 .else
 PKGNAMESUFFIX=	-nox11
diff --git a/net/py-mp-random/Makefile b/net/py-mp-random/Makefile
index cdfeb20cab31..53e04bc3045e 100644
--- a/net/py-mp-random/Makefile
+++ b/net/py-mp-random/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=mp-random
+PORTNAME=	mp-random
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	net python
@@ -17,7 +17,6 @@ MAINTAINER=	randomimage-widget@mirrorproject.com
 COMMENT=	Display random Mirror Project images on your desktop
 
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 USE_WX=		2.4
 WX_COMPS=	python
 NO_BUILD=	yes
diff --git a/net/sambasentinel/Makefile b/net/sambasentinel/Makefile
index 9472fdd03156..93d976afb296 100644
--- a/net/sambasentinel/Makefile
+++ b/net/sambasentinel/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	jags:${PORTSDIR}/net/jags
 PLIST_FILES=	bin/SambaSentinel
 WRKSRC=		${WRKDIR}/SambaSentinel
 USE_GMAKE=	yes
-USE_XPM=	yes
 USE_GNOME=	gtk12
 ALL_TARGET=	SambaSentinel
 
diff --git a/net/tvark/Makefile b/net/tvark/Makefile
index bd7cab3e01ab..f485f6b9d052 100644
--- a/net/tvark/Makefile
+++ b/net/tvark/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES=	http://voodoo.bawue.com/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI network monitoring tool, tied to a MySQL database
 
-USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
 USE_MYSQL=	yes
diff --git a/net/warppipe/Makefile b/net/warppipe/Makefile
index 1c1fd74a9174..87714a6b619f 100644
--- a/net/warppipe/Makefile
+++ b/net/warppipe/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Online multi-player gaming for the Nintendo GameCube
 LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	YES
 WRKSRC=		${WRKDIR}/WarpPipe-0.3.5-bsd
 NO_BUILD=	YES
 
diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile
index a7fae00b5c0c..c5360ae08454 100644
--- a/net/wmnetload/Makefile
+++ b/net/wmnetload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnetload
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net windowmaker afterstep
 MASTER_SITES=	ftp://truffula.com/pub/ \
 				http://dl.fkb.wormulon.net/wmnetload/ \
@@ -19,7 +19,7 @@ COMMENT=	Network load monitor dockapp
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 USE_BZIP2=	yes
-USE_XPM=	yes
+USE_XORG=	xpm x11
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index 978a0c2ce84d..315bb3e76a3d 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	serg@cad.kiev.ua
 COMMENT=	Windowmaker dock app to display network hosts status
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 1592b5b58917..558300076b7b 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtraceroute
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index 0ad1b369c760..5b9658c0febf 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://c64.org/~nr/xwhois/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK-based frontend to the whois service (RFC954)
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index d94cf262fbea..dd25b66539e2 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PicMonger
 PORTVERSION=	0.9.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	news graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=picmonger
@@ -18,7 +18,7 @@ COMMENT=	An automated USENET (NNTP) picture decoding client
 LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
 RUN_DEPENDS=	mpack:${PORTSDIR}/converters/mpack
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 1705637250a3..75326a396f6d 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A NNTP client for Gnome
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 6a7b8de54b77..59e9ec8cd8b3 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
 
 USE_GNOME=	gnomeprefix gnometarget gnomevfs2
 USE_GMAKE=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-librapi=${LOCALBASE} \
 			--with-libsynce=${LOCALBASE} \
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 832a3bd43644..24ee19b79f13 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -22,7 +22,6 @@ USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gnometarget
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_XLIB=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lsynce
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE} \
diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile
index d1c74ba3dfbd..3bc595b2ee5d 100644
--- a/ports-mgmt/instant-tinderbox/Makefile
+++ b/ports-mgmt/instant-tinderbox/Makefile
@@ -39,7 +39,7 @@ USE_PHP=	yes
 USE_TCL_RUN=	yes
 USE_TK_RUN=	yes
 
-USE_XLIB=	yes
+USE_XORG=	x11 xpm
 USE_PERL5=	yes
 
 USE_ICONV=	yes
@@ -51,7 +51,6 @@ USE_GHOSTSCRIPT=yes
 USE_BISON=	build
 USE_FREETYPE=	yes
 USE_GL=		yes
-USE_XPM=	yes
 USE_OPENLDAP=	yes
 USE_FAM=	yes
 USE_PYTHON=	yes
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 91f3f66df699..dff2eb952b31 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -33,7 +33,7 @@ LDFLAGS=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
 PKGNAMESUFFIX=	-nox11
 PREVIEWER=	no_prev
 .else
-USE_XLIB=	yes
+USE_XORG=	x11
 CPPFLAGS+=	-DHAS_UNIX_X11 -I${X11BASE}/include
 LDFLAGS+=	-L${X11BASE}/lib -lX11
 PREVIEWER=	to_x11
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 9cd2067a40dd..6f06164f817f 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mgv
 PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.netsw.org/graphic/postscript/interpreter/mgv/ \
 		http://mirror2.unixfreunde.de/ \
@@ -16,8 +16,7 @@ MASTER_SITES=	http://www.netsw.org/graphic/postscript/interpreter/mgv/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PostScript and PDF previewer
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
diff --git a/print/wmlpq/Makefile b/print/wmlpq/Makefile
index 26e22453ce8a..f6b7cde63654 100644
--- a/print/wmlpq/Makefile
+++ b/print/wmlpq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmlpq
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print windowmaker
 MASTER_SITES=	http://www.ur.uklinux.net/wmlpq/dl/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -18,8 +18,7 @@ COMMENT=	Print queue monitoring dockapp for Window Maker
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		${PORTNAME}.1x
 
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index 3dd77873a1eb..9983286791bb 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcyrx
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian windowmaker
 MASTER_SITES=	http://ozz.pp.ru/distfiles/ \
 		ftp://ftp.vistdon.ru/pub/unix/X/wmanagers/windowmaker/
@@ -16,7 +16,7 @@ DISTNAME=	cyrx-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The cyrillic keyboard layout manager for Window Maker
 
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/wmcyrx2
 MAKE_ENV+=	COPT="${CXXFLAGS} -fpermissive"
diff --git a/russian/xcyrBGR/Makefile b/russian/xcyrBGR/Makefile
index f0455284948c..950d8f9a46c6 100644
--- a/russian/xcyrBGR/Makefile
+++ b/russian/xcyrBGR/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcyrBGR
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian
 MASTER_SITES=	ftp://ftp.slavof.net/pub/FreeBSD/X11/cyrillic/ \
 		ftp://mail.partners-bg.org/pub/FreeBSD/X11/cyrillic/ \
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The bulgarian cyrillic keyboard layout manager for X11
 
 PLIST_FILES=	bin/xcyrBGR
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 NO_INSTALL_MANPAGES=	yes
 MAKE_ENV=	COPT="${CXXFLAGS} -fpermissive"
 
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index 94bd21b19fa6..4a564e8c01c0 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xruskb
 PORTVERSION=	1.15.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/source/xruskb/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A keyboard layout switcher and indicator
 
-USE_X_PREFIX=	YES
+USE_XORG=	x11 ice xt xmu
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share
diff --git a/science/bblimage/Makefile b/science/bblimage/Makefile
index 5962695151fd..c3aee72b9a3b 100644
--- a/science/bblimage/Makefile
+++ b/science/bblimage/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bblimage
 PORTVERSION=	0.66
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
@@ -19,7 +19,7 @@ COMMENT=	A set of software tools for medical image processing
 
 LIB_DEPENDS=	Xm.2:${PORTSDIR}/x11-toolkits/lesstif
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lapack --with-python
diff --git a/science/oases/Makefile b/science/oases/Makefile
index b0f1cea75e0f..921c3f6f5004 100644
--- a/science/oases/Makefile
+++ b/science/oases/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	oases
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	ftp://keel.mit.edu/pub/Oases/
 DISTNAME=	oases_Mar-28-2002
@@ -18,7 +18,7 @@ COMMENT=	Ocean Acoustics and Seismic Exploration Synthesis
 
 WRKSRC=		${WRKDIR}/Oases_export
 
-USE_XLIB=	yes
+USE_XORG=	x11
 MAKE_ENV+=	OASES_ROOT="${WRKSRC}" HOSTTYPE=FreeBSD OSTYPE=FreeBSD
 
 USE_FORTRAN=	yes
diff --git a/science/pyvox/Makefile b/science/pyvox/Makefile
index 5962695151fd..c3aee72b9a3b 100644
--- a/science/pyvox/Makefile
+++ b/science/pyvox/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bblimage
 PORTVERSION=	0.66
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
@@ -19,7 +19,7 @@ COMMENT=	A set of software tools for medical image processing
 
 LIB_DEPENDS=	Xm.2:${PORTSDIR}/x11-toolkits/lesstif
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lapack --with-python
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index f0a82c8ec362..a2bc82908526 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
 
@@ -42,7 +42,7 @@ USE_GNOME+=	glib20
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	x11 xmu
 PLIST_SUB+=	X11=''
 MAN8+=		webspy.8
 .else
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 98639e1c1a58..40e8272520a8 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Figaro's Password Manager, an app to securely store your passwords
 
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index b03e14d599da..9f8f319c862c 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -20,7 +20,6 @@ BUILD_WRKSRC=	${WRKSRC}/contrib
 ALL_TARGET=	gnome-ssh-askpass2
 
 PLIST_FILES=	bin/gnome-ssh-askpass2
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index e7d0852836e8..bafe4dd532b7 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gringotts.2:${PORTSDIR}/security/libgringotts \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 WANT_GNOME=	yes
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index cf7023a178f6..f2e2b3f5961d 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -17,9 +17,8 @@ DISTNAME=	gtk-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and easy to use TCP only port scanner (GTK+ version)
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 USE_GNOME=	gtk12
 
 MAN1=		gtk-knocker.1
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 89c86d8feab8..5cd344e57001 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://members.chello.nl/~h.lai/libgnomesu/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library and frontend for running commands as root
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 79e91a119e66..e9d245deaf25 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssh
 PORTVERSION=	1.2.33
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/ \
 		ftp://ftp.nsysu.edu.tw/Unix/Security/ssh/ \
@@ -122,7 +122,7 @@ CONFIGURE_ARGS+=	--with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5
 # Include extra files if X11 is installed
 .if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
 	&& !defined(WITHOUT_X11))
-USE_XLIB=	yes
+USE_XORG=	x11
 PLIST:=		${WRKDIR}/PLIST
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist.x11 ${PKGDIR}/pkg-plist > ${PLIST}
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 3e68b2c563d6..6cae038fed76 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asapm
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asapm/
 
@@ -16,8 +16,7 @@ COMMENT=	Laptop battery status display for X11
 
 ONLY_FOR_ARCHS=	i386
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install install.man
 
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index 29e9e6377dc0..7694fd845718 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	asfsm-1.0pre15
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	File-system monitor for the AfterStep window manager
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm x11 sm ice xext xaw xt
 GNU_CONFIGURE=	yes
 
 MAN1=		asfsm.1
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index 4fa57ae01304..e21a255d7902 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.tigr.net/afterstep/download/asmem/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An AfterStep look-n-feel memory utilization monitor
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm \
 		--with-xpm-includes=${X11BASE}/include \
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index d677295de11f..b70d644c03c0 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	apps/asmon
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A swallowable applet monitors the CPU usage, memory and swap, etc
 
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xpm x11
 
 BUILD_WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon
 CFLAGS+=	-I${X11BASE}/include
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 7b16bee5cb04..0c2808c98a32 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -21,7 +21,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	APM monitor for the Blackbox slit
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile
index b7d708d62041..ccd70b6cfecd 100644
--- a/sysutils/disktool/Makefile
+++ b/sysutils/disktool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	disktool
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.auxio.org/pub/mirrors/step.polymtl.ca/pub/Xview/apps/disktool/
 DISTNAME=	disktool-2.0c
@@ -17,8 +17,6 @@ COMMENT=	XView sysadmin tool for monitoring diskfull situations
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
-USE_X_PREFIX=	yes
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 ALL_TARGET=	disktool
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index 6a929bbdd821..08dea43ee9c4 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	gkfreq
 PORTVERSION=	1.0
 PORTREVISION=	1
-#PORTREVISION=	0
 CATEGORIES=	sysutils
 DISTNAME=	gkrellm-gkfreq-${PORTVERSION}
 MASTER_SITES=	http://www.peakunix.net/downloads/
@@ -21,6 +20,4 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkfreq.so
 
-USE_X_PREFIX=	yes
-
 .include <bsd.port.mk>
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index f5be829a5350..6ed03b9276be 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -18,7 +18,6 @@ COMMENT=	GKrellM Leds for CapsLock, NumLock and ScrollLock
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index 262a82335bcf..15057aa65a48 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 PLIST_FILES=	libexec/gkrellm/plugins/gkmouse.so
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
 
diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile
index f4b4e83d5367..a360bf1180ba 100644
--- a/sysutils/gkrellmwho/Makefile
+++ b/sysutils/gkrellmwho/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
 ALL_TARGET=	#empty
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 96a8312abb39..c8363ba0e0ab 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 MAKEFILE=	Makefile.FreeBSD
 MAKE_ARGS=	CC="${CC}" \
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 5a77f08ce2cb..521703ca4700 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -16,7 +16,6 @@ DISTNAME=	gnome-find-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical version of the GNU "find" utility
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index d46b2166ebc4..be9634d8a94e 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GNOME=	gtk20 gnomehier
-USE_XLIB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|' \
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index a60b82d32809..2e88cbfc5a98 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/gtoaster
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnometarget gtk12
 USE_GMAKE=	yes
diff --git a/sysutils/ticker.app/Makefile b/sysutils/ticker.app/Makefile
index 1adff1ba8ec6..23293d5e52a4 100644
--- a/sysutils/ticker.app/Makefile
+++ b/sysutils/ticker.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ticker.app
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ticker dockapp for Window Maker
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index 71e47e51d82c..80090eeb3794 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmapm
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://dockapps.org/files/18/25/
 
@@ -18,8 +18,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmapm
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		wmapm.1
 PLIST_FILES=	bin/wmapm
diff --git a/sysutils/wmapmload/Makefile b/sysutils/wmapmload/Makefile
index 3bf69f48dc3b..2f3e2912487d 100644
--- a/sysutils/wmapmload/Makefile
+++ b/sysutils/wmapmload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmapmload
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	APM battery status monitor dockapp with a similar look to wmcpuload
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
 
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index afa244c7acca..7a35a2ac343f 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Window Maker dockapp that displays info about your battery
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib \
 		--x-includes=${X11BASE}/include
diff --git a/sysutils/wmbsdbatt/Makefile b/sysutils/wmbsdbatt/Makefile
index 7d9c27eb571b..7b0a18134dfa 100644
--- a/sysutils/wmbsdbatt/Makefile
+++ b/sysutils/wmbsdbatt/Makefile
@@ -6,15 +6,14 @@
 
 PORTNAME=	wmbsdbatt
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://homepage.univie.ac.at/l.ertl/wmbsdbatt/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp for battery & temperature monitoring through ACPI
 
-USE_XLIB=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 
 PLIST_FILES=	bin/wmbsdbatt
 
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 4c35f6a70aab..292e8f612b91 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -16,8 +16,7 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	wmcube-gdk is a modified version of the dockapp wmCube
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gtk12
 MAKEFILE=	Makefile.FREEBSD
 
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index efb1ab515dfc..25829a7e2d77 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -19,8 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dockapp that displays cpu load and a realtime 3d object
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAKEFILE=	Makefile.FREEBSD
 
 do-install:
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index 99d5c0e4ee3d..fda10d87a0e0 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	wmdiskmon
 PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk usage monitor dockapp
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XPM=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
 
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 04aaa83714b2..08cb8504efac 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Window Maker dock app showing load average as a flame
 
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index 976ae0c3d285..d6cc2e2abe8e 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmflame
 PORTVERSION=	0.60
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.novalis.org/programs/
 
@@ -17,8 +17,7 @@ COMMENT=	A dockapp that shows the load average as a flame
 PLIST_FILES=	bin/wmflame
 WRKSRC=	${WRKDIR}/wmflame.app/${PORTNAME}
 USE_GMAKE=	yes
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmflame ${PREFIX}/bin
diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index 5ad949c7f535..b8d68dc609fa 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	wmfsm
 PORTVERSION=	0.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.cs.ubc.ca/~cmg/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays filesystem usage of mountpoints in a nice WindowMaker dockapp
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index a361f7c4c087..dea47bc7054c 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmhm
 PORTVERSION=	1.46
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
@@ -21,8 +21,7 @@ GNU_CONFIGURE=	yes
 MAN8=		wmhm.8
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/wmhm
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"requires speaker(4)"
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index b94866036ca3..c2c7ae19d50a 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wminet
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
@@ -17,8 +17,7 @@ COMMENT=	Window Maker dockable inetd monitor
 
 WRKSRC=		${WRKDIR}/wminet.app/wminet
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index 7c23832dbfa3..d596f086a81d 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -16,8 +16,7 @@ COMMENT=	WM dock app to display info from MB power management controllers
 
 ONLY_FOR_ARCHS=	i386
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm-includes=${X11BASE}/include \
diff --git a/sysutils/wmlongrun/Makefile b/sysutils/wmlongrun/Makefile
index 78f8646d2009..bf5b89dcf394 100644
--- a/sysutils/wmlongrun/Makefile
+++ b/sysutils/wmlongrun/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	wmlongrun
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockapp to monitor the LongRun(tm) status on Crusoe
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index e5874e9de8a9..d4d4b2bef224 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Memory and swap monitoring dockapp
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/wmmemfree
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 27addb9b95e7..b24973945560 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmemmon
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mem/Swap monitoring dockapp for WindowMaker
 
 #USE_BZIP2=	yes	# ATM the .bz2 distfile is broken.
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index a25860eadb00..85f71ad230b8 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PCcard monitor for FreeBSD + PAO
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 MAN1=		wmpccard.1.gz
 NOMANCOMPRESS=	yes
 PLIST_FILES=	bin/wmpccard
diff --git a/sysutils/wmshutdown/Makefile b/sysutils/wmshutdown/Makefile
index ec6bfbdc5d7f..f30d1b3c663b 100644
--- a/sysutils/wmshutdown/Makefile
+++ b/sysutils/wmshutdown/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Window Maker dock application to shutdown or reboot
 
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 do-install:
 	@${ECHO} "wmShutdown -- Rafael V. Aroca <rafael@linuxqos.cjb.net>"
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index 29d359312324..14b4db548e62 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmtop
 PORTVERSION=	0.84
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://ftp1.sourceforge.net/wmtop/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windowmaker dock app to display top 3 CPU consuming processes
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm x11
 ALL_TARGET=	freebsd
 
 MAN1=		wmtop.1
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 52fe9d7867a6..2aa18ae4ffe3 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmupmon
 PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://j-z-s.com/projects/downloads/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An uptime showing dockapp with a similar look to wmcpuload
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_AUTOTOOLS=	automake:15 autoheader:261
 CONFIGURE_ARGS=	--program-prefix=""
 
diff --git a/sysutils/wmzazof/Makefile b/sysutils/wmzazof/Makefile
index b6edce0ac116..f189036afd62 100644
--- a/sysutils/wmzazof/Makefile
+++ b/sysutils/wmzazof/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmzazof
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://members.chello.be/cr49940/wmzazof/
 
@@ -16,8 +16,7 @@ COMMENT=	A simple dockapp that displays the uptime, free and used memory
 
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/wmzazof ${PREFIX}/bin
diff --git a/sysutils/xsu/Makefile b/sysutils/xsu/Makefile
index d76a18179e07..39bc7a7464a3 100644
--- a/sysutils/xsu/Makefile
+++ b/sysutils/xsu/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	xsu
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xsu runs commands as root after prompting for the root password
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
 CONFIGURE_ARGS=	--su-pwd-out="Password:"
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 1c1d0f7baec8..05e26a7cef3f 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xsysstats
 PORTVERSION=	1.51
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -19,7 +19,7 @@ COMMENT=	A system information display tool
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN1=		xsysstats.1
 
 ALL_TARGET=	xsysstats
diff --git a/textproc/Ebnf2ps/Makefile b/textproc/Ebnf2ps/Makefile
index 420331a3517c..88769348e1f3 100644
--- a/textproc/Ebnf2ps/Makefile
+++ b/textproc/Ebnf2ps/Makefile
@@ -21,7 +21,7 @@ BROKEN=		Does not build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_SUBMAKE=	yes
 
 MAKE_ENV+=	X11BASE=${X11BASE}
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 57e96af661f0..397609558fe6 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-USE_XLIB=	yes
 USE_GNOME=	bonobo gnomehack gnomelibs gnomeprefix libxml2
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 0a84acf375ef..d0f33ad7f1f5 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -18,7 +18,6 @@ COMMENT=	IIIMF gnome input method switcher
 
 ONLY_FOR_ARCHS=	i386
 
-USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 4b84586e8ae6..d3eccc07e867 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
 
 ONLY_FOR_ARCHS=	i386
 
-USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 29055b8e40f3..ecac30ac028f 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 4049b059ae9e..a1b78b57ce2c 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 ice xt
 USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index d453824e43ad..fae2bdbbf2cb 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME tool to find strings in a set of files
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 8ddaff916e1b..0d57218111f7 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Simple GTK+-2 HTML editor
 
 LIB_DEPENDS=	gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml38
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtksourceview
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-clocks/gtubeclock/Makefile b/x11-clocks/gtubeclock/Makefile
index addfc48e34d4..09dbf974bad3 100644
--- a/x11-clocks/gtubeclock/Makefile
+++ b/x11-clocks/gtubeclock/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gtubeclock
 PORTVERSION=	0.9.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bonnyswan.com/gtubeclock/downloads/
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	A nixie tube clock for GNOME
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 libgnomeui
 
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index f35c69987930..f2b6a851f5b7 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asfiles
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/ASFiles
@@ -19,8 +19,7 @@ COMMENT=	X11 file manager. Dockable in WindowMaker
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_PERL5_BUILD=yes
 MAN1=	files.1
 MAN3=	regexp.3
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index b4c0b6d05e07..964862c5f13c 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -16,8 +16,7 @@ COMMENT=	OS/2 - like Desktop-File-Manager for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index c80cb654b3eb..6b667a4de902 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ARGS=	--without-fam
 
 CONFLICTS=	gnome-commander2-*
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 8f4821c82c9b..38f9c7992622 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A graphical frontend to mtools
 
 RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index 470c10dcf1a1..1c287a836ff7 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -21,7 +21,6 @@ COMMENT=	File manager and launcher
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/glib12 \
 		-I${LOCALBASE}/include/gtk12" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index edfae236aadb..92bf0d329912 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	artwiz-fonts
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.xs4all.nl/~hanb/software/fluxbox/ \
 		http://www.cus.org.uk/~dom/distfiles/artwiz-fonts/
@@ -18,7 +18,6 @@ COMMENT=	A set of free fonts for X11 desktops
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/fluxbox-${PORTNAME}
 
diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile
index a8a30663d4d3..c94d55dc938c 100644
--- a/x11-fonts/avifonts/Makefile
+++ b/x11-fonts/avifonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avifonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://graphis.hellug.gr/packages/
 DISTNAME=	avifonts
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index 3beccf01459a..b3212986c026 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		freefont-ttf
 PORTVERSION=		20060126
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	freefont
@@ -16,7 +16,6 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Free UCS Outline Fonts
 
 NO_BUILD=		yes
-USE_X_PREFIX=		yes
 WRKSRC=			${WRKDIR}/freefont-${PORTVERSION}
 SUB_FILES=		pkg-message
 SUB_LIST=		INSTALLDIR=${INSTALLDIR}
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index 14e46cbd464e..335de36c6106 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -18,6 +18,6 @@ COMMENT=	GTK+-based .bdf font editor for X
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/gfe
 USE_GNOME=	gtk12
-USE_XPM=	yes
+USE_XORG=	xpm
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index 5a537bc3b692..b1b517affbf2 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mgopen
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.ellak.gr/fonts/mgopen/files/
 DISTNAME=	MgOpen
@@ -18,7 +18,6 @@ COMMENT=	MgOpen greek fonts collection
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 676aafb3af7e..28e0da00f148 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	terminus-font
 PORTVERSION=	4.20
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.is-vn.bg/hamster/
 
@@ -20,7 +20,6 @@ BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USE_PERL5=	yes
-USE_X_PREFIX=	yes
 ALL_TARGET=	pcf
 SHAREMODE=	644
 FONTDIR=	lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 1cdb7b689e78..8e72d6c37e4d 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmbdfed
 PORTVERSION=	4.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -21,7 +21,6 @@ COMMENT=	A Motif tool for editing X11 bitmap fonts
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 
 MAN1=		xmbdfed.1
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 940a5492e6c8..d74459512d17 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	anholt/driglide/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
 
-USE_XLIB=	yes
+USE_XORG=	xxf86vm xxf86dga
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:261 libtool:15
diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile
index d68873077dd8..4d0618a155af 100644
--- a/x11-themes/sapphire-themes/Makefile
+++ b/x11-themes/sapphire-themes/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli \
 		sapphire:${PORTSDIR}/x11-wm/sapphire
 
 REINPLACE_ARGS=	-i '' -E
-USE_X_PREFIX=	yes
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index 485fa644a91a..70e5f12ca08a 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	9libs
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits plan9
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plan9 compatibility libraries
 
-USE_XLIB=	yes
+USE_XORG=	x11 xt ice
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/9libs
 
diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile
index 329b105efcb8..cf0d983bf74b 100644
--- a/x11-toolkits/XawPlus/Makefile
+++ b/x11-toolkits/XawPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XawPlus
 PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://people.freenet.de/kra/XawPlus/
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -16,9 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A replacement for Xaw with a nicer 3-D look and some extensions
 
+USE_XORG=	x11 xaw
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \
 		INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib"
 ALL_TARGET=	lib
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index 333d53314643..4650b90a2de7 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fl_editor
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://robertk.com/source/fl_editor/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,6 @@ COMMENT=	Text Editor Widgets for the Fast Light ToolKit
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index cacc84d9b762..bfd84de4c20d 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,6 @@ COMMENT=	Virtual Widgets for the Fast Light ToolKit
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/1.0
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	DIRS=src
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 24a8c3b21a20..020f72e2f850 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Display large amounts of numerical data fast and easy
 
 CONFLICTS=	gtkdatabox2-*
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 254a679b178c..562fe857b9ac 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 4e87d7ff4f96..f3f0bb66f60e 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -16,7 +16,6 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+ 2.0
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk20 gnomehack
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index de7e242f5fa4..651efb638bc9 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -18,7 +18,6 @@ COMMENT=	An OpenGL widget for the GTK+ GUI toolkit
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index ccafbacc6c77..7dc78b97f11c 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OpenGL extension to GTK
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 7c8025e8d8cc..d8b91c1b67e0 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GCC=	3.4+
 USE_GMAKE=	yes
diff --git a/x11-toolkits/inti-gconf/Makefile b/x11-toolkits/inti-gconf/Makefile
index a585ff824dad..6f5cb2b97844 100644
--- a/x11-toolkits/inti-gconf/Makefile
+++ b/x11-toolkits/inti-gconf/Makefile
@@ -19,7 +19,6 @@ COMMENT=	An Inti binding for GConf, the GNOME Configuration System
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
 USE_GNOME=	gconf2 gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/inti-gl/Makefile b/x11-toolkits/inti-gl/Makefile
index 859701530eb9..e7b065320808 100644
--- a/x11-toolkits/inti-gl/Makefile
+++ b/x11-toolkits/inti-gl/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti \
 		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/inti-sourceview/Makefile b/x11-toolkits/inti-sourceview/Makefile
index 4abf476bb162..520e99a74aad 100644
--- a/x11-toolkits/inti-sourceview/Makefile
+++ b/x11-toolkits/inti-sourceview/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtksourceview gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index 02167a06e8af..ca1072eecc17 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of C++ classes for developing GNOME and GTK+ applications
 
 USE_GNOME=	glib20 gtk20 atk pango gnomehack gnomeprefix
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 712a1e18d7e6..5137c3759f19 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -19,7 +19,6 @@ COMMENT=	A source code editor widget for GTK+
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_AUTOTOOLS=	automake:15:env autoconf:261:env libtool:15
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 3e46538e3025..b970ecffedd6 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack lthack gtk20 libxml2
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index 99bbb1731a56..564a48ee2b41 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -22,6 +22,5 @@ USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 33971a7202cd..bc8975dc99bf 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	pangopdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implements Pango library with a PDF backend for PDF output
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pango
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index f10ab435bd99..ce0d341cc569 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.0.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -22,7 +22,6 @@ LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs \
 
 CONFLICTS=	paragui-devel-[0-9]*
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index f0ce19dd62e7..f1a39441c775 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 
 PYDISTUTILS_PKGNAME=	pyFltk
 PYDISTUTILS_PKGVERSION=	1.1.2
diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile
index 2c9760bde679..9469499ca404 100644
--- a/x11-toolkits/py-fox/Makefile
+++ b/x11-toolkits/py-fox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fxpy
@@ -21,7 +21,6 @@ LIB_DEPENDS=	FOX-1.0:${PORTSDIR}/x11-toolkits/fox10
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_XLIB=	yes
 USE_GL=		yes
 
 PYDISTUTILS_PKGNAME=	FXPy
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 74714f8c824c..2d5379288006 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Ruby binding for GTK+
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GNOME=	gtk12
 
 RUBY_GNOME_VERSION=		0.34
diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile
index a2e6c7fd297d..b15847397981 100644
--- a/x11-toolkits/scx/Makefile
+++ b/x11-toolkits/scx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scx
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	ftp://ftp.scsh.net/pub/scsh/packages/scx/
 
@@ -16,8 +16,8 @@ COMMENT=	A GUI library for scsh and Scheme 48
 
 RUN_DEPENDS=	${LOCALBASE}/lib/scsh/scsh-install-pkg:${PORTSDIR}/devel/scsh-install-lib
 
+USE_XORG=	x11 xmu
 NO_BUILD=	yes
-USE_XLIB=	yes
 USE_LDCONFIG=	${PREFIX}/lib/scsh/0.6/scx-0.2/lib/${MACHINE_ARCH}-portbld-freebsd${OSREL}/
 
 DEPRECATED=		Version branch long since retired
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 77c46f16bbcf..254d1a9cd889 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	v
 PORTVERSION=	1.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vgui
@@ -19,7 +19,7 @@ COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows
 
 WRKSRC=		${WRKDIR}/home/vgui
 
-USE_X_PREFIX=	YES
+USE_XORG=	x11 xt xmu xaw
 USE_GMAKE=	YES
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 USE_DOS2UNIX=	yes
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 4a704933a226..9448d7702f09 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdk
 PORTVERSION=	2.4.1
-PORTREVISION=	4
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vdklib
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile
index e33d3344714c..09c448a1e9fd 100644
--- a/x11-toolkits/wmapp/Makefile
+++ b/x11-toolkits/wmapp/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	wmapp
 PORTVERSION=	0.0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits windowmaker
 MASTER_SITES=	http://www.princeton.edu/~kmccarty/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DockApp Graphics Library
 
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 CFLAGS+=	-I${X11BASE}/include
 ALL_TARGET=	# empty
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 411b29edd2e3..aa2132931772 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	Xbae
 PORTVERSION=	4.50.97
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xbae
@@ -21,7 +21,6 @@ COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 USE_MOTIF=	yes
-USE_X_PREFIX=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=--enable-production
 
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 4c563e2019e6..32a248f96452 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xclasses
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xcmail
@@ -25,8 +25,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 WRKSRC=		${WRKDIR}/xclasses
 
 pre-configure:
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index 5bcd5f1aac52..3b863875d67b 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xg
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://messners.com/code/ \
 		http://www.messners.com/code/
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows(tm) controls - like widget set for Motif(tm)
 
 WRKSRC=		${WRKDIR}/Xg-${PORTVERSION}
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_MOTIF=	yes
 MAKEFILE=	makefile
 
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index d1c52f6106a5..6fa2219b3c95 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits www
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
@@ -19,7 +19,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 USE_AUTOTOOLS=	libtool:15:env
 USE_MOTIF=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${LIBTOOL} ${CC}"
 USE_LDCONFIG=	yes
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index cc608ab6d6b7..9e6373e1e9e1 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pwm
 PORTVERSION=	2007.07.20
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/ \
 		http://schot.a-eskwadraat.nl/files/
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 MAINTAINER=	schot@a-eskwadraat.nl
 COMMENT=	A lightweight window manager with emphasis on usability
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 MAKE_ENV=	X11_PREFIX="${X11BASE}" HAS_SYSTEM_ASPRINTF=1
 
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
author	Martin Wilke <miwi@FreeBSD.org>	2008-03-25 22:44:48 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2008-03-25 22:44:48 +0000
commit	cda30a295fd474159658e5a43f99f4441d06682f (patch)
tree	2007491b9bfa70afd7bf89bf4d2324df2200b1b2
parent	Repocopy linux_base-f7 -> linux_base-f8 is completed. (diff)