Switch from libglut to freeglut and retire libglut. Libglut hasn't been

developed in years and has been dropped from the MESA 8.0 distribution.
Freeglut is a rewrite of glut and is actively developed and is used by
many linux distributions instead of libglut.

Bump all ports that directly depend on libglut because of the shlib version
change.

There are some extra items in this patch.

*) Because freeglut doesn't have the same dependancies as libglut, some ports
	need extra dependencies added to USE_XORG to make them build.
*) Mark graphics/f90gl broken, f90gl depends on a header that is only shipped
	with libglut.
*) Remove option for libglut/freeglut selection in games/cake, only freeglut
	remains now.
*) While here fix a png related build issue games/vegastrike.

Thanks to miwi for running the exp-run.

Approved by:	portmgr (miwi)

Collaboration with:	zeising@
Obtained from:	xorg-dev staging area.

50 files changed, 56 insertions, 90 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index d8e0013e3d0c..58d71760d3ac 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -469,7 +469,6 @@
     SUBDIR += libggimisc
     SUBDIR += libggiwmh
     SUBDIR += libgltext
-    SUBDIR += libglut
     SUBDIR += libgnomecanvas
     SUBDIR += libgnomecanvas-reference
     SUBDIR += libgnomecanvasmm
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index bb2389bfe83d..e48718ac97c1 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	devil
 PORTVERSION=	1.7.8
 PORTEPOCH=	1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF/openil/DevIL/${PORTVERSION}
 DISTNAME=	DevIL-${PORTVERSION}
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 91decc1ea343..e8bb157adb97 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	driconf
 PORTVERSION=	0.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/d/${PORTNAME}
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index c5ec316026b2..544676c5ece3 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dynamechs
 PORTVERSION=	4.0.p1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.0pre1
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 15b8b7052f61..9c53ccef199e 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enblend
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION}
diff --git a/graphics/f90gl/Makefile b/graphics/f90gl/Makefile
index bec59b6ed241..4fd3c4476e64 100644
--- a/graphics/f90gl/Makefile
+++ b/graphics/f90gl/Makefile
@@ -22,6 +22,8 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Official Fortran 90 bindings for OpenGL
 
+BROKEN=		doesn't build with freeglut
+
 USE_GL=		glut glu
 USE_XORG=	xaw
 USE_LDCONFIG=	yes
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index 92e4d7c69579..4c77a24a1796 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffff
 PORTVERSION=	323
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/FFFF%203.2.3
 DISTNAME=	FFFF${PORTVERSION}-src
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index ee2b81495ef9..cbead3c8c2ff 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index ce5835e2a0b6..b55a23e8e542 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fv
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.eaflux.com/fv/sources/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 55ee5c672e82..ba314d49a421 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gl
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	graphics scheme
 MASTER_SITES=	SF/gauche/Gauche-gl
 PKGNAMEPREFIX=	gauche-
@@ -19,6 +20,7 @@ COMMENT=	OpenGL binding for Gauche
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USE_XORG=	ice sm
 USE_GL=		glut
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 64e65fe8e96a..2db9db229bc5 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gle
 PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}\
 		http://linas.org/gle/pub/ \
@@ -17,6 +17,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}\
 MAINTAINER=	ports@dclg.ca
 COMMENT=	A GL Tubing and Extrusion Library
 
+USE_XORG=	ice xt xmu
 USE_GL=		glut
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile
index be826cb435c2..7ae869950e82 100644
--- a/graphics/glexcess/Makefile
+++ b/graphics/glexcess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glexcess
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.glexcess.com/files/
 DISTNAME=	${PORTNAME}
@@ -19,7 +19,7 @@ COMMENT=	An impressive OpenGL Demo
 USE_GL=		glut
 
 MAKE_ARGS=	'CXXFLAGS=${CXXFLAGS} -I${LOCALBASE}/include -pipe -s -O2' \
