- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 5 insertions, 9 deletions

diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index bff6f1ec4eeb..37db5edb6185 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	evilwm
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
 MAINTAINER=	lasg@lasg.dk
 COMMENT=	Minimalist window manager based on 9wm
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xpm xext xrender
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		evilwm.1
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index f55a4f8e4618..2bb2e396b210 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oroborus
 PORTVERSION=	2.0.18
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/ \
 		http://matt.peterson.org/FreeBSD/ports/
@@ -17,8 +18,7 @@ COMMENT=	A small and simple GNOME-compatible window manager
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xpm
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 92351b092260..cffcab261228 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -18,7 +18,7 @@ COMMENT=	CDE like desktop with GTK
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_GCC=	4.1
-USE_XPM=	yes
+USE_XORG=	x11
 USE_GETTEXT=	yes
 USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 899533b6ff44..97781f6256f4 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20 gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libmcs libutil mcsmanager panel
-USE_XLIB=	yes
 
 OPTIONS=	FAM	"Enable FAM support"		on \
 		THUNAR	"Enable thunar support"		on
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 87220d226447..06095f0458b5 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libmcs libutil mcsmanager
-USE_XLIB=	yes
 
 OPTIONS=	GTKDOC	"install the library documentation"	off \
 		STARTUP "Enable startup notification support"	on
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 8544825c10e7..1fe745504309 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libmcs libutil mcsmanager
-USE_XLIB=	yes
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index a4afb916d742..c9d5bc3a4516 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -26,8 +26,6 @@ USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmcs libutil libgui mcsmanager panel
 
-USE_XLIB=	yes
-
 OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
 		STARTUP 	"Enable startup notification support"			on \
 		REVMOUSE	"Reverse mouse workspace changing direction"		off