The FreeBSD x11 team proudly presents

an zeising, kwm, miwi, bapt, eadler production: Xorg 7.7 Starring: xserver 1.12.4 (new xorg only) Mesa 8.0.4, including libGL, libGLU and dri (new xorg only) libX11 1.5.0 libxcb 1.9 libdrm 2.4.42 (new xorg only) freeglut 2.8.1 Also starring: Updates to drivers and other libraries and utilities Additional notes: Change pkgconf to be a build dependency. Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use this. Trim makefile headers. Take maintanership of x11/xcb-proto, ok'd by ashish. If you are running WITH_NEW_XORG=, you need to rebuild all installed drivers, see UPDATING for more information. Various fixes to make ports compile. PR: ports/177942 Exp-run by: miwi Approved by: portmgr (miwi) Thanks to all who helped testing!
svn path=/head/; revision=319055
2025-07-18 01:39:16 -04:00 · 2013-05-25 14:37:02 +00:00 · 2013-05-25 14:37:02 +00:00 · 92ea0d614b · 2021-03-31 03:12:20 +00:00
commit 92ea0d614b
parent ffbb851452
507 changed files with 4206 additions and 2863 deletions
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -1903,8 +1903,14 @@ X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-type1
 X_FONTS_ALIAS_PORT=	${PORTSDIR}/x11-fonts/font-alias
 .if defined(USE_IMAKE)
 .if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 	${OSVERSION} >= 1000010
 CONFIGURE_ENV+=		IMAKECPP="gcpp"
 MAKE_ENV+=		IMAKECPP="gcpp"
 .else
 CONFIGURE_ENV+=		IMAKECPP="${CPP}"
 MAKE_ENV+=		IMAKECPP="${CPP}"
 .endif
 MAKE_FLAGS?=		CC="${CC}" CXX="${CXX}"
 BUILD_DEPENDS+=		imake:${X_IMAKE_PORT}
 .endif
@ -1924,8 +1930,10 @@ MAKE_ENV+=		DISPLAY="localhost:1001"
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
 _GL_gl_USE_XORG=		glproto dri2proto
 _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
 _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 _GL_glu_USE_XORG=		glproto dri2proto
 _GL_glw_LIB_DEPENDS=		GLw.1:${PORTSDIR}/graphics/libGLw
 _GL_glut_LIB_DEPENDS=		glut.12:${PORTSDIR}/graphics/freeglut
 _GL_linux_RUN_DEPENDS=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
@ -1939,6 +1947,8 @@ USE_GL=		glu
 		!defined(_GL_${_component}_RUN_DEPENDS)
 IGNORE=		uses unknown GL component
 .  else
 USE_XORG+=	${_GL_${_component}_USE_XORG}
 BUILD_DEPENDS+=	${_GL_${_component}_BUILD_DEPENDS}
 LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 RUN_DEPENDS+=	${_GL_${_component}_RUN_DEPENDS}
 .  endif
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@ -17,14 +17,14 @@ Xorg_Pre_Include=		bsd.xorg.mk
 # Some notes:
 #
-# app - requires pkgconfig, don't install shared libraries (I guess)
+# app - Installs applications, no shared libraries.
-# data - nothing I could factorize
+# data - Installs only data.
 # doc - no particular notes
-# driver - input depends on inputproto/renderproto at least
+# driver - input depends on inputproto/randrproto at least
 #          video depends on randrproto/renderproto at least
 # font - don't install .pc file
-# lib - various dependencies, install .pc file
+# lib - various dependencies, install .pc file, needs pathfix
-# proto - install .pc file, no dependencies, needed only at build time for most of them
+# proto - install .pc file, needs pathfix, most only needed at build time.
 # xserver - there's only one atm, I guess everything can fit into the port itself
 .if defined(XORG_CAT)
@ -38,8 +38,17 @@ DIST_SUBDIR=	xorg/${XORG_CAT}
 MASTER_SITES?=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
 # All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and
 # then continues the build.
 USES+=		pkgconfig
 # All xorg ports needs xorg-macros.
 . if ${PORTNAME} != xorg-macros
 USE_XORG+=      xorg-macros
 . endif
 . if ${XORG_CAT} == "app"
-USE_GNOME+=	pkgconfig
+# Nothing at the moment
 . endif
 . if ${XORG_CAT} == "data"
@ -47,7 +56,6 @@ USE_GNOME+=	pkgconfig
 . endif
 . if ${XORG_CAT} == "driver"
 USE_GNOME+=	pkgconfig
 USE_XORG+=	xorg-server xproto randrproto xi
 # work around a llvm bug on i386, llvm bug #15806 
 # reproduced with clang 3.2 (current release) and 3.1
@ -56,11 +64,12 @@ CFLAGS+=	-fno-optimize-sibling-calls
 .  endif
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
 .  if ${PORTNAME:M*input*}x != x
-USE_XORG+=	inputproto renderproto
+USE_XORG+=	inputproto videoproto fontsproto renderproto xextproto \
 		dri2proto
 .  elif ${PORTNAME:M*video*}x != x
-USE_XORG+=	fontsproto renderproto
+USE_XORG+=	videoproto fontsproto renderproto xextproto dri2proto
 .  else
-IGNORE=		doesn't contain either "driver" or "input"
+IGNORE=		doesn't contain either "video" or "input"
 .  endif
 . endif
@ -84,10 +93,9 @@ INSTALLS_TTF?=	no
 .  endif
 .  if ${PORTNAME:M*font-util*}x != x
-USE_GNOME+=	gnomehack
+USES+=	pathfix
 NEED_MKFONTFOO=	no
 .  elif ${INSTALLS_TTF} == "yes"
 USE_GNOME+=	pkgconfig
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 .  else
@ -123,23 +131,23 @@ post-install:
 . endif
 . if ${XORG_CAT} == "lib"
-USE_GNOME+=	gnomehack pkgconfig
+USES+=	pathfix
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 . endif
 . if ${XORG_CAT} == "proto"
-USE_GNOME+=	gnomehack
+USES+=	pathfix
 . endif
 . if ${XORG_CAT} == "xserver"
 DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
 WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
-USE_GNOME+=	gnomehack
+USES+=	pathfix
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
-USE_XORG+=	pciaccess
+USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto
 . endif
 .endif
@ -192,6 +200,7 @@ XORG_MODULES=	bigreqsproto \
 				xaw6 \
 				xaw7 \
 				xbitmaps \
 				xcb \
 				xcmiscproto \
 				xcomposite \
 				xcursor \
@ -274,6 +283,7 @@ 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
 xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
 xcb_LIB_PC_DEPENDS=			${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
 xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
 xcursor_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor
--- a/10
+++ b/10
@ -5,6 +5,16 @@ 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.
 20130525:
  AFFECTS: users of x11/xorg and all xorg ports
  AUTHOR zeising@FreeBSD.org
  xorg, including libraries and some drivers, was updated.
  If you are running the default xorg distribution, no special upgrade procedure
  should be neccessary.
  If you are running with WITH_NEW_XORG= make sure to update and rebuild all
  installed drivers since xorg-server has been updated.
 20130520:
  AFFECTS: users of textproc/elasticsearch
  AUTHOR: tj@FreeBSD.org
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@ -43,10 +43,9 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 		xcb:${PORTSDIR}/x11/libxcb
 USE_GL=		gl glu glut
-USE_XORG=	ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
+USE_XORG=	ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
 PLIST_SUB+=	X11=""
 .else
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@ -43,10 +43,9 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 		xcb:${PORTSDIR}/x11/libxcb
 USE_GL=		gl glu glut
-USE_XORG=	ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
+USE_XORG=	ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
 PLIST_SUB+=	X11=""
 .else
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@ -19,14 +19,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 USES=		iconv pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	desktopfileutils gnomedocutils gtk20
 USE_PERL5_RUN=	yes
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@ -27,8 +27,7 @@ LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 DEPRECATED=	Depends on QT3; unmaintained
 EXPIRATION_DATE=	2013-07-01
@ -40,7 +39,7 @@ USE_QT_VER=	3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xft xi \
+USE_XORG=	ice sm x11 xau xcb xcursor xdmcp xext xfixes xft xi \
 		xinerama xrandr xrender xt
 USE_LDCONFIG=	yes
 QTCPPFLAGS+=	-L${LOCALBASE}/lib
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@ -15,8 +15,7 @@ LICENSE=	LGPL21 # (or later)
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		aa:${PORTSDIR}/graphics/aalib \
+		aa:${PORTSDIR}/graphics/aalib
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
 		${PYNUMPY}
@ -27,7 +26,7 @@ MUTAGEN_DESC=	Enable Mutagen support
 USES=		iconv
 USE_ZIP=	yes
 USE_SDL=	sdl
-USE_XORG=	x11 xau xdmcp
+USE_XORG=	x11 xau xcb xdmcp
 USE_WX=		2.6+
 WX_COMPS=	python:lib
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmms-curses
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # Date created:				2007-07-20
 # Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	xmms-curses
 PORTVERSION=	0.2.2
@ -16,12 +12,11 @@ COMMENT=	A ncurses program for (remote) controlling multimedia/xmms
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
 		xcb.2:${PORTSDIR}/x11/libxcb
 USES=		gettext iconv
 USE_GNOME=	gtk12
-USE_XORG=	x11 xau xdmcp xext xi
+USE_XORG=	x11 xau xcb xdmcp xext xi
 MAN1=	${PORTNAME}.1
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@ -13,13 +13,12 @@ COMMENT=	XMMS input plugin for playing FLAC files
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		FLAC.10:${PORTSDIR}/audio/flac \
 		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
-		ogg:${PORTSDIR}/audio/libogg \
+		ogg:${PORTSDIR}/audio/libogg
 		xcb.2:${PORTSDIR}/x11/libxcb
 USE_AUTOTOOLS=	libtool
 USES=		gettext iconv
 USE_GNOME=	gtk12
-USE_XORG=	x11 xau xdmcp xext xi
+USE_XORG=	x11 xau xcb xdmcp xext xi
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@ -18,12 +18,11 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		rle:${PORTSDIR}/graphics/urt \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 USE_BZIP2=	yes
 USE_GL=		gl glu
-USE_XORG=	ice inputproto sm x11 xau xdamage xdmcp xext xfixes xft xi \
+USE_XORG=	ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
 		xproto xrender xscrnsaver xt xxf86vm
 USE_GMAKE=	yes
 USES=		bison pathfix cmake
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@ -16,8 +16,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		fltk:${PORTSDIR}/x11-toolkits/fltk \
+		fltk:${PORTSDIR}/x11-toolkits/fltk
 		xcb:${PORTSDIR}/x11/libxcb
 USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
@ -28,7 +27,7 @@ GH_COMMIT=	fb52aa2
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 USES=		cmake:outsource iconv
 USE_DOS2UNIX=	yes
-USE_XORG=	ice sm x11 xau xdamage xdmcp xext xfixes xft \
+USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
 USE_GL=		glu
 USE_GNOME=	libxml2
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@ -20,8 +20,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
+		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
 		xcb:${PORTSDIR}/x11/libxcb
 OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
 ATLAS_DESC=	Enable ATLAS support
@ -30,8 +29,8 @@ USES=		pkgconfig gettext iconv
 USE_FORTRAN=	yes
 USE_GL=		glu
 USE_GNOME=	gdkpixbuf2 gtk20
-USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
-		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
+		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@ -32,8 +32,7 @@ LIB_DEPENDS=	gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 		expat:${PORTSDIR}/textproc/expat2 \
 		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
+		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
 		xcb:${PORTSDIR}/x11/libxcb
 MAKE_JOBS_SAFE=	yes
 USES=		pkgconfig iconv
@ -41,8 +40,8 @@ USE_GNOME=	gdkpixbuf2 gtk20 libxml2
 USE_GL=		glu glut
 USE_AUTOTOOLS=	automake libtool
 USE_GMAKE=	yes
-USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
-		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
+		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 .include <bsd.port.options.mk>
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@ -23,8 +23,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils \
+		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
 USES=		pkgconfig iconv
@ -32,7 +31,7 @@ USE_GHOSTSCRIPT_RUN=yes
 USE_GNOME=	gdkpixbuf2 gtk20
 GNU_CONFIGURE=	yes
 USE_GCC=	4.4+
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 MAKE_JOBS_SAFE=	yes
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@ -18,8 +18,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 OPTIONS_DEFINE=	DOCS
@ -28,7 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		gettext iconv
 USE_GNOME=	glib20
 USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 MAKE_JOBS_SAFE=	yes
 PORTDOCS=	CHANGELOG TODO
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@ -16,16 +16,13 @@ PLIST_FILES=	bin/gccmakedep
 .include <bsd.port.pre.mk>
-.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+    ${OSVERSION} >= 1000010
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
+CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
 post-build:
 	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 		-e 's|^RM= *|RM=|' \
 		-e 's|^LN= *|LN=|' \
 		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 .endif
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 .include <bsd.port.post.mk>
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@ -1,8 +1,8 @@
-# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	imake
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTEPOCH=	1
 CATEGORIES=	devel
@ -11,13 +11,17 @@ COMMENT=	Imake and other utilities from X.Org
 RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
 		makedepend:${PORTSDIR}/devel/makedepend \
-		${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
 USE_PERL5=	yes
 XORG_CAT=	util
 USE_XORG=	xproto
 # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
 # which is fatal for imake.
 CPPFLAGS+=	-DDEFAULT_CC=\\\"gcc\\\"
 .ifdef USE_IMAKE
 .error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
@ -34,16 +38,14 @@ MAN1=		ccmakedep.1 \
 post-patch:
 	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 .include <bsd.port.pre.mk>
-.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+	${OSVERSION} >= 1000010
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
+CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
 post-build:
 	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 .endif
 .include <bsd.port.post.mk>
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@ -1,2 +1,2 @@
-SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
+SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
-SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
+SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
--- a/devel/imake/files/patch-xmkmf.cpp
+++ b/devel/imake/files/patch-xmkmf.cpp
@ -1,17 +1,6 @@
--- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
+--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
-+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
+++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
-@@ -53,6 +53,10 @@
+@@ -64,3 +64,12 @@
     args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
 fi
 +if [ -n "$CPP" -a -z "$IMAKECPP" ];then
 +    export IMAKECPP=$CPP
 +fi
 +
 echo imake $imake_defines $args
 case "$do_all" in
 yes)
@@ -68,3 +72,12 @@
     imake $imake_defines $args
     ;;
 esac
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@ -1,19 +1,14 @@
 # New ports collection makefile for:	libpciaccess
 # Date Created:				May 11 2008
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	libpciaccess
-PORTVERSION=	0.12.1
+PORTVERSION=	0.13.1
 PORTREVISION=	1
 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
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
+SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
-SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
+SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
--- a/devel/libpciaccess/files/patch-src-common_init.c
+++ b/devel/libpciaccess/files/patch-src-common_init.c
@ -1,13 +0,0 @@
 --- src/common_init.c.orig	2008-10-11 18:31:00.000000000 +0000
 +++ src/common_init.c	2009-03-29 20:10:52.000000000 +0000
@@ -70,7 +70,9 @@
 void
 pci_system_init_dev_mem(int fd)
 {
 -#ifdef __OpenBSD__
 +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 +    pci_system_freebsd_init_dev_mem(fd);
 +#elif defined(__OpenBSD__)
     pci_system_openbsd_init_dev_mem(fd);
 #endif
 }
--- a/devel/libpciaccess/files/patch-src-freebsd_pci.c
+++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c
@ -1,113 +1,169 @@
--- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
+--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
-+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
+++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
-@@ -72,6 +72,10 @@
+@@ -1,6 +1,8 @@
- #define PCIM_BAR_MEM_SPACE      0
+ /*
- #define PCIM_BAR_IO_SPACE       1
+  * (C) Copyright Eric Anholt 2006
  * (C) Copyright IBM Corporation 2006
 + * (C) Copyright Mark Kettenis 2011
 + * (C) Copyright Robert Millan 2012
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -561,6 +563,138 @@
     freebsd_pci_sys = NULL;
 }
-+#if defined(__sparc64__)
+#if defined(__i386__) || defined(__amd64__)
-+static int screenfd;
+#include <machine/cpufunc.h>
 +#endif
 +
- /**
+static struct pci_io_handle *
-  * FreeBSD private pci_system structure that extends the base pci_system
+pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
-  * structure.
+    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
@@ -103,12 +107,18 @@
 {
     const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0) 
         ? (PROT_READ | PROT_WRITE) : PROT_READ;
 +#if !defined(__sparc64__)
     struct mem_range_desc mrd;
     struct mem_range_op mro;
 +#endif
     int fd, err = 0;
 +#if defined(__sparc64__)
 +    fd = screenfd;
 +#else
     fd = open("/dev/mem", O_RDWR);
 +#endif
     if (fd == -1)
 	return errno;
@@ -118,6 +128,7 @@
 	err = errno;
     }
 +#if !defined(__sparc64__)
     mrd.mr_base = map->base;
     mrd.mr_len = map->size;
     strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner));
@@ -138,6 +149,7 @@
     }
     close(fd);
 +#endif
     return err;
 }
@@ -146,6 +158,7 @@
 pci_device_freebsd_unmap_range( struct pci_device *dev,
 				struct pci_device_mapping *map )
 {
 +#if !defined(__sparc64__)
     struct mem_range_desc mrd;
     struct mem_range_op mro;
     int fd;
@@ -171,6 +184,7 @@
 	    fprintf(stderr, "Failed to open /dev/mem\n");
 	}
     }
 +#endif
     return pci_device_generic_unmap_range(dev, map);
 }
@@ -293,20 +307,28 @@
     }
     printf("Using rom_base = 0x%lx\n", (long)rom_base);
 +#if defined(__sparc64__)
 +    memfd = screenfd;
 +#else
     memfd = open( "/dev/mem", O_RDONLY );
 +#endif
     if ( memfd == -1 )
 	return errno;
     bios = mmap( NULL, dev->rom_size, PROT_READ, 0, memfd, rom_base );
     if ( bios == MAP_FAILED ) {
 +#if !defined(__sparc64__)
 	close( memfd );
 +#endif
 	return errno;
     }
     memcpy( buffer, bios, dev->rom_size );
     munmap( bios, dev->rom_size );
 +#if !defined(__sparc64__)
     close( memfd );
 +#endif
     if (pci_rom) {
 	pci_device_cfg_write_u32( dev, PCIR_BIOS, rom );
@@ -341,7 +363,6 @@
 static int
 pci_device_freebsd_probe( struct pci_device * dev )
 {
 -    struct pci_device_private *priv = (struct pci_device_private *) dev;
     struct pci_bar_io bar;
     uint8_t irq;
     int err, i;
@@ -644,3 +665,11 @@
     return 0;
 }
 +
 +void
 +pci_system_freebsd_init_dev_mem(int fd)
 +{
-+#if defined(__sparc64__)
+#if defined(__i386__) || defined(__amd64__)
-+    screenfd = fd;
+	ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC);
 +
 +	if (ret->fd < 0)
 +		return NULL;
 +
 +	ret->base = base;
 +	ret->size = size;
 +	return ret;
 +#elif defined(PCI_MAGIC_IO_RANGE)
 +	ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
 +	    aperturefd, PCI_MAGIC_IO_RANGE + base);
 +	if (ret->memory == MAP_FAILED)
 +		return NULL;
 +
 +	ret->base = base;
 +	ret->size = size;
 +	return ret;
 +#else
 +	return NULL;
 +#endif
 +}
 +
 +#if defined(__i386__) || defined(__amd64__)
 +static void
 +pci_device_freebsd_close_io(struct pci_device *dev, struct pci_io_handle *handle)
 +{
 +	if (handle->fd > -1)
 +		close(handle->fd);
 +}
 +#endif
 +
 +static uint32_t
 +pci_device_freebsd_read32(struct pci_io_handle *handle, uint32_t reg)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	return inl(handle->base + reg);
 +#else
 +	return *(uint32_t *)((uintptr_t)handle->memory + reg);
 +#endif
 +}
 +
 +static uint16_t
 +pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	return inw(handle->base + reg);
 +#else
 +	return *(uint16_t *)((uintptr_t)handle->memory + reg);
 +#endif
 +}
 +
 +static uint8_t
 +pci_device_freebsd_read8(struct pci_io_handle *handle, uint32_t reg)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	return inb(handle->base + reg);
 +#else
 +	return *(uint8_t *)((uintptr_t)handle->memory + reg);
 +#endif
 +}
 +
 +static void
 +pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg,
 +    uint32_t data)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	outl(handle->base + reg, data);
 +#else
 +	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
 +#endif
 +}
 +
 +static void
 +pci_device_freebsd_write16(struct pci_io_handle *handle, uint32_t reg,
 +    uint16_t data)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	outw(handle->base + reg, data);
 +#else
 +	*(uint8_t *)((uintptr_t)handle->memory + reg) = data;
 +#endif
 +}
 +
 +static void
 +pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg,
 +    uint8_t data)
 +{
 +#if defined(__i386__) || defined(__amd64__)
 +	outb(handle->base + reg, data);
 +#else
 +	*(uint32_t *)((uintptr_t)handle->memory + reg) = data;
 +#endif
 +}
 +
 +static int
 +pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 +    pciaddr_t size, unsigned map_flags, void **addr)
 +{
 +	struct pci_device_mapping map;
 +	int err;
 +
 +	map.base = base;
 +	map.size = size;
 +	map.flags = map_flags;
 +	map.memory = NULL;
 +	err = pci_device_freebsd_map_range(dev, &map);
 +	*addr = map.memory;
 +
 +	return err;
 +}
 +
 +static int
 +pci_device_freebsd_unmap_legacy(struct pci_device *dev, void *addr,
 +    pciaddr_t size)
 +{
 +	struct pci_device_mapping map;
 +
 +	map.memory = addr;
 +	map.size = size;
 +	map.flags = 0;
 +	return pci_device_freebsd_unmap_range(dev, &map);
 +}
 +
 static const struct pci_system_methods freebsd_pci_methods = {
     .destroy = pci_system_freebsd_destroy,
     .destroy_device = NULL, /* nothing to do for this */
@@ -571,6 +705,18 @@
     .read = pci_device_freebsd_read,
     .write = pci_device_freebsd_write,
     .fill_capabilities = pci_fill_capabilities_generic,
 +    .open_legacy_io = pci_device_freebsd_open_legacy_io,
 +#if defined(__i386__) || defined(__amd64__)
 +    .close_io = pci_device_freebsd_close_io,
 +#endif
 +    .read32 = pci_device_freebsd_read32,
 +    .read16 = pci_device_freebsd_read16,
 +    .read8 = pci_device_freebsd_read8,
 +    .write32 = pci_device_freebsd_write32,
 +    .write16 = pci_device_freebsd_write16,
 +    .write8 = pci_device_freebsd_write8,
 +    .map_legacy = pci_device_freebsd_map_legacy,
 +    .unmap_legacy = pci_device_freebsd_unmap_legacy,
 };
 /**
--- a/devel/libpciaccess/files/patch-src-pciaccess_private.h
+++ b/devel/libpciaccess/files/patch-src-pciaccess_private.h
@ -1,10 +0,0 @@
 --- src/pciaccess_private.h.orig	2008-10-11 18:31:00.000000000 +0000
 +++ src/pciaccess_private.h	2009-03-29 20:07:50.000000000 +0000
@@ -136,6 +136,7 @@
 extern int pci_system_linux_sysfs_create( void );
 extern int pci_system_freebsd_create( void );
 +extern void pci_system_freebsd_init_dev_mem( int );
 extern int pci_system_netbsd_create( void );
 extern int pci_system_openbsd_create( void );
 extern void pci_system_openbsd_init_dev_mem( int );
--- a/devel/lndir/Makefile
+++ b/devel/lndir/Makefile
@ -9,7 +9,7 @@ MAINTAINER=	unixmania@gmail.com
 COMMENT=	Create a shadow directory of symbolic links to another directory tree
 XORG_CAT=	util
-USE_XORG=	xproto xorg-macros
+USE_XORG=	xproto
 PLIST_FILES=	bin/lndir
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@ -1,20 +1,15 @@
-# New ports collection makefile for:	makedepend
+# Created by: Ian Vaudrey <i.vaudrey@bigfoot.com>
 # Date created:				August 15th 1997
 # Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 #
 # $FreeBSD$
 #
 PORTNAME=	makedepend
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 PORTEPOCH=	1
 CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	A dependency generator for makefiles
+COMMENT=	Dependency generator for makefiles
 XORG_CAT=	util
 USE_GNOME=	pkgconfig
 USE_XORG=	xproto
 PLIST_FILES=	bin/makedepend
--- a/devel/makedepend/distinfo
+++ b/devel/makedepend/distinfo
@ -1,2 +1,2 @@
-SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
+SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
-SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
+SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@ -1,12 +1,8 @@
-# New ports collection makefile for:	xorg-macros
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # Date Created:				24 Mar 2007
 # Whom:					Eric Anholt <anholt@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	xorg-macros
-PORTVERSION=	1.16.1
+PORTVERSION=	1.17
 CATEGORIES=	devel x11
 DISTNAME=	util-macros-$(PORTVERSION)
--- a/devel/xorg-macros/distinfo
+++ b/devel/xorg-macros/distinfo
@ -1,2 +1,2 @@
-SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
+SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
-SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
+SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@ -24,8 +24,7 @@ LIB_DEPENDS=	mspack:${PORTSDIR}/archivers/libmspack \
 		tiff:${PORTSDIR}/graphics/tiff \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 OPTIONS_DEFINE=	DEBUG DOCS
@ -35,7 +34,7 @@ USE_WX=		2.6+
 USE_PYTHON_BUILD=yes
 USE_GMAKE=	yes
 USES=		gettext iconv
-USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \
+USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 		xext xfixes xi xinerama xrandr xrender xxf86vm
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BASE="${PREFIX}" \
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@ -19,8 +19,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 USES=		pkgconfig gettext iconv
 USE_GNOME=	gdkpixbuf2 gtk20
@ -29,7 +28,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ENV=	ac_cv_have_isinff=no
 CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@ -17,14 +17,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		osp:${PORTSDIR}/textproc/opensp \
 		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USES=		gettext iconv
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
-		xi xinerama xrandr xrender
+		xfixes xi xinerama xrandr xrender
 USE_GNOME=	desktopfileutils gnomehier gtk20
 INSTALLS_ICONS=	yes
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@ -18,13 +18,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 WRKSRC=		${WRKDIR}/Capitalism-${PORTVERSION}
 USES=		iconv
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
 		corelib gui network script xml
 MAKE_JOBS_SAFE=	yes
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	gnome-games
 PORTVERSION=	2.32.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -25,6 +25,7 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack librsvg2 desktopfileutils \
 		pygnomedesktop gnomedocutils
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@ -19,13 +19,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
+		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
 		xcb:${PORTSDIR}/x11/libxcb
 USES=		pkgconfig gettext iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@ -17,14 +17,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 CXXFLAGS+=	-fPIC
 USES=		gettext iconv
 USE_GNOME=	glib20
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@ -1,13 +1,9 @@
-# New ports collection makefile for:	clutter-box2d
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # Date created:		2008-12-25
 # Whom:			Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	clutter-box2d
 PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://source.clutter-project.org/sources/${PORTNAME}/0.10/
@ -18,12 +14,14 @@ LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack ltverhack gnomeprefix
+USES=		pathfix
 USE_GNOME=	ltverhack gnomeprefix
 USE_GL=		gl
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-introspection=no
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.mk>
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@ -18,13 +18,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		fftw3:${PORTSDIR}/math/fftw3 \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USES=		cmake gettext iconv
-USE_XORG=	ice sm x11 xau xdmcp xext xrender xt
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender xt
 USE_QT4=	corelib gui linguist_build moc_build qmake_build \
 		rcc_build uic_build
 USE_GNOME=	glib20
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@ -1,4 +1,4 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	dri
@ -10,27 +10,30 @@ CATEGORIES=	graphics
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		expat.6:${PORTSDIR}/textproc/expat2
+		expat:${PORTSDIR}/textproc/expat2
 USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
-		SAVAGE SIS SWRAST TDFX UNICHROME
+
 .if ! defined(WITH_NEW_XORG)
 ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
 .endif
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.if ${ARCH} == "ia64"
+OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
-BROKEN=		does not install on ia64
+OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
 .if defined(WITH_NEW_XORG)
 OPTIONS_DEFINE_powerpc=	RADEON SWRAST
 OPTIONS_DEFINE_sparc64=	RADEON SWRAST
 .else
 OPTIONS_DEFINE_powerpc=	MACH64 RADEON SWRAST TDFX
 OPTIONS_DEFINE_sparc64=	MACH64 RADEON SWRAST
 .endif
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 OPTIONS_DEFINE=	${ALL_DRI_DRIVERS}
 .elif ${ARCH} == "powerpc"
 OPTIONS_DEFINE=	MACH64 RADEON SWRAST TDFX
 .elif ${ARCH} == "sparc64"
 OPTIONS_DEFINE=	MACH64 RADEON SWRAST
 .endif
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 I810_DESC=	Include DRI support for Intel i810
@ -42,7 +45,7 @@ R128_DESC=	Include DRI support for AMD/ATI R128
 R200_DESC=	Include DRI support for AMD/ATI R200
 R300_DESC=	Include DRI support for AMD/ATI R300
 R600_DESC=	Include DRI support for AMD/ATI R600
-RADEON_DESC=	Include DRI support for AMD/ATI R100
+RADEON_DESC=	Include DRI support for AMD/ATI RADEON
 SAVAGE_DESC=	Include DRI support for S3/Via Savage
 SIS_DESC=	Include DRI support for SiS 300 and 6326
 SWRAST_DESC=	Include generic software DRI support
@ -61,7 +64,9 @@ PLIST_SUB+=	${_d}_DRIVER="@comment "
 .endif
 .endfor
-.include <bsd.port.pre.mk>
+.if ${ARCH} == "ia64"
 BROKEN=		does not install on ia64
 .endif
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
@ -71,4 +76,4 @@ CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@ -1,4 +0,0 @@
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
 SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
 SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@ -1,19 +1,19 @@
 include/GL/internal/dri_interface.h
-%%I810_DRIVER%%lib/dri/i810_dri.so
+%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
-%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
-%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
-%%R128_DRIVER%%lib/dri/r128_dri.so
+%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_DRIVER%%lib/dri/r300_dri.so
+%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
-%%R600_DRIVER%%lib/dri/r600_dri.so
+%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
 %%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
-%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
@dirrm lib/dri
@dirrmtry include/GL/internal
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	eog-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -18,9 +18,10 @@ RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
+USE_GL=		gl
 USE_GNOME=	gnomeprefix intlhack gtk20
 WANT_GNOME=	yes
-USES=		gettext
+USES=		gettext pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@ -1,7 +1,8 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 PORTNAME=	freeglut
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
@ -27,6 +28,8 @@ DOCS=	download.html freeglut.html freeglut_logo.png		\
 	progress.html structure.html
 BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
 .include <bsd.port.options.mk>
 pre-configure:
 .for fract in Fractals/fractals.c Fractals_random/fractals_random.c
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g"		\
@ -38,14 +41,14 @@ post-build:
 		${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR}
 .for prog in ${BINS}
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@ -1,2 +1,2 @@
-SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
+SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
-SIZE (freeglut-2.8.0.tar.gz) = 979459
+SIZE (freeglut-2.8.1.tar.gz) = 1005343
--- a/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
+++ b/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
@ -1,18 +0,0 @@
 --- progs/demos/smooth_opengl3/smooth_opengl3.c.orig	2012-01-04 14:38:43.000000000 +0100
 +++ progs/demos/smooth_opengl3/smooth_opengl3.c	2012-01-04 14:39:10.000000000 +0100
@@ -98,6 +98,7 @@
 #define APIENTRY
 #endif
 +#ifndef GL_VERSION_1_5
 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
 typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
 typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
@@ -117,6 +118,7 @@
 typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
 typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
 typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
 +#endif
 PFNGLGENBUFFERSPROC gl_GenBuffers;
 PFNGLBINDBUFFERPROC gl_BindBuffer;
--- a/graphics/freeglut/pkg-message
+++ b/graphics/freeglut/pkg-message
@ -0,0 +1,9 @@
 Since FreeBSD has new USB stack, freeglut normally doesn't build on FreeBSD 8
 (yet). To workaround this a small patch adds one include file and comments out
 content of one function (only leaves return NULL).
 This might cause side effects.  Joysticks do not work, and there might be ports
 that do not compile or applications that crash because of this.
 Do not hesitate to contact x11@FreeBSD.org if there are any issues and side
 effects because of this.
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@ -12,15 +12,14 @@ COMMENT=	Portable framework for OpenGL development
 LICENSE=	ZLIB
 LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		drm:${PORTSDIR}/graphics/libdrm \
+		drm:${PORTSDIR}/graphics/libdrm
 		xcb:${PORTSDIR}/x11/libxcb
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	compile.sh
 ALL_TARGET=	x11
 INSTALL_TARGET=	x11-install
-USE_XORG=	x11 xau xdamage xdmcp xext xfixes xrandr xrender xxf86vm
+USE_XORG=	x11 xau xcb xdamage xdmcp xext xfixes xrandr xrender xxf86vm
 USE_GL=		glu
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@ -13,15 +13,14 @@ COMMENT=	A 2D graphics library
 LICENSE=	LGPL20 MIT
 LICENSE_COMB=	multi
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 		xcb:${PORTSDIR}/x11/libxcb
 OPTIONS_DEFINE=	BGI BMP JPEG PNG PRINT TIFF ZLIB
 OPTIONS_DEFAULT=	ZLIB BGI BMP PNG PRINT
 BGI_DESC=	Enable BGI support
 BMP_DESC=	Enable BMP support
-USE_XORG=	x11 xau xdmcp
+USE_XORG=	x11 xau xcb xdmcp
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@ -1,4 +1,4 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	libGL
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@ -11,11 +11,9 @@
 #
 #    - graphics/libGL
 #    - graphics/libGLU
 #    - graphics/libGLw
 #    - graphics/dri
 #
 # $FreeBSD$
 #
 .MAKE.FreeBSD_UL=	yes
@ -23,7 +21,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 .if defined(WITH_NEW_XORG)
-MESABASEVERSION=	7.11.2
+MESABASEVERSION=	8.0.5
 # if there is a subversion, include the '-' between 7.11-rc2 for example.
 MESASUBVERSION=		
 PLIST_SUB+=	OLD="@comment " NEW=""
@ -33,8 +31,8 @@ MESASUBVERSION=
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
-DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
 MAINTAINER?=	x11@FreeBSD.org
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
@ -46,22 +44,19 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
-		--disable-egl --disable-glut
+		--disable-egl
 .if defined(WITH_NEW_XORG)
 EXTRA_PATCHES+=	${PATCHDIR}/extra-configure \
 		${PATCHDIR}/extra-mach64_context.h \
 		${PATCHDIR}/extra-sis_context.h \
 		${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \
 		${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \
 		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \
-		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \
+		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
 		${PATCHDIR}/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
 		${PATCHDIR}/extra-mach64_context.h-old \
@ -69,12 +64,16 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
 		${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
 		${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \
 		${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S
 CONFIGURE_ARGS+=--disable-glut --disable-glw
 .endif
 ALL_TARGET=		default
-PATCHDIR=		${.CURDIR}/../../graphics/libGL/files
+MASTERDIR=		${.CURDIR}/../../graphics/libGL
-WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
+PATCHDIR=		${MASTERDIR}/files
 DESCR=			${.CURDIR}/pkg-descr
 PLIST=			${.CURDIR}/pkg-plist
 WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 .if !defined(ARCH)
 ARCH!=			uname -p
@ -86,38 +85,25 @@ COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 CONFIGURE_ARGS+=	--disable-glu
 .endif
 .if ${COMPONENT:Mglw} == ""
 CONFIGURE_ARGS+=	--disable-glw
 .else
 CONFIGURE_ARGS+=	--enable-motif
 .endif
 .if ${COMPONENT:Mdri} == ""
 CONFIGURE_ARGS+=	--with-dri-drivers=no
 .else
 CONFIGURE_ARGS+=	--with-dri-drivers="i915,i965,r200,radeon,swrast"
 .endif
 .if !defined(WITH_NEW_XORG)
 .if defined(WITHOUT_XCB)
 CONFIGURE_ARGS+=	--disable-xcb
 .else
 CONFIGURE_ARGS+=	--enable-xcb
 .endif
 .endif
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/src/glu/Makefile \
 		${WRKSRC}/src/glw/Makefile \
 		${WRKSRC}/src/mesa/Makefile \
 		${WRKSRC}/src/mesa/drivers/dri/Makefile
-.if defined(WITH_NEW_XORG)
+
 # replace hardlinks with patched radeon_span.c
 .for i in r200 r300 r600
 	@${CP} -fp ${WRKSRC}/src/mesa/drivers/dri/radeon/radeon_span.c \
 		${WRKSRC}/src/mesa/drivers/dri/${i}/
 .endfor
 .endif
 .if ${COMPONENT:Mglut} != ""
 	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/src/glut/glx/Makefile
 .endif
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@ -1,4 +1,4 @@
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
+SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
--- a/graphics/libGL/files/extra-configure
+++ b/graphics/libGL/files/extra-configure
@ -1,42 +1,40 @@
--- configure.orig	2011-11-17 19:46:34.000000000 +0000
+--- configure.orig	2012-07-10 17:30:46.000000000 +0200
-+++ configure	2012-06-28 12:53:09.000000000 +0000
+++ configure	2012-09-01 13:27:22.000000000 +0200
-@@ -7817,10 +7817,35 @@
+@@ -9017,9 +9017,34 @@
-             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
-         fi
+         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
 -        if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
+-            DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
 -                radeon tdfx unichrome savage sis swrast"
 -        fi
 +        case "$host_cpu" in
 +        x86_64)
 +            # i810 is missing because there is no x86-64 system where it
 +            # could *ever* be used.
 +            if test "x$DRI_DIRS" = "xyes"; then
-+                DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
+                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
 +                    radeon savage tdfx unichrome sis swrast"
 +            fi
 +            ;;
 +        i*86)
 +            if test "x$DRI_DIRS" = "xyes"; then
-+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
+                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
 +                    r600 radeon savage tdfx unichrome sis swrast"
 +            fi
 +            ;;
 +        powerpc*)
 +            # Build only the drivers for cards that exist on PowerPC.
 +            # At some point MGA will be added, but not yet.
 +            if test "x$DRI_DIRS" = "xyes"; then
-+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+                DRI_DIRS="r200 radeon swrast"
 +            fi
 +            ;;
 +        sparc*)
 +            # Build only the drivers for cards that exist on SPARC.
 +            if test "x$DRI_DIRS" = "xyes"; then
-+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+                DRI_DIRS="r200 radeon swrast"
 +            fi
 +            ;;
 +        esac
 +
         ;;
     gnu*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
--- a/graphics/libGL/files/extra-mach64_context.h
+++ b/graphics/libGL/files/extra-mach64_context.h
@ -1,21 +0,0 @@
 --- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-05-13 01:47:18.000000000 +0200
 +++ src/mesa/drivers/dri/mach64/mach64_context.h	2011-07-27 09:59:53.000000000 +0200
@@ -289,7 +289,7 @@
 /* ================================================================
  * Byte ordering
  */
 -#if MESA_LITTLE_ENDIAN == 1
 +#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1
 #define LE32_IN( x )		( *(GLuint *)(x) )
 #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
 #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
