- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

8 files changed, 7 insertions, 15 deletions

diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile
index 2152edd..19feab7 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 d5b11d7..1ff41a0 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 f3ab321..03059b9 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 5bdf52a..8ce3838 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 b1f561a..358d343 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 ee18bb5..58c2150 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 c173b7b..da75830 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 1471935..e0f09f0 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