svn commit: r302037 - in head: . Mk astro/boinc-astropulse astro/boinc-setiathome-enhanced astro/celestia astro/nightfall astro/openuniverse audio/fmit biology/molden biology/protomol biology/pymol...

Koop Mast kwm at FreeBSD.org
Sat Aug 4 22:52:05 UTC 2012


Author: kwm
Date: Sat Aug  4 22:52:02 2012
New Revision: 302037
URL: http://svn.freebsd.org/changeset/ports/302037

Log:
  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.

Added:
  head/deskutils/kmatrix3d/files/patch-src__Makefile.am   (contents, props changed)
Deleted:
  head/graphics/libglut/
Modified:
  head/MOVED
  head/Mk/bsd.port.mk
  head/UPDATING
  head/astro/boinc-astropulse/Makefile
  head/astro/boinc-setiathome-enhanced/Makefile
  head/astro/celestia/Makefile
  head/astro/nightfall/Makefile
  head/astro/openuniverse/Makefile
  head/audio/fmit/Makefile
  head/biology/molden/Makefile
  head/biology/protomol/Makefile
  head/biology/pymol/Makefile
  head/cad/calculix/Makefile
  head/cad/leocad/Makefile
  head/cad/slffea/Makefile
  head/databases/grass/Makefile
  head/deskutils/kmatrix3d/Makefile
  head/devel/bullet/Makefile
  head/devel/glui/Makefile
  head/devel/hs-haskell-platform/Makefile
  head/devel/simgear/Makefile
  head/emulators/mednafen/Makefile
  head/emulators/yabause/Makefile
  head/games/BillardGL/Makefile
  head/games/KnightCap/Makefile
  head/games/atr3d/Makefile
  head/games/bubble-chains/Makefile
  head/games/cake/Makefile
  head/games/construo/Makefile
  head/games/crack-attack/Makefile
  head/games/cultivation/Makefile
  head/games/d2x/Makefile
  head/games/ensemblist/Makefile
  head/games/etracer/Makefile
  head/games/foobillard/Makefile
  head/games/gl-117/Makefile
  head/games/glaxium/Makefile
  head/games/glsfcave/Makefile
  head/games/gracer/Makefile
  head/games/kiki/Makefile
  head/games/netherearth/Makefile
  head/games/nexuiz/Makefile
  head/games/nighthawk/Makefile
  head/games/quetoo/Makefile
  head/games/stormbaancoureur/Makefile
  head/games/supertuxkart/Makefile
  head/games/torcs/Makefile
  head/games/tux-aqfh/Makefile
  head/games/vamos/Makefile
  head/games/vegastrike/Makefile
  head/games/vegastrike/files/patch-src-gfx-vsimage.cpp
  head/graphics/Makefile
  head/graphics/devil/Makefile
  head/graphics/driconf/Makefile
  head/graphics/dynamechs/Makefile
  head/graphics/enblend/Makefile
  head/graphics/f90gl/Makefile
  head/graphics/ffff/Makefile
  head/graphics/fpc-opengl/Makefile
  head/graphics/fv/Makefile
  head/graphics/gauche-gl/Makefile
  head/graphics/gle/Makefile
  head/graphics/glexcess/Makefile
  head/graphics/gltt/Makefile
  head/graphics/hugin/Makefile
  head/graphics/jasper/Makefile
  head/graphics/kdegraphics3/Makefile
  head/graphics/landscape/Makefile
  head/graphics/lib3ds/Makefile
  head/graphics/libGL/bsd.mesalib.mk
  head/graphics/libaux/Makefile
  head/graphics/libgltext/Makefile
  head/graphics/makehuman/Makefile
  head/graphics/mesa-demos/Makefile
  head/graphics/mhgui/Makefile
  head/graphics/morpheus/Makefile
  head/graphics/ocaml-lablgl/Makefile
  head/graphics/p5-OpenGL/Makefile
  head/graphics/pfstools/Makefile
  head/graphics/pure-gl/Makefile
  head/graphics/py-opengl/Makefile
  head/graphics/pyro/Makefile
  head/graphics/quat-gui/Makefile
  head/graphics/quesa/Makefile
  head/graphics/quesoglc/Makefile
  head/graphics/reallyslick/Makefile
  head/graphics/ruby-opengl/Makefile
  head/graphics/rubygem-opengl/Makefile
  head/graphics/simpleviewer/Makefile
  head/graphics/swftools/Makefile
  head/graphics/tiff/Makefile
  head/graphics/tulip/Makefile
  head/graphics/view3ds/Makefile
  head/graphics/white_dune/Makefile
  head/graphics/xmms-dancingparticles/Makefile
  head/graphics/xmms-fishmatic/Makefile
  head/graphics/xmms-paranormal/Makefile
  head/lang/hugs/Makefile
  head/lang/smalltalk/Makefile
  head/math/asymptote/Makefile
  head/math/carve/Makefile
  head/math/fung-calc/Makefile
  head/math/ros-geometry/Makefile
  head/multimedia/vdr-plugin-xineliboutput/Makefile
  head/net/boinc-client/Makefile
  head/print/pdfcube/Makefile
  head/science/flounder/Makefile
  head/science/ghemical/Makefile
  head/science/liboglappth/Makefile
  head/science/medit/Makefile
  head/science/xmakemol/Makefile
  head/x11-clocks/glclock/Makefile
  head/x11-fm/tdfsb/Makefile
  head/x11-toolkits/fox17/Makefile
  head/x11-toolkits/hs-GLUT/Makefile
  head/x11-toolkits/hs-OpenGL/Makefile
  head/x11-toolkits/otk/Makefile
  head/x11-wm/epplets/Makefile
  head/x11/3ddesktop/Makefile
  head/x11/slim/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/MOVED	Sat Aug  4 22:52:02 2012	(r302037)
@@ -3627,3 +3627,4 @@ editors/emacs.app||2012-07-29|Has expire
 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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/Mk/bsd.port.mk	Sat Aug  4 22:52:02 2012	(r302037)
@@ -1939,7 +1939,7 @@ _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/gr
 _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)

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/UPDATING	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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 at 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 at FreeBSD.org

Modified: head/astro/boinc-astropulse/Makefile
==============================================================================
--- head/astro/boinc-astropulse/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/astro/boinc-astropulse/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/astro/boinc-setiathome-enhanced/Makefile
==============================================================================
--- head/astro/boinc-setiathome-enhanced/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/astro/boinc-setiathome-enhanced/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/astro/celestia/Makefile
==============================================================================
--- head/astro/celestia/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/astro/celestia/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/astro/nightfall/Makefile
==============================================================================
--- head/astro/nightfall/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/astro/nightfall/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.70
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 

Modified: head/astro/openuniverse/Makefile
==============================================================================
--- head/astro/openuniverse/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/astro/openuniverse/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	openuniverse
 DISTVERSION=	1.0beta3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0beta3
 

Modified: head/audio/fmit/Makefile
==============================================================================
--- head/audio/fmit/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/audio/fmit/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/biology/molden/Makefile
==============================================================================
--- head/biology/molden/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/biology/molden/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/

Modified: head/biology/protomol/Makefile
==============================================================================
--- head/biology/protomol/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/biology/protomol/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/
 		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

Modified: head/biology/pymol/Makefile
==============================================================================
--- head/biology/pymol/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/biology/pymol/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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|}
 

Modified: head/cad/calculix/Makefile
==============================================================================
--- head/cad/calculix/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/cad/calculix/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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${
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
+USE_XORG=	xmu
 USE_GL=	glut
 
 BROWSER?=	mozilla

Modified: head/cad/leocad/Makefile
==============================================================================
--- head/cad/leocad/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/cad/leocad/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/cad/slffea/Makefile
==============================================================================
--- head/cad/slffea/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/cad/slffea/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/databases/grass/Makefile
==============================================================================
--- head/databases/grass/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/databases/grass/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/deskutils/kmatrix3d/Makefile
==============================================================================
--- head/deskutils/kmatrix3d/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/deskutils/kmatrix3d/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/km
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-USE_GL=			glut
+USE_GL=			glu glut
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool automake:env autoheader:env

Added: head/deskutils/kmatrix3d/files/patch-src__Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/kmatrix3d/files/patch-src__Makefile.am	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/devel/bullet/Makefile
==============================================================================
--- head/devel/bullet/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/devel/bullet/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -8,6 +8,7 @@
 PORTNAME=	bullet
 PORTVERSION=	2.77
 CATEGORIES=	devel
+PORTREVISION=	1
 MASTER_SITES=	GOOGLE_CODE
 EXTRACT_SUFX=	.tgz
 

Modified: head/devel/glui/Makefile
==============================================================================
--- head/devel/glui/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/devel/glui/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,6 +7,7 @@
 
 PORTNAME=	glui
 PORTVERSION=	2.36
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	SF/${PORTNAME}/Source/${PORTVERSION}
 EXTRACT_SUFX=	.tgz

Modified: head/devel/hs-haskell-platform/Makefile
==============================================================================
--- head/devel/hs-haskell-platform/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/devel/hs-haskell-platform/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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 \

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/devel/simgear/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/ \

Modified: head/emulators/mednafen/Makefile
==============================================================================
--- head/emulators/mednafen/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/emulators/mednafen/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/emulators/yabause/Makefile
==============================================================================
--- head/emulators/yabause/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/emulators/yabause/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}/
 

Modified: head/games/BillardGL/Makefile
==============================================================================
--- head/games/BillardGL/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/BillardGL/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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:

Modified: head/games/KnightCap/Makefile
==============================================================================
--- head/games/KnightCap/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/KnightCap/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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
 
 WRKSRC=		${WRKDIR}/Export
 
+USE_XORG=	xmu xt xext x11 xi
 USE_GL=		glut
 ALL_TARGET=	KnightCap
 

Modified: head/games/atr3d/Makefile
==============================================================================
--- head/games/atr3d/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/atr3d/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/games/bubble-chains/Makefile
==============================================================================
--- head/games/bubble-chains/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/bubble-chains/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/games/cake/Makefile
==============================================================================
--- head/games/cake/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/cake/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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>

Modified: head/games/construo/Makefile
==============================================================================
--- head/games/construo/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/construo/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/crack-attack/Makefile
==============================================================================
--- head/games/crack-attack/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/crack-attack/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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 at 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

Modified: head/games/cultivation/Makefile
==============================================================================
--- head/games/cultivation/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/cultivation/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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 coo
 
 LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
 
+USE_XORG=	x11 xi xext xmu
 USE_GL=		glut
 USE_GMAKE=	yes
 

Modified: head/games/d2x/Makefile
==============================================================================
--- head/games/d2x/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/d2x/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/
 

Modified: head/games/ensemblist/Makefile
==============================================================================
--- head/games/ensemblist/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/ensemblist/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/
 		png15:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
+USE_XORG=	xmu
 USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"
 

Modified: head/games/etracer/Makefile
==============================================================================
--- head/games/etracer/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/etracer/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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
 			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

Modified: head/games/foobillard/Makefile
==============================================================================
--- head/games/foobillard/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/foobillard/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	foobillard
 PORTVERSION=	3.0a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 

Modified: head/games/gl-117/Makefile
==============================================================================
--- head/games/gl-117/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/gl-117/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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
 

Modified: head/games/glaxium/Makefile
==============================================================================
--- head/games/glaxium/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/glaxium/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/games/glsfcave/Makefile
==============================================================================
--- head/games/glsfcave/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/glsfcave/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/

Modified: head/games/gracer/Makefile
==============================================================================
--- head/games/gracer/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/gracer/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF
 

Modified: head/games/kiki/Makefile
==============================================================================
--- head/games/kiki/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/kiki/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/netherearth/Makefile
==============================================================================
--- head/games/netherearth/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/netherearth/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	netherearth
 PORTVERSION=	0.51
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/
 

Modified: head/games/nexuiz/Makefile
==============================================================================
--- head/games/nexuiz/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/nexuiz/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/nighthawk/Makefile
==============================================================================
--- head/games/nighthawk/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/nighthawk/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/quetoo/Makefile
==============================================================================
--- head/games/quetoo/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/quetoo/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/ \

Modified: head/games/stormbaancoureur/Makefile
==============================================================================
--- head/games/stormbaancoureur/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/stormbaancoureur/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/

Modified: head/games/supertuxkart/Makefile
==============================================================================
--- head/games/supertuxkart/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/supertuxkart/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/torcs/Makefile
==============================================================================
--- head/games/torcs/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/torcs/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	torcs
 DISTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/all-in-one/${PORTVERSION}
 

Modified: head/games/tux-aqfh/Makefile
==============================================================================
--- head/games/tux-aqfh/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/tux-aqfh/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	tux_aqfh
 PORTVERSION=	1.0.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxaqfh/tuxaqfh/${PORTVERSION}-classic
 

Modified: head/games/vamos/Makefile
==============================================================================
--- head/games/vamos/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/vamos/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/vegastrike/Makefile
==============================================================================
--- head/games/vegastrike/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/vegastrike/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/games/vegastrike/files/patch-src-gfx-vsimage.cpp
==============================================================================
--- head/games/vegastrike/files/patch-src-gfx-vsimage.cpp	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/games/vegastrike/files/patch-src-gfx-vsimage.cpp	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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;
+   }

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -469,7 +469,6 @@
     SUBDIR += libggimisc
     SUBDIR += libggiwmh
     SUBDIR += libgltext
-    SUBDIR += libglut
     SUBDIR += libgnomecanvas
     SUBDIR += libgnomecanvas-reference
     SUBDIR += libgnomecanvasmm

Modified: head/graphics/devil/Makefile
==============================================================================
--- head/graphics/devil/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/devil/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/graphics/driconf/Makefile
==============================================================================
--- head/graphics/driconf/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/driconf/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/graphics/dynamechs/Makefile
==============================================================================
--- head/graphics/dynamechs/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/dynamechs/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/graphics/enblend/Makefile
==============================================================================
--- head/graphics/enblend/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/enblend/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/graphics/f90gl/Makefile
==============================================================================
--- head/graphics/f90gl/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/f90gl/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -22,6 +22,8 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	maho at 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

Modified: head/graphics/ffff/Makefile
==============================================================================
--- head/graphics/ffff/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/ffff/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/graphics/fpc-opengl/Makefile
==============================================================================
--- head/graphics/fpc-opengl/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/fpc-opengl/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 

Modified: head/graphics/fv/Makefile
==============================================================================
--- head/graphics/fv/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/fv/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}

Modified: head/graphics/gauche-gl/Makefile
==============================================================================
--- head/graphics/gauche-gl/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/gauche-gl/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/graphics/gle/Makefile
==============================================================================
--- head/graphics/gle/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/gle/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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}
 MAINTAINER=	ports at dclg.ca
 COMMENT=	A GL Tubing and Extrusion Library
 
+USE_XORG=	ice xt xmu
 USE_GL=		glut
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes

Modified: head/graphics/glexcess/Makefile
==============================================================================
--- head/graphics/glexcess/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/glexcess/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/graphics/gltt/Makefile
==============================================================================
--- head/graphics/gltt/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/gltt/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltt
 PORTVERSION=	2.5.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://gltt.sourceforge.net/download/
 

Modified: head/graphics/hugin/Makefile
==============================================================================
--- head/graphics/hugin/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/hugin/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2011.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 

Modified: head/graphics/jasper/Makefile
==============================================================================
--- head/graphics/jasper/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/jasper/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -40,7 +40,8 @@ UUID_DESC=	UUID support (required by GDA
 .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

Modified: head/graphics/kdegraphics3/Makefile
==============================================================================
--- head/graphics/kdegraphics3/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/kdegraphics3/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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

Modified: head/graphics/landscape/Makefile
==============================================================================
--- head/graphics/landscape/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/landscape/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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/
 

Modified: head/graphics/lib3ds/Makefile
==============================================================================
--- head/graphics/lib3ds/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/lib3ds/Makefile	Sat Aug  4 22:52:02 2012	(r302037)
@@ -7,7 +7,7 @@
 
 PORTNAME=	lib3ds
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 

Modified: head/graphics/libGL/bsd.mesalib.mk
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/libGL/bsd.mesalib.mk	Sat Aug  4 22:52:02 2012	(r302037)
@@ -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} == ""

Modified: head/graphics/libaux/Makefile
==============================================================================
--- head/graphics/libaux/Makefile	Sat Aug  4 22:01:54 2012	(r302036)
+++ head/graphics/libaux/Makefile	Sat Aug  4 22:52:02 2012	(r302037)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



More information about the svn-ports-all mailing list