- Update X.org ports to 7.4+ (few ports are more recent than the katamari).

- Bump PORTREVISION for all ports depending on libglut since the shlib version number went from 4 to 3. - Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't installed anymore. - Couple of ports fixes (mostly missing xorg components added to USE_XORG).
2009-01-23 16:28:36 +00:00
parent 66a81c62b9
commit 340b57f8be
629 changed files with 1678 additions and 2411 deletions
--- a/2
+++ b/2
@@ -3765,4 +3765,6 @@ x11-toolkits/fxscintilla-fox10||2009-01-21|Removed deprecated port, use x11-tool
 x11-toolkits/py-fox||2009-01-21|Removed deprecated port, has a broken dependency
 x11-toolkits/ruby-fox10||2009-01-21|Removed deprecated port, use x11-toolkits/ruby-fox16 instead
 devel/linux-glib2||2009-01-21|Removed since the port is incorporated into all linux base ports
+x11/xorg-protos||2009-XX-XX|Not really necessary
+x11-drivers/synaptics|x11-drivers/xf86-input-synaptics|2009-XX-XX|Now an official X.org driver
 net/mpich|net/mpich2|2009-01-23|Broken and superseded by mpich2
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -395,6 +395,7 @@ MOZ_OPTIONS+=	--with-system-zlib=/usr		\
 		--disable-pedantic		\
 		--disable-bidi			\
 		--disable-xterm-updates		\
+		--disable-xprint		\
 		--enable-xinerama
 MOZ_MK_OPTIONS+=	XP_UNIX=1		\
 			PERL=${PERL}
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1373,7 +1373,7 @@ FILESDIR?=		${MASTERDIR}/files
 SCRIPTDIR?=		${MASTERDIR}/scripts
 PKGDIR?=		${MASTERDIR}

-.if defined(USE_IMAKE) && !defined(USE_X_PREFIX)
+.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) && !defined(USE_XORG)
 USE_X_PREFIX=	yes
 .endif
 .if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no"
@@ -1877,7 +1877,7 @@ PLIST_SUB+=			XAWVER=${XAWVER}
 _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
 _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 _GL_glw_LIB_DEPENDS=		GLw.1:${PORTSDIR}/graphics/libGLw
-_GL_glut_LIB_DEPENDS=		glut.4:${PORTSDIR}/graphics/libglut
+_GL_glut_LIB_DEPENDS=		glut.3:${PORTSDIR}/graphics/libglut
 _GL_linux_RUN_DEPENDS=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri

 .if defined(USE_GL)
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -133,6 +133,9 @@ DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
 WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
 USE_GNOME+=	gnomehack
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
+
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
+USE_XORG+=	pciaccess
 . endif

 .endif
@@ -146,13 +149,14 @@ Xorg_Post_Include=		bsd.xorg.mk
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.

-XORG_MODULES=	bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
+XORG_MODULES=	bigreqsproto compositeproto damageproto dmx dmxproto dri2proto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pciaccess pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm

 bigreqsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
 compositeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
 damageproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
 dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
+dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
 evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
 fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
 fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
@@ -165,6 +169,7 @@ inputproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDI
 kbproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto
 libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
+pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
 pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
 printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
 randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
@@ -177,10 +182,9 @@ trapproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}
 videoproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto
 x11_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
 xau_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
-xaw_LIB_PC_DEPENDS=		${xaw${XAWVER}_LIB_PC_DEPENDS}
+xaw_LIB_PC_DEPENDS=		${xaw7_LIB_PC_DEPENDS}
 xaw6_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw
 xaw7_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw
-xaw8_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw
 xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
 xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
 xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -6,6 +6,7 @@

 PORTNAME=	boinc-setiathome-enhanced
 PORTVERSION=	${SETI_PORTVERSION_FULL}.${AP_PORTVERSION_FULL}
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
 DISTFILES=	astropulse-${AP_PORTVERSION_FULL}.tar.bz2 setiathome-${SETI_PORTVERSION_FULL}.tar.bz2
@@ -24,7 +25,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
 RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
 LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		xcb.1:${PORTSDIR}/x11/libxcb
+		xcb.2:${PORTSDIR}/x11/libxcb

 USE_GL=		gl glu glut
 USE_XORG=	ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	celestia
 PORTVERSION=	1.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	astro
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-${CELESTIA_UI}
@@ -21,6 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GL=		gl
+USE_XORG=	x11 xt xext xmu xi
 USE_GETTEXT=	yes
 WANT_GNOME=	yes

@@ -35,7 +36,7 @@ CONFLICTS=	${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|:S|$|-[0-9]*|} # lol

 .if ${CELESTIA_UI} == "glut"
 CONFIGURE_ARGS+=	--with-glut
-LIB_DEPENDS+=	glut:${PORTSDIR}/graphics/libglut
+USE_GL+=	glut
 .elif ${CELESTIA_UI} == "gtk"
 CONFIGURE_ARGS+=	--with-gtk
 USE_GNOME+=	gtk20
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	openuniverse
 DISTVERSION=	1.0beta3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro
 MASTER_SITES=	SF

--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xtide
 PORTVERSION=	2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	fmit
 PORTVERSION=	0.97.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/fmit/

--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	nas
 PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tar.gz
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	rosegarden
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cannam.demon.co.uk/rosegarden/distribution/
 DISTNAME=	${PORTNAME}-2.1pl2
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xcdplayer
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xmixer
 PORTVERSION=	0.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://mpx.freeshell.net/

--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xwave
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
--- a/biology/L-Breeder/Makefile
+++ b/biology/L-Breeder/Makefile
@@ -8,7 +8,7 @@

 PORTNAME=	LBreeder
 PORTVERSION=	1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	biology
 MASTER_SITES=	http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/
 DISTNAME=	${PORTNAME}-source
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	phylip
 PORTVERSION=	3.68
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/phylip/ \
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	protomol
 PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	pymol
 PORTVERSION=	1.0r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/pymol|}

@@ -16,11 +16,11 @@ COMMENT=	Free and Open-Source molecular modeling system
 BUILD_DEPENDS=	${PYNUMERIC}
 RUN_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2

 WRKSRC=		${WRKDIR}/pymol-${PORTVERSION}
+USE_GL=		glut
 USE_GMAKE=	yes
 USE_PYTHON=	yes

--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	cider
 PORTVERSION=	1.b1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mita
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	jspice3
 PORTVERSION=	2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/	\
 		ftp://ftp.srware.com/pub/
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	leocad
 PORTVERSION=	0.73
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
@@ -19,9 +19,9 @@ COMMENT=	A CAD program that uses bricks similar to those found in many toys

 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		glut.4:${PORTSDIR}/graphics/libglut
+		png.5:${PORTSDIR}/graphics/png

+USE_GL=		glut
 USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	netgen
 PORTVERSION=	4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://www.hpfem.jku.at/cgi/download.cgi?ID=
 DISTNAME=	ngs${PORTVERSION:S/.//g}
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 USE_TK=		yes
 USE_TK_BUILD=	yes
 USE_GL=		yes
+USE_XORG=	xmu xi

 ALL_TARGET=	ng

--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=		opencascade
 PORTVERSION=		6.3
+PORTREVISION=		1
 CATEGORIES=		cad science
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -31,6 +32,7 @@ USE_TCL_BUILD=	84
 USE_TCL_RUN=	84
 USE_TCL_THREADS=yes
 USE_JAVA=	yes
+USE_XORG=	xmu
 JAVA_VERSION=	1.4+
 #.if defined(MAINTAINER_MODE)
 # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk.
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -8,7 +8,7 @@

 PORTNAME=	slffea
 PORTVERSION=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}13
@@ -17,10 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	jmelo@FreeBSD.org
 COMMENT=	San Le's Free Finite Element Analysis

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 CONFLICTS=	swi-pl-[0-9]* TenDRA-[0-9]*

+USE_GL=		glut
+
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.3
 ALL_TARGET=	everything
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	spice
 PORTVERSION=	3f5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources
 DISTFILES=	spice3f5${EXTRACT_SUFX}:sources	\
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	fqterm
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	qterm
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.yuanjue.net/download/
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	grass
 PORTVERSION=	6.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.itc.it/grass62/source/ \
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@@ -8,6 +8,7 @@

 PORTNAME=	mysql-gui-tools
 PORTVERSION=	5.0r12
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLGUITools
--- a/deskutils/aspostit/Makefile
+++ b/deskutils/aspostit/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	aspostit
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/aspostit
--- a/deskutils/autocutsel/Makefile
+++ b/deskutils/autocutsel/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	autocutsel
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	autocutsel
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -25,6 +25,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack pygnomedesktop intlhack
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_DISPLAY=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		kmatrix3d
 PORTVERSION=		0.1
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -692,6 +692,7 @@
    SUBDIR += libowfat
    SUBDIR += libpasori
    SUBDIR += libpci
+    SUBDIR += libpciaccess
    SUBDIR += libpdel
    SUBDIR += libpeak
    SUBDIR += libphish
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	bullet
 PORTVERSION=	2.73
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-sp1/}
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -8,7 +8,7 @@

 PORTNAME=	clanlib
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.clanlib.org/download/releases-0.8/ \
@@ -33,7 +33,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-clanJavaScript --disable-docs
 USE_GMAKE=	yes
-USE_XORG=	x11
+USE_XORG=	x11 xmu xi
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LDCONFIG=	yes
 USE_SDL=	gfx
--- a/devel/glui/Makefile
+++ b/devel/glui/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	glui
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.cs.unc.edu/~rademach/glui/src/release/
 DISTNAME=	glui_v2_1_beta
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libpciaccess
+# Date Created:				May 11 2008
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libpciaccess
+PORTVERSION=	0.10.5
+CATEGORIES=	devel
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Generic PCI access library
+
+BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+# XXX - Is it a runtime dep too?
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+
+CONFIGURE_ARGS+=	--with-pciids-path=${LOCALBASE}/share/pciids
+
+XORG_CAT=	lib
+
+.include <bsd.port.mk>
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 617bebf31e5685c83f935009aeae5f38
+SHA256 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = b6c5765a3994e59053cb3b46741b858bb56ea868baa5c48fba7e5c36ca4ae95d
+SIZE (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 260817
--- a/devel/libpciaccess/pkg-descr
+++ b/devel/libpciaccess/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the pciaccess library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
--- a/devel/libpciaccess/pkg-plist
+++ b/devel/libpciaccess/pkg-plist
@@ -0,0 +1,6 @@
+include/pciaccess.h
+lib/libpciaccess.a
+lib/libpciaccess.la
+lib/libpciaccess.so
+lib/libpciaccess.so.0
+libdata/pkgconfig/pciaccess.pc
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	m17n-lib
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	ois
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	wgois
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	pdcurses
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11

 USE_LDCONFIG=	yes
-USE_XORG=	x11 xext sm ice xt xaw8
+USE_XORG=	x11 xext sm ice xt xaw
 GNU_CONFIGURE=	yes

 OPTIONS=	DEBUG "Enable debugging support" off \
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	pdcurses
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Curses library implementation for Win32, DOS, OS/2 and X11

 USE_LDCONFIG=	yes
-USE_XORG=	x11 xext sm ice xt xaw8
+USE_XORG=	x11 xext sm ice xt xaw
 GNU_CONFIGURE=	yes

 OPTIONS=	DEBUG "Enable debugging support" off \
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	plan9port
 PORTVERSION=	20080909
+PORTREVISION=	1
 CATEGORIES=	devel plan9
 MASTER_SITES=	http://swtch.com/plan9port/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	serge.gagnon.1@ulaval.ca
 COMMENT=	Port of the bulk of the Plan9 software build environment to Unix

-USE_XORG=	x11 xt xi xaw6 xaw7 xaw8
+USE_XORG=	x11 xt xi xaw
 USE_PERL5_BUILD=YES
 WRKSRC=		${WRKDIR}/plan9
 PLIST=		${WRKDIR}/.PLIST
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	SimGear
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	ftp://ftp.de.simgear.org/pub/simgear/Source/ \
 		ftp://ftp.simgear.org/pub/simgear/Source/
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -8,6 +8,7 @@

 PORTNAME=	t1lib
 PORTVERSION=	5.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -6,7 +6,7 @@
 #

 PORTNAME=	xorg-macros
-PORTVERSION=	1.1.5
+PORTVERSION=	1.2.1
 CATEGORIES=	devel x11
 DISTNAME=	util-macros-$(PORTVERSION)

@@ -15,7 +15,6 @@ COMMENT=	X.Org development aclocal macros

 XORG_CAT=	util

-PLIST_FILES=	share/aclocal/xorgversion.m4 \
-		share/aclocal/xorg-macros.m4
+PLIST_FILES=	share/aclocal/xorg-macros.m4

 .include <bsd.port.mk>
--- a/devel/xorg-macros/distinfo
+++ b/devel/xorg-macros/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/util-macros-1.1.5.tar.bz2) = 51952682d8b42aeda3af5cee0133ce2c
-SHA256 (xorg/util/util-macros-1.1.5.tar.bz2) = 75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
-SIZE (xorg/util/util-macros-1.1.5.tar.bz2) = 47165
+MD5 (xorg/util/util-macros-1.2.1.tar.bz2) = dc7ddaf9bea8b341510efe4dac125af4
+SHA256 (xorg/util/util-macros-1.2.1.tar.bz2) = 2863ce6c25a40a3c5d6f31721d496a8a8d5e99bb646e73b990d727623a208878
+SIZE (xorg/util/util-macros-1.2.1.tar.bz2) = 48602
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	3.1.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -8,6 +8,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -8,6 +8,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	3.0.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	3.1.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -8,6 +8,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@

 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xed
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	darcnes
 PORTVERSION=	9b0401
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
 DISTNAME=	dn${PORTVERSION}
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	mednafen
 PORTVERSION=	0.8.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators games
 MASTER_SITES=	SF

--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -8,6 +8,7 @@

 PORTNAME=	spim
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/

--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	${UPPORTNAME:L}
 PORTVERSION=	5.07
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	SF/opentaxsolver
 DISTNAME=	${UPPORTNAME}2007_${PORTVERSION}
@@ -16,6 +17,7 @@ MAINTAINER=	jhein@timing.com
 COMMENT=	US tax prep software

 USE_GL=		yes
+USE_XORG=	xmu xext x11
 UPPORTNAME=	OpenTaxSolver

 post-patch:
--- a/french/xtel/Makefile
+++ b/french/xtel/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	xtel
 PORTVERSION=	3.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french comms emulators
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/

--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		BillardGL
 PORTVERSION=		1.75
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	billardgl
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	knightcap
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.samba.org/pub/KnightCap/
 DISTNAME=	KnightCap-${PORTVERSION}
@@ -15,11 +15,9 @@ DISTNAME=	KnightCap-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chess program with 3D interface for X Window System

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 WRKSRC=		${WRKDIR}/Export

-USE_GL=		yes
+USE_GL=		glut
 ALL_TARGET=	KnightCap

 DOCSDIR=	${PREFIX}/share/doc/KnightCap
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	actx
 PORTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/ActX/

--- a/games/airrox/Makefile
+++ b/games/airrox/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	airrox
 PORTVERSION=	0.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-0.04
@@ -15,11 +15,9 @@ DISTNAME=	${PORTNAME}-0.04
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	An 3D Air Hockey, which uses SDL & OpenGL

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_GMAKE=	yes
 USE_SDL=	mixer net sdl
-USE_GL=		yes
+USE_GL=		glut
 REINPLACE_ARGS=	-i ''
 ALL_TARGET=	linux
 WRKSRC=		${WRKDIR}/${PORTNAME}/source
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		brutalchess
 PORTVERSION=		0.5.2
-PORTREVISION=	3
+PORTREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ MAINTAINER=		gustau.perez@gmail.com
 COMMENT=		Nice looking OpenGL chess game

 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XORG=	x11
+USE_XORG=		x11 xext xt xmu xi

 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool:15
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -8,6 +8,7 @@

 PORTNAME=	burrtools
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF

@@ -19,6 +20,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		xmlwrapp.5:${PORTSDIR}/textproc/xmlwrapp

 USE_GL=		yes
+USE_XORG=	x11 xt xext xmu xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	cake
 PORTVERSION=	2005.12.26
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.calodox.scene.org/morbac/cake/download/ \
 		${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/
@@ -36,7 +36,7 @@ OPTIONS=	FREEGLUT "Build with alternative GLUT library, FreeGLUT" off
 .if defined(WITH_FREEGLUT)
 LIB_DEPENDS=	glut.11:${PORTSDIR}/graphics/freeglut
 .else
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glut
 .endif
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg

--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	connectfive
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/connectfive
 DISTNAME=	connectFive
@@ -22,6 +22,7 @@ ALL_TARGET=	default

 USE_SDL=	sdl
 USE_GL=		gl
+USE_XORG=	xmu xext x11
 USE_GMAKE=	yes

 WRKSRC=	${WRKDIR}/connectFive
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	construo
 PORTVERSION=	0.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	construo
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	crack-attack
 PORTVERSION=	1.1.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	crossfire
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		ftp://ftp.real-time.com/pub/games/crossfire/
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	cultivation
 PORTVERSION=	8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
@@ -14,9 +15,9 @@ DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Unique game of conflict and cooperation in a gardening community

-LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio \
-		glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio

+USE_GL=		glut
 USE_GMAKE=	yes

 WRKSRC=		${WRKDIR}/${DISTNAME}/game2
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	d2x
 PORTVERSION=	0.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/d2x/src/

--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assemble given shapes from primitives

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
-		mikmod.2:${PORTSDIR}/audio/libmikmod \
+LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod \
 		png.5:${PORTSDIR}/graphics/png

 USE_GMAKE=	yes
-USE_GL=		gl
+USE_GL=		glut
 MAKE_ARGS=	CC="${CC}" DATADIR="${DATADIR}"

 PLIST=		${WRKDIR}/pkg-plist
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=		etracer
 PORTVERSION=		0.4
+PORTREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		SF/extremetuxracer
 DISTNAME=		extremetuxracer-${PORTVERSION}
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	tuxracer
 PORTVERSION=	0.61
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxracer
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
@@ -20,6 +20,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83

 USE_SDL=	mixer sdl
 USE_GL=		gl
+USE_XORG=	x11 xt xmu xi
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:262
 AUTOMAKE_ARGS=	-a
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	falconseye
 PORTVERSION=	1.9.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/falconseye
 DISTNAME=	nethack_source_331_jtp_${PORTVERSION:S/.//g}
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	fgsd
 DISTVERSION=	0.3.1a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF

--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	flightgear-atlas
 PORTVERSION=	0.3.0.20080504
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://contribs.martymac.com/FreeBSD-ports/distfiles/ \
 		http://freebsd.unixfreunde.de/sources/
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	FlightGear
 PORTVERSION?=	${FGVERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	foobillard
 PORTVERSION=	3.0a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/

@@ -35,7 +36,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
 USE_SDL=	yes
 CONFIGURE_ARGS+=	--enable-SDL
 .else
-LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glut
 CONFIGURE_ARGS+=	--enable-glut
 .endif

--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -31,6 +31,7 @@ GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
 USE_PYTHON=	yes
 USE_SDL=	mixer
+USE_DISPLAY=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui pygnome2
 CONFIGURE_ARGS=	--enable-gnet
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -42,14 +43,6 @@ INFO=		gcompris

 .include <bsd.port.pre.mk>

-.if !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.if !defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+=	DISPLAY="localhost:1001"
-.endif
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 		${WRKSRC}/configure
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -8,7 +8,7 @@

 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTVERSIONSUFFIX=	-src
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	glasteroids
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.honors.montana.edu/~jjc/Glasteroids/
 DISTNAME=	Glasteriods
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- a/games/glsfcave/Makefile
+++ b/games/glsfcave/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	glsfcave
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \
 		http://mirror.amdmi3.ru/
@@ -15,10 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Control a ribbon to avoid hitting walls

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_BZIP2=	yes
-USE_GL=		yes
+USE_GL=		glut

 WRKSRC=		${WRKDIR}/${PORTNAME}

--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF

--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	kiki
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,11 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Kiki the nanobot is a 3-D puzzle game

-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 USE_PYTHON=	2.3
 USE_GMAKE=	yes
-USE_GL=		gl
+USE_GL=		glut
 USE_SDL=	sdl mixer image
 USE_DOS2UNIX=	kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h

--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	magiccube4d
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.superliminal.com/cube/
 DISTNAME=	mc4d-src-${PORTVERSION:S/./_/}
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	nethack
 PORTVERSION=	3.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	nethack
 PORTVERSION=	3.3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nethack
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/games/netherearth/Makefile
+++ b/games/netherearth/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	netherearth
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/

--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	nexuiz
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
--- a/Show More
+++ b/Show More