@@ -298,6 +298,9 @@
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #include <machine/endian.h>
 #define bswap_32 bswap32
 +#elif defined(__FreeBSD__)
 +#include <sys/endian.h>
 +#define bswap_32 bswap32
 #else
 #include <byteswap.h>
 #endif
--- a/graphics/libGL/files/extra-sis_context.h
+++ b/graphics/libGL/files/extra-sis_context.h
@ -1,22 +0,0 @@
 --- src/mesa/drivers/dri/sis/sis_context.h.orig	2010-12-14 22:43:15.000000000 +0100
 +++ src/mesa/drivers/dri/sis/sis_context.h	2011-07-27 09:58:22.000000000 +0200
@@ -400,10 +400,18 @@
 #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
 #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
 -#if defined(__i386__) || defined(__x86_64__)
 +#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
 #define MMIO_WMB()	__asm __volatile("" : : : "memory")
 #elif defined(__ia64__)
 #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
 +#elif defined(__powerpc__)
 +#define MMIO_WMB()	__asm __volatile("eieio" : : : "memory")
 +#elif defined(__sparc64__)
 +/*
 + * #StoreStore probably would be sufficient for this driver at the
 + * time of this writing but we use #Sync for safety.
 + */
 +#define MMIO_WMB()	__asm __volatile("membar #Sync" : : : "memory")
 #else
 #error platform needs WMB
 #endif
--- a/graphics/libGL/files/extra-srcmesadriversdriradeon__radeon_span.c
+++ b/graphics/libGL/files/extra-srcmesadriversdriradeon__radeon_span.c
@ -1,15 +0,0 @@
 --- src/mesa/drivers/dri/radeon/radeon_span.c.orig	2011-07-09 03:37:10.000000000 +0200
 +++ src/mesa/drivers/dri/radeon/radeon_span.c	2012-06-28 21:44:07.000000000 +0200
@@ -55,7 +55,11 @@
 #include <byteswap.h>
 #define CPU_TO_LE16( x )	bswap_16( x )
 #define LE16_TO_CPU( x )	bswap_16( x )
 -#endif /* __linux__ */
 +#elif defined(__FreeBSD__)
 +#include <sys/endian.h>
 +#define CPU_TO_LE16( x )	bswap16( x )
 +#define LE16_TO_CPU( x )	bswap16( x )
 +#endif
 #else
 #define CPU_TO_LE16( x )	( x )
 #define LE16_TO_CPU( x )	( x )
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@ -3,11 +3,11 @@
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
-include/GL/glfbdev.h
+%%OLD%%include/GL/glfbdev.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
-include/GL/mesa_wgl.h
+%%OLD%%include/GL/mesa_wgl.h
 %%OLD%%include/GL/mglmesa.h
 include/GL/osmesa.h
 %%OLD%%include/GL/svgamesa.h
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@ -1,8 +1,7 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	libGLU
 PORTREVISION=	2
 PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
@ -19,11 +18,4 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
+.include <bsd.port.mk>
 .include <bsd.port.pre.mk>
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
 .include <bsd.port.post.mk>
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@ -1,4 +0,0 @@
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
 SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
 SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@ -1,26 +1,25 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	libGLw
-PORTVERSION=	${MESAVERSION}
+PORTVERSION=	8.0.0
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/glw/
 DISTNAME=	glw-${PORTVERSION}
 DIST_SUBDIR=	GL
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL widgets library
 USE_BZIP2=	yes
 USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GL=		gl
 USE_MOTIF=	yes
-USE_XORG=	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
+USE_XORG=	x11 xt xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --enable-motif
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_WRKSRC=	${WRKSRC}/src/glw
+.include <bsd.port.mk>
 BUILD_WRKSRC=	${WRKSRC}/src/glw
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.pre.mk>
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
 .include <bsd.port.post.mk>
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@ -1,4 +1,2 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
 SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
--- a/graphics/libGLw/pkg-plist
+++ b/graphics/libGLw/pkg-plist
@ -2,7 +2,7 @@ include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
 include/GL/GLwMDrawA.h
 include/GL/GLwMDrawAP.h
 lib/libGLw.la
 lib/libGLw.so
 lib/libGLw.so.1
 libdata/pkgconfig/glw.pc
@dirrmtry include/GL
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@ -10,23 +10,26 @@ MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 LIB_DEPENDS=	pciaccess:${PORTSDIR}/devel/libpciaccess \
 		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 MAKE_JOBS_SAFE=	yes
 .if defined(WITH_NEW_XORG)
-OPTIONS_DEFINE=	KMS
+USE_GMAKE=	yes
-KMS_DESC=	Enable experimental KMS support
+
 OPTIONS_DEFINE=	KMS MANPAGES
 OPTIONS_DEFAULT=KMS
 KMS_DESC=	Enable KMS support
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	MANPAGES
 .endif
 .include <bsd.port.options.mk>
@ -38,12 +41,34 @@ PLIST_SUB+=	KMS=""
 PLIST_SUB+=	KMS="@comment "
 .endif
-LIBDRM_VERSION=	2.4.31
+.if ${PORT_OPTIONS:MMANPAGES}
-LIBDRM_REVISION=1
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-PLIST_SUB+=	OLD="@comment " NEW=""
+		xsltproc:${PORTSDIR}/textproc/libxslt
 MAN3=		drmAvailable.3 \
 		drmHandleEvent.3 \
 		drmModeGetResources.3
 MAN7=		drm-gem.7 \
 		drm-kms.7 \
 		drm-memory.7 \
 		drm-mm.7 \
 		drm-ttm.7 \
 		drm.7
 .else
 CONFIGURE_ARGS+=--disable-manpages
 .endif
 LIBDRM_VERSION=	2.4.44
 LIBDRM_REVISION=0
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-configure \
 		${FILESDIR}/extra-tests_modetest_Makefile.in \
 		${FILESDIR}/extra-tests_modetest_modetest.c \
 		${FILESDIR}/extra-tests_modetest_strchrnul.c
 CONFIGURE_ARGS+=--disable-vmwgfx
 .else
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 LIBDRM_VERSION=	2.4.17
-LIBDRM_REVISION=1
+LIBDRM_REVISION=0
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
@ -59,7 +84,7 @@ PLIST_SUB+=	RADEON_DRIVERS="@comment "
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
-			   12661s/x86_/amd/g' \
+			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
 		${WRKSRC}/configure
 .include <bsd.port.post.mk>
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@ -1,4 +1,4 @@
 SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
+SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
-SIZE (libdrm-2.4.31.tar.bz2) = 475677
+SIZE (libdrm-2.4.44.tar.bz2) = 538416
--- a/graphics/libdrm/files/extra-configure
+++ b/graphics/libdrm/files/extra-configure
@ -0,0 +1,39 @@
 --- configure.orig	2013-02-22 00:30:16.861698520 +0100
 +++ configure	2013-02-22 00:30:26.189704713 +0100
@@ -671,6 +671,8 @@
 HAVE_VMWGFX_TRUE
 HAVE_LIBKMS_FALSE
 HAVE_LIBKMS_TRUE
 +HAVE_STRCHRNUL_FALSE
 +HAVE_STRCHRNUL_TRUE
 CLOCK_LIB
 pkgconfigdir
 PTHREADSTUBS_LIBS
@@ -12341,6 +12345,27 @@
 done
 +for ac_func in strchrnul
 +do :
 +  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
 +if test "x$ac_cv_func_strchrnul" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRCHRNUL 1
 +_ACEOF
 + HAVE_STRCHRNUL=yes
 +fi
 +done
 +
 +
 + if test "x$ac_cv_func_strchrnul" = xyes; then
 +  HAVE_STRCHRNUL_TRUE=
 +  HAVE_STRCHRNUL_FALSE='#'
 +else
 +  HAVE_STRCHRNUL_TRUE='#'
 +  HAVE_STRCHRNUL_FALSE=
 +fi
 +
 +
 MAYBE_WARN="-Wall -Wextra \
--- a/graphics/libdrm/files/extra-tests_modetest_Makefile.in
+++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in
@ -0,0 +1,52 @@
 --- tests/modetest/Makefile.in.orig	2013-04-04 15:41:48.212028807 +0200
 +++ tests/modetest/Makefile.in	2013-04-04 15:45:21.384003991 +0200
@@ -36,8 +52,11 @@
 host_triplet = @host@
 @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT)
 @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT)
 -@HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_CFLAGS)
 -@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_LIBS)
 +@HAVE_STRCHRNUL_FALSE@am__append_1 = \
 +@HAVE_STRCHRNUL_FALSE@	strchrnul.c
 +
 +@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS)
 +@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS)
 subdir = tests/modetest
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -53,7 +72,10 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 -am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT)
 +am__modetest_SOURCES_DIST = buffers.c modetest.c buffers.h strchrnul.c
 +@HAVE_STRCHRNUL_FALSE@am__objects_1 = strchrnul.$(OBJEXT)
 +am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) \
 +	$(am__objects_1)
 modetest_OBJECTS = $(am_modetest_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -229,12 +265,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
 -	-I$(top_srcdir) $(am__append_1)
 -modetest_SOURCES = \
 -	buffers.c modetest.c buffers.h
 -
 +	-I$(top_srcdir) $(am__append_2)
 +modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1)
 modetest_LDADD = $(top_builddir)/libdrm.la \
 -	$(top_builddir)/libkms/libkms.la $(am__append_2)
 +	$(top_builddir)/libkms/libkms.la $(am__append_3)
 all: all-am
 .SUFFIXES:
@@ -333,6 +370,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--- a/graphics/libdrm/files/extra-tests_modetest_modetest.c
+++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c
@ -0,0 +1,13 @@
 --- tests/modetest/modetest.c.orig	2013-02-22 00:44:28.203705216 +0100
 +++ tests/modetest/modetest.c	2013-02-22 00:44:56.803699770 +0100
@@ -57,6 +57,10 @@
 #include "buffers.h"
 +#ifndef HAVE_STRCHRNUL
 +char *strchrnul(const char *, int);
 +#endif
 +
 drmModeRes *resources;
 int fd, modes;
--- a/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
+++ b/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
@ -0,0 +1,48 @@
 --- tests/modetest/strchrnul.c.orig	2013-02-22 00:35:04.198698781 +0100
 +++ tests/modetest/strchrnul.c	2013-02-22 00:34:36.280333357 +0100
@@ -0,0 +1,45 @@
 +/*-
 + * Copyright (c) 2013 Niclas Zeising
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
 + */
 +
 +/*
 + * Copied from:
 + * svn://svn.freebsd.org/base/head/lib/libc/string/strchrnul.c 246766 2013-02-13 15:46:33Z zeising
 + */
 +
 +char *
 +strchrnul(const char *p, int ch)
 +{
 +	char c;
 +
 +	c = ch;
 +	for (;; ++p) {
 +		if (*p == c || *p == '\0')
 +			return ((char *)p);
 +	}
 +	/* NOTREACHED */
 +}
 +
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@ -17,12 +17,13 @@
 %%NEW%%include/libdrm/drm_mode.h
 %%NEW%%include/libdrm/drm_sarea.h
 %%NEW%%include/libdrm/i915_drm.h
 %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_aub.h
 %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h
 %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
 %%NEW%%include/libdrm/mach64_drm.h
 %%NEW%%include/libdrm/mga_drm.h
 %%NEW%%include/libdrm/nouveau.h
 %%NEW%%include/libdrm/nouveau_drm.h
 %%NEW%%include/libdrm/nouveau_drmif.h
 %%NEW%%include/libdrm/r128_drm.h
 %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
 %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
@ -37,17 +38,14 @@
 %%NEW%%include/libdrm/sis_drm.h
 %%NEW%%include/libdrm/via_drm.h
 %%NEW%%%%KMS%%include/libkms/libkms.h
-include/nouveau/nouveau_bo.h
+%%OLD%%include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
+%%OLD%%include/nouveau/nouveau_channel.h
 %%OLD%%include/nouveau/nouveau_class.h
-include/nouveau/nouveau_device.h
+%%OLD%%include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
+%%OLD%%include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
+%%OLD%%include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
+%%OLD%%include/nouveau/nouveau_pushbuf.h
-%%NEW%%include/nouveau/nouveau_reloc.h
+%%OLD%%include/nouveau/nouveau_resource.h
 include/nouveau/nouveau_resource.h
 %%NEW%%include/nouveau/nv04_pushbuf.h
 %%NEW%%include/nouveau/nvc0_pushbuf.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@ -58,7 +56,8 @@ lib/libdrm.so.2
 %%INTEL_DRIVER%%lib/libdrm_intel.so.1
 lib/libdrm_nouveau.la
 lib/libdrm_nouveau.so
-lib/libdrm_nouveau.so.1
+%%OLD%%lib/libdrm_nouveau.so.1
 %%NEW%%lib/libdrm_nouveau.so.2
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
@ -70,7 +69,7 @@ libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
-@dirrm include/nouveau
+%%OLD%%@dirrm include/nouveau
 %%NEW%%%%KMS%%@dirrm include/libkms
 %%NEW%%@dirrm include/libdrm
 %%OLD%%@dirrm include/drm
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@ -27,13 +27,12 @@ LIB_DEPENDS=	mspack:${PORTSDIR}/archivers/libmspack \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		freexl:${PORTSDIR}/textproc/freexl \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 GNU_CONFIGURE=	yes
 USES=		pkgconfig gettext iconv
 USE_GMAKE=	yes
-USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender xxf86vm
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
 USE_WX=		2.8
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@ -1,4 +1,4 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 PORTNAME=	mesa-demos
--- a/graphics/pinpoint/Makefile
+++ b/graphics/pinpoint/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	pinpoint
 DISTVERSION=	0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
@ -16,6 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 USE_XZ=		yes
 USE_GL=		gl
 USE_GMAKE=	yes
 USE_GNOME=	librsvg2
 GNU_CONFIGURE=	yes
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@ -31,8 +31,7 @@ CONFIGURE_ARGS+=	--with-jpeg=no
 .endif
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	ice sm x11 xau xdmcp xext xv
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
 LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 CONFIGURE_ARGS+=	--with-x=yes
 .else
 CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@ -181,12 +181,12 @@ do-install-mozc_tool:
 # ibus_mozc
 .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 USE_XORG=	xcb
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=1 \
 		enable_gtk_renderer=1
-LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus \
+LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus
 		xcb-xfixes:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
 		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@ -31,9 +31,8 @@ PLIST_FILES=	bin/pxspread bin/xspread
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xau xdmcp xt
+USE_XORG=	x11 xau xcb xdmcp xt
-LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 		xcb:${PORTSDIR}/x11/libxcb
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@ -35,9 +35,8 @@ LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
+		fltk_images:${PORTSDIR}/x11-toolkits/fltk
-		xcb:${PORTSDIR}/x11/libxcb
+USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
 USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
 PLIST_FILES+=	bin/Nut
 DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@ -1,13 +1,10 @@
-# New ports collection makefile for:	clutter-gst
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # Date created:		2008-12-25
 # Whom:			Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
 #   $MCom: ports/multimedia/clutter-gst/Makefile,v 1.6 2010/06/29 21:14:02 kwm Exp $
 PORTNAME=	clutter-gst
 PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
@ -19,8 +16,10 @@ LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack ltverhack gnomeprefix
+USES=		pathfix
 USE_GNOME=	ltverhack gnomeprefix
 USE_GSTREAMER=	yes
 USE_GL=		gl
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@ -22,11 +22,10 @@ LIB_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 USE_GNOME=	glib20 gtk20
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@ -14,12 +14,11 @@ COMMENT=	Video Disk Recorder - softhddevice plugin
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		vdpau:${PORTSDIR}/multimedia/libvdpau \
 		xcb:${PORTSDIR}/x11/libxcb \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 		asound:${PORTSDIR}/audio/alsa-lib
 USES=		pkgconfig
-USE_XORG+=	xv x11 xinerama
+USE_XORG+=	xv x11 xcb xinerama
 USE_GL+=	gl glu
 PATCH_STRIP=	-p1
 HAVE_CONFIGURE=	yes
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -636,9 +636,8 @@ CONFIGURE_ARGS+=--disable-x264
 .endif
 .if ${PORT_OPTIONS:MXCB}
-USE_XORG=	xpm
+USE_XORG=	xcb xpm
-LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
+LIB_DEPENDS+=	xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
 CONFIGURE_ARGS+=--enable-xcb --with-x
 .else
 CONFIGURE_ARGS+=--disable-xcb --without-x
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	empathy
 PORTVERSION=	2.34.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
@ -101,6 +101,7 @@ PLIST_SUB+=	NST="@comment "
 .endif
 .if ${PORT_OPTIONS:MMAP}
 USE_GL=		gl
 LIB_DEPENDS+=	champlain-0.8:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-map
 PLIST_SUB+=	MAP=""
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@ -26,14 +26,13 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		gpg-error:${PORTSDIR}/security/libgpg-error \
 		gpgme:${PORTSDIR}/security/gpgme \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 WRKSRC=		${WRKDIR}/trunk
 USES=		gettext iconv
 USE_GNOME=	glib20
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_QT4=	corelib gui network xml script designer_build uic_build \
 		qmake_build moc_build rcc_build
 HAS_CONFIGURE=	yes
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@ -15,7 +15,12 @@ COMMENT=	TigerVNC is an advanced VNC implementation
 LISENCE=	GPLv2
 LISENCE_FILE=	${WRKSRC}/LICENCE.TXT
 .if defined(WITH_NEW_XORG)
 BROKEN=		Does not build
 .endif
 PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 BUILD_DEPENDS=  ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri
 # almost equivalent to x11-servers/xorg-server's
 RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@ -14,10 +14,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		dbus:${PORTSDIR}/devel/dbus \
 		xcb:${PORTSDIR}/x11/libxcb \
 		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
-USE_XORG=	x11 xdamage xfixes xrandr xinerama xext xtst xau xrender xdmcp recordproto
+USE_XORG=	x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \
 		xdmcp recordproto
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@ -33,8 +33,7 @@ LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient \
 		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
 		enchant:${PORTSDIR}/textproc/enchant \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 # TODO enable devel/libexecinfo
 # TODO ntrack and ntrack-qt (needs porting) ?
@ -45,7 +44,7 @@ GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
 USE_BZIP2=	yes
 USES=		cmake pkgconfig gettext iconv
-USE_XORG=	ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xfixes xrender xscrnsaver
 CMAKE_ARGS=	-DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON
 # Setting KADU_VERSION disables git invocation
 MAKE_JOBS_SAFE=	yes
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@ -17,12 +17,11 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
 		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 USES=		gettext iconv
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_QT4=	corelib gui network xml qmake_build moc_build uic_build rcc_build
 USE_KDE4=	kdehier
 QMAKE_ARGS=	PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@ -20,13 +20,12 @@ LIB_DEPENDS=	cups:${PORTSDIR}/print/cups-client \
 		pixman:${PORTSDIR}/x11/pixman \
 		png15:${PORTSDIR}/graphics/png \
 		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		tiff:${PORTSDIR}/graphics/tiff \
+		tiff:${PORTSDIR}/graphics/tiff
 		xcb:${PORTSDIR}/x11/libxcb
 GNU_CONFIGURE=	yes
 USES=		gettext
 USE_GNOME=	desktopfileutils pango
-USE_XORG=	x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 INSTALLS_ICONS=	yes
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@ -14,15 +14,14 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 LICENSE=	GPLv3
 USE_GCC=	any
 USE_BZIP2=	yes
 USES=		cmake gettext iconv
-USE_XORG=	ice sm x11 xau xdmcp xext xrender
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_GNOME=	glib20
 USE_QT4=	corelib gui xml rcc_build qmake_build uic_build moc_build \
 		svg
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@ -22,8 +22,7 @@ LIB_DEPENDS=	atkmm-1.6:${PORTSDIR}/accessibility/atkmm \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
+		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		smartctl:${PORTSDIR}/sysutils/smartmontools
@ -31,7 +30,7 @@ USE_AUTOTOOLS=	libtool
 USES=		pkgconfig gettext iconv
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender 
 INSTALLS_ICONS=	yes
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@ -18,13 +18,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 		xcb:${PORTSDIR}/x11/libxcb
 GNU_CONFIGURE=	yes
 USES=		pkgconfig gettext iconv
 USE_GNOME=	gdkpixbuf2 gtk20
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 MAKE_JOBS_SAFE=	yes
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@ -25,8 +25,7 @@ LIB_DEPENDS=	atkmm:${PORTSDIR}/accessibility/atkmm \
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
+		pangomm:${PORTSDIR}/x11-toolkits/pangomm
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
 		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
@ -35,7 +34,7 @@ OPTIONS_DEFAULT=XINERAMA
 USES=		gettext iconv
 USE_GNOME=	gtk20
-USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
+USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xrandr xrender
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-inotify
--- a/x11-clocks/oclock/Makefile
+++ b/x11-clocks/oclock/Makefile
@ -1,9 +1,4 @@
 # New ports collection makefile for:	oclock
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	oclock
 PORTVERSION=	1.0.3
--- a/x11-clocks/xclock/Makefile
+++ b/x11-clocks/xclock/Makefile
@ -1,9 +1,4 @@
 # New ports collection makefile for:	xclock
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	xclock
 PORTVERSION=	1.0.6
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@ -1,9 +1,4 @@
 # New ports collection makefile for:	xf86-input-acecad
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	xf86-input-acecad
 PORTVERSION=	1.5.0
@ -13,7 +8,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org acecad input driver
 XORG_CAT=	driver
 USE_XORG=	xextproto videoproto
 MAN4=		acecad.4x
 .include <bsd.port.mk>
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@ -25,7 +25,7 @@ IGNORE=         is useless without uep(4) kernel driver
 .endif
 .if defined(WITH_NEW_XORG)
-IGNORE=		does not build with X server 1.10
+IGNORE=		does not build with X server 1.12
 .endif
 .include <bsd.port.post.mk>
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@ -1,9 +1,4 @@
 # New ports collection makefile for:	xf86-input-elographics
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 PORTNAME=	xf86-input-elographics
 PORTVERSION=	${ELO_VERSION}
@ -14,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org elographics input driver
 XORG_CAT=	driver
 USE_XORG=	xextproto videoproto
 MAN4=		elographics.4x
 .if defined(WITH_NEW_XORG)
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@ -0,0 +1,19 @@
 # $FreeBSD$
 PORTNAME=	xf86-input-fpit
 PORTVERSION=	1.4.0
 CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org fpit input driver
 XORG_CAT=	driver
 USE_XORG=	xrandr
 MAN4=		fpit.4x
 .if !defined(WITH_NEW_XORG)
 IGNORE=		does not build with X server 1.7.7
 .endif
 .include <bsd.port.mk>
--- a/x11-drivers/xf86-input-fpit/distinfo
+++ b/x11-drivers/xf86-input-fpit/distinfo
@ -0,0 +1,2 @@
 SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a
 SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843
--- a/x11-drivers/xf86-input-fpit/pkg-descr
+++ b/x11-drivers/xf86-input-fpit/pkg-descr
@ -0,0 +1,3 @@
 This package contains the X.Org xf86-input-fpit driver.
 WWW: http://www.x.org
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@ -0,0 +1,6 @@
 lib/xorg/modules/input/fpit_drv.la
 lib/xorg/modules/input/fpit_drv.so
 share/X11/xorg.conf.d/50-fpit.conf
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
--- a/Show more
+++ b/Show more
`@ -1,2 +1,2 @@`
	`SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe`	`SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1`
	`SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773`	`SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503`
`@ -1,2 +1,2 @@`
	`SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344`	`SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084`
	`SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217`	`SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351`
`@ -1,2 +1,2 @@`
	`SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737`	`SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe`
	`SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703`	`SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683`
`@ -1,2 +1,2 @@`
	`SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933`	`SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed`
	`SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404`	`SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029`
`@ -1,2 +1,2 @@`
	`SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05`	`SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a`
	`SIZE (freeglut-2.8.0.tar.gz) = 979459`	`SIZE (freeglut-2.8.1.tar.gz) = 1005343`
		`@ -0,0 +1,2 @@`
							`SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a`
							`SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843`
		`@ -0,0 +1,3 @@`
							`This package contains the X.Org xf86-input-fpit driver.`

							`WWW: http://www.x.org`