- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 1 insertions, 8 deletions

diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 66d61d3d6aad..7b09912f9dea 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gamma.so
-USE_X_PREFIX=	yes
 MAKE_ENV=	PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins
 ALL_TARGET=	gamma.so
 
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index 8168e6b411c7..97646415b265 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/helium.so
-USE_X_PREFIX=	yes
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index b4296a35cf02..1974f17cdfc6 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/xkb.so
-USE_X_PREFIX=	yes
 MAKE_ENV=	PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins
 ALL_TARGET=	xkb.so
 
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index dfc62fd5ce07..fb1ac703b6b4 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 ALL_TARGET=	gkrellweather.so
 
 MAKE_ENV=	enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} CC=${CC}
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 349c0acfdbd8..57f5b3d70611 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 MAINTAINER=	mcgee@wam.umd.edu
 COMMENT=	A gTK+ viewer for the User Friendly and several other popular comics
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop
 GNU_CONFIGURE=	yes
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 5476dc62754f..ebfbf2f62532 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		wmweather.1
 
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 85d57e53e1dc..aa30c8ecdd77 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -22,6 +22,5 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libgui
-USE_XLIB=	yes
 
 .include <bsd.port.mk>