9 files changed, 12 insertions, 15 deletions

diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 176eab416cf5..0405e4e8352c 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbcmd
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://darkshed.feuersenger.net/files/c_cpp/fbcmd/
 
@@ -19,9 +19,9 @@ RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/fluxbox
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	first
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CXX="${CXX}" CFLAGS="${CFLAGS}"
 
+USE_XORG=	x11 xmu
 PLIST_FILES=	bin/fbcmd
 
 post-extract:
diff --git a/x11-wm/fbpager/Makefile b/x11-wm/fbpager/Makefile
index 59c584ead4b3..84407490d4f3 100644
--- a/x11-wm/fbpager/Makefile
+++ b/x11-wm/fbpager/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	fbpager
 PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.fluxbox.org/download/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Desktop pager for the Fluxbox window manager
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index e1b6e19eea67..8691c6bbbb73 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	ion-2-*
 
 MAN1=		ion.1x
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 48a6635735f9..6b9904847e95 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Preferences manager for the Openbox window manager
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		obparser.16:${PORTSDIR}/x11-wm/openbox
 
-USE_XLIB=	yes
 USE_GNOME=	gnomehier gnometarget libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 7f761d318c32..85a0425e3293 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -20,7 +20,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 ltverhack
 USE_AUTOTOOLS=	libtool:15
-USE_XLIB=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index 3a0c64f6bd54..a8e140dbe588 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	ratmenu
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.mired.org/downloads/
 
 MAINTAINER=	mwm@mired.org
 COMMENT=	A simple menu patterened for use with ratpoison
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 ALL_TARGET=	ratmenu
 MAN1=		ratmenu.1
 PLIST_FILES=	bin/ratmenu
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index 0dd4ee00bbb3..79a5f3c82069 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	weewm
 PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://weewm.flashtux.org/download/
@@ -16,7 +16,7 @@ MAINTAINER=	ppl@nbnet.nb.ca
 COMMENT=	Fast and ultra light windowmanager with total keyboard control
 
 PLIST_FILES=	bin/weewm
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${X11BASE},g' \
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 2bcde91cd4d0..c0e21ee1bad5 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	windowlab
 PORTVERSION=	1.33
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.nickgravgaard.com/windowlab/
 EXTRACT_SUFX=	.tar
@@ -17,7 +17,7 @@ COMMENT=	A small window manager for X11
 
 MAN1=		windowlab.1x
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext
 USE_GMAKE=	yes
 
 MAKE_ARGS=	MENURC=${PREFIX}/etc/windowlab/menurc CC="${CC}"
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 8b1b11541300..bcf1d092b72f 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -25,9 +25,8 @@ RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_PERL5=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes