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.
author: Koop Mast <kwm@FreeBSD.org> 2012-08-04 22:52:02 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2012-08-04 22:52:02 +0000
commit: 5aa7246575084f0aefcffe71d7305d0b36b2ed33 (patch)
tree: a3b9f3e6c4e41379a4ad771026302ecf0ad0ae1b
parent: 2d4609c1309d60a953f0d9a6be96d373ca6ccfc6 (diff)
download: ports-5aa7246575084f0aefcffe71d7305d0b36b2ed33.tar.gz
ports-5aa7246575084f0aefcffe71d7305d0b36b2ed33.zip
125 files changed, 190 insertions, 171 deletions
diff --git a/MOVED b/MOVED
index 457e7375b61c..ff715103892f 100644
--- a/MOVED
+++ b/MOVED
@@ -3627,3 +3627,4 @@ editors/emacs.app||2012-07-29|Has expired: API no longer supported
 devel/ruby-gnustep||2012-07-29|Has expired: API no longer supported
 www/etoile-rsskit|www/rsskit|2012-08-04|Project renamed
 www/etoile-grr|www/grr|2012-08-04|Project renamed
+graphics/libglut|graphics/freeglut|2012-08-04|replace libglut with freeglut
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 2f3f6ec9a77d..5d7b1f10e8b6 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1939,7 +1939,7 @@ _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
 _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
 _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 _GL_glw_LIB_DEPENDS=		GLw.1:${PORTSDIR}/graphics/libGLw
-_GL_glut_LIB_DEPENDS=		glut.3:${PORTSDIR}/graphics/libglut
+_GL_glut_LIB_DEPENDS=		glut.12:${PORTSDIR}/graphics/freeglut
 _GL_linux_RUN_DEPENDS=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 
 .if defined(USE_GL)
diff --git a/UPDATING b/UPDATING
index 9b22f074e9fe..931983012b77 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120804:
+  AFFECTS: users of libglut.
+  AUTHOR: x11@FreeBSD.org
+
+  The libglut library is replaced by the Freeglut library.
+  Due to shlib version bump all glut users should be rebuild.
+  Please follow the instructions below to upgrade.
+
+  portmaster -o graphics/freeglut graphics/libglut
+  portmaster -r freeglut
+
 20120801:
   AFFECTS: users of editors/emacs
   AUTHOR: ashish@FreeBSD.org
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index b358b830a4c8..4f580c9da685 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	boinc-astropulse
 PORTVERSION=	6.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
 DISTNAME=	astropulse-svn-1280
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index bda631f9b9af..8c69ea2760a4 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	boinc-setiathome-enhanced
 PORTVERSION=	6.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
 DISTNAME=	setiathome-svn-1008
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 8440cd30cf05..00caf504c97b 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	celestia
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Celestia-source/${PORTVERSION}
 PKGNAMESUFFIX=	-${CELESTIA_UI}
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 161e24a7a2d2..3335e7426430 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.70
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index cb1915fe1d93..399b73e208c7 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openuniverse
 DISTVERSION=	1.0beta3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0beta3
 
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 08a79c17b5b7..10f08e722aae 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fmit
 PORTVERSION=	0.99.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/fmit/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
@@ -23,6 +23,7 @@ OPTIONS_DEFINE=	OSS ALSA PORTAUDIO JACK
 OPTIONS_DEFAULT=	OSS JACK
 
 USE_BZIP2=	yes
+USE_XORG=	xmu
 USE_QT4=	corelib gui opengl \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glut
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index 71950050a9e3..405978bc8e3c 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	molden
 PORTVERSION=	4.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 656012dfcaef..588ce97129d2 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	protomol
 PORTVERSION=	2.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/ProtoMol/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tar.gz
@@ -20,6 +20,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
+USE_XORG=	xmu xt sm ice xext x11 xi
 
 # Hack to cure a misbehavior of the configure script
 CONFIGURE_ARGS+=	--without-irix_mipspro_mpi
diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile
index bc84b3a13fb3..c2d28bdbd788 100644
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pymol
 PORTVERSION=	${VERSION}.${SVNREVISION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/pymol|}
 
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 1321f19e9632..1f38787cfdf1 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	CalculiX
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -47,6 +47,7 @@ DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}	\
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
+USE_XORG=	xmu
 USE_GL=	glut
 
 BROWSER?=	mozilla
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 1fd2f19d65d1..6d5d7fe4b199 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	leocad
 PORTVERSION=	0.77.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${LEOCAD_DISTNAME} ${LEOCAD_PIECES}
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 37556b035821..8b0fe78dd7ae 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	slffea
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/SLFFEA/${PORTVERSION}
 DISTNAME=	${PORTNAME}15
@@ -20,6 +21,7 @@ CONFLICTS=	swi-pl-[0-9]* TenDRA-[0-9]*
 
 LICENSE=	GPLv2
 
+USE_XORG=	xmu xt
 USE_GL=		glut
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 35bf2d965a01..a30bc9d9f651 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
@@ -41,6 +41,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
+USE_XORG=	sm ice xi x11 xt xmu xext
 USE_GL=		glut
 USE_TCL=	yes
 USE_TCL_BUILD=	yes
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 982bd4bfa853..ac708c7e58ea 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kmatrix3d
 PORTVERSION=		0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=		deskutils
 MASTER_SITES=		SF
 
@@ -20,7 +20,7 @@ DOCSDIR=		${PREFIX}/share/doc/HTML/en/kmatrix3d
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-USE_GL=			glut
+USE_GL=			glu glut
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool automake:env autoheader:env
diff --git a/deskutils/kmatrix3d/files/patch-src__Makefile.am b/deskutils/kmatrix3d/files/patch-src__Makefile.am
new file mode 100644
index 000000000000..4a5bdea8b32c
--- /dev/null
+++ b/deskutils/kmatrix3d/files/patch-src__Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2012-07-22 11:54:01.000000000 +0200
++++ src/Makefile.am	2012-07-22 11:54:12.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ kmatrix3d_kss_SOURCES = kmatrix3dui.ui kmatrix3d.cpp camera.cpp \
+ 	effet_particule.cpp ligne3d1.cpp vector3f.cpp
+-kmatrix3d_kss_LDADD = -lpng -lglut $(LIB_QT) $(LIB_KDECORE) $(LDADD) \
++kmatrix3d_kss_LDADD = -lpng -lGLU -lglut $(LIB_QT) $(LIB_KDECORE) $(LDADD) \
+ 	$(LIB_KSYCOCA)
+ 
+ #datadir = $(kde_datadir)/kmatrix3d
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index af49b27359bd..2b2589e813db 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	bullet
 PORTVERSION=	2.77
 CATEGORIES=	devel
+PORTREVISION=	1
 MASTER_SITES=	GOOGLE_CODE
 EXTRACT_SUFX=	.tgz
 
diff --git a/devel/glui/Makefile b/devel/glui/Makefile
index 7f63a74ed950..1f9f12ae0745 100644
--- a/devel/glui/Makefile
+++ b/devel/glui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glui
 PORTVERSION=	2.36
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	SF/${PORTNAME}/Source/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index c3985f877348..37c23e1ec2b4 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -18,14 +18,14 @@ LICENSE=	BSD
 METAPORT=	yes
 USE_CABAL=	cgi==3001.1.7.4_4,1 \
 		fgl==5.4.2.4_2 \
-		GLUT==2.1.2.1_4,1 \
+		GLUT==2.1.2.1_5,1 \
 		haskell-src==1.0.1.5_1 \
 		html==1.0.1.2_4 \
 		HTTP==4000.2.3_1 \
 		HUnit==1.2.4.2_2 \
 		mtl==2.1.1_1 \
 		network==2.3.0.13_1 \
-		OpenGL==2.2.3.1_1,1 \
+		OpenGL==2.2.3.1_2,1 \
 		parallel==3.2.0.2_1 \
 		parsec==3.1.2_1 \
 		QuickCheck==2.4.2_1 \
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index b81d71cce95c..20c3328189d2 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simgear
 PORTVERSION=	2.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel games
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
 		ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 5cdab8276a33..0465d827216f 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mednafen
 PORTVERSION=	0.8.B
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	SF/${PORTNAME}/Mednafen/${PORTVERSION}
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 471b3f25f1bd..ae19e37574ec 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yabause
 PORTVERSION=	0.9.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/1.1/1/g}/
 
diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index 9675746a71cc..a6c388d8ca0e 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		BillardGL
 PORTVERSION=		1.75
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		games
 MASTER_SITES=		SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
 
@@ -17,6 +17,7 @@ COMMENT=	OpenGL billiards simulator
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_GMAKE=	yes
+USE_XORG=	xmu xext x11 xi
 USE_GL=		gl glut
 
 post-patch:
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index afc3284f05ee..a89d9c9efafa 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knightcap
 PORTVERSION=	3.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.samba.org/pub/KnightCap/
 DISTNAME=	KnightCap-${PORTVERSION}
@@ -17,6 +17,7 @@ COMMENT=	Chess program with 3D interface for X Window System
 
 WRKSRC=		${WRKDIR}/Export
 
+USE_XORG=	xmu xt xext x11 xi
 USE_GL=		glut
 ALL_TARGET=	KnightCap
 
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index c1aceb4fd15e..8a69d571a7ad 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 943863503e44..f153410eec85 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubble-chains
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://bubble-chains.sintegrial.com/files/
 DISTNAME=	chains-${DISTVERSION}
diff --git a/games/cake/Makefile b/games/cake/Makefile
index 841a396dbb9c..3e8df7182280 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cake
 PORTVERSION=	2005.12.26
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.calodox.scene.org/morbac/cake/download/ \
 		${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/
@@ -29,15 +29,8 @@ WRKSRC=		${WRKDIR}/cake_src
 
 PLIST_FILES=	bin/cake
 
-OPTIONS=	FREEGLUT "Build with alternative GLUT library, FreeGLUT" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_FREEGLUT)
-LIB_DEPENDS=	glut.12:${PORTSDIR}/graphics/freeglut
-.else
+USE_XORG=	x11 xext xmu xt xi sm ice
 USE_GL=		glut
-.endif
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 post-patch: .SILENT
@@ -60,4 +53,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 5090d2bbb76e..3c51b12c75eb 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	construo
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	construo
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_XORG=	sm ice x11 xext xxf86vm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lGLU
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
 
 OPTIONS=	GLUT "Use glut" on
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 6d06be2031ba..12dd3931a43c 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	crack-attack
 PORTVERSION=	1.1.14
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	OpenGL game based on Super Nintendo classic Tetris Attack
 
+USE_XORG=	x11 xi xmu sm ice
 USE_GL=		glut
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index ccbe21c8d915..4aee3585bdae 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cultivation
 PORTVERSION=	8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
@@ -17,6 +17,7 @@ COMMENT=	Unique game of conflict and cooperation in a gardening community
 
 LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
 
+USE_XORG=	x11 xi xext xmu
 USE_GL=		glut
 USE_GMAKE=	yes
 
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index dae4d220be1c..39d24bd57ceb 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	d2x
 PORTVERSION=	0.2.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://offload2.icculus.org:9090/d2x/src/
 
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 76d62661088d..5c56b77add3e 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod \
 		png15:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
+USE_XORG=	xmu
 USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"
 
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 94cd8dd98666..14f871edf143 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		etracer
 PORTVERSION=		0.4
-PORTREVISION=	7
+PORTREVISION=		8
 CATEGORIES=		games
 MASTER_SITES=		SF/extremetuxracer/extreme-tuxracer/${PORTVERSION}
 DISTNAME=		extremetuxracer-${PORTVERSION}
@@ -19,6 +19,7 @@ LIB_DEPENDS=		png15:${PORTSDIR}/graphics/png \
 			freetype.9:${PORTSDIR}/print/freetype2
 
 USE_SDL=		mixer sdl
+USE_XORG=		x11 xi xext xmu xt
 USE_GL=			gl glu glut
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 70176f4b5d19..04bc4c2b5f9c 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foobillard
 PORTVERSION=	3.0a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index ce06650928d6..a4c78102494d 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/GL-117%20Source
 
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 83c78cf25bd6..9618b9dbe587 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/games/glsfcave/Makefile b/games/glsfcave/Makefile
index b9a40935afeb..9e0bc954ab57 100644
--- a/games/glsfcave/Makefile
+++ b/games/glsfcave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glsfcave
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 335e07d81df7..903f87fb7c09 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index 29b8b1d2015d..9955e1f6cef6 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kiki
 PORTVERSION=	1.0.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 EXTRACT_SUFX=	-src.tgz
diff --git a/games/netherearth/Makefile b/games/netherearth/Makefile
index e5411f766cc1..728cbd1c52f8 100644
--- a/games/netherearth/Makefile
+++ b/games/netherearth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netherearth
 PORTVERSION=	0.51
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/
 
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 86d54102aafc..a4158cc3ce1d 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.5.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \
 		SF/${PORTNAME}/mappack/nexmappack_r2:mappack
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 477bb7425bb6..d74e9a4da594 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nighthawk
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index 1260cedde9d8..e1d31ec70601 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quetoo
 PORTVERSION=	0.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
 		http://tastyspleen.net/~jdolan/ \
diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 362ad2b00434..7fd6962796db 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stormbaancoureur
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index e4525314c190..302059d68658 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	supertuxkart
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/supertuxkart/SuperTuxKart/${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.bz2
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 2bced7fb5141..b7245e602553 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torcs
 DISTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/all-in-one/${PORTVERSION}
 
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index 8f8fcc549250..5bbb65261c05 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tux_aqfh
 PORTVERSION=	1.0.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxaqfh/tuxaqfh/${PORTVERSION}-classic
 
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index df7671a70f9c..736c6d1ef196 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vamos
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -20,6 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_OPENAL=	al alut
+USE_XORG=	sm ice x11 xi xext xmu
 USE_GL=		glut
 USE_SDL=	sdl
 USE_GMAKE=	yes
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index d0b851be1b51..d76a9818fd50 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vegastrike
 PORTVERSION=	0.5.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	vegastrike-source-${PORTVERSION}
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_SDL=	sdl
+USE_XORG=	sm ice xi x11 xext xrender xinerama xi xrandr xcursor \
+		xcomposite xdamage xfixes 
 USE_GL=		gl glu glut
 USE_GNOME=	gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/games/vegastrike/files/patch-src-gfx-vsimage.cpp b/games/vegastrike/files/patch-src-gfx-vsimage.cpp
index 7ce8c9d06513..75a529293995 100644
--- a/games/vegastrike/files/patch-src-gfx-vsimage.cpp
+++ b/games/vegastrike/files/patch-src-gfx-vsimage.cpp
@@ -1,5 +1,5 @@
 --- src/gfx/vsimage.cpp.orig	2008-04-24 14:12:37.000000000 +0200
-+++ src/gfx/vsimage.cpp	2010-03-31 16:39:55.000000000 +0200
++++ src/gfx/vsimage.cpp	2012-06-15 21:20:32.000000000 +0200
 @@ -147,7 +147,7 @@
  	unsigned char sig[8];
  	file->Begin();
@@ -18,3 +18,12 @@
  
  	png_set_expand (png_ptr);
  	png_read_update_info (png_ptr,info_ptr);
+@@ -865,7 +865,7 @@
+     png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+     return BadFormat;
+   }
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf( png_ptr ))) {
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     return BadFormat;
+   }
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/}
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index c46226157478..a90439edaa3b 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugs98
 PORTVERSION=	200609
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://cvs.haskell.org/Hugs/downloads/2006-09/
 DISTNAME=	${PORTNAME}-plus-${HUGS_DATE}
@@ -37,6 +37,7 @@ BROKEN=		dumps core during build on ${ARCH}
 
 .if !defined(WITHOUT_X11)
 USE_GL=	glut
+USE_XORG=	sm ice xmu xi x11
 PLIST_SUB+=	X11=""
 .else
 BROKEN=		not supported at the moment
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 26dc53837acb..832d674d7397 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smalltalk
 PORTVERSION=	3.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,6 +29,7 @@ USE_GNOME=	gnomehack pkgconfig pango
 USE_ICONV=	yes
 USE_SQLITE=	yes
 USE_GMAKE=	yes
+USE_XORG=	ice xi xmu
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_EMACS=no
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index e1a20ecfc20b..7d49f5c28fd9 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	2.16
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
diff --git a/math/carve/Makefile b/math/carve/Makefile
index 228573e5d27e..48dac53f6085 100644
--- a/math/carve/Makefile
+++ b/math/carve/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	carve
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 EXTRACT_SUFX=	.tgz
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index d32a1d56d005..3f3d7dc7de9d 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	fung-calc
 PORTVERSION=	1.3.2b
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math kde
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}
 
diff --git a/math/ros-geometry/Makefile b/math/ros-geometry/Makefile
index 9fd3c914eecf..464e6514e54c 100644
--- a/math/ros-geometry/Makefile
+++ b/math/ros-geometry/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ros-geometry
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/:rel \
 		http://pr.willowgarage.com/downloads/:pr \
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index bacf1bbbbf3f..f0920b6697e3 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20120511
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF:release \
 		LOCAL:snapshot
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 3b13825db518..50db9ad92f69 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	boinc-client
 PORTVERSION=	7.0.25
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
@@ -77,6 +77,7 @@ PORT_OPTIONS+=	X11
 
 .if ${PORT_OPTIONS:MX11}
 USE_GL=		glut
+USE_XORG+=	xmu xi
 LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	X11=""
 .else
@@ -84,7 +85,7 @@ PLIST_SUB+=	X11="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMANAGER}
-USE_XORG=	x11
+USE_XORG+=	x11
 USE_WX=		2.8+
 USE_ICONV=	yes
 WX_CONF_ARGS=	absolute
diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile
index cec0ab68ae0f..042fe2c04623 100644
--- a/print/pdfcube/Makefile
+++ b/print/pdfcube/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdfcube
 DISTVERSION=	0.0.4-beta
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://code.100allora.it/releases/pdfcube/
 
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index ff7b0f298414..fceba98f4b34 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	flounder
 PORTVERSION=	0.40
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	science
 MASTER_SITES=	http://www.enel.ucalgary.ca/People/vigmond/flounder/
 EXTRACT_SUFX=	.tgz
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index f3b39fe83098..2c32bdbe0176 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ghemical
 PORTVERSION=	2.99.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/release20090911/ \
 		http://bioinformatics.org/ghemical/download/
diff --git a/science/liboglappth/Makefile b/science/liboglappth/Makefile
index 70c86f10250f..915f27c4ba02 100644
--- a/science/liboglappth/Makefile
+++ b/science/liboglappth/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liboglappth
 PORTVERSION=	0.98
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/current/ \
 		http://bioinformatics.org/ghemical/download/
diff --git a/science/medit/Makefile b/science/medit/Makefile
index 54ff0cf3addc..d9ff19ad7054 100644
--- a/science/medit/Makefile
+++ b/science/medit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	medit
 PORTVERSION=	2011.03.06
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.ann.jussieu.fr/~frey/ftp/archives/
 EXTRACT_SUFX=	.tgz
diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index 254af4a7cb30..32dda8928c72 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmakemol
 PORTVERSION=	5.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SAVANNAH
 
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 0abc54bac5d5..ca72653eb9a7 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glclock
 DISTVERSION=	6.0b6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 8ffb95af665c..23503d7a7c3f 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tdfsb
 PORTVERSION=	0.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.determinate.net/webdata/data/
 
@@ -26,10 +26,12 @@ USE_PKGCONFIG=	yes
 PORTDOCS=	README
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS+=	`${LOCALBASE}/bin/pkgconf --cflags SDL_image glut` \
-		`${LOCALBASE}/bin/smpeg-config --cflags`
-LDFLAGS+=	`${LOCALBASE}/bin/pkgconf --libs SDL_image glut` \
-		`${LOCALBASE}/bin/smpeg-config --libs`
+CPPFLAGS+=	`${LOCALBASE}/bin/pkgconf --cflags SDL_image gl` \
+		`${LOCALBASE}/bin/smpeg-config --cflags` \
+		-I ${LOCALBASE}/include
+LDFLAGS+=	`${LOCALBASE}/bin/pkgconf --libs SDL_image gl` \
+		`${LOCALBASE}/bin/smpeg-config --libs` \
+		-L ${LOCALBASE}/lib -lGLU -lglut
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index ce65219ed975..39759d554e0b 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.7.33
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
    		ftp://ftp.fox-toolkit.org/pub/
@@ -32,6 +32,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${MAJORVER}
 
 USE_GCC=	4.4+
 USE_GL=		glut
+USE_XORG=	sm
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 18590b70a237..bdffb407a1cd 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	GLUT
 PORTVERSION=	2.1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 20c6d3070a1e..626b375c883b 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	OpenGL
 PORTVERSION=	2.2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 69f077cf9afb..7dc97dd4e384 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	otk
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	${PORTNAME}_lib_${PORTVERSION}
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 0bb2e838bd68..bf33c00b1f4c 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epplets
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}
 
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 63776df8be8c..5ef9d6246b08 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	3ddesktop
 PORTVERSION=	0.2.9
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11
 MASTER_SITES=	SF/desk3d/${PORTNAME}/${PORTVERSION}
 
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index c3de237bc467..6637d6dc9f2e 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	slim
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://slim.berlios.de/releases/
author	Koop Mast <kwm@FreeBSD.org>	2012-08-04 22:52:02 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2012-08-04 22:52:02 +0000
commit	5aa7246575084f0aefcffe71d7305d0b36b2ed33 (patch)
tree	a3b9f3e6c4e41379a4ad771026302ecf0ad0ae1b
parent	2d4609c1309d60a953f0d9a6be96d373ca6ccfc6 (diff)
download	ports-5aa7246575084f0aefcffe71d7305d0b36b2ed33.tar.gz ports-5aa7246575084f0aefcffe71d7305d0b36b2ed33.zip