- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

19 files changed, 20 insertions, 36 deletions

diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 0677d4450f2f..4e0af31ffd55 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	agave
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
@@ -23,7 +23,6 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomedocutils intlhack
 GCONF_SCHEMAS=	agave.schemas
 INSTALLS_ICONS=	yes
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index a6fef501eeb1..f3d04a875f6e 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	danpei
 PORTVERSION=	2.9.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	danpei
@@ -21,7 +21,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 GNU_CONFIGURE=	yes
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index 19a321fb214c..ba575515792d 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eterm-bg
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.eterm.org/download/
 DISTNAME=	Eterm-bg-${PORTVERSION}
@@ -17,7 +17,6 @@ COMMENT=	Image files for background of Eterm
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 
 do-install:
 	${MKDIR} ${PREFIX}/share/Eterm
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index ea865c490dcc..ffaab05962ac 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	smyru@heron.pl
 COMMENT=	A simple GTK+ 2.0 color selector
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index a6030c89164b..9eb8c096fde7 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gifsicle
 PORTVERSION=	1.48
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lcdf.org/gifsicle/
 
@@ -28,7 +28,7 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x --disable-gifview
 PLIST_SUB=	X11='@comment '
 .else
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN1+=		gifview.1
 PLIST_SUB=	X11=''
 .endif
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 8253f380f58d..4178615be50c 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -17,7 +17,6 @@ COMMENT=	An image viewer that uses Gdk-Pixbuf and OpenGL
 LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
 USE_GETTEXT=	yes
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index b43b57bd9827..5aad30475cb8 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ida
 PORTVERSION=	0.21
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://dl.bytesex.org/releases/fbida/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -22,7 +22,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		exif.12:${PORTSDIR}/graphics/libexif
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 USE_PERL5_BUILD=yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index e7708450fd6a..3e26a03cbcfa 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libggi
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
@@ -125,7 +125,7 @@ CONFIGURE_ARGS+=	--enable-kgi --with-extra-includes=/usr/include/dev
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	x11 xxf86dga
 PLIST_SUB+=	WITH_X=""
 .else
 CONFIGURE_ARGS+=	--disable-x --disable-dga
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index 032c3ef65031..fe8338622d5f 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libggiwmh
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -41,7 +41,7 @@ MLINKS=		ggiWmhIconify.3 ggiWmhMoveIcon.3 \
 		- ggiWmhMaximize.3 - ggiWmhResize.3
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	x11
 PLIST_SUB+=	XWMH=""
 .else
 CONFIGURE_ARGS+=--disable-x
diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile
index cb5e33842ecb..a8f4171a755a 100644
--- a/graphics/libx3dtk/Makefile
+++ b/graphics/libx3dtk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libx3dtk
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/
 DISTNAME=	X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E}
@@ -24,7 +24,6 @@ WRKSRC=		${WRKDIR}/X3DToolKit-1.0
 
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_XLIB=	yes
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 36826f8d3ca4..727b46ad7eb3 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.5/
 MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	Flash Rendering Library
 
-LIB_DEPENDS=	 oil-0.3.1:${PORTSDIR}/devel/liboil \
+LIB_DEPENDS=	oil-0.3.1:${PORTSDIR}/devel/liboil \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup
 
-USE_XLIB=	yes
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool:15:env automake:19:env autoconf:261
 GNU_CONFIGURE=	yes
diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile
index 4d10a022b56c..e538d7ddd0dc 100644
--- a/graphics/xmms-dancingparticles/Makefile
+++ b/graphics/xmms-dancingparticles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dancingparticles
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://tardyp.free.fr/dancingparticles/
 PKGNAMEPREFIX=	xmms-
@@ -21,7 +21,6 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 		glut.4:${PORTSDIR}/graphics/libglut \
 		xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
 USE_SDL=	sdl
diff --git a/graphics/xmms-dflowers/Makefile b/graphics/xmms-dflowers/Makefile
index 7c3a2eee1641..ccffd46a53fb 100644
--- a/graphics/xmms-dflowers/Makefile
+++ b/graphics/xmms-dflowers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dflowers
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
@@ -19,7 +19,6 @@ COMMENT=	Dual Flowers visualization plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
 post-patch:
diff --git a/graphics/xmms-dspectogram/Makefile b/graphics/xmms-dspectogram/Makefile
index c89d018f2172..257c4fc490d8 100644
--- a/graphics/xmms-dspectogram/Makefile
+++ b/graphics/xmms-dspectogram/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dspectogram
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
@@ -19,7 +19,6 @@ COMMENT=	Dual Spectogram visualization plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
 post-patch:
diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile
index fb06ce6abd7c..3a1b7f4d43a3 100644
--- a/graphics/xmms-plazma/Makefile
+++ b/graphics/xmms-plazma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-plazma
 DISTVERSION=	0.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://membres.lycos.fr/diablolight/
 
@@ -16,7 +16,6 @@ COMMENT=	Plazma is an XMMS visualization plugin
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
 USE_SDL=	sdl
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index d31a70e466b3..8cd2d9f62335 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scivi
 DISTVERSION=	0.2.0-rc3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT=	Scivi is a visualization plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index 03afa39e2a0e..19c515b79d91 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vumeter
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}plugin
@@ -18,7 +18,6 @@ COMMENT=	Analog VUmeter plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/xmms-waterfall/Makefile b/graphics/xmms-waterfall/Makefile
index 78388806ef49..03cac8b66f45 100644
--- a/graphics/xmms-waterfall/Makefile
+++ b/graphics/xmms-waterfall/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waterfall
 PORTVERSION=	0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.sethoscope.net/waterfall/
 PKGNAMEPREFIX=	xmms-
@@ -17,7 +17,6 @@ COMMENT=	Yet another XMMS spectrum analyzer
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 42ff6b8b5931..30e3d05a796d 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -64,7 +64,6 @@ CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=		X11="@comment "
 .else
 CONFIGURE_ARGS+=	--with-x
-USE_X_PREFIX=		yes
 USE_MOTIF=		yes
 MAN1+=			xpdf.1
 PLIST_SUB+=		X11=""