- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

33 files changed, 39 insertions, 63 deletions

diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 741e41091c8f..663a2be6e76b 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-musepack
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://dl.slik.org/musepack/
 
@@ -17,7 +17,6 @@ COMMENT=	XMMS input plugin for playing MPC Musepack (.mpc, .mp+) files
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 PLIST_FILES=	lib/xmms/Input/xmms-mpegplus-1.8.0.so
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 227699c34645..8199fb0695e8 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freehdl
 PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.home.hs-karlsruhe.de/~fado0011/ \
 		http://cran.mit.edu/~enaroska/
@@ -18,7 +18,6 @@ COMMENT=	A free VHDL simulator
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
-USE_XLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib \
 		--prefix=${PREFIX} \
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 57cc5ef1d28c..d5d5ba4d9bfe 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghfaxviewer
 PORTVERSION=	0.22.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	halifax
@@ -20,7 +20,6 @@ LIB_DEPENDS=	gnomeprint.16:${PORTSDIR}/print/gnome-print \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index a854aa43a045..f9ccc32d7af3 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtksql
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://membres.lycos.fr/bbrox/GtkSQL/
 
@@ -18,7 +18,6 @@ COMMENT=	Graphical query tool for PostgreSQL and/or MySQL
 WITH_MYSQL=	yes
 .endif
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
 .include <bsd.port.pre.mk>
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index 17be69f75b02..38c44cb33c6a 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaddr
 PORTVERSION=	1.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 
@@ -15,7 +15,6 @@ MAINTAINER=	lme@FreeBSD.org
 COMMENT=	A GTK (and optionally, GNOME) address book
 
 PLIST_FILES=	bin/gaddr
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index 78df8f602fb4..5c3f6e01b08a 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmget
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,7 +16,7 @@ COMMENT=	Dock app for Window Maker providing wget functionality
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 312115c64fa0..6b5ec066adc6 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blobwars
 DISTVERSION=	1.04-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=distfiles
@@ -18,7 +18,6 @@ COMMENT=	You are the fearless Blob agent, Bob
 MAKEFILE=	makefile
 MAKE_ENV=	CXX="${CXX}"
 
-USE_X_PREFIX=	yes
 USE_SDL=	sdl image mixer ttf
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/blobwars-1.04
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index d44e8aa41a49..3048aab61bab 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpuyopuyo
 PORTVERSION=	0.9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/
 
@@ -15,8 +15,7 @@ MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	A puzzle game, somewhat like Tetris
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_AUTOTOOLS=	autoconf:213
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index a4939defccdf..8b459840181e 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flphoto
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fltk
@@ -22,7 +22,6 @@ LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/graphics/xglurbules/Makefile b/graphics/xglurbules/Makefile
index d77d19923c60..55854ec5880b 100644
--- a/graphics/xglurbules/Makefile
+++ b/graphics/xglurbules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xglurbules
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://stephenroome.com/xglurbules/
 
@@ -15,8 +16,7 @@ COMMENT=	Burning particle system eye candy program thingy for X11
 
 MAN1=		xglurbules.1
 
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xt x11 sm ice xpm
 
 MANCOMPRESSED=	yes
 
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 4ae64517913a..4cb0119b4905 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	claws-mail>=3.3.1:${PORTSDIR}/mail/claws-mail
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 7bfb216aad8a..3d8635625800 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coolmail
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=system/mail/biffs
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	A Xbiff like mail tool with animated 3D graphics
 
-USE_XLIB=	yes
+USE_XORG=	x11 xext xmu xi
 PATCH_STRIP=	-p1
 
 MAN1=		coolmail.1
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 9b3401323960..3b5cb73b46a3 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geg
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.infolaunch.com/~daveb/
@@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR=	science/visualization/plotting
 MAINTAINER=	domi@saargate.de
 COMMENT=	Visualise multiple 2D-functions of one variable
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	-a -i
diff --git a/misc/ftree/Makefile b/misc/ftree/Makefile
index b0f6ffa9fb76..3f04a3d40393 100644
--- a/misc/ftree/Makefile
+++ b/misc/ftree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ftree
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc linux
 MASTER_SITES=	http://www.vjet.demon.co.uk/ftree/ \
 		http://www.unknown.nu/ports/
@@ -18,7 +19,6 @@ COMMENT=	An X11 genealogy program
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 NO_CDROM=	Non-commercial use only
 RESTRICTED=	Non-commercial use only
 
diff --git a/misc/grun/Makefile b/misc/grun/Makefile
index ce629976b4b6..0f3585e764b9 100644
--- a/misc/grun/Makefile
+++ b/misc/grun/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	grun
 PORTVERSION=	0.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
 MAINTAINER=	domi@saargate.de
 COMMENT=	Gtk-launcher similar to the Windows(tm) "Run..." dialog
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-testfile
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 03f5ac6d0768..dca1dbeca01f 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,7 +22,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 ONLY_FOR_ARCHS=	i386 alpha
 
-USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:261 libtool:15 libltdl:15
 USE_EFL=	imlib2
 
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 3e37e06abed3..863f65af73f6 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	20080309
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -22,7 +23,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	2.4+
-USE_XLIB=	yes
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${X11BASE}/include" \
 		LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 009aacd0f515..fd6d7958bf88 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	0.11.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/ \
 		http://ports.internal.vlink.ru/distfiles/
@@ -22,7 +23,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	2.4+
-USE_XLIB=	yes
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${X11BASE}/include" \
 		LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index 74f6759355ac..c6318c103fdf 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gkrellmqst
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net games
 MASTER_SITES=	http://tadpol.org/projects/archives/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -23,7 +23,6 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm \
 
 PLIST_FILES=	libexec/gkrellm/plugins/qst.so
 WRKSRC=		${WRKDIR}/${PORTNAME:S/mq/m_q/}
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index d3f20cb3ab7e..cf9a5fb7954e 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-vnc
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
@@ -16,7 +16,6 @@ COMMENT=	A GNOME/gtk viewer for VNC servers
 
 PLIST_FILES=	bin/gnome-vnc-viewer
 USE_GNOME=	gnomelibs
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index b29891c30e80..9af84fba9e02 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -8,15 +8,15 @@
 PORTNAME=	wmwifi
 PORTVERSION=	0.4
 DISTVERSIONSUFFIX=-bsd
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://digitalssg.net/debian/
 
 MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Dockapp displaying the signal strength of WiFi connection
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 
 CONFIGURE_ENV+=	"CPPFLAGS=-I${X11BASE}/include"
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 7c75fa715e6d..7aaa5028c246 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x11vnc
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=libvncserver
@@ -17,7 +18,7 @@ COMMENT=	VNC server for use with real X displays
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	gnometarget
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index 2f5e8b022953..c5b653ba6d44 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpasman
 PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://gpasman.sourceforge.net/files/
 
@@ -16,7 +16,6 @@ COMMENT=	A password manager that stores password information encrypted
 
 PLIST_FILES=	bin/gpasman
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index 4baa14e7345b..3beab7899542 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nbosd
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,6 @@ COMMENT=	Displays battery life and CPU frequency with an OSD
 
 BUILD_DEPENDS=	xosd-config:${PORTSDIR}/misc/xosd
 
-USE_X_PREFIX=	yes
 PLIST_FILES=	bin/nbosd
 PORTDOCS=	*
 
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index 9e82a3af75d7..a3fec729962a 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmbday
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/
 
@@ -16,7 +16,6 @@ COMMENT=	Window Maker dock app that will remind you of birthdays
 BUILD_DEPENDS=	${X11BASE}/bin/xmessage:${X_CLIENTS_PORT}
 
 HAS_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 MAKEFILE=	BSDmakefile
 MAKE_ENV+=	${CONFIGURE_ENV}
 
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index e4cc4a91c341..5421031746a3 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmbinclock
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.inxsoft.net/wmbinclock/
 
@@ -15,9 +15,8 @@ MAINTAINER=	logix@foobar.franken.de
 COMMENT=	A binary clock in a windowmaker applet
 
 PLIST_FILES=	bin/wmBinClock
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 3bd6cd92d185..8698bd94448b 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	t1:${PORTSDIR}/devel/t1lib \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	glib20 gtk20 gnomehack
 USE_AUTOTOOLS=	libtool:15
 CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 822a061a61f2..bd21e9fbc130 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kahakai
 PORTVERSION=	0.6.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,7 +31,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4
 USE_EFL=	imlib2
 
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index 74ad6db09eb6..1e00081f5b26 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A Run box for Blackbox
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index f77b76399910..8f7c094437a7 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmessage
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
@@ -15,7 +15,6 @@ MAINTAINER=	domi@saargate.de
 COMMENT=	Gtk+ clone of xmessage. displays a given text in a X11 window
 
 PLIST_FILES=	bin/gmessage
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 4856604c8d9e..7561e9adbb35 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	materm
@@ -16,8 +17,7 @@ MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Development version of mrxvt
 
 CONFLICTS=	mrxvt-0.4.*
-
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 MAN1=		mrxvt.1
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index 0038f31580aa..5233752b37e6 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	silo
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://doublef.nm.ru/silo/sources/
 
@@ -15,9 +15,7 @@ MAINTAINER=	doublef@tele-kom.ru
 COMMENT=	A simple X11 launcher extensible in any programming language
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xpm x11
 
 pre-everything::
 .if defined(WITHOUT_IMLIB)
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 4b81e8c6ea21..8edf9e11b9d5 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tilda
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,6 @@ LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 vte
 USE_GCC=	3.4+
-USE_XLIB=	yes
 
 DOCS=		AUTHORS ChangeLog README TODO