11 files changed, 12 insertions, 20 deletions

diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 4e27b633259c..d65644f49063 100644
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-rootvis
 PORTVERSION=	0.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	bmp-plugins
@@ -23,7 +23,6 @@ PLIST_FILES=	lib/bmp/Visualization/librootvis.so \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 
 .include <bsd.port.mk>
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index ebc09092e353..3252eb61ec36 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.5.0b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=crayzedsgui
@@ -17,7 +17,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A library providing windowing and widgets for graphics APIs
 
 LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil \
-		pcre.0:${PORTSDIR}/devel/pcre
+		pcre.0:${PORTSDIR}/devel/pcre \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/0b/0/}
 CONFIGURE_ARGS=	--enable-toluacegui --disable-irrlicht-renderer \
@@ -32,7 +33,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GL=		yes
 USE_LUA=	5.0
-USE_XLIB=	yes
 USE_GNOME=	gnomehack
 
 .if !defined(NOPORTDOCS)
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index b0defb3ff997..97169e52c902 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 USE_DOS2UNIX=	yes
 USE_GCC=	3.2+
 USE_GL=		yes
-USE_XLIB=	yes
 USE_ZIP=	yes
 
 SOURCE=		FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \
diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile
index edc645678a69..f297f8fd32da 100644
--- a/graphics/hs-hgl/Makefile
+++ b/graphics/hs-hgl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hgl
 PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics haskell
 MASTER_SITES=	http://haskell.org/graphics/downloads/
 PKGNAMEPREFIX=	hs-
@@ -20,7 +20,7 @@ RUN_DEPENDS=	hugs:${PORTSDIR}/lang/hugs
 
 WRKSRC=		${WRKDIR}/graphics-${PORTVERSION}
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 
 HGL_LIBS=	${PREFIX}/lib/hugs/x11
 HGL_DOCS=	${PREFIX}/share/doc/hs-hgl
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 706dc87e6f0a..21f32bb77f44 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
@@ -30,7 +30,6 @@ GNU_CONFIGURE=	YES
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	YES
 USE_BZIP2=	YES
-USE_XLIB=	YES
 #USE_GCC=	3.4
 USE_GNOME=	gnomehack
 USE_GMAKE=	YES
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index 75bb9728244e..b1595f605bc6 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -34,7 +34,7 @@ DIST_SUBDIR=	povray31
 #   no UNIX source files for POV-Ray 3.1.
 #
 
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN1=		povray.1
 
 POVLIB=		${PREFIX}/lib/povray31
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index 05cd770d5c56..5b8b31439abe 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	cgkit
 PORTVERSION=	2.0.0a7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,6 @@ COMMENT=	Python Computer Graphics Kit
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-python scons:${PORTSDIR}/devel/scons
 
 USE_GL=		yes
-USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	2.0.0alpha7
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 5dc5ab5a3f3a..ec855f811f80 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmGrabImage
 PORTVERSION=	0.72
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics windowmaker
 MASTER_SITES=	http://dockapps.org/files/12/19/
 EXTRACT_SUFX=	.tgz
@@ -19,8 +19,7 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmGrabImage
 
-USE_X_PREFIX=	YES
-USE_XPM=	YES
+USE_XORG=	xpm
 
 MAN1=		wmGrabImage.1
 
diff --git a/graphics/xmms-dscope/Makefile b/graphics/xmms-dscope/Makefile
index eb4fc276dc61..e11e38ba507f 100644
--- a/graphics/xmms-dscope/Makefile
+++ b/graphics/xmms-dscope/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Dual Scope 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-dspectral/Makefile b/graphics/xmms-dspectral/Makefile
index c6d5f437e04b..f78fbf83c98a 100644
--- a/graphics/xmms-dspectral/Makefile
+++ b/graphics/xmms-dspectral/Makefile
@@ -19,7 +19,6 @@ COMMENT=	Dual Spectralizer visualization plugin for XMMS
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 
 post-patch:
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 0139ff71ad47..adbfd0820330 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xzgv
 PORTVERSION=	0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
 MAINTAINER=	nosuzuki@postcard.st
 COMMENT=	An image viewer with thumbnail-based file selector for X
 
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes