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!

4 files changed, 10 insertions, 14 deletions

diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index df2996f307b0..5dc71ba81d2f 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,13 +1,10 @@
-# New ports collection makefile for:	clutter-gst
-# Date created:		2008-12-25
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: 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
 
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index 56c7032eb2a6..52d3d112bd38 100644
--- 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 \
-		xcb:${PORTSDIR}/x11/libxcb
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
 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
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index acc75d229043..04167522593d 100644
--- 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
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 9570fea0ec75..af6ba033c3d9 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -636,9 +636,8 @@ CONFIGURE_ARGS+=--disable-x264
 .endif
 
 .if ${PORT_OPTIONS:MXCB}
-USE_XORG=	xpm
-LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
+USE_XORG=	xcb xpm
+LIB_DEPENDS+=	xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
 CONFIGURE_ARGS+=--enable-xcb --with-x
 .else
 CONFIGURE_ARGS+=--disable-xcb --without-x