-		'LDFLAGS=-L${LOCALBASE}/lib -lGL -lglut'
+		'LDFLAGS=-L${LOCALBASE}/lib -lGL -lGLU -lglut'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/scene*.cpp
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 2455aa5b9156..689c1e1f2e79 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltt
 PORTVERSION=	2.5.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://gltt.sourceforge.net/download/
 
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 72300b08ea94..3886ec987a99 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2011.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 782f6834e32f..b4edb72dbc72 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -40,7 +40,8 @@ UUID_DESC=	UUID support (required by GDAL)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENGL}
-USE_GL=	glut
+USE_XORG=	x11 xmu xi xext
+USE_GL=		glut
 CONFIGURE_ARGS+=--enable-opengl
 PLIST_SUB+=	OPENGL=""
 .else
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 58a22fd593fa..7cf10a5ebfb8 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile
index 6018c832dc57..b4407ec9ac09 100644
--- a/graphics/landscape/Makefile
+++ b/graphics/landscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		landscape
 PORTVERSION=		0.7
-PORTREVISION=	12
+PORTREVISION=		13
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://homepage.ntlworld.com/jon.belson/files/
 
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 31361ef50bc1..150a1e23cfaf 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lib3ds
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 09a5d91bf694..929994125c38 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -12,7 +12,6 @@
 #    - graphics/libGL
 #    - graphics/libGLU
 #    - graphics/libGLw
-#    - graphics/libglut
 #    - graphics/dri
 #
 # $FreeBSD$
@@ -50,7 +49,7 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
-		--disable-egl
+		--disable-egl --disable-glut
 
 .if defined(WITH_NEW_XORG)
 EXTRA_PATCHES+=	${PATCHDIR}/extra-configure \
@@ -81,14 +80,8 @@ ARCH!=			uname -p
 
 COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 
-.if ${COMPONENT:Mglut} == ""
-. if ${COMPONENT:Mglu} == ""
-CONFIGURE_ARGS+=	--disable-glu --disable-glut
-. else
-CONFIGURE_ARGS+=	--disable-glut
-. endif
-.else
-DISTFILES+=		MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
+.if ${COMPONENT:Mglu} == ""
+CONFIGURE_ARGS+=	--disable-glu
 .endif
 
 .if ${COMPONENT:Mglw} == ""
diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile
index 2f39f3a6cc0b..8d34e90f705f 100644
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libaux
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/
 DISTFILES=	libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index 39906334cf8d..a66b9fd193eb 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgltext
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gltext/gltext/${PORTVERSION}
 DISTNAME=	gltext-${PORTVERSION}
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
deleted file mode 100644
index 1d55cf44ab4b..000000000000
--- a/graphics/libglut/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:    libglut
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 anholt
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libglut
-PORTVERSION=	${MESAVERSION}
-CATEGORIES=	graphics
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	OpenGL utility toolkit
-
-USE_GL=		glu
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
-
-do-install:
-	cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${WRKSRC}/include/GL/glutf90.h \
-		${PREFIX}/include/GL
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
deleted file mode 100644
index 6726d9c68d98..000000000000
--- a/graphics/libglut/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
-SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
-SHA256 (MesaGLUT-7.11.2.tar.bz2) = 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7
-SIZE (MesaGLUT-7.11.2.tar.bz2) = 201575
diff --git a/graphics/libglut/pkg-descr b/graphics/libglut/pkg-descr
deleted file mode 100644
index e5a545207f86..000000000000
--- a/graphics/libglut/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-libglut is a library provided with Mesa which provides an interface for creating
-windows containing OpenGL contexts on a wide variety of platforms and handling
-user interaction.
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist
deleted file mode 100644
index 382dca6b67fe..000000000000
--- a/graphics/libglut/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/GL/glut.h
-include/GL/glutf90.h
-lib/libglut.so
-lib/libglut.so.3
-libdata/pkgconfig/glut.pc
-@dirrmtry include/GL
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index 4c5f2986780d..b4a2edc23710 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	makehuman
 DISTVERSION=	0.9.1-rc1a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
 
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 1bceb961108a..3c8366481b4e 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mesa-demos
 PORTVERSION=	7.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
 DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
@@ -21,7 +22,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GL=		glu glut
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
+USE_XORG=	glproto x11 xext xt xxf86vm xdamage xfixes dri2proto
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-gallium --with-demos=demos,xdemos
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index c721dc6e8677..a047f08e0410 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mhgui
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/makehuman/MakeHuman%20Source/MakeHuman_091
 
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
+USE_XORG=	xi xmu ice sm
 USE_GL=		glut
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index ae212f10d8e2..7634268f5c03 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	morpheus
 PORTVERSION=	0.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.winnicki.net/morpheus/meat/
 
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index 6c282f9b8aa3..8745f5998258 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lablgl
 PORTVERSION=	20120306
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
 		https://forge.ocamlcore.org/frs/download.php/816/
@@ -18,6 +19,7 @@ COMMENT=	OpenGL interface for Objective Caml
 LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/lablGL
+USE_XORG=	x11 xext xmu
 USE_GL=		glut
 USE_GMAKE=	yes
 USE_OCAML=	yes
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index 474db3d9056b..22bdc2861e93 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	OpenGL
 PORTVERSION=	0.66
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHM
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index da4820ae085d..f55cc76591c5 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.6.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/pure-gl/Makefile b/graphics/pure-gl/Makefile
index b1537c4a49e9..4931863ca86d 100644
--- a/graphics/pure-gl/Makefile
+++ b/graphics/pure-gl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pure-gl
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	lichray@gmail.com
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index a15b7435cad7..0f58de8ca379 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	SF/py${PORTNAME}/PyOpenGL/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile
index 7db5894a4282..6c17ca4b6a7d 100644
--- a/graphics/pyro/Makefile
+++ b/graphics/pyro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyro
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://nostatic.org/pyro/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index dc15974e2efd..283133119a2b 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quat
 PORTVERSION=	1.20
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.physcip.uni-stuttgart.de/phy11733/download/
 PKGNAMESUFFIX=	-gui
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index d11ea1a47fc5..867fa908e9d5 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quesa
 PORTVERSION=	1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 .ifdef (WITH_EXAMPLES)
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 22dcc6142631..5ba0c2dfd4d1 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quesoglc
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/QuesoGLC/${PORTVERSION}
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 0dbf51b52d8c..ee36bf5b9b0e 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index 06c759be0eea..e8e56b17ae2b 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	0.32b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,6 +20,7 @@ COMMENT=	OpenGL/GLU/GLUT interface modules for Ruby
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
+USE_XORG=	x11 xi xmu xext
 USE_GL=		glut
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/graphics/rubygem-opengl/Makefile b/graphics/rubygem-opengl/Makefile
index 1af8a32cd853..bfb1a99f6a3d 100644
--- a/graphics/rubygem-opengl/Makefile
+++ b/graphics/rubygem-opengl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	0.60.1
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	RG
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index 9e02170f6af9..47d8cc5403e5 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simpleviewer
 PORTVERSION=	1.7.1553.8560
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OpenGL%20edition
 DISTNAME=	sviewgl-src-${PORTVERSION}
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index f4dccbc0102d..efd9a9b2d86e 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	swftools
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.swftools.org/ \
 		http://www.c-s.li/ports/
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index ba15baa91066..cb5cfa14a4ab 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	tiff
 PORTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index c92c3ab7a03a..50e103e7236b 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tulip
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 25b4f0b61777..530e6e367873 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	view3ds
 PORTVERSION=	1.0.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index e5bd3ed0e779..a62f7bbc7443 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	white_dune
 PORTVERSION=	${DISTVERSION:S/pl/./}
 DISTVERSION=	0.30pl5
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES
diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile
index 0d2e9f67ecb0..71e3483012f4 100644
--- a/graphics/xmms-dancingparticles/Makefile
+++ b/graphics/xmms-dancingparticles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dancingparticles
 PORTVERSION=	0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://tardyp.free.fr/dancingparticles/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index 7a6d71d9cf61..d4e18061a2b7 100644
--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-fishmatic
 PORTVERSION=	0.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://stukach.com/hosted/
 DISTNAME=	fishmatic
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index de82db081ff8..6d5e1d1158dc 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-paranormal
 PORTVERSION=	0.2.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/paranormal/old-paranormal-xmms/${PORTVERSION}
 DISTNAME=	paranormal-${PORTVERSION:S/.p/pre/}