From zeising@daemonic.se  Wed Apr 17 21:27:06 2013
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id DBC684CB
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 21:27:06 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id ECC4188D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 21:27:04 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 7D3C74003F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 23:27:02 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 676CA40041; Wed, 17 Apr 2013 23:27:02 +0200 (CEST)
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id 6ECB14003F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 23:26:37 +0200 (CEST)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id 3Zrc2h5bY7z8gh0
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 23:26:36 +0200 (CEST)
Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025)
	with ESMTPS id wAu7f1eUq7Fc for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 17 Apr 2013 23:25:46 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
	by mx.daemonic.se (Postfix) with ESMTPS id 3Zrc1k3tkCz8ggv
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 23:25:46 +0200 (CEST)
Received: from vivi.daemonic.se (vivi.daemonic.se [IPv6:2001:470:dca9:1::4])
	by mail.daemonic.se (Postfix) with ESMTPS id 3Zrc1k3CTKz9Ctj
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Apr 2013 23:25:46 +0200 (CEST)
Received: (from zeising@localhost)
	by vivi.daemonic.se (8.14.6/8.14.6/Submit) id r3HLPfNN002655;
	Wed, 17 Apr 2013 23:25:41 +0200 (CEST)
	(envelope-from zeising)
Message-Id: <201304172125.r3HLPfNN002655@vivi.daemonic.se>
Date: Wed, 17 Apr 2013 23:25:41 +0200 (CEST)
From: Niclas Zeising <zeising@FreeBSD.org>
Reply-To: Niclas Zeising <zeising@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [exp-run] update of xorg ports to 7.7
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         177942
>Category:       ports
>Synopsis:       [exp-run] update of xorg ports to 7.7
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 17 21:30:00 UTC 2013
>Closed-Date:    Fri May 31 16:14:32 UTC 2013
>Last-Modified:  Fri May 31 16:14:32 UTC 2013
>Originator:     Niclas Zeising
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD vivi.daemonic.se 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r248060M: Fri Mar 8 20:11:35 CET 2013 root@vivi.daemonic.se:/usr/obj/usr/src/sys/VIVI amd64


	
>Description:
	Attached patch updates FreeBSD xorg ports to the latest version, including new libX11, libxcb, MESA and xorg-server.  This patch also includes changes to bsd.port.mk and bsd.xorg.mk to support these changes, as well as changes to USES=pathfix and USE_PKGCONFIG=build, and fixes to make imake work with clang.
	Since this patch touches a great deal of the ports tree it is in need of exp-runs.
	Preferably two exp-runs, once in a normal environment to build the old xorg, and once, with WITH_NEW_XORG= defined in /etc/make.conf or similar, to build the new xorg.  It is ok if the version of FreeBSD used for these runs differ slightly.
	To sum:
	exp-run 1: normal
	exp-run 2: WITH_NEW_XORG= in /etc/make.conf
	The patch applies fine with svn patch, but our regular patch might have trouble with the extra metadata (such as property changes) that svn adds to the patch.  If applied with normal patch, don't forget -E to remove empty files.
	If the patch is too big for gnats, it can also be downloaded from http://people.freebsd.org/~zeising/xorg-7.7.diff
>How-To-Repeat:
	
>Fix:

	

--- xorg-7.7.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 316007)
+++ Mk/bsd.port.mk	(working copy)
@@ -1962,8 +1962,14 @@
 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
@@ -1982,6 +1988,7 @@
 
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
+_GL_gl_USE_XORG=		glproto dri2proto
 _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
 _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
 _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
@@ -1998,6 +2005,8 @@
 		!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
Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk	(revision 316007)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -17,14 +17,14 @@
 
 # Some notes:
 #
-# app - requires pkgconfig, don't install shared libraries (I guess)
-# data - nothing I could factorize
+# app - Installs applications, no shared libraries.
+# 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
-# proto - install .pc file, no dependencies, needed only at build time for most of them
+# lib - various dependencies, install .pc file, needs pathfix
+# 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 @@
 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.
+USE_PKGCONFIG=	build
+
+# 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 @@
 . 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 @@
 .  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 @@
 .  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 @@
 . 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 @@
 				xaw6 \
 				xaw7 \
 				xbitmaps \
+				xcb \
 				xcmiscproto \
 				xcomposite \
 				xcursor \
@@ -274,6 +283,7 @@
 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
Index: UPDATING
===================================================================
--- UPDATING	(revision 316007)
+++ UPDATING	(working copy)
@@ -5,6 +5,12 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+201304xx:
+  AFFECTS: users of x11/xorg and all xorg ports
+  AUTHOR zeising@FreeBSD.org
+
+  xorg, including libraries, was updated.
+
 20130408:
   AFFECTS: users of astro/libkgeomap, graphics/digikam-kde4, graphics/kipi-plugins-kde4
   AUTHOR: makc@FreeBSD.org
Index: devel/gccmakedep/Makefile
===================================================================
--- devel/gccmakedep/Makefile	(revision 316007)
+++ devel/gccmakedep/Makefile	(working copy)
@@ -16,16 +16,13 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
-
-post-build:
-	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
-		-e 's|^RM= *|RM=|' \
-		-e 's|^LN= *|LN=|' \
-		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
+    ${OSVERSION} >= 1000010
+CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
Index: devel/imake/Makefile
===================================================================
--- devel/imake/Makefile	(revision 316007)
+++ devel/imake/Makefile	(working copy)
@@ -1,8 +1,8 @@
-# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
+# Created by: anholt
 # $FreeBSD$
 
 PORTNAME=	imake
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTEPOCH=	1
 CATEGORIES=	devel
 
@@ -11,13 +11,18 @@
 
 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
+USE_PKGCONFIG=	build
 
+# 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 +39,14 @@
 
 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
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
-
-post-build:
-	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
+	${OSVERSION} >= 1000010
+CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
 .endif
 
 .include <bsd.port.post.mk>
Index: devel/imake/distinfo
===================================================================
--- devel/imake/distinfo	(revision 316007)
+++ devel/imake/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
-SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
+SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
+SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
Index: devel/imake/files/patch-xmkmf.cpp
===================================================================
--- devel/imake/files/patch-xmkmf.cpp	(revision 316007)
+++ devel/imake/files/patch-xmkmf.cpp	(working copy)
@@ -1,17 +1,6 @@
---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
-+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
-@@ -53,6 +53,10 @@
-     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 @@
+--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
+@@ -64,3 +64,12 @@
      imake $imake_defines $args
      ;;
  esac
Index: devel/libpciaccess/Makefile
===================================================================
--- devel/libpciaccess/Makefile	(revision 316007)
+++ devel/libpciaccess/Makefile	(working copy)
@@ -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
Index: devel/libpciaccess/distinfo
===================================================================
--- devel/libpciaccess/distinfo	(revision 316007)
+++ devel/libpciaccess/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
-SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
+SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
+SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
Index: devel/libpciaccess/files/patch-src-common_init.c
===================================================================
--- devel/libpciaccess/files/patch-src-common_init.c	(revision 316007)
+++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
@@ -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
- }
Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
===================================================================
--- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 316007)
+++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
@@ -1,113 +1,169 @@
---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
-+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
-@@ -72,6 +72,10 @@
- #define PCIM_BAR_MEM_SPACE      0
- #define PCIM_BAR_IO_SPACE       1
+--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
+@@ -1,6 +1,8 @@
+ /*
+  * (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__)
-+static int screenfd;
++#if defined(__i386__) || defined(__amd64__)
++#include <machine/cpufunc.h>
 +#endif
 +
- /**
-  * FreeBSD private pci_system structure that extends the base pci_system
-  * structure.
-@@ -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;
++static struct pci_io_handle *
++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
++{
++#if defined(__i386__) || defined(__amd64__)
++	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
- 
-     int fd, err = 0;
- 
-+#if defined(__sparc64__)
-+    fd = screenfd;
++}
++
++#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
-     fd = open("/dev/mem", O_RDWR);
++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
 +#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);
++}
++
++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
- 
-     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");
- 	}
-     }
++}
++
++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
- 
-     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;
++}
++
++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
-     memfd = open( "/dev/mem", O_RDONLY );
++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
 +#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 );
++}
++
++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
- 	return errno;
-     }
- 
-     memcpy( buffer, bios, dev->rom_size );
- 
-     munmap( bios, dev->rom_size );
-+#if !defined(__sparc64__)
-     close( memfd );
++}
++
++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
- 
-     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)
++static int
++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
++    pciaddr_t size, unsigned map_flags, void **addr)
 +{
-+#if defined(__sparc64__)
-+    screenfd = fd;
++	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,
+ };
+ 
+ /**
Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
===================================================================
--- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 316007)
+++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
@@ -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 );
Index: devel/lndir/Makefile
===================================================================
--- devel/lndir/Makefile	(revision 316007)
+++ devel/lndir/Makefile	(working copy)
@@ -9,7 +9,7 @@
 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
 
Index: devel/makedepend/Makefile
===================================================================
--- devel/makedepend/Makefile	(revision 316007)
+++ devel/makedepend/Makefile	(working copy)
@@ -1,20 +1,16 @@
-# New ports collection makefile for:	makedepend
-# Date created:				August 15th 1997
-# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
-#
+# Created by: 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_PKGCONFIG=	build
 USE_XORG=	xproto
 
 PLIST_FILES=	bin/makedepend
Index: devel/makedepend/distinfo
===================================================================
--- devel/makedepend/distinfo	(revision 316007)
+++ devel/makedepend/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
-SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
+SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
+SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
Index: devel/xorg-macros/Makefile
===================================================================
--- devel/xorg-macros/Makefile	(revision 316007)
+++ devel/xorg-macros/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xorg-macros
-# Date Created:				24 Mar 2007
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-macros
-PORTVERSION=	1.16.1
+PORTVERSION=	1.17
 CATEGORIES=	devel x11
 DISTNAME=	util-macros-$(PORTVERSION)
 
Index: devel/xorg-macros/distinfo
===================================================================
--- devel/xorg-macros/distinfo	(revision 316007)
+++ devel/xorg-macros/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
-SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
+SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
+SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile	(revision 316007)
+++ graphics/dri/Makefile	(working copy)
@@ -10,27 +10,30 @@
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		expat.6:${PORTSDIR}/textproc/expat2
+		expat:${PORTSDIR}/textproc/expat2
 
 USE_PKGCONFIG=	build
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
-		SAVAGE SIS SWRAST TDFX UNICHROME
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 
+.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"
-BROKEN=		does not install on ia64
+OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
+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 @@
 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 @@
 .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 @@
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/dri/distinfo
===================================================================
--- graphics/dri/distinfo	(revision 316007)
+++ graphics/dri/distinfo	(working copy)
@@ -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
Index: graphics/dri/pkg-plist
===================================================================
--- graphics/dri/pkg-plist	(revision 316007)
+++ graphics/dri/pkg-plist	(working copy)
@@ -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
-%%MGA_DRIVER%%lib/dri/mga_dri.so
-%%R128_DRIVER%%lib/dri/r128_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_DRIVER%%lib/dri/r300_dri.so
-%%R600_DRIVER%%lib/dri/r600_dri.so
+%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
+%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
 %%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
-%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal
Index: graphics/freeglut/Makefile
===================================================================
--- graphics/freeglut/Makefile	(revision 316007)
+++ graphics/freeglut/Makefile	(working copy)
@@ -1,13 +1,8 @@
-# vim:ts=8:sw=8
-# New ports collection makefile for:	freeglut
-# Date created:		Wed Apr 23 2003
-# Whom:			thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=	freeglut
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -33,6 +28,8 @@
 	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"		\
@@ -44,14 +41,14 @@
 		${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}
Index: graphics/freeglut/distinfo
===================================================================
--- graphics/freeglut/distinfo	(revision 316007)
+++ graphics/freeglut/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
-SIZE (freeglut-2.8.0.tar.gz) = 979459
+SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
+SIZE (freeglut-2.8.1.tar.gz) = 1005343
Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
===================================================================
--- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 316007)
+++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
@@ -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;
Index: graphics/freeglut/pkg-message
===================================================================
--- graphics/freeglut/pkg-message	(revision 0)
+++ graphics/freeglut/pkg-message	(working copy)
@@ -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.

Property changes on: graphics/freeglut/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/libGL/bsd.mesalib.mk
===================================================================
--- graphics/libGL/bsd.mesalib.mk	(revision 316007)
+++ graphics/libGL/bsd.mesalib.mk	(working copy)
@@ -11,17 +11,15 @@
 #
 #    - graphics/libGL
 #    - graphics/libGLU
-#    - graphics/libGLw
 #    - graphics/dri
 #
 # $FreeBSD$
-#
 
 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=""
@@ -31,8 +29,8 @@
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
-DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
 MAINTAINER?=	x11@FreeBSD.org
 
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
@@ -44,22 +42,19 @@
 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__radeon__radeon_span.c
+		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
 		${PATCHDIR}/extra-mach64_context.h-old \
@@ -67,12 +62,16 @@
 		${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
-WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
+MASTERDIR=		${.CURDIR}/../../graphics/libGL
+PATCHDIR=		${MASTERDIR}/files
+DESCR=			${.CURDIR}/pkg-descr
+PLIST=			${.CURDIR}/pkg-plist
+WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 
 .if !defined(ARCH)
 ARCH!=			uname -p
@@ -84,38 +83,25 @@
 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
+
Index: graphics/libGL/distinfo
===================================================================
--- graphics/libGL/distinfo	(revision 316007)
+++ graphics/libGL/distinfo	(working copy)
@@ -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
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
+SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
+SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
Index: graphics/libGL/files/extra-configure
===================================================================
--- graphics/libGL/files/extra-configure	(revision 316007)
+++ graphics/libGL/files/extra-configure	(working copy)
@@ -1,42 +1,40 @@
---- configure.orig	2011-11-17 19:46:34.000000000 +0000
-+++ configure	2012-06-28 12:53:09.000000000 +0000
-@@ -7817,10 +7817,35 @@
-             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
-         fi
+--- configure.orig	2012-07-10 17:30:46.000000000 +0200
++++ configure	2012-09-01 13:27:22.000000000 +0200
+@@ -9017,9 +9017,34 @@
+         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+         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 \
--                radeon tdfx unichrome savage sis swrast"
+-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
-+                    radeon savage tdfx unichrome sis swrast"
++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
 +            fi
 +            ;;
 +        i*86)
 +            if test "x$DRI_DIRS" = "xyes"; then
-+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
-+                    r600 radeon savage tdfx unichrome sis swrast"
++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
Index: graphics/libGL/files/extra-mach64_context.h
===================================================================
--- graphics/libGL/files/extra-mach64_context.h	(revision 316007)
+++ graphics/libGL/files/extra-mach64_context.h	(working copy)
@@ -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
Index: graphics/libGL/files/extra-sis_context.h
===================================================================
--- graphics/libGL/files/extra-sis_context.h	(revision 316007)
+++ graphics/libGL/files/extra-sis_context.h	(working copy)
@@ -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
Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
===================================================================
--- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 316007)
+++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
@@ -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 )
Index: graphics/libGL/pkg-plist
===================================================================
--- graphics/libGL/pkg-plist	(revision 316007)
+++ graphics/libGL/pkg-plist	(working copy)
@@ -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
Index: graphics/libGLU/Makefile
===================================================================
--- graphics/libGLU/Makefile	(revision 316007)
+++ graphics/libGLU/Makefile	(working copy)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	libGLU
-PORTREVISION=	2
 PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
 
@@ -13,16 +12,8 @@
 
 do-install:
 	@${MKDIR} ${PREFIX}/include/GL/
-	cd ${WRKSRC}/src/glu; ${GMAKE} install
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
 	cd ${WRKSRC}/src/glu; ${GMAKE} install
 
 .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>
+.include <bsd.port.mk>
Index: graphics/libGLU/distinfo
===================================================================
--- graphics/libGLU/distinfo	(revision 316007)
+++ graphics/libGLU/distinfo	(working copy)
@@ -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
Index: graphics/libGLw/Makefile
===================================================================
--- graphics/libGLw/Makefile	(revision 316007)
+++ graphics/libGLw/Makefile	(working copy)
@@ -1,26 +1,26 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libGLw
-PORTVERSION=	${MESAVERSION}
-PORTREVISION=	2
+PORTVERSION=	8.0.0
 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
+USE_PKGCONFIG=	yes
+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
 
-do-install:
-	cd ${WRKSRC}/src/glw; ${GMAKE} install
-
-.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>
+.include <bsd.port.mk>
Index: graphics/libGLw/distinfo
===================================================================
--- graphics/libGLw/distinfo	(revision 316007)
+++ graphics/libGLw/distinfo	(working copy)
@@ -1,4 +1,2 @@
-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
+SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
+SIZE (GL/glw-8.0.0.tar.bz2) = 221136
Index: graphics/libGLw/pkg-plist
===================================================================
--- graphics/libGLw/pkg-plist	(revision 316007)
+++ graphics/libGLw/pkg-plist	(working copy)
@@ -2,7 +2,7 @@
 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
Index: graphics/libdrm/Makefile
===================================================================
--- graphics/libdrm/Makefile	(revision 316007)
+++ graphics/libdrm/Makefile	(working copy)
@@ -10,24 +10,27 @@
 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
-KMS_DESC=	Enable experimental KMS support
+USE_GMAKE=	yes
 
+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>
 
 .if ${PORT_OPTIONS:MKMS}
@@ -38,12 +41,34 @@
 PLIST_SUB+=	KMS="@comment "
 .endif
 
-LIBDRM_VERSION=	2.4.31
+.if ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		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.43
 LIBDRM_REVISION=1
 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 @@
 
 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>
Index: graphics/libdrm/distinfo
===================================================================
--- graphics/libdrm/distinfo	(revision 316007)
+++ graphics/libdrm/distinfo	(working copy)
@@ -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
-SIZE (libdrm-2.4.31.tar.bz2) = 475677
+SHA256 (libdrm-2.4.43.tar.bz2) = 7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975
+SIZE (libdrm-2.4.43.tar.bz2) = 521531
Index: graphics/libdrm/files/extra-configure
===================================================================
--- graphics/libdrm/files/extra-configure	(revision 0)
+++ graphics/libdrm/files/extra-configure	(working copy)
@@ -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 \

Property changes on: graphics/libdrm/files/extra-configure
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
===================================================================
--- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
+++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
@@ -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 $@ $<

Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
===================================================================
--- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
+++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
@@ -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;
+ 

Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
===================================================================
--- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
+++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
@@ -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 */
++}
++

Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: graphics/libdrm/pkg-plist
===================================================================
--- graphics/libdrm/pkg-plist	(revision 316007)
+++ graphics/libdrm/pkg-plist	(working copy)
@@ -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
-include/nouveau/nouveau_channel.h
+%%OLD%%include/nouveau/nouveau_bo.h
+%%OLD%%include/nouveau/nouveau_channel.h
 %%OLD%%include/nouveau/nouveau_class.h
-include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
-%%NEW%%include/nouveau/nouveau_reloc.h
-include/nouveau/nouveau_resource.h
-%%NEW%%include/nouveau/nv04_pushbuf.h
-%%NEW%%include/nouveau/nvc0_pushbuf.h
+%%OLD%%include/nouveau/nouveau_device.h
+%%OLD%%include/nouveau/nouveau_grobj.h
+%%OLD%%include/nouveau/nouveau_notifier.h
+%%OLD%%include/nouveau/nouveau_pushbuf.h
+%%OLD%%include/nouveau/nouveau_resource.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@@ -58,7 +56,8 @@
 %%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_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
Index: graphics/mesa-demos/Makefile
===================================================================
--- graphics/mesa-demos/Makefile	(revision 316007)
+++ graphics/mesa-demos/Makefile	(working copy)
@@ -1,4 +1,4 @@
-# Created by: anholt@FreeBSD.org
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mesa-demos
Index: net/tigervnc/Makefile
===================================================================
--- net/tigervnc/Makefile	(revision 316007)
+++ net/tigervnc/Makefile	(working copy)
@@ -12,8 +12,7 @@
 COMMENT=	TigerVNC is an advanced VNC implementation
 
 PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
-BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 
 CONFLICTS=	tridiavnc-[0-9]* \
 		tightvnc-[0-9]* \
@@ -33,7 +32,7 @@
 USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
 		inputproto kbproto pixman randrproto renderproto resourceproto \
 		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
-		xfont xproto xrandr xtrans xtst
+		xfont xproto xrandr xtrans xtst xorg-macros
 
 MAN1+=		vncpasswd.1 \
 		x0vncserver.1 \
Index: x11/appres/Makefile
===================================================================
--- x11/appres/Makefile	(revision 316007)
+++ x11/appres/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	appres
-# Date Created:				15 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	appres
 PORTVERSION=	1.0.3
Index: x11/beforelight/Makefile
===================================================================
--- x11/beforelight/Makefile	(revision 316007)
+++ x11/beforelight/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	A sample screen saver for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
+USE_XORG=	x11 xscrnsaver xt xaw7 xt
 
 MAN1=		beforelight.1
 
Index: x11/bigreqsproto/Makefile
===================================================================
--- x11/bigreqsproto/Makefile	(revision 316007)
+++ x11/bigreqsproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	bigreqsproto
-# Date Created:				07 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bigreqsproto
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/bigreqsproto/distinfo
===================================================================
--- x11/bigreqsproto/distinfo	(revision 316007)
+++ x11/bigreqsproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
-SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
+SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
+SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
Index: x11/compositeproto/Makefile
===================================================================
--- x11/compositeproto/Makefile	(revision 316007)
+++ x11/compositeproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	compositeproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	compositeproto
 PORTVERSION=	0.4.2
Index: x11/damageproto/Makefile
===================================================================
--- x11/damageproto/Makefile	(revision 316007)
+++ x11/damageproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	damageproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	damageproto
 PORTVERSION=	1.2.1
Index: x11/dmxproto/Makefile
===================================================================
--- x11/dmxproto/Makefile	(revision 316007)
+++ x11/dmxproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dmxproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	dmxproto
 PORTVERSION=	2.3.1
Index: x11/dri2proto/Makefile
===================================================================
--- x11/dri2proto/Makefile	(revision 316007)
+++ x11/dri2proto/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	dri2proto
-# Date Created:				Jul 28 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	dri2proto
-PORTVERSION=	2.6
+PORTVERSION=	2.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/dri2proto/distinfo
===================================================================
--- x11/dri2proto/distinfo	(revision 316007)
+++ x11/dri2proto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
-SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
+SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
+SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
Index: x11/editres/Makefile
===================================================================
--- x11/editres/Makefile	(revision 316007)
+++ x11/editres/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Dynamic resource editor for X Toolkit Applications
 
 XORG_CAT=	app
-USE_XORG=	x11 xt xmu xaw xorg-macros
+USE_XORG=	x11 xt xmu xaw
 
 MAN1=		editres.1
 
Index: x11/evieext/Makefile
===================================================================
--- x11/evieext/Makefile	(revision 316007)
+++ x11/evieext/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	evieext
-# Date Created:				25 Apr 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	evieext
 PORTVERSION=	1.1.1
Index: x11/fixesproto/Makefile
===================================================================
--- x11/fixesproto/Makefile	(revision 316007)
+++ x11/fixesproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fixesproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fixesproto
 PORTVERSION=	5.0
Index: x11/fstobdf/Makefile
===================================================================
--- x11/fstobdf/Makefile	(revision 316007)
+++ x11/fstobdf/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	fstobdf
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	fstobdf
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/fstobdf/distinfo
===================================================================
--- x11/fstobdf/distinfo	(revision 316007)
+++ x11/fstobdf/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
-SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
+SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
+SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
Index: x11/glproto/Makefile
===================================================================
--- x11/glproto/Makefile	(revision 316007)
+++ x11/glproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	glproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	glproto
-PORTVERSION=	1.4.15
+PORTVERSION=	1.4.16
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/glproto/distinfo
===================================================================
--- x11/glproto/distinfo	(revision 316007)
+++ x11/glproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
-SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
+SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
+SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
Index: x11/iceauth/Makefile
===================================================================
--- x11/iceauth/Makefile	(revision 316007)
+++ x11/iceauth/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	iceauth
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	iceauth
 PORTVERSION=	1.0.5
Index: x11/ico/Makefile
===================================================================
--- x11/ico/Makefile	(revision 316007)
+++ x11/ico/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Displays a wire-frame rotating plyhedron
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/ico
 
Index: x11/inputproto/Makefile
===================================================================
--- x11/inputproto/Makefile	(revision 316007)
+++ x11/inputproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	inputproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	inputproto
-PORTVERSION=	2.0.2
+PORTVERSION=	2.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,4 +10,6 @@
 
 XORG_CAT=	proto
 
+CONFIGURE_ARGS=	--without-asciidoc
+
 .include <bsd.port.mk>
Index: x11/inputproto/distinfo
===================================================================
--- x11/inputproto/distinfo	(revision 316007)
+++ x11/inputproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
-SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
+SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
+SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
Index: x11/inputproto/pkg-plist
===================================================================
--- x11/inputproto/pkg-plist	(revision 316007)
+++ x11/inputproto/pkg-plist	(working copy)
@@ -3,7 +3,4 @@
 include/X11/extensions/XI2proto.h
 include/X11/extensions/XIproto.h
 libdata/pkgconfig/inputproto.pc
-%%DOCSDIR%%/XI2proto.txt
-%%DOCSDIR%%/XIproto.txt
-@dirrm %%DOCSDIR%%
 @dirrmtry include/X11/extensions
Index: x11/kbproto/Makefile
===================================================================
--- x11/kbproto/Makefile	(revision 316007)
+++ x11/kbproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	kbproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kbproto
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/kbproto/distinfo
===================================================================
--- x11/kbproto/distinfo	(revision 316007)
+++ x11/kbproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
-SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
+SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
+SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
Index: x11/kbproto/pkg-plist
===================================================================
--- x11/kbproto/pkg-plist	(revision 316007)
+++ x11/kbproto/pkg-plist	(working copy)
@@ -4,4 +4,38 @@
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
 libdata/pkgconfig/kbproto.pc
+%%DOCSDIR%%/XKBproto-1.svg
+%%DOCSDIR%%/XKBproto-10.svg
+%%DOCSDIR%%/XKBproto-11.svg
+%%DOCSDIR%%/XKBproto-2.svg
+%%DOCSDIR%%/XKBproto-3.svg
+%%DOCSDIR%%/XKBproto-4.svg
+%%DOCSDIR%%/XKBproto-5.svg
+%%DOCSDIR%%/XKBproto-6.svg
+%%DOCSDIR%%/XKBproto-7.svg
+%%DOCSDIR%%/XKBproto-8.svg
+%%DOCSDIR%%/XKBproto-9.svg
+%%DOCSDIR%%/acknowledgements.xml
+%%DOCSDIR%%/appA.xml
+%%DOCSDIR%%/appB.xml
+%%DOCSDIR%%/appC.xml
+%%DOCSDIR%%/appD.xml
+%%DOCSDIR%%/ch01.xml
+%%DOCSDIR%%/ch02.xml
+%%DOCSDIR%%/ch03.xml
+%%DOCSDIR%%/ch04.xml
+%%DOCSDIR%%/ch05.xml
+%%DOCSDIR%%/ch06.xml
+%%DOCSDIR%%/ch07.xml
+%%DOCSDIR%%/ch08.xml
+%%DOCSDIR%%/ch09.xml
+%%DOCSDIR%%/ch10.xml
+%%DOCSDIR%%/ch11.xml
+%%DOCSDIR%%/ch12.xml
+%%DOCSDIR%%/ch13.xml
+%%DOCSDIR%%/ch14.xml
+%%DOCSDIR%%/ch15.xml
+%%DOCSDIR%%/ch16.xml
+%%DOCSDIR%%/xkbproto.xml
+@dirrmtry %%DOCSDIR%%
 @dirrmtry include/X11/extensions
Index: x11/libICE/Makefile
===================================================================
--- x11/libICE/Makefile	(revision 316007)
+++ x11/libICE/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libICE
-# Date Created:			09 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libICE
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libICE/distinfo
===================================================================
--- x11/libICE/distinfo	(revision 316007)
+++ x11/libICE/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
-SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
+SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
+SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
Index: x11/libSM/Makefile
===================================================================
--- x11/libSM/Makefile	(revision 316007)
+++ x11/libSM/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libSM
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -12,7 +12,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	lib
-USE_XORG=	ice xproto:both xtrans xorg-macros
+USE_XORG=	ice xproto:both xtrans
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
 
Index: x11/libSM/distinfo
===================================================================
--- x11/libSM/distinfo	(revision 316007)
+++ x11/libSM/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
-SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
+SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
+SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
Index: x11/libX11/Makefile
===================================================================
--- x11/libX11/Makefile	(revision 316007)
+++ x11/libX11/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libX11
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.0
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -11,13 +11,11 @@
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-
 XORG_CAT=	lib
 USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 		kbproto:both inputproto xf86bigfontproto xproto:both \
-		xorg-macros
+		xcb
+USE_PERL5_BUILD=yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--without-xmlto \
Index: x11/libX11/distinfo
===================================================================
--- x11/libX11/distinfo	(revision 316007)
+++ x11/libX11/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
-SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
+SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
+SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
Index: x11/libXScrnSaver/Makefile
===================================================================
--- x11/libXScrnSaver/Makefile	(revision 316007)
+++ x11/libXScrnSaver/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libXScrnSaver
-# Date Created:				15 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXScrnSaver
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXScrnSaver/distinfo
===================================================================
--- x11/libXScrnSaver/distinfo	(revision 316007)
+++ x11/libXScrnSaver/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
-SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
+SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
+SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
Index: x11/libXScrnSaver/pkg-plist
===================================================================
--- x11/libXScrnSaver/pkg-plist	(revision 316007)
+++ x11/libXScrnSaver/pkg-plist	(working copy)
@@ -5,3 +5,4 @@
 lib/libXss.a
 libdata/pkgconfig/xscrnsaver.pc
 @dirrmtry include/X11/extensions
+
Index: x11/libXTrap/Makefile
===================================================================
--- x11/libXTrap/Makefile	(revision 316007)
+++ x11/libXTrap/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libXTrap
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXTrap
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXTrap/distinfo
===================================================================
--- x11/libXTrap/distinfo	(revision 316007)
+++ x11/libXTrap/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
-SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
+SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
+SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
Index: x11/libXau/Makefile
===================================================================
--- x11/libXau/Makefile	(revision 316007)
+++ x11/libXau/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXau
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXau
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXau/distinfo
===================================================================
--- x11/libXau/distinfo	(revision 316007)
+++ x11/libXau/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
-SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
+SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
+SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
Index: x11/libXcomposite/Makefile
===================================================================
--- x11/libXcomposite/Makefile	(revision 316007)
+++ x11/libXcomposite/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXcomposite
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.4
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXcomposite/distinfo
===================================================================
--- x11/libXcomposite/distinfo	(revision 316007)
+++ x11/libXcomposite/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
-SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
+SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
+SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
Index: x11/libXcomposite/pkg-plist
===================================================================
--- x11/libXcomposite/pkg-plist	(revision 316007)
+++ x11/libXcomposite/pkg-plist	(working copy)
@@ -4,3 +4,4 @@
 lib/libXcomposite.so
 lib/libXcomposite.so.1
 libdata/pkgconfig/xcomposite.pc
+@dirrmtry include/X11/extensions
Index: x11/libXcursor/Makefile
===================================================================
--- x11/libXcursor/Makefile	(revision 316007)
+++ x11/libXcursor/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXcursor
-# Date Created:			22 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXcursor
-PORTVERSION=	1.1.12
+PORTVERSION=	1.1.13
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXcursor/distinfo
===================================================================
--- x11/libXcursor/distinfo	(revision 316007)
+++ x11/libXcursor/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
-SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
+SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
+SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
Index: x11/libXdamage/Makefile
===================================================================
--- x11/libXdamage/Makefile	(revision 316007)
+++ x11/libXdamage/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXdamage
-# Date Created:			13 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXdamage
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXdamage/distinfo
===================================================================
--- x11/libXdamage/distinfo	(revision 316007)
+++ x11/libXdamage/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
-SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
+SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
+SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
Index: x11/libXdamage/pkg-plist
===================================================================
--- x11/libXdamage/pkg-plist	(revision 316007)
+++ x11/libXdamage/pkg-plist	(working copy)
@@ -4,3 +4,4 @@
 lib/libXdamage.so
 lib/libXdamage.so.1
 libdata/pkgconfig/xdamage.pc
+@dirrmtry include/X11/extensions
Index: x11/libXdmcp/Makefile
===================================================================
--- x11/libXdmcp/Makefile	(revision 316007)
+++ x11/libXdmcp/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXdmcp
-# Date Created:			28 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXdmcp
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXdmcp/distinfo
===================================================================
--- x11/libXdmcp/distinfo	(revision 316007)
+++ x11/libXdmcp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
-SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
+SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
+SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
Index: x11/libXevie/Makefile
===================================================================
--- x11/libXevie/Makefile	(revision 316007)
+++ x11/libXevie/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXevie
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXevie
 PORTVERSION=	1.0.3
Index: x11/libXext/Makefile
===================================================================
--- x11/libXext/Makefile	(revision 316007)
+++ x11/libXext/Makefile	(working copy)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXext
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXext/distinfo
===================================================================
--- x11/libXext/distinfo	(revision 316007)
+++ x11/libXext/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
-SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
+SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
+SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
Index: x11/libXfixes/Makefile
===================================================================
--- x11/libXfixes/Makefile	(revision 316007)
+++ x11/libXfixes/Makefile	(working copy)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXfixes
 PORTVERSION=	5.0
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXi/Makefile
===================================================================
--- x11/libXi/Makefile	(revision 316007)
+++ x11/libXi/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXi
-# Date Created:			22 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXi
-PORTVERSION=	1.4.5
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -16,9 +12,14 @@
 LICENSE=	MIT
 
 XORG_CAT=	lib
-USE_XORG=	xproto x11 xext xextproto inputproto:both
+USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
 
-CONFIGURE_ARGS+=--disable-specs --without-xmlto
+CONFIGURE_ARGS+=--disable-docs \
+		--disable-specs \
+	       	--without-xmlto \
+		--without-fop \
+		--without-asciidoc \
+		--without-xsltproc
 
 MAN3=		XAllowDeviceEvents.3 \
 		XChangeDeviceControl.3 \
@@ -47,6 +48,8 @@
 		XGrabDevice.3\
 		XGrabDeviceButton.3\
 		XGrabDeviceKey.3\
+		XIBarrierReleasePointer.3\
+		XIBarrierReleasePointers.3\
 		XIChangeHierarchy.3\
 		XIChangeProperty.3\
 		XIDefineCursor.3\
@@ -61,6 +64,7 @@
 		XIGrabEnter.3\
 		XIGrabFocusIn.3\
 		XIGrabKeycode.3\
+		XIGrabTouchBegin.3 \
 		XIListProperties.3\
 		XIQueryDevice.3\
 		XIQueryPointer.3\
@@ -74,6 +78,7 @@
 		XIUngrabEnter.3 \
 		XIUngrabFocusIn.3 \
 		XIUngrabKeycode.3 \
+		XIUngrabTouchBegin.3 \
 		XIWarpPointer.3 \
 		XListDeviceProperties.3 \
 		XListInputDevices.3 \
Index: x11/libXi/distinfo
===================================================================
--- x11/libXi/distinfo	(revision 316007)
+++ x11/libXi/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
-SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
+SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
+SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
Index: x11/libXinerama/Makefile
===================================================================
--- x11/libXinerama/Makefile	(revision 316007)
+++ x11/libXinerama/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXinerama
-# Date Created:			7 May, 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXinerama
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXinerama/distinfo
===================================================================
--- x11/libXinerama/distinfo	(revision 316007)
+++ x11/libXinerama/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
-SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
+SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
+SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
Index: x11/libXp/Makefile
===================================================================
--- x11/libXp/Makefile	(revision 316007)
+++ x11/libXp/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXp
-# Date Created:			4 May 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXp
 PORTVERSION=	1.0.1
Index: x11/libXpm/Makefile
===================================================================
--- x11/libXpm/Makefile	(revision 316007)
+++ x11/libXpm/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXpm
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXpm
-PORTVERSION=	3.5.9
+PORTVERSION=	3.5.10
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXpm/distinfo
===================================================================
--- x11/libXpm/distinfo	(revision 316007)
+++ x11/libXpm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
-SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
+SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
+SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
Index: x11/libXprintAppUtil/Makefile
===================================================================
--- x11/libXprintAppUtil/Makefile	(revision 316007)
+++ x11/libXprintAppUtil/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXprintAppUtil
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXprintAppUtil
 PORTVERSION=	1.0.1
Index: x11/libXprintUtil/Makefile
===================================================================
--- x11/libXprintUtil/Makefile	(revision 316007)
+++ x11/libXprintUtil/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXprintUtil
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXprintUtil
 PORTVERSION=	1.0.1
Index: x11/libXrandr/Makefile
===================================================================
--- x11/libXrandr/Makefile	(revision 316007)
+++ x11/libXrandr/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXrandr
-# Date Created:			9 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXrandr
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXrandr/distinfo
===================================================================
--- x11/libXrandr/distinfo	(revision 316007)
+++ x11/libXrandr/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
-SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
+SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
+SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
Index: x11/libXrender/Makefile
===================================================================
--- x11/libXrender/Makefile	(revision 316007)
+++ x11/libXrender/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   xrender
-# Date Created:			2 Jul, 2003
-# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
-#
+# Created by: Foxfair Hu <foxfair@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXrender
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXrender/distinfo
===================================================================
--- x11/libXrender/distinfo	(revision 316007)
+++ x11/libXrender/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
-SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
+SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
+SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
Index: x11/libXres/Makefile
===================================================================
--- x11/libXres/Makefile	(revision 316007)
+++ x11/libXres/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXres
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXres/distinfo
===================================================================
--- x11/libXres/distinfo	(revision 316007)
+++ x11/libXres/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
-SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
+SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
+SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
Index: x11/libXtrans/Makefile
===================================================================
--- x11/libXtrans/Makefile	(revision 316007)
+++ x11/libXtrans/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXtrans
-# Date Created:			28 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXtrans
 PORTVERSION=	0.1
Index: x11/libXtst/Makefile
===================================================================
--- x11/libXtst/Makefile	(revision 316007)
+++ x11/libXtst/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXtst
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXtst
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXtst/distinfo
===================================================================
--- x11/libXtst/distinfo	(revision 316007)
+++ x11/libXtst/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
-SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
+SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
+SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
Index: x11/libXv/Makefile
===================================================================
--- x11/libXv/Makefile	(revision 316007)
+++ x11/libXv/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXv
-# Date Created:			13 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXv
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXv/distinfo
===================================================================
--- x11/libXv/distinfo	(revision 316007)
+++ x11/libXv/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
-SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
+SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
+SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
Index: x11/libXvMC/Makefile
===================================================================
--- x11/libXvMC/Makefile	(revision 316007)
+++ x11/libXvMC/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXvMC
-# Date Created:			8 Feb 206
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXvMC
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXvMC/distinfo
===================================================================
--- x11/libXvMC/distinfo	(revision 316007)
+++ x11/libXvMC/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
-SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
+SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
+SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
Index: x11/libXxf86dga/Makefile
===================================================================
--- x11/libXxf86dga/Makefile	(revision 316007)
+++ x11/libXxf86dga/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXxf86dga
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86dga
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXxf86dga/distinfo
===================================================================
--- x11/libXxf86dga/distinfo	(revision 316007)
+++ x11/libXxf86dga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
-SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
+SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
+SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
===================================================================
--- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
+++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
@@ -0,0 +1,20 @@
+--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
+@@ -21,6 +21,8 @@
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+ 
++#include <stdint.h>
++
+ 
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+@@ -928,7 +930,7 @@
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);

Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/libXxf86misc/Makefile
===================================================================
--- x11/libXxf86misc/Makefile	(revision 316007)
+++ x11/libXxf86misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXxf86misc
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86misc
 PORTVERSION=	1.0.3
Index: x11/libXxf86vm/Makefile
===================================================================
--- x11/libXxf86vm/Makefile	(revision 316007)
+++ x11/libXxf86vm/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXxf86vm
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86vm
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXxf86vm/distinfo
===================================================================
--- x11/libXxf86vm/distinfo	(revision 316007)
+++ x11/libXxf86vm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
-SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
+SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
+SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
Index: x11/libdmx/Makefile
===================================================================
--- x11/libdmx/Makefile	(revision 316007)
+++ x11/libdmx/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libdmx
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libdmx
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libdmx/distinfo
===================================================================
--- x11/libdmx/distinfo	(revision 316007)
+++ x11/libdmx/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
-SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
+SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
+SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
Index: x11/liboldX/Makefile
===================================================================
--- x11/liboldX/Makefile	(revision 316007)
+++ x11/liboldX/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	liboldX
-# Date Created:				Dec 16 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	liboldX
 PORTVERSION=	1.0.1
Index: x11/libxcb/Makefile
===================================================================
--- x11/libxcb/Makefile	(revision 316007)
+++ x11/libxcb/Makefile	(working copy)
@@ -1,18 +1,17 @@
-# New ports collection makefile for:	libxcb
-# Date Created:				2006-08-23
-# Whom:					Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libxcb
-PORTVERSION=	1.7
+PORTVERSION=	1.9
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) library
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
@@ -21,15 +20,12 @@
 
 CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 USE_BZIP2=	yes
-USES=	pathfix
+USES=		pathfix
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xau xdmcp
-USE_PYTHON_BUILD=	2.5-2.7
+USE_PYTHON_BUILD=	2.5+
 
 GNU_CONFIGURE=	yes
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
@@ -46,8 +42,12 @@
 XPROTO_CFLAGS=	-I${LOCALBASE}/include
 XPROTO_LIBS=	-L${LOCALBASE}/lib
 
+.include "${.CURDIR}/manpages"
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
 .endif
 
Index: x11/libxcb/distinfo
===================================================================
--- x11/libxcb/distinfo	(revision 316007)
+++ x11/libxcb/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
-SIZE (libxcb-1.7.tar.bz2) = 318619
+SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
+SIZE (libxcb-1.9.tar.bz2) = 387612
Index: x11/libxcb/manpages
===================================================================
--- x11/libxcb/manpages	(revision 0)
+++ x11/libxcb/manpages	(working copy)
@@ -0,0 +1,2041 @@
+MAN3 = \
+xcb-examples.3 \
+xcb-requests.3 \
+xcb_alloc_color.3 \
+xcb_alloc_color_cells.3 \
+xcb_alloc_color_cells_masks.3 \
+xcb_alloc_color_cells_masks_end.3 \
+xcb_alloc_color_cells_masks_length.3 \
+xcb_alloc_color_cells_pixels.3 \
+xcb_alloc_color_cells_pixels_end.3 \
+xcb_alloc_color_cells_pixels_length.3 \
+xcb_alloc_color_cells_reply.3 \
+xcb_alloc_color_cells_unchecked.3 \
+xcb_alloc_color_planes.3 \
+xcb_alloc_color_planes_pixels.3 \
+xcb_alloc_color_planes_pixels_end.3 \
+xcb_alloc_color_planes_pixels_length.3 \
+xcb_alloc_color_planes_reply.3 \
+xcb_alloc_color_planes_unchecked.3 \
+xcb_alloc_color_reply.3 \
+xcb_alloc_color_unchecked.3 \
+xcb_alloc_named_color.3 \
+xcb_alloc_named_color_reply.3 \
+xcb_alloc_named_color_unchecked.3 \
+xcb_allow_events.3 \
+xcb_allow_events_checked.3 \
+xcb_bell.3 \
+xcb_bell_checked.3 \
+xcb_big_requests_enable.3 \
+xcb_big_requests_enable_reply.3 \
+xcb_big_requests_enable_unchecked.3 \
+xcb_button_press_event_t.3 \
+xcb_button_release_event_t.3 \
+xcb_change_active_pointer_grab.3 \
+xcb_change_active_pointer_grab_checked.3 \
+xcb_change_gc.3 \
+xcb_change_gc_checked.3 \
+xcb_change_hosts.3 \
+xcb_change_hosts_checked.3 \
+xcb_change_keyboard_control.3 \
+xcb_change_keyboard_control_checked.3 \
+xcb_change_keyboard_mapping.3 \
+xcb_change_keyboard_mapping_checked.3 \
+xcb_change_pointer_control.3 \
+xcb_change_pointer_control_checked.3 \
+xcb_change_property.3 \
+xcb_change_property_checked.3 \
+xcb_change_save_set.3 \
+xcb_change_save_set_checked.3 \
+xcb_change_window_attributes.3 \
+xcb_change_window_attributes_checked.3 \
+xcb_circulate_notify_event_t.3 \
+xcb_circulate_request_event_t.3 \
+xcb_circulate_window.3 \
+xcb_circulate_window_checked.3 \
+xcb_clear_area.3 \
+xcb_clear_area_checked.3 \
+xcb_client_message_event_t.3 \
+xcb_close_font.3 \
+xcb_close_font_checked.3 \
+xcb_colormap_notify_event_t.3 \
+xcb_composite_create_region_from_border_clip.3 \
+xcb_composite_create_region_from_border_clip_checked.3 \
+xcb_composite_get_overlay_window.3 \
+xcb_composite_get_overlay_window_reply.3 \
+xcb_composite_get_overlay_window_unchecked.3 \
+xcb_composite_name_window_pixmap.3 \
+xcb_composite_name_window_pixmap_checked.3 \
+xcb_composite_query_version.3 \
+xcb_composite_query_version_reply.3 \
+xcb_composite_query_version_unchecked.3 \
+xcb_composite_redirect_subwindows.3 \
+xcb_composite_redirect_subwindows_checked.3 \
+xcb_composite_redirect_window.3 \
+xcb_composite_redirect_window_checked.3 \
+xcb_composite_release_overlay_window.3 \
+xcb_composite_release_overlay_window_checked.3 \
+xcb_composite_unredirect_subwindows.3 \
+xcb_composite_unredirect_subwindows_checked.3 \
+xcb_composite_unredirect_window.3 \
+xcb_composite_unredirect_window_checked.3 \
+xcb_configure_notify_event_t.3 \
+xcb_configure_request_event_t.3 \
+xcb_configure_window.3 \
+xcb_configure_window_checked.3 \
+xcb_convert_selection.3 \
+xcb_convert_selection_checked.3 \
+xcb_copy_area.3 \
+xcb_copy_area_checked.3 \
+xcb_copy_colormap_and_free.3 \
+xcb_copy_colormap_and_free_checked.3 \
+xcb_copy_gc.3 \
+xcb_copy_gc_checked.3 \
+xcb_copy_plane.3 \
+xcb_copy_plane_checked.3 \
+xcb_create_colormap.3 \
+xcb_create_colormap_checked.3 \
+xcb_create_cursor.3 \
+xcb_create_cursor_checked.3 \
+xcb_create_gc.3 \
+xcb_create_gc_checked.3 \
+xcb_create_glyph_cursor.3 \
+xcb_create_glyph_cursor_checked.3 \
+xcb_create_notify_event_t.3 \
+xcb_create_pixmap.3 \
+xcb_create_pixmap_checked.3 \
+xcb_create_window.3 \
+xcb_create_window_checked.3 \
+xcb_damage_add.3 \
+xcb_damage_add_checked.3 \
+xcb_damage_create.3 \
+xcb_damage_create_checked.3 \
+xcb_damage_destroy.3 \
+xcb_damage_destroy_checked.3 \
+xcb_damage_notify_event_t.3 \
+xcb_damage_query_version.3 \
+xcb_damage_query_version_reply.3 \
+xcb_damage_query_version_unchecked.3 \
+xcb_damage_subtract.3 \
+xcb_damage_subtract_checked.3 \
+xcb_delete_property.3 \
+xcb_delete_property_checked.3 \
+xcb_destroy_notify_event_t.3 \
+xcb_destroy_subwindows.3 \
+xcb_destroy_subwindows_checked.3 \
+xcb_destroy_window.3 \
+xcb_destroy_window_checked.3 \
+xcb_dpms_capable.3 \
+xcb_dpms_capable_reply.3 \
+xcb_dpms_capable_unchecked.3 \
+xcb_dpms_disable.3 \
+xcb_dpms_disable_checked.3 \
+xcb_dpms_enable.3 \
+xcb_dpms_enable_checked.3 \
+xcb_dpms_force_level.3 \
+xcb_dpms_force_level_checked.3 \
+xcb_dpms_get_timeouts.3 \
+xcb_dpms_get_timeouts_reply.3 \
+xcb_dpms_get_timeouts_unchecked.3 \
+xcb_dpms_get_version.3 \
+xcb_dpms_get_version_reply.3 \
+xcb_dpms_get_version_unchecked.3 \
+xcb_dpms_info.3 \
+xcb_dpms_info_reply.3 \
+xcb_dpms_info_unchecked.3 \
+xcb_dpms_set_timeouts.3 \
+xcb_dpms_set_timeouts_checked.3 \
+xcb_dri2_authenticate.3 \
+xcb_dri2_authenticate_reply.3 \
+xcb_dri2_authenticate_unchecked.3 \
+xcb_dri2_buffer_swap_complete_event_t.3 \
+xcb_dri2_connect.3 \
+xcb_dri2_connect_alignment_pad.3 \
+xcb_dri2_connect_alignment_pad_end.3 \
+xcb_dri2_connect_alignment_pad_length.3 \
+xcb_dri2_connect_device_name.3 \
+xcb_dri2_connect_device_name_end.3 \
+xcb_dri2_connect_device_name_length.3 \
+xcb_dri2_connect_driver_name.3 \
+xcb_dri2_connect_driver_name_end.3 \
+xcb_dri2_connect_driver_name_length.3 \
+xcb_dri2_connect_reply.3 \
+xcb_dri2_connect_unchecked.3 \
+xcb_dri2_copy_region.3 \
+xcb_dri2_copy_region_reply.3 \
+xcb_dri2_copy_region_unchecked.3 \
+xcb_dri2_create_drawable.3 \
+xcb_dri2_create_drawable_checked.3 \
+xcb_dri2_destroy_drawable.3 \
+xcb_dri2_destroy_drawable_checked.3 \
+xcb_dri2_get_buffers.3 \
+xcb_dri2_get_buffers_buffers.3 \
+xcb_dri2_get_buffers_buffers_iterator.3 \
+xcb_dri2_get_buffers_buffers_length.3 \
+xcb_dri2_get_buffers_reply.3 \
+xcb_dri2_get_buffers_unchecked.3 \
+xcb_dri2_get_buffers_with_format.3 \
+xcb_dri2_get_buffers_with_format_buffers.3 \
+xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
+xcb_dri2_get_buffers_with_format_buffers_length.3 \
+xcb_dri2_get_buffers_with_format_reply.3 \
+xcb_dri2_get_buffers_with_format_unchecked.3 \
+xcb_dri2_get_msc.3 \
+xcb_dri2_get_msc_reply.3 \
+xcb_dri2_get_msc_unchecked.3 \
+xcb_dri2_get_param.3 \
+xcb_dri2_get_param_reply.3 \
+xcb_dri2_get_param_unchecked.3 \
+xcb_dri2_invalidate_buffers_event_t.3 \
+xcb_dri2_query_version.3 \
+xcb_dri2_query_version_reply.3 \
+xcb_dri2_query_version_unchecked.3 \
+xcb_dri2_swap_buffers.3 \
+xcb_dri2_swap_buffers_reply.3 \
+xcb_dri2_swap_buffers_unchecked.3 \
+xcb_dri2_swap_interval.3 \
+xcb_dri2_swap_interval_checked.3 \
+xcb_dri2_wait_msc.3 \
+xcb_dri2_wait_msc_reply.3 \
+xcb_dri2_wait_msc_unchecked.3 \
+xcb_dri2_wait_sbc.3 \
+xcb_dri2_wait_sbc_reply.3 \
+xcb_dri2_wait_sbc_unchecked.3 \
+xcb_enter_notify_event_t.3 \
+xcb_expose_event_t.3 \
+xcb_fill_poly.3 \
+xcb_fill_poly_checked.3 \
+xcb_focus_in_event_t.3 \
+xcb_focus_out_event_t.3 \
+xcb_force_screen_saver.3 \
+xcb_force_screen_saver_checked.3 \
+xcb_free_colormap.3 \
+xcb_free_colormap_checked.3 \
+xcb_free_colors.3 \
+xcb_free_colors_checked.3 \
+xcb_free_cursor.3 \
+xcb_free_cursor_checked.3 \
+xcb_free_gc.3 \
+xcb_free_gc_checked.3 \
+xcb_free_pixmap.3 \
+xcb_free_pixmap_checked.3 \
+xcb_get_atom_name.3 \
+xcb_get_atom_name_name.3 \
+xcb_get_atom_name_name_end.3 \
+xcb_get_atom_name_name_length.3 \
+xcb_get_atom_name_reply.3 \
+xcb_get_atom_name_unchecked.3 \
+xcb_get_font_path.3 \
+xcb_get_font_path_path_iterator.3 \
+xcb_get_font_path_path_length.3 \
+xcb_get_font_path_reply.3 \
+xcb_get_font_path_unchecked.3 \
+xcb_get_geometry.3 \
+xcb_get_geometry_reply.3 \
+xcb_get_geometry_unchecked.3 \
+xcb_get_image.3 \
+xcb_get_image_data.3 \
+xcb_get_image_data_end.3 \
+xcb_get_image_data_length.3 \
+xcb_get_image_reply.3 \
+xcb_get_image_unchecked.3 \
+xcb_get_input_focus.3 \
+xcb_get_input_focus_reply.3 \
+xcb_get_input_focus_unchecked.3 \
+xcb_get_keyboard_control.3 \
+xcb_get_keyboard_control_reply.3 \
+xcb_get_keyboard_control_unchecked.3 \
+xcb_get_keyboard_mapping.3 \
+xcb_get_keyboard_mapping_keysyms.3 \
+xcb_get_keyboard_mapping_keysyms_end.3 \
+xcb_get_keyboard_mapping_keysyms_length.3 \
+xcb_get_keyboard_mapping_reply.3 \
+xcb_get_keyboard_mapping_unchecked.3 \
+xcb_get_modifier_mapping.3 \
+xcb_get_modifier_mapping_keycodes.3 \
+xcb_get_modifier_mapping_keycodes_end.3 \
+xcb_get_modifier_mapping_keycodes_length.3 \
+xcb_get_modifier_mapping_reply.3 \
+xcb_get_modifier_mapping_unchecked.3 \
+xcb_get_motion_events.3 \
+xcb_get_motion_events_events.3 \
+xcb_get_motion_events_events_iterator.3 \
+xcb_get_motion_events_events_length.3 \
+xcb_get_motion_events_reply.3 \
+xcb_get_motion_events_unchecked.3 \
+xcb_get_pointer_control.3 \
+xcb_get_pointer_control_reply.3 \
+xcb_get_pointer_control_unchecked.3 \
+xcb_get_pointer_mapping.3 \
+xcb_get_pointer_mapping_map.3 \
+xcb_get_pointer_mapping_map_end.3 \
+xcb_get_pointer_mapping_map_length.3 \
+xcb_get_pointer_mapping_reply.3 \
+xcb_get_pointer_mapping_unchecked.3 \
+xcb_get_property.3 \
+xcb_get_property_reply.3 \
+xcb_get_property_unchecked.3 \
+xcb_get_property_value.3 \
+xcb_get_property_value_end.3 \
+xcb_get_property_value_length.3 \
+xcb_get_screen_saver.3 \
+xcb_get_screen_saver_reply.3 \
+xcb_get_screen_saver_unchecked.3 \
+xcb_get_selection_owner.3 \
+xcb_get_selection_owner_reply.3 \
+xcb_get_selection_owner_unchecked.3 \
+xcb_get_window_attributes.3 \
+xcb_get_window_attributes_reply.3 \
+xcb_get_window_attributes_unchecked.3 \
+xcb_glx_are_textures_resident.3 \
+xcb_glx_are_textures_resident_data.3 \
+xcb_glx_are_textures_resident_data_end.3 \
+xcb_glx_are_textures_resident_data_length.3 \
+xcb_glx_are_textures_resident_reply.3 \
+xcb_glx_are_textures_resident_unchecked.3 \
+xcb_glx_change_drawable_attributes.3 \
+xcb_glx_change_drawable_attributes_checked.3 \
+xcb_glx_client_info.3 \
+xcb_glx_client_info_checked.3 \
+xcb_glx_copy_context.3 \
+xcb_glx_copy_context_checked.3 \
+xcb_glx_create_context.3 \
+xcb_glx_create_context_attribs_arb.3 \
+xcb_glx_create_context_attribs_arb_checked.3 \
+xcb_glx_create_context_checked.3 \
+xcb_glx_create_glx_pixmap.3 \
+xcb_glx_create_glx_pixmap_checked.3 \
+xcb_glx_create_new_context.3 \
+xcb_glx_create_new_context_checked.3 \
+xcb_glx_create_pbuffer.3 \
+xcb_glx_create_pbuffer_checked.3 \
+xcb_glx_create_pixmap.3 \
+xcb_glx_create_pixmap_checked.3 \
+xcb_glx_create_window.3 \
+xcb_glx_create_window_checked.3 \
+xcb_glx_delete_lists.3 \
+xcb_glx_delete_lists_checked.3 \
+xcb_glx_delete_queries_arb.3 \
+xcb_glx_delete_queries_arb_checked.3 \
+xcb_glx_delete_textures.3 \
+xcb_glx_delete_textures_checked.3 \
+xcb_glx_delete_window.3 \
+xcb_glx_delete_window_checked.3 \
+xcb_glx_destroy_context.3 \
+xcb_glx_destroy_context_checked.3 \
+xcb_glx_destroy_glx_pixmap.3 \
+xcb_glx_destroy_glx_pixmap_checked.3 \
+xcb_glx_destroy_pbuffer.3 \
+xcb_glx_destroy_pbuffer_checked.3 \
+xcb_glx_destroy_pixmap.3 \
+xcb_glx_destroy_pixmap_checked.3 \
+xcb_glx_end_list.3 \
+xcb_glx_end_list_checked.3 \
+xcb_glx_feedback_buffer.3 \
+xcb_glx_feedback_buffer_checked.3 \
+xcb_glx_finish.3 \
+xcb_glx_finish_reply.3 \
+xcb_glx_finish_unchecked.3 \
+xcb_glx_flush.3 \
+xcb_glx_flush_checked.3 \
+xcb_glx_gen_lists.3 \
+xcb_glx_gen_lists_reply.3 \
+xcb_glx_gen_lists_unchecked.3 \
+xcb_glx_gen_queries_arb.3 \
+xcb_glx_gen_queries_arb_data.3 \
+xcb_glx_gen_queries_arb_data_end.3 \
+xcb_glx_gen_queries_arb_data_length.3 \
+xcb_glx_gen_queries_arb_reply.3 \
+xcb_glx_gen_queries_arb_unchecked.3 \
+xcb_glx_gen_textures.3 \
+xcb_glx_gen_textures_data.3 \
+xcb_glx_gen_textures_data_end.3 \
+xcb_glx_gen_textures_data_length.3 \
+xcb_glx_gen_textures_reply.3 \
+xcb_glx_gen_textures_unchecked.3 \
+xcb_glx_get_booleanv.3 \
+xcb_glx_get_booleanv_data.3 \
+xcb_glx_get_booleanv_data_end.3 \
+xcb_glx_get_booleanv_data_length.3 \
+xcb_glx_get_booleanv_reply.3 \
+xcb_glx_get_booleanv_unchecked.3 \
+xcb_glx_get_clip_plane.3 \
+xcb_glx_get_clip_plane_data.3 \
+xcb_glx_get_clip_plane_data_end.3 \
+xcb_glx_get_clip_plane_data_length.3 \
+xcb_glx_get_clip_plane_reply.3 \
+xcb_glx_get_clip_plane_unchecked.3 \
+xcb_glx_get_color_table.3 \
+xcb_glx_get_color_table_data.3 \
+xcb_glx_get_color_table_data_end.3 \
+xcb_glx_get_color_table_data_length.3 \
+xcb_glx_get_color_table_parameterfv.3 \
+xcb_glx_get_color_table_parameterfv_data.3 \
+xcb_glx_get_color_table_parameterfv_data_end.3 \
+xcb_glx_get_color_table_parameterfv_data_length.3 \
+xcb_glx_get_color_table_parameterfv_reply.3 \
+xcb_glx_get_color_table_parameterfv_unchecked.3 \
+xcb_glx_get_color_table_parameteriv.3 \
+xcb_glx_get_color_table_parameteriv_data.3 \
+xcb_glx_get_color_table_parameteriv_data_end.3 \
+xcb_glx_get_color_table_parameteriv_data_length.3 \
+xcb_glx_get_color_table_parameteriv_reply.3 \
+xcb_glx_get_color_table_parameteriv_unchecked.3 \
+xcb_glx_get_color_table_reply.3 \
+xcb_glx_get_color_table_unchecked.3 \
+xcb_glx_get_compressed_tex_image_arb.3 \
+xcb_glx_get_compressed_tex_image_arb_data.3 \
+xcb_glx_get_compressed_tex_image_arb_data_end.3 \
+xcb_glx_get_compressed_tex_image_arb_data_length.3 \
+xcb_glx_get_compressed_tex_image_arb_reply.3 \
+xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
+xcb_glx_get_convolution_filter.3 \
+xcb_glx_get_convolution_filter_data.3 \
+xcb_glx_get_convolution_filter_data_end.3 \
+xcb_glx_get_convolution_filter_data_length.3 \
+xcb_glx_get_convolution_filter_reply.3 \
+xcb_glx_get_convolution_filter_unchecked.3 \
+xcb_glx_get_convolution_parameterfv.3 \
+xcb_glx_get_convolution_parameterfv_data.3 \
+xcb_glx_get_convolution_parameterfv_data_end.3 \
+xcb_glx_get_convolution_parameterfv_data_length.3 \
+xcb_glx_get_convolution_parameterfv_reply.3 \
+xcb_glx_get_convolution_parameterfv_unchecked.3 \
+xcb_glx_get_convolution_parameteriv.3 \
+xcb_glx_get_convolution_parameteriv_data.3 \
+xcb_glx_get_convolution_parameteriv_data_end.3 \
+xcb_glx_get_convolution_parameteriv_data_length.3 \
+xcb_glx_get_convolution_parameteriv_reply.3 \
+xcb_glx_get_convolution_parameteriv_unchecked.3 \
+xcb_glx_get_doublev.3 \
+xcb_glx_get_doublev_data.3 \
+xcb_glx_get_doublev_data_end.3 \
+xcb_glx_get_doublev_data_length.3 \
+xcb_glx_get_doublev_reply.3 \
+xcb_glx_get_doublev_unchecked.3 \
+xcb_glx_get_drawable_attributes.3 \
+xcb_glx_get_drawable_attributes_attribs.3 \
+xcb_glx_get_drawable_attributes_attribs_end.3 \
+xcb_glx_get_drawable_attributes_attribs_length.3 \
+xcb_glx_get_drawable_attributes_reply.3 \
+xcb_glx_get_drawable_attributes_unchecked.3 \
+xcb_glx_get_error.3 \
+xcb_glx_get_error_reply.3 \
+xcb_glx_get_error_unchecked.3 \
+xcb_glx_get_fb_configs.3 \
+xcb_glx_get_fb_configs_property_list.3 \
+xcb_glx_get_fb_configs_property_list_end.3 \
+xcb_glx_get_fb_configs_property_list_length.3 \
+xcb_glx_get_fb_configs_reply.3 \
+xcb_glx_get_fb_configs_unchecked.3 \
+xcb_glx_get_floatv.3 \
+xcb_glx_get_floatv_data.3 \
+xcb_glx_get_floatv_data_end.3 \
+xcb_glx_get_floatv_data_length.3 \
+xcb_glx_get_floatv_reply.3 \
+xcb_glx_get_floatv_unchecked.3 \
+xcb_glx_get_histogram.3 \
+xcb_glx_get_histogram_data.3 \
+xcb_glx_get_histogram_data_end.3 \
+xcb_glx_get_histogram_data_length.3 \
+xcb_glx_get_histogram_parameterfv.3 \
+xcb_glx_get_histogram_parameterfv_data.3 \
+xcb_glx_get_histogram_parameterfv_data_end.3 \
+xcb_glx_get_histogram_parameterfv_data_length.3 \
+xcb_glx_get_histogram_parameterfv_reply.3 \
+xcb_glx_get_histogram_parameterfv_unchecked.3 \
+xcb_glx_get_histogram_parameteriv.3 \
+xcb_glx_get_histogram_parameteriv_data.3 \
+xcb_glx_get_histogram_parameteriv_data_end.3 \
+xcb_glx_get_histogram_parameteriv_data_length.3 \
+xcb_glx_get_histogram_parameteriv_reply.3 \
+xcb_glx_get_histogram_parameteriv_unchecked.3 \
+xcb_glx_get_histogram_reply.3 \
+xcb_glx_get_histogram_unchecked.3 \
+xcb_glx_get_integerv.3 \
+xcb_glx_get_integerv_data.3 \
+xcb_glx_get_integerv_data_end.3 \
+xcb_glx_get_integerv_data_length.3 \
+xcb_glx_get_integerv_reply.3 \
+xcb_glx_get_integerv_unchecked.3 \
+xcb_glx_get_lightfv.3 \
+xcb_glx_get_lightfv_data.3 \
+xcb_glx_get_lightfv_data_end.3 \
+xcb_glx_get_lightfv_data_length.3 \
+xcb_glx_get_lightfv_reply.3 \
+xcb_glx_get_lightfv_unchecked.3 \
+xcb_glx_get_lightiv.3 \
+xcb_glx_get_lightiv_data.3 \
+xcb_glx_get_lightiv_data_end.3 \
+xcb_glx_get_lightiv_data_length.3 \
+xcb_glx_get_lightiv_reply.3 \
+xcb_glx_get_lightiv_unchecked.3 \
+xcb_glx_get_mapdv.3 \
+xcb_glx_get_mapdv_data.3 \
+xcb_glx_get_mapdv_data_end.3 \
+xcb_glx_get_mapdv_data_length.3 \
+xcb_glx_get_mapdv_reply.3 \
+xcb_glx_get_mapdv_unchecked.3 \
+xcb_glx_get_mapfv.3 \
+xcb_glx_get_mapfv_data.3 \
+xcb_glx_get_mapfv_data_end.3 \
+xcb_glx_get_mapfv_data_length.3 \
+xcb_glx_get_mapfv_reply.3 \
+xcb_glx_get_mapfv_unchecked.3 \
+xcb_glx_get_mapiv.3 \
+xcb_glx_get_mapiv_data.3 \
+xcb_glx_get_mapiv_data_end.3 \
+xcb_glx_get_mapiv_data_length.3 \
+xcb_glx_get_mapiv_reply.3 \
+xcb_glx_get_mapiv_unchecked.3 \
+xcb_glx_get_materialfv.3 \
+xcb_glx_get_materialfv_data.3 \
+xcb_glx_get_materialfv_data_end.3 \
+xcb_glx_get_materialfv_data_length.3 \
+xcb_glx_get_materialfv_reply.3 \
+xcb_glx_get_materialfv_unchecked.3 \
+xcb_glx_get_materialiv.3 \
+xcb_glx_get_materialiv_data.3 \
+xcb_glx_get_materialiv_data_end.3 \
+xcb_glx_get_materialiv_data_length.3 \
+xcb_glx_get_materialiv_reply.3 \
+xcb_glx_get_materialiv_unchecked.3 \
+xcb_glx_get_minmax.3 \
+xcb_glx_get_minmax_data.3 \
+xcb_glx_get_minmax_data_end.3 \
+xcb_glx_get_minmax_data_length.3 \
+xcb_glx_get_minmax_parameterfv.3 \
+xcb_glx_get_minmax_parameterfv_data.3 \
+xcb_glx_get_minmax_parameterfv_data_end.3 \
+xcb_glx_get_minmax_parameterfv_data_length.3 \
+xcb_glx_get_minmax_parameterfv_reply.3 \
+xcb_glx_get_minmax_parameterfv_unchecked.3 \
+xcb_glx_get_minmax_parameteriv.3 \
+xcb_glx_get_minmax_parameteriv_data.3 \
+xcb_glx_get_minmax_parameteriv_data_end.3 \
+xcb_glx_get_minmax_parameteriv_data_length.3 \
+xcb_glx_get_minmax_parameteriv_reply.3 \
+xcb_glx_get_minmax_parameteriv_unchecked.3 \
+xcb_glx_get_minmax_reply.3 \
+xcb_glx_get_minmax_unchecked.3 \
+xcb_glx_get_pixel_mapfv.3 \
+xcb_glx_get_pixel_mapfv_data.3 \
+xcb_glx_get_pixel_mapfv_data_end.3 \
+xcb_glx_get_pixel_mapfv_data_length.3 \
+xcb_glx_get_pixel_mapfv_reply.3 \
+xcb_glx_get_pixel_mapfv_unchecked.3 \
+xcb_glx_get_pixel_mapuiv.3 \
+xcb_glx_get_pixel_mapuiv_data.3 \
+xcb_glx_get_pixel_mapuiv_data_end.3 \
+xcb_glx_get_pixel_mapuiv_data_length.3 \
+xcb_glx_get_pixel_mapuiv_reply.3 \
+xcb_glx_get_pixel_mapuiv_unchecked.3 \
+xcb_glx_get_pixel_mapusv.3 \
+xcb_glx_get_pixel_mapusv_data.3 \
+xcb_glx_get_pixel_mapusv_data_end.3 \
+xcb_glx_get_pixel_mapusv_data_length.3 \
+xcb_glx_get_pixel_mapusv_reply.3 \
+xcb_glx_get_pixel_mapusv_unchecked.3 \
+xcb_glx_get_polygon_stipple.3 \
+xcb_glx_get_polygon_stipple_data.3 \
+xcb_glx_get_polygon_stipple_data_end.3 \
+xcb_glx_get_polygon_stipple_data_length.3 \
+xcb_glx_get_polygon_stipple_reply.3 \
+xcb_glx_get_polygon_stipple_unchecked.3 \
+xcb_glx_get_query_objectiv_arb.3 \
+xcb_glx_get_query_objectiv_arb_data.3 \
+xcb_glx_get_query_objectiv_arb_data_end.3 \
+xcb_glx_get_query_objectiv_arb_data_length.3 \
+xcb_glx_get_query_objectiv_arb_reply.3 \
+xcb_glx_get_query_objectiv_arb_unchecked.3 \
+xcb_glx_get_query_objectuiv_arb.3 \
+xcb_glx_get_query_objectuiv_arb_data.3 \
+xcb_glx_get_query_objectuiv_arb_data_end.3 \
+xcb_glx_get_query_objectuiv_arb_data_length.3 \
+xcb_glx_get_query_objectuiv_arb_reply.3 \
+xcb_glx_get_query_objectuiv_arb_unchecked.3 \
+xcb_glx_get_queryiv_arb.3 \
+xcb_glx_get_queryiv_arb_data.3 \
+xcb_glx_get_queryiv_arb_data_end.3 \
+xcb_glx_get_queryiv_arb_data_length.3 \
+xcb_glx_get_queryiv_arb_reply.3 \
+xcb_glx_get_queryiv_arb_unchecked.3 \
+xcb_glx_get_separable_filter.3 \
+xcb_glx_get_separable_filter_reply.3 \
+xcb_glx_get_separable_filter_rows_and_cols.3 \
+xcb_glx_get_separable_filter_rows_and_cols_end.3 \
+xcb_glx_get_separable_filter_rows_and_cols_length.3 \
+xcb_glx_get_separable_filter_unchecked.3 \
+xcb_glx_get_string.3 \
+xcb_glx_get_string_reply.3 \
+xcb_glx_get_string_string.3 \
+xcb_glx_get_string_string_end.3 \
+xcb_glx_get_string_string_length.3 \
+xcb_glx_get_string_unchecked.3 \
+xcb_glx_get_tex_envfv.3 \
+xcb_glx_get_tex_envfv_data.3 \
+xcb_glx_get_tex_envfv_data_end.3 \
+xcb_glx_get_tex_envfv_data_length.3 \
+xcb_glx_get_tex_envfv_reply.3 \
+xcb_glx_get_tex_envfv_unchecked.3 \
+xcb_glx_get_tex_enviv.3 \
+xcb_glx_get_tex_enviv_data.3 \
+xcb_glx_get_tex_enviv_data_end.3 \
+xcb_glx_get_tex_enviv_data_length.3 \
+xcb_glx_get_tex_enviv_reply.3 \
+xcb_glx_get_tex_enviv_unchecked.3 \
+xcb_glx_get_tex_gendv.3 \
+xcb_glx_get_tex_gendv_data.3 \
+xcb_glx_get_tex_gendv_data_end.3 \
+xcb_glx_get_tex_gendv_data_length.3 \
+xcb_glx_get_tex_gendv_reply.3 \
+xcb_glx_get_tex_gendv_unchecked.3 \
+xcb_glx_get_tex_genfv.3 \
+xcb_glx_get_tex_genfv_data.3 \
+xcb_glx_get_tex_genfv_data_end.3 \
+xcb_glx_get_tex_genfv_data_length.3 \
+xcb_glx_get_tex_genfv_reply.3 \
+xcb_glx_get_tex_genfv_unchecked.3 \
+xcb_glx_get_tex_geniv.3 \
+xcb_glx_get_tex_geniv_data.3 \
+xcb_glx_get_tex_geniv_data_end.3 \
+xcb_glx_get_tex_geniv_data_length.3 \
+xcb_glx_get_tex_geniv_reply.3 \
+xcb_glx_get_tex_geniv_unchecked.3 \
+xcb_glx_get_tex_image.3 \
+xcb_glx_get_tex_image_data.3 \
+xcb_glx_get_tex_image_data_end.3 \
+xcb_glx_get_tex_image_data_length.3 \
+xcb_glx_get_tex_image_reply.3 \
+xcb_glx_get_tex_image_unchecked.3 \
+xcb_glx_get_tex_level_parameterfv.3 \
+xcb_glx_get_tex_level_parameterfv_data.3 \
+xcb_glx_get_tex_level_parameterfv_data_end.3 \
+xcb_glx_get_tex_level_parameterfv_data_length.3 \
+xcb_glx_get_tex_level_parameterfv_reply.3 \
+xcb_glx_get_tex_level_parameterfv_unchecked.3 \
+xcb_glx_get_tex_level_parameteriv.3 \
+xcb_glx_get_tex_level_parameteriv_data.3 \
+xcb_glx_get_tex_level_parameteriv_data_end.3 \
+xcb_glx_get_tex_level_parameteriv_data_length.3 \
+xcb_glx_get_tex_level_parameteriv_reply.3 \
+xcb_glx_get_tex_level_parameteriv_unchecked.3 \
+xcb_glx_get_tex_parameterfv.3 \
+xcb_glx_get_tex_parameterfv_data.3 \
+xcb_glx_get_tex_parameterfv_data_end.3 \
+xcb_glx_get_tex_parameterfv_data_length.3 \
+xcb_glx_get_tex_parameterfv_reply.3 \
+xcb_glx_get_tex_parameterfv_unchecked.3 \
+xcb_glx_get_tex_parameteriv.3 \
+xcb_glx_get_tex_parameteriv_data.3 \
+xcb_glx_get_tex_parameteriv_data_end.3 \
+xcb_glx_get_tex_parameteriv_data_length.3 \
+xcb_glx_get_tex_parameteriv_reply.3 \
+xcb_glx_get_tex_parameteriv_unchecked.3 \
+xcb_glx_get_visual_configs.3 \
+xcb_glx_get_visual_configs_property_list.3 \
+xcb_glx_get_visual_configs_property_list_end.3 \
+xcb_glx_get_visual_configs_property_list_length.3 \
+xcb_glx_get_visual_configs_reply.3 \
+xcb_glx_get_visual_configs_unchecked.3 \
+xcb_glx_is_direct.3 \
+xcb_glx_is_direct_reply.3 \
+xcb_glx_is_direct_unchecked.3 \
+xcb_glx_is_list.3 \
+xcb_glx_is_list_reply.3 \
+xcb_glx_is_list_unchecked.3 \
+xcb_glx_is_query_arb.3 \
+xcb_glx_is_query_arb_reply.3 \
+xcb_glx_is_query_arb_unchecked.3 \
+xcb_glx_is_texture.3 \
+xcb_glx_is_texture_reply.3 \
+xcb_glx_is_texture_unchecked.3 \
+xcb_glx_make_context_current.3 \
+xcb_glx_make_context_current_reply.3 \
+xcb_glx_make_context_current_unchecked.3 \
+xcb_glx_make_current.3 \
+xcb_glx_make_current_reply.3 \
+xcb_glx_make_current_unchecked.3 \
+xcb_glx_new_list.3 \
+xcb_glx_new_list_checked.3 \
+xcb_glx_pbuffer_clobber_event_t.3 \
+xcb_glx_pixel_storef.3 \
+xcb_glx_pixel_storef_checked.3 \
+xcb_glx_pixel_storei.3 \
+xcb_glx_pixel_storei_checked.3 \
+xcb_glx_query_context.3 \
+xcb_glx_query_context_attribs.3 \
+xcb_glx_query_context_attribs_end.3 \
+xcb_glx_query_context_attribs_length.3 \
+xcb_glx_query_context_reply.3 \
+xcb_glx_query_context_unchecked.3 \
+xcb_glx_query_extensions_string.3 \
+xcb_glx_query_extensions_string_reply.3 \
+xcb_glx_query_extensions_string_unchecked.3 \
+xcb_glx_query_server_string.3 \
+xcb_glx_query_server_string_reply.3 \
+xcb_glx_query_server_string_string.3 \
+xcb_glx_query_server_string_string_end.3 \
+xcb_glx_query_server_string_string_length.3 \
+xcb_glx_query_server_string_unchecked.3 \
+xcb_glx_query_version.3 \
+xcb_glx_query_version_reply.3 \
+xcb_glx_query_version_unchecked.3 \
+xcb_glx_read_pixels.3 \
+xcb_glx_read_pixels_data.3 \
+xcb_glx_read_pixels_data_end.3 \
+xcb_glx_read_pixels_data_length.3 \
+xcb_glx_read_pixels_reply.3 \
+xcb_glx_read_pixels_unchecked.3 \
+xcb_glx_render.3 \
+xcb_glx_render_checked.3 \
+xcb_glx_render_large.3 \
+xcb_glx_render_large_checked.3 \
+xcb_glx_render_mode.3 \
+xcb_glx_render_mode_data.3 \
+xcb_glx_render_mode_data_end.3 \
+xcb_glx_render_mode_data_length.3 \
+xcb_glx_render_mode_reply.3 \
+xcb_glx_render_mode_unchecked.3 \
+xcb_glx_select_buffer.3 \
+xcb_glx_select_buffer_checked.3 \
+xcb_glx_set_client_info_2arb.3 \
+xcb_glx_set_client_info_2arb_checked.3 \
+xcb_glx_set_client_info_arb.3 \
+xcb_glx_set_client_info_arb_checked.3 \
+xcb_glx_swap_buffers.3 \
+xcb_glx_swap_buffers_checked.3 \
+xcb_glx_use_x_font.3 \
+xcb_glx_use_x_font_checked.3 \
+xcb_glx_vendor_private.3 \
+xcb_glx_vendor_private_checked.3 \
+xcb_glx_vendor_private_with_reply.3 \
+xcb_glx_vendor_private_with_reply_data_2.3 \
+xcb_glx_vendor_private_with_reply_data_2_end.3 \
+xcb_glx_vendor_private_with_reply_data_2_length.3 \
+xcb_glx_vendor_private_with_reply_reply.3 \
+xcb_glx_vendor_private_with_reply_unchecked.3 \
+xcb_glx_wait_gl.3 \
+xcb_glx_wait_gl_checked.3 \
+xcb_glx_wait_x.3 \
+xcb_glx_wait_x_checked.3 \
+xcb_grab_button.3 \
+xcb_grab_button_checked.3 \
+xcb_grab_key.3 \
+xcb_grab_key_checked.3 \
+xcb_grab_keyboard.3 \
+xcb_grab_keyboard_reply.3 \
+xcb_grab_keyboard_unchecked.3 \
+xcb_grab_pointer.3 \
+xcb_grab_pointer_reply.3 \
+xcb_grab_pointer_unchecked.3 \
+xcb_grab_server.3 \
+xcb_grab_server_checked.3 \
+xcb_graphics_exposure_event_t.3 \
+xcb_gravity_notify_event_t.3 \
+xcb_image_text_16.3 \
+xcb_image_text_16_checked.3 \
+xcb_image_text_8.3 \
+xcb_image_text_8_checked.3 \
+xcb_input_allow_device_events.3 \
+xcb_input_allow_device_events_checked.3 \
+xcb_input_change_device_dont_propagate_list.3 \
+xcb_input_change_device_dont_propagate_list_checked.3 \
+xcb_input_change_device_key_mapping.3 \
+xcb_input_change_device_key_mapping_checked.3 \
+xcb_input_change_device_notify_event_t.3 \
+xcb_input_change_keyboard_device.3 \
+xcb_input_change_keyboard_device_reply.3 \
+xcb_input_change_keyboard_device_unchecked.3 \
+xcb_input_change_pointer_device.3 \
+xcb_input_change_pointer_device_reply.3 \
+xcb_input_change_pointer_device_unchecked.3 \
+xcb_input_close_device.3 \
+xcb_input_close_device_checked.3 \
+xcb_input_device_bell.3 \
+xcb_input_device_bell_checked.3 \
+xcb_input_device_button_press_event_t.3 \
+xcb_input_device_button_release_event_t.3 \
+xcb_input_device_button_state_notify_event_t.3 \
+xcb_input_device_key_press_event_t.3 \
+xcb_input_device_key_release_event_t.3 \
+xcb_input_device_key_state_notify_event_t.3 \
+xcb_input_device_mapping_notify_event_t.3 \
+xcb_input_device_motion_notify_event_t.3 \
+xcb_input_device_presence_notify_event_t.3 \
+xcb_input_device_state_notify_event_t.3 \
+xcb_input_device_valuator_event_t.3 \
+xcb_input_focus_in_event_t.3 \
+xcb_input_focus_out_event_t.3 \
+xcb_input_get_device_button_mapping.3 \
+xcb_input_get_device_button_mapping_map.3 \
+xcb_input_get_device_button_mapping_map_end.3 \
+xcb_input_get_device_button_mapping_map_length.3 \
+xcb_input_get_device_button_mapping_reply.3 \
+xcb_input_get_device_button_mapping_unchecked.3 \
+xcb_input_get_device_control.3 \
+xcb_input_get_device_control_reply.3 \
+xcb_input_get_device_control_unchecked.3 \
+xcb_input_get_device_dont_propagate_list.3 \
+xcb_input_get_device_dont_propagate_list_classes.3 \
+xcb_input_get_device_dont_propagate_list_classes_end.3 \
+xcb_input_get_device_dont_propagate_list_classes_length.3 \
+xcb_input_get_device_dont_propagate_list_reply.3 \
+xcb_input_get_device_dont_propagate_list_unchecked.3 \
+xcb_input_get_device_focus.3 \
+xcb_input_get_device_focus_reply.3 \
+xcb_input_get_device_focus_unchecked.3 \
+xcb_input_get_device_key_mapping.3 \
+xcb_input_get_device_key_mapping_keysyms.3 \
+xcb_input_get_device_key_mapping_keysyms_end.3 \
+xcb_input_get_device_key_mapping_keysyms_length.3 \
+xcb_input_get_device_key_mapping_reply.3 \
+xcb_input_get_device_key_mapping_unchecked.3 \
+xcb_input_get_device_modifier_mapping.3 \
+xcb_input_get_device_modifier_mapping_keymaps.3 \
+xcb_input_get_device_modifier_mapping_keymaps_end.3 \
+xcb_input_get_device_modifier_mapping_keymaps_length.3 \
+xcb_input_get_device_modifier_mapping_reply.3 \
+xcb_input_get_device_modifier_mapping_unchecked.3 \
+xcb_input_get_device_motion_events.3 \
+xcb_input_get_device_motion_events_reply.3 \
+xcb_input_get_device_motion_events_unchecked.3 \
+xcb_input_get_extension_version.3 \
+xcb_input_get_extension_version_reply.3 \
+xcb_input_get_extension_version_unchecked.3 \
+xcb_input_get_feedback_control.3 \
+xcb_input_get_feedback_control_reply.3 \
+xcb_input_get_feedback_control_unchecked.3 \
+xcb_input_get_selected_extension_events.3 \
+xcb_input_get_selected_extension_events_all_classes.3 \
+xcb_input_get_selected_extension_events_all_classes_end.3 \
+xcb_input_get_selected_extension_events_all_classes_length.3 \
+xcb_input_get_selected_extension_events_reply.3 \
+xcb_input_get_selected_extension_events_this_classes.3 \
+xcb_input_get_selected_extension_events_this_classes_end.3 \
+xcb_input_get_selected_extension_events_this_classes_length.3 \
+xcb_input_get_selected_extension_events_unchecked.3 \
+xcb_input_grab_device.3 \
+xcb_input_grab_device_button.3 \
+xcb_input_grab_device_button_checked.3 \
+xcb_input_grab_device_key.3 \
+xcb_input_grab_device_key_checked.3 \
+xcb_input_grab_device_reply.3 \
+xcb_input_grab_device_unchecked.3 \
+xcb_input_list_input_devices.3 \
+xcb_input_list_input_devices_devices.3 \
+xcb_input_list_input_devices_devices_iterator.3 \
+xcb_input_list_input_devices_devices_length.3 \
+xcb_input_list_input_devices_reply.3 \
+xcb_input_list_input_devices_unchecked.3 \
+xcb_input_open_device.3 \
+xcb_input_open_device_class_info.3 \
+xcb_input_open_device_class_info_iterator.3 \
+xcb_input_open_device_class_info_length.3 \
+xcb_input_open_device_reply.3 \
+xcb_input_open_device_unchecked.3 \
+xcb_input_proximity_in_event_t.3 \
+xcb_input_proximity_out_event_t.3 \
+xcb_input_query_device_state.3 \
+xcb_input_query_device_state_reply.3 \
+xcb_input_query_device_state_unchecked.3 \
+xcb_input_select_extension_event.3 \
+xcb_input_select_extension_event_checked.3 \
+xcb_input_send_extension_event.3 \
+xcb_input_send_extension_event_checked.3 \
+xcb_input_set_device_button_mapping.3 \
+xcb_input_set_device_button_mapping_reply.3 \
+xcb_input_set_device_button_mapping_unchecked.3 \
+xcb_input_set_device_focus.3 \
+xcb_input_set_device_focus_checked.3 \
+xcb_input_set_device_mode.3 \
+xcb_input_set_device_mode_reply.3 \
+xcb_input_set_device_mode_unchecked.3 \
+xcb_input_set_device_modifier_mapping.3 \
+xcb_input_set_device_modifier_mapping_reply.3 \
+xcb_input_set_device_modifier_mapping_unchecked.3 \
+xcb_input_set_device_valuators.3 \
+xcb_input_set_device_valuators_reply.3 \
+xcb_input_set_device_valuators_unchecked.3 \
+xcb_input_ungrab_device.3 \
+xcb_input_ungrab_device_button.3 \
+xcb_input_ungrab_device_button_checked.3 \
+xcb_input_ungrab_device_checked.3 \
+xcb_input_ungrab_device_key.3 \
+xcb_input_ungrab_device_key_checked.3 \
+xcb_install_colormap.3 \
+xcb_install_colormap_checked.3 \
+xcb_intern_atom.3 \
+xcb_intern_atom_reply.3 \
+xcb_intern_atom_unchecked.3 \
+xcb_key_press_event_t.3 \
+xcb_key_release_event_t.3 \
+xcb_keymap_notify_event_t.3 \
+xcb_kill_client.3 \
+xcb_kill_client_checked.3 \
+xcb_leave_notify_event_t.3 \
+xcb_list_extensions.3 \
+xcb_list_extensions_names_iterator.3 \
+xcb_list_extensions_names_length.3 \
+xcb_list_extensions_reply.3 \
+xcb_list_extensions_unchecked.3 \
+xcb_list_fonts.3 \
+xcb_list_fonts_names_iterator.3 \
+xcb_list_fonts_names_length.3 \
+xcb_list_fonts_reply.3 \
+xcb_list_fonts_unchecked.3 \
+xcb_list_fonts_with_info.3 \
+xcb_list_fonts_with_info_name.3 \
+xcb_list_fonts_with_info_name_end.3 \
+xcb_list_fonts_with_info_name_length.3 \
+xcb_list_fonts_with_info_properties.3 \
+xcb_list_fonts_with_info_properties_iterator.3 \
+xcb_list_fonts_with_info_properties_length.3 \
+xcb_list_fonts_with_info_reply.3 \
+xcb_list_fonts_with_info_unchecked.3 \
+xcb_list_hosts.3 \
+xcb_list_hosts_hosts_iterator.3 \
+xcb_list_hosts_hosts_length.3 \
+xcb_list_hosts_reply.3 \
+xcb_list_hosts_unchecked.3 \
+xcb_list_installed_colormaps.3 \
+xcb_list_installed_colormaps_cmaps.3 \
+xcb_list_installed_colormaps_cmaps_end.3 \
+xcb_list_installed_colormaps_cmaps_length.3 \
+xcb_list_installed_colormaps_reply.3 \
+xcb_list_installed_colormaps_unchecked.3 \
+xcb_list_properties.3 \
+xcb_list_properties_atoms.3 \
+xcb_list_properties_atoms_end.3 \
+xcb_list_properties_atoms_length.3 \
+xcb_list_properties_reply.3 \
+xcb_list_properties_unchecked.3 \
+xcb_lookup_color.3 \
+xcb_lookup_color_reply.3 \
+xcb_lookup_color_unchecked.3 \
+xcb_map_notify_event_t.3 \
+xcb_map_request_event_t.3 \
+xcb_map_subwindows.3 \
+xcb_map_subwindows_checked.3 \
+xcb_map_window.3 \
+xcb_map_window_checked.3 \
+xcb_mapping_notify_event_t.3 \
+xcb_motion_notify_event_t.3 \
+xcb_no_exposure_event_t.3 \
+xcb_no_operation.3 \
+xcb_no_operation_checked.3 \
+xcb_open_font.3 \
+xcb_open_font_checked.3 \
+xcb_poly_arc.3 \
+xcb_poly_arc_checked.3 \
+xcb_poly_fill_arc.3 \
+xcb_poly_fill_arc_checked.3 \
+xcb_poly_fill_rectangle.3 \
+xcb_poly_fill_rectangle_checked.3 \
+xcb_poly_line.3 \
+xcb_poly_line_checked.3 \
+xcb_poly_point.3 \
+xcb_poly_point_checked.3 \
+xcb_poly_rectangle.3 \
+xcb_poly_rectangle_checked.3 \
+xcb_poly_segment.3 \
+xcb_poly_segment_checked.3 \
+xcb_poly_text_16.3 \
+xcb_poly_text_16_checked.3 \
+xcb_poly_text_8.3 \
+xcb_poly_text_8_checked.3 \
+xcb_property_notify_event_t.3 \
+xcb_put_image.3 \
+xcb_put_image_checked.3 \
+xcb_query_best_size.3 \
+xcb_query_best_size_reply.3 \
+xcb_query_best_size_unchecked.3 \
+xcb_query_colors.3 \
+xcb_query_colors_colors.3 \
+xcb_query_colors_colors_iterator.3 \
+xcb_query_colors_colors_length.3 \
+xcb_query_colors_reply.3 \
+xcb_query_colors_unchecked.3 \
+xcb_query_extension.3 \
+xcb_query_extension_reply.3 \
+xcb_query_extension_unchecked.3 \
+xcb_query_font.3 \
+xcb_query_font_char_infos.3 \
+xcb_query_font_char_infos_iterator.3 \
+xcb_query_font_char_infos_length.3 \
+xcb_query_font_properties.3 \
+xcb_query_font_properties_iterator.3 \
+xcb_query_font_properties_length.3 \
+xcb_query_font_reply.3 \
+xcb_query_font_unchecked.3 \
+xcb_query_keymap.3 \
+xcb_query_keymap_reply.3 \
+xcb_query_keymap_unchecked.3 \
+xcb_query_pointer.3 \
+xcb_query_pointer_reply.3 \
+xcb_query_pointer_unchecked.3 \
+xcb_query_text_extents.3 \
+xcb_query_text_extents_reply.3 \
+xcb_query_text_extents_unchecked.3 \
+xcb_query_tree.3 \
+xcb_query_tree_children.3 \
+xcb_query_tree_children_end.3 \
+xcb_query_tree_children_length.3 \
+xcb_query_tree_reply.3 \
+xcb_query_tree_unchecked.3 \
+xcb_randr_add_output_mode.3 \
+xcb_randr_add_output_mode_checked.3 \
+xcb_randr_change_output_property.3 \
+xcb_randr_change_output_property_checked.3 \
+xcb_randr_configure_output_property.3 \
+xcb_randr_configure_output_property_checked.3 \
+xcb_randr_create_mode.3 \
+xcb_randr_create_mode_reply.3 \
+xcb_randr_create_mode_unchecked.3 \
+xcb_randr_delete_output_mode.3 \
+xcb_randr_delete_output_mode_checked.3 \
+xcb_randr_delete_output_property.3 \
+xcb_randr_delete_output_property_checked.3 \
+xcb_randr_destroy_mode.3 \
+xcb_randr_destroy_mode_checked.3 \
+xcb_randr_get_crtc_gamma.3 \
+xcb_randr_get_crtc_gamma_blue.3 \
+xcb_randr_get_crtc_gamma_blue_end.3 \
+xcb_randr_get_crtc_gamma_blue_length.3 \
+xcb_randr_get_crtc_gamma_green.3 \
+xcb_randr_get_crtc_gamma_green_end.3 \
+xcb_randr_get_crtc_gamma_green_length.3 \
+xcb_randr_get_crtc_gamma_red.3 \
+xcb_randr_get_crtc_gamma_red_end.3 \
+xcb_randr_get_crtc_gamma_red_length.3 \
+xcb_randr_get_crtc_gamma_reply.3 \
+xcb_randr_get_crtc_gamma_size.3 \
+xcb_randr_get_crtc_gamma_size_reply.3 \
+xcb_randr_get_crtc_gamma_size_unchecked.3 \
+xcb_randr_get_crtc_gamma_unchecked.3 \
+xcb_randr_get_crtc_info.3 \
+xcb_randr_get_crtc_info_outputs.3 \
+xcb_randr_get_crtc_info_outputs_end.3 \
+xcb_randr_get_crtc_info_outputs_length.3 \
+xcb_randr_get_crtc_info_possible.3 \
+xcb_randr_get_crtc_info_possible_end.3 \
+xcb_randr_get_crtc_info_possible_length.3 \
+xcb_randr_get_crtc_info_reply.3 \
+xcb_randr_get_crtc_info_unchecked.3 \
+xcb_randr_get_crtc_transform.3 \
+xcb_randr_get_crtc_transform_current_filter_name.3 \
+xcb_randr_get_crtc_transform_current_filter_name_end.3 \
+xcb_randr_get_crtc_transform_current_filter_name_length.3 \
+xcb_randr_get_crtc_transform_current_params.3 \
+xcb_randr_get_crtc_transform_current_params_end.3 \
+xcb_randr_get_crtc_transform_current_params_length.3 \
+xcb_randr_get_crtc_transform_pending_filter_name.3 \
+xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
+xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
+xcb_randr_get_crtc_transform_pending_params.3 \
+xcb_randr_get_crtc_transform_pending_params_end.3 \
+xcb_randr_get_crtc_transform_pending_params_length.3 \
+xcb_randr_get_crtc_transform_reply.3 \
+xcb_randr_get_crtc_transform_unchecked.3 \
+xcb_randr_get_output_info.3 \
+xcb_randr_get_output_info_clones.3 \
+xcb_randr_get_output_info_clones_end.3 \
+xcb_randr_get_output_info_clones_length.3 \
+xcb_randr_get_output_info_crtcs.3 \
+xcb_randr_get_output_info_crtcs_end.3 \
+xcb_randr_get_output_info_crtcs_length.3 \
+xcb_randr_get_output_info_modes.3 \
+xcb_randr_get_output_info_modes_end.3 \
+xcb_randr_get_output_info_modes_length.3 \
+xcb_randr_get_output_info_name.3 \
+xcb_randr_get_output_info_name_end.3 \
+xcb_randr_get_output_info_name_length.3 \
+xcb_randr_get_output_info_reply.3 \
+xcb_randr_get_output_info_unchecked.3 \
+xcb_randr_get_output_primary.3 \
+xcb_randr_get_output_primary_reply.3 \
+xcb_randr_get_output_primary_unchecked.3 \
+xcb_randr_get_output_property.3 \
+xcb_randr_get_output_property_data.3 \
+xcb_randr_get_output_property_data_end.3 \
+xcb_randr_get_output_property_data_length.3 \
+xcb_randr_get_output_property_reply.3 \
+xcb_randr_get_output_property_unchecked.3 \
+xcb_randr_get_panning.3 \
+xcb_randr_get_panning_reply.3 \
+xcb_randr_get_panning_unchecked.3 \
+xcb_randr_get_screen_info.3 \
+xcb_randr_get_screen_info_rates_iterator.3 \
+xcb_randr_get_screen_info_rates_length.3 \
+xcb_randr_get_screen_info_reply.3 \
+xcb_randr_get_screen_info_sizes.3 \
+xcb_randr_get_screen_info_sizes_iterator.3 \
+xcb_randr_get_screen_info_sizes_length.3 \
+xcb_randr_get_screen_info_unchecked.3 \
+xcb_randr_get_screen_resources.3 \
+xcb_randr_get_screen_resources_crtcs.3 \
+xcb_randr_get_screen_resources_crtcs_end.3 \
+xcb_randr_get_screen_resources_crtcs_length.3 \
+xcb_randr_get_screen_resources_current.3 \
+xcb_randr_get_screen_resources_current_crtcs.3 \
+xcb_randr_get_screen_resources_current_crtcs_end.3 \
+xcb_randr_get_screen_resources_current_crtcs_length.3 \
+xcb_randr_get_screen_resources_current_modes.3 \
+xcb_randr_get_screen_resources_current_modes_iterator.3 \
+xcb_randr_get_screen_resources_current_modes_length.3 \
+xcb_randr_get_screen_resources_current_names.3 \
+xcb_randr_get_screen_resources_current_names_end.3 \
+xcb_randr_get_screen_resources_current_names_length.3 \
+xcb_randr_get_screen_resources_current_outputs.3 \
+xcb_randr_get_screen_resources_current_outputs_end.3 \
+xcb_randr_get_screen_resources_current_outputs_length.3 \
+xcb_randr_get_screen_resources_current_reply.3 \
+xcb_randr_get_screen_resources_current_unchecked.3 \
+xcb_randr_get_screen_resources_modes.3 \
+xcb_randr_get_screen_resources_modes_iterator.3 \
+xcb_randr_get_screen_resources_modes_length.3 \
+xcb_randr_get_screen_resources_names.3 \
+xcb_randr_get_screen_resources_names_end.3 \
+xcb_randr_get_screen_resources_names_length.3 \
+xcb_randr_get_screen_resources_outputs.3 \
+xcb_randr_get_screen_resources_outputs_end.3 \
+xcb_randr_get_screen_resources_outputs_length.3 \
+xcb_randr_get_screen_resources_reply.3 \
+xcb_randr_get_screen_resources_unchecked.3 \
+xcb_randr_get_screen_size_range.3 \
+xcb_randr_get_screen_size_range_reply.3 \
+xcb_randr_get_screen_size_range_unchecked.3 \
+xcb_randr_list_output_properties.3 \
+xcb_randr_list_output_properties_atoms.3 \
+xcb_randr_list_output_properties_atoms_end.3 \
+xcb_randr_list_output_properties_atoms_length.3 \
+xcb_randr_list_output_properties_reply.3 \
+xcb_randr_list_output_properties_unchecked.3 \
+xcb_randr_notify_event_t.3 \
+xcb_randr_query_output_property.3 \
+xcb_randr_query_output_property_reply.3 \
+xcb_randr_query_output_property_unchecked.3 \
+xcb_randr_query_output_property_valid_values.3 \
+xcb_randr_query_output_property_valid_values_end.3 \
+xcb_randr_query_output_property_valid_values_length.3 \
+xcb_randr_query_version.3 \
+xcb_randr_query_version_reply.3 \
+xcb_randr_query_version_unchecked.3 \
+xcb_randr_screen_change_notify_event_t.3 \
+xcb_randr_select_input.3 \
+xcb_randr_select_input_checked.3 \
+xcb_randr_set_crtc_config.3 \
+xcb_randr_set_crtc_config_reply.3 \
+xcb_randr_set_crtc_config_unchecked.3 \
+xcb_randr_set_crtc_gamma.3 \
+xcb_randr_set_crtc_gamma_checked.3 \
+xcb_randr_set_crtc_transform.3 \
+xcb_randr_set_crtc_transform_checked.3 \
+xcb_randr_set_output_primary.3 \
+xcb_randr_set_output_primary_checked.3 \
+xcb_randr_set_panning.3 \
+xcb_randr_set_panning_reply.3 \
+xcb_randr_set_panning_unchecked.3 \
+xcb_randr_set_screen_config.3 \
+xcb_randr_set_screen_config_reply.3 \
+xcb_randr_set_screen_config_unchecked.3 \
+xcb_randr_set_screen_size.3 \
+xcb_randr_set_screen_size_checked.3 \
+xcb_recolor_cursor.3 \
+xcb_recolor_cursor_checked.3 \
+xcb_record_create_context.3 \
+xcb_record_create_context_checked.3 \
+xcb_record_disable_context.3 \
+xcb_record_disable_context_checked.3 \
+xcb_record_enable_context.3 \
+xcb_record_enable_context_data.3 \
+xcb_record_enable_context_data_end.3 \
+xcb_record_enable_context_data_length.3 \
+xcb_record_enable_context_reply.3 \
+xcb_record_enable_context_unchecked.3 \
+xcb_record_free_context.3 \
+xcb_record_free_context_checked.3 \
+xcb_record_get_context.3 \
+xcb_record_get_context_intercepted_clients_iterator.3 \
+xcb_record_get_context_intercepted_clients_length.3 \
+xcb_record_get_context_reply.3 \
+xcb_record_get_context_unchecked.3 \
+xcb_record_query_version.3 \
+xcb_record_query_version_reply.3 \
+xcb_record_query_version_unchecked.3 \
+xcb_record_register_clients.3 \
+xcb_record_register_clients_checked.3 \
+xcb_record_unregister_clients.3 \
+xcb_record_unregister_clients_checked.3 \
+xcb_render_add_glyphs.3 \
+xcb_render_add_glyphs_checked.3 \
+xcb_render_add_traps.3 \
+xcb_render_add_traps_checked.3 \
+xcb_render_change_picture.3 \
+xcb_render_change_picture_checked.3 \
+xcb_render_composite.3 \
+xcb_render_composite_checked.3 \
+xcb_render_composite_glyphs_16.3 \
+xcb_render_composite_glyphs_16_checked.3 \
+xcb_render_composite_glyphs_32.3 \
+xcb_render_composite_glyphs_32_checked.3 \
+xcb_render_composite_glyphs_8.3 \
+xcb_render_composite_glyphs_8_checked.3 \
+xcb_render_create_anim_cursor.3 \
+xcb_render_create_anim_cursor_checked.3 \
+xcb_render_create_conical_gradient.3 \
+xcb_render_create_conical_gradient_checked.3 \
+xcb_render_create_cursor.3 \
+xcb_render_create_cursor_checked.3 \
+xcb_render_create_glyph_set.3 \
+xcb_render_create_glyph_set_checked.3 \
+xcb_render_create_linear_gradient.3 \
+xcb_render_create_linear_gradient_checked.3 \
+xcb_render_create_picture.3 \
+xcb_render_create_picture_checked.3 \
+xcb_render_create_radial_gradient.3 \
+xcb_render_create_radial_gradient_checked.3 \
+xcb_render_create_solid_fill.3 \
+xcb_render_create_solid_fill_checked.3 \
+xcb_render_fill_rectangles.3 \
+xcb_render_fill_rectangles_checked.3 \
+xcb_render_free_glyph_set.3 \
+xcb_render_free_glyph_set_checked.3 \
+xcb_render_free_glyphs.3 \
+xcb_render_free_glyphs_checked.3 \
+xcb_render_free_picture.3 \
+xcb_render_free_picture_checked.3 \
+xcb_render_query_filters.3 \
+xcb_render_query_filters_aliases.3 \
+xcb_render_query_filters_aliases_end.3 \
+xcb_render_query_filters_aliases_length.3 \
+xcb_render_query_filters_filters_iterator.3 \
+xcb_render_query_filters_filters_length.3 \
+xcb_render_query_filters_reply.3 \
+xcb_render_query_filters_unchecked.3 \
+xcb_render_query_pict_formats.3 \
+xcb_render_query_pict_formats_formats.3 \
+xcb_render_query_pict_formats_formats_iterator.3 \
+xcb_render_query_pict_formats_formats_length.3 \
+xcb_render_query_pict_formats_reply.3 \
+xcb_render_query_pict_formats_screens_iterator.3 \
+xcb_render_query_pict_formats_screens_length.3 \
+xcb_render_query_pict_formats_subpixels.3 \
+xcb_render_query_pict_formats_subpixels_end.3 \
+xcb_render_query_pict_formats_subpixels_length.3 \
+xcb_render_query_pict_formats_unchecked.3 \
+xcb_render_query_pict_index_values.3 \
+xcb_render_query_pict_index_values_reply.3 \
+xcb_render_query_pict_index_values_unchecked.3 \
+xcb_render_query_pict_index_values_values.3 \
+xcb_render_query_pict_index_values_values_iterator.3 \
+xcb_render_query_pict_index_values_values_length.3 \
+xcb_render_query_version.3 \
+xcb_render_query_version_reply.3 \
+xcb_render_query_version_unchecked.3 \
+xcb_render_reference_glyph_set.3 \
+xcb_render_reference_glyph_set_checked.3 \
+xcb_render_set_picture_clip_rectangles.3 \
+xcb_render_set_picture_clip_rectangles_checked.3 \
+xcb_render_set_picture_filter.3 \
+xcb_render_set_picture_filter_checked.3 \
+xcb_render_set_picture_transform.3 \
+xcb_render_set_picture_transform_checked.3 \
+xcb_render_trapezoids.3 \
+xcb_render_trapezoids_checked.3 \
+xcb_render_tri_fan.3 \
+xcb_render_tri_fan_checked.3 \
+xcb_render_tri_strip.3 \
+xcb_render_tri_strip_checked.3 \
+xcb_render_triangles.3 \
+xcb_render_triangles_checked.3 \
+xcb_reparent_notify_event_t.3 \
+xcb_reparent_window.3 \
+xcb_reparent_window_checked.3 \
+xcb_res_query_client_pixmap_bytes.3 \
+xcb_res_query_client_pixmap_bytes_reply.3 \
+xcb_res_query_client_pixmap_bytes_unchecked.3 \
+xcb_res_query_client_resources.3 \
+xcb_res_query_client_resources_reply.3 \
+xcb_res_query_client_resources_types.3 \
+xcb_res_query_client_resources_types_iterator.3 \
+xcb_res_query_client_resources_types_length.3 \
+xcb_res_query_client_resources_unchecked.3 \
+xcb_res_query_clients.3 \
+xcb_res_query_clients_clients.3 \
+xcb_res_query_clients_clients_iterator.3 \
+xcb_res_query_clients_clients_length.3 \
+xcb_res_query_clients_reply.3 \
+xcb_res_query_clients_unchecked.3 \
+xcb_res_query_version.3 \
+xcb_res_query_version_reply.3 \
+xcb_res_query_version_unchecked.3 \
+xcb_resize_request_event_t.3 \
+xcb_rotate_properties.3 \
+xcb_rotate_properties_checked.3 \
+xcb_screensaver_notify_event_t.3 \
+xcb_screensaver_query_info.3 \
+xcb_screensaver_query_info_reply.3 \
+xcb_screensaver_query_info_unchecked.3 \
+xcb_screensaver_query_version.3 \
+xcb_screensaver_query_version_reply.3 \
+xcb_screensaver_query_version_unchecked.3 \
+xcb_screensaver_select_input.3 \
+xcb_screensaver_select_input_checked.3 \
+xcb_screensaver_set_attributes.3 \
+xcb_screensaver_set_attributes_checked.3 \
+xcb_screensaver_suspend.3 \
+xcb_screensaver_suspend_checked.3 \
+xcb_screensaver_unset_attributes.3 \
+xcb_screensaver_unset_attributes_checked.3 \
+xcb_selection_clear_event_t.3 \
+xcb_selection_notify_event_t.3 \
+xcb_selection_request_event_t.3 \
+xcb_selinux_get_client_context.3 \
+xcb_selinux_get_client_context_context.3 \
+xcb_selinux_get_client_context_context_end.3 \
+xcb_selinux_get_client_context_context_length.3 \
+xcb_selinux_get_client_context_reply.3 \
+xcb_selinux_get_client_context_unchecked.3 \
+xcb_selinux_get_device_context.3 \
+xcb_selinux_get_device_context_context.3 \
+xcb_selinux_get_device_context_context_end.3 \
+xcb_selinux_get_device_context_context_length.3 \
+xcb_selinux_get_device_context_reply.3 \
+xcb_selinux_get_device_context_unchecked.3 \
+xcb_selinux_get_device_create_context.3 \
+xcb_selinux_get_device_create_context_context.3 \
+xcb_selinux_get_device_create_context_context_end.3 \
+xcb_selinux_get_device_create_context_context_length.3 \
+xcb_selinux_get_device_create_context_reply.3 \
+xcb_selinux_get_device_create_context_unchecked.3 \
+xcb_selinux_get_property_context.3 \
+xcb_selinux_get_property_context_context.3 \
+xcb_selinux_get_property_context_context_end.3 \
+xcb_selinux_get_property_context_context_length.3 \
+xcb_selinux_get_property_context_reply.3 \
+xcb_selinux_get_property_context_unchecked.3 \
+xcb_selinux_get_property_create_context.3 \
+xcb_selinux_get_property_create_context_context.3 \
+xcb_selinux_get_property_create_context_context_end.3 \
+xcb_selinux_get_property_create_context_context_length.3 \
+xcb_selinux_get_property_create_context_reply.3 \
+xcb_selinux_get_property_create_context_unchecked.3 \
+xcb_selinux_get_property_data_context.3 \
+xcb_selinux_get_property_data_context_context.3 \
+xcb_selinux_get_property_data_context_context_end.3 \
+xcb_selinux_get_property_data_context_context_length.3 \
+xcb_selinux_get_property_data_context_reply.3 \
+xcb_selinux_get_property_data_context_unchecked.3 \
+xcb_selinux_get_property_use_context.3 \
+xcb_selinux_get_property_use_context_context.3 \
+xcb_selinux_get_property_use_context_context_end.3 \
+xcb_selinux_get_property_use_context_context_length.3 \
+xcb_selinux_get_property_use_context_reply.3 \
+xcb_selinux_get_property_use_context_unchecked.3 \
+xcb_selinux_get_selection_context.3 \
+xcb_selinux_get_selection_context_context.3 \
+xcb_selinux_get_selection_context_context_end.3 \
+xcb_selinux_get_selection_context_context_length.3 \
+xcb_selinux_get_selection_context_reply.3 \
+xcb_selinux_get_selection_context_unchecked.3 \
+xcb_selinux_get_selection_create_context.3 \
+xcb_selinux_get_selection_create_context_context.3 \
+xcb_selinux_get_selection_create_context_context_end.3 \
+xcb_selinux_get_selection_create_context_context_length.3 \
+xcb_selinux_get_selection_create_context_reply.3 \
+xcb_selinux_get_selection_create_context_unchecked.3 \
+xcb_selinux_get_selection_data_context.3 \
+xcb_selinux_get_selection_data_context_context.3 \
+xcb_selinux_get_selection_data_context_context_end.3 \
+xcb_selinux_get_selection_data_context_context_length.3 \
+xcb_selinux_get_selection_data_context_reply.3 \
+xcb_selinux_get_selection_data_context_unchecked.3 \
+xcb_selinux_get_selection_use_context.3 \
+xcb_selinux_get_selection_use_context_context.3 \
+xcb_selinux_get_selection_use_context_context_end.3 \
+xcb_selinux_get_selection_use_context_context_length.3 \
+xcb_selinux_get_selection_use_context_reply.3 \
+xcb_selinux_get_selection_use_context_unchecked.3 \
+xcb_selinux_get_window_context.3 \
+xcb_selinux_get_window_context_context.3 \
+xcb_selinux_get_window_context_context_end.3 \
+xcb_selinux_get_window_context_context_length.3 \
+xcb_selinux_get_window_context_reply.3 \
+xcb_selinux_get_window_context_unchecked.3 \
+xcb_selinux_get_window_create_context.3 \
+xcb_selinux_get_window_create_context_context.3 \
+xcb_selinux_get_window_create_context_context_end.3 \
+xcb_selinux_get_window_create_context_context_length.3 \
+xcb_selinux_get_window_create_context_reply.3 \
+xcb_selinux_get_window_create_context_unchecked.3 \
+xcb_selinux_list_properties.3 \
+xcb_selinux_list_properties_properties_iterator.3 \
+xcb_selinux_list_properties_properties_length.3 \
+xcb_selinux_list_properties_reply.3 \
+xcb_selinux_list_properties_unchecked.3 \
+xcb_selinux_list_selections.3 \
+xcb_selinux_list_selections_reply.3 \
+xcb_selinux_list_selections_selections_iterator.3 \
+xcb_selinux_list_selections_selections_length.3 \
+xcb_selinux_list_selections_unchecked.3 \
+xcb_selinux_query_version.3 \
+xcb_selinux_query_version_reply.3 \
+xcb_selinux_query_version_unchecked.3 \
+xcb_selinux_set_device_context.3 \
+xcb_selinux_set_device_context_checked.3 \
+xcb_selinux_set_device_create_context.3 \
+xcb_selinux_set_device_create_context_checked.3 \
+xcb_selinux_set_property_create_context.3 \
+xcb_selinux_set_property_create_context_checked.3 \
+xcb_selinux_set_property_use_context.3 \
+xcb_selinux_set_property_use_context_checked.3 \
+xcb_selinux_set_selection_create_context.3 \
+xcb_selinux_set_selection_create_context_checked.3 \
+xcb_selinux_set_selection_use_context.3 \
+xcb_selinux_set_selection_use_context_checked.3 \
+xcb_selinux_set_window_create_context.3 \
+xcb_selinux_set_window_create_context_checked.3 \
+xcb_send_event.3 \
+xcb_send_event_checked.3 \
+xcb_set_access_control.3 \
+xcb_set_access_control_checked.3 \
+xcb_set_clip_rectangles.3 \
+xcb_set_clip_rectangles_checked.3 \
+xcb_set_close_down_mode.3 \
+xcb_set_close_down_mode_checked.3 \
+xcb_set_dashes.3 \
+xcb_set_dashes_checked.3 \
+xcb_set_font_path.3 \
+xcb_set_font_path_checked.3 \
+xcb_set_input_focus.3 \
+xcb_set_input_focus_checked.3 \
+xcb_set_modifier_mapping.3 \
+xcb_set_modifier_mapping_reply.3 \
+xcb_set_modifier_mapping_unchecked.3 \
+xcb_set_pointer_mapping.3 \
+xcb_set_pointer_mapping_reply.3 \
+xcb_set_pointer_mapping_unchecked.3 \
+xcb_set_screen_saver.3 \
+xcb_set_screen_saver_checked.3 \
+xcb_set_selection_owner.3 \
+xcb_set_selection_owner_checked.3 \
+xcb_shape_combine.3 \
+xcb_shape_combine_checked.3 \
+xcb_shape_get_rectangles.3 \
+xcb_shape_get_rectangles_rectangles.3 \
+xcb_shape_get_rectangles_rectangles_iterator.3 \
+xcb_shape_get_rectangles_rectangles_length.3 \
+xcb_shape_get_rectangles_reply.3 \
+xcb_shape_get_rectangles_unchecked.3 \
+xcb_shape_input_selected.3 \
+xcb_shape_input_selected_reply.3 \
+xcb_shape_input_selected_unchecked.3 \
+xcb_shape_mask.3 \
+xcb_shape_mask_checked.3 \
+xcb_shape_notify_event_t.3 \
+xcb_shape_offset.3 \
+xcb_shape_offset_checked.3 \
+xcb_shape_query_extents.3 \
+xcb_shape_query_extents_reply.3 \
+xcb_shape_query_extents_unchecked.3 \
+xcb_shape_query_version.3 \
+xcb_shape_query_version_reply.3 \
+xcb_shape_query_version_unchecked.3 \
+xcb_shape_rectangles.3 \
+xcb_shape_rectangles_checked.3 \
+xcb_shape_select_input.3 \
+xcb_shape_select_input_checked.3 \
+xcb_shm_attach.3 \
+xcb_shm_attach_checked.3 \
+xcb_shm_completion_event_t.3 \
+xcb_shm_create_pixmap.3 \
+xcb_shm_create_pixmap_checked.3 \
+xcb_shm_detach.3 \
+xcb_shm_detach_checked.3 \
+xcb_shm_get_image.3 \
+xcb_shm_get_image_reply.3 \
+xcb_shm_get_image_unchecked.3 \
+xcb_shm_put_image.3 \
+xcb_shm_put_image_checked.3 \
+xcb_shm_query_version.3 \
+xcb_shm_query_version_reply.3 \
+xcb_shm_query_version_unchecked.3 \
+xcb_store_colors.3 \
+xcb_store_colors_checked.3 \
+xcb_store_named_color.3 \
+xcb_store_named_color_checked.3 \
+xcb_sync_alarm_notify_event_t.3 \
+xcb_sync_await.3 \
+xcb_sync_await_checked.3 \
+xcb_sync_await_fence.3 \
+xcb_sync_await_fence_checked.3 \
+xcb_sync_change_alarm.3 \
+xcb_sync_change_alarm_checked.3 \
+xcb_sync_change_counter.3 \
+xcb_sync_change_counter_checked.3 \
+xcb_sync_counter_notify_event_t.3 \
+xcb_sync_create_alarm.3 \
+xcb_sync_create_alarm_checked.3 \
+xcb_sync_create_counter.3 \
+xcb_sync_create_counter_checked.3 \
+xcb_sync_create_fence.3 \
+xcb_sync_create_fence_checked.3 \
+xcb_sync_destroy_alarm.3 \
+xcb_sync_destroy_alarm_checked.3 \
+xcb_sync_destroy_counter.3 \
+xcb_sync_destroy_counter_checked.3 \
+xcb_sync_destroy_fence.3 \
+xcb_sync_destroy_fence_checked.3 \
+xcb_sync_get_priority.3 \
+xcb_sync_get_priority_reply.3 \
+xcb_sync_get_priority_unchecked.3 \
+xcb_sync_initialize.3 \
+xcb_sync_initialize_reply.3 \
+xcb_sync_initialize_unchecked.3 \
+xcb_sync_list_system_counters.3 \
+xcb_sync_list_system_counters_counters_iterator.3 \
+xcb_sync_list_system_counters_counters_length.3 \
+xcb_sync_list_system_counters_reply.3 \
+xcb_sync_list_system_counters_unchecked.3 \
+xcb_sync_query_alarm.3 \
+xcb_sync_query_alarm_reply.3 \
+xcb_sync_query_alarm_unchecked.3 \
+xcb_sync_query_counter.3 \
+xcb_sync_query_counter_reply.3 \
+xcb_sync_query_counter_unchecked.3 \
+xcb_sync_query_fence.3 \
+xcb_sync_query_fence_reply.3 \
+xcb_sync_query_fence_unchecked.3 \
+xcb_sync_reset_fence.3 \
+xcb_sync_reset_fence_checked.3 \
+xcb_sync_set_counter.3 \
+xcb_sync_set_counter_checked.3 \
+xcb_sync_set_priority.3 \
+xcb_sync_set_priority_checked.3 \
+xcb_sync_trigger_fence.3 \
+xcb_sync_trigger_fence_checked.3 \
+xcb_test_compare_cursor.3 \
+xcb_test_compare_cursor_reply.3 \
+xcb_test_compare_cursor_unchecked.3 \
+xcb_test_fake_input.3 \
+xcb_test_fake_input_checked.3 \
+xcb_test_get_version.3 \
+xcb_test_get_version_reply.3 \
+xcb_test_get_version_unchecked.3 \
+xcb_test_grab_control.3 \
+xcb_test_grab_control_checked.3 \
+xcb_translate_coordinates.3 \
+xcb_translate_coordinates_reply.3 \
+xcb_translate_coordinates_unchecked.3 \
+xcb_ungrab_button.3 \
+xcb_ungrab_button_checked.3 \
+xcb_ungrab_key.3 \
+xcb_ungrab_key_checked.3 \
+xcb_ungrab_keyboard.3 \
+xcb_ungrab_keyboard_checked.3 \
+xcb_ungrab_pointer.3 \
+xcb_ungrab_pointer_checked.3 \
+xcb_ungrab_server.3 \
+xcb_ungrab_server_checked.3 \
+xcb_uninstall_colormap.3 \
+xcb_uninstall_colormap_checked.3 \
+xcb_unmap_notify_event_t.3 \
+xcb_unmap_subwindows.3 \
+xcb_unmap_subwindows_checked.3 \
+xcb_unmap_window.3 \
+xcb_unmap_window_checked.3 \
+xcb_visibility_notify_event_t.3 \
+xcb_warp_pointer.3 \
+xcb_warp_pointer_checked.3 \
+xcb_x_print_attribut_notify_event_t.3 \
+xcb_x_print_create_context.3 \
+xcb_x_print_create_context_checked.3 \
+xcb_x_print_notify_event_t.3 \
+xcb_x_print_print_destroy_context.3 \
+xcb_x_print_print_destroy_context_checked.3 \
+xcb_x_print_print_end_doc.3 \
+xcb_x_print_print_end_doc_checked.3 \
+xcb_x_print_print_end_job.3 \
+xcb_x_print_print_end_job_checked.3 \
+xcb_x_print_print_end_page.3 \
+xcb_x_print_print_end_page_checked.3 \
+xcb_x_print_print_get_attributes.3 \
+xcb_x_print_print_get_attributes_reply.3 \
+xcb_x_print_print_get_attributes_unchecked.3 \
+xcb_x_print_print_get_context.3 \
+xcb_x_print_print_get_context_reply.3 \
+xcb_x_print_print_get_context_unchecked.3 \
+xcb_x_print_print_get_document_data.3 \
+xcb_x_print_print_get_document_data_data.3 \
+xcb_x_print_print_get_document_data_data_end.3 \
+xcb_x_print_print_get_document_data_data_length.3 \
+xcb_x_print_print_get_document_data_reply.3 \
+xcb_x_print_print_get_document_data_unchecked.3 \
+xcb_x_print_print_get_image_resolution.3 \
+xcb_x_print_print_get_image_resolution_reply.3 \
+xcb_x_print_print_get_image_resolution_unchecked.3 \
+xcb_x_print_print_get_one_attributes.3 \
+xcb_x_print_print_get_one_attributes_reply.3 \
+xcb_x_print_print_get_one_attributes_unchecked.3 \
+xcb_x_print_print_get_one_attributes_value.3 \
+xcb_x_print_print_get_one_attributes_value_end.3 \
+xcb_x_print_print_get_one_attributes_value_length.3 \
+xcb_x_print_print_get_page_dimensions.3 \
+xcb_x_print_print_get_page_dimensions_reply.3 \
+xcb_x_print_print_get_page_dimensions_unchecked.3 \
+xcb_x_print_print_get_printer_list.3 \
+xcb_x_print_print_get_printer_list_printers_iterator.3 \
+xcb_x_print_print_get_printer_list_printers_length.3 \
+xcb_x_print_print_get_printer_list_reply.3 \
+xcb_x_print_print_get_printer_list_unchecked.3 \
+xcb_x_print_print_get_screen_of_context.3 \
+xcb_x_print_print_get_screen_of_context_reply.3 \
+xcb_x_print_print_get_screen_of_context_unchecked.3 \
+xcb_x_print_print_input_selected.3 \
+xcb_x_print_print_input_selected_all_events_list.3 \
+xcb_x_print_print_input_selected_all_events_list_end.3 \
+xcb_x_print_print_input_selected_all_events_list_length.3 \
+xcb_x_print_print_input_selected_event_list.3 \
+xcb_x_print_print_input_selected_event_list_end.3 \
+xcb_x_print_print_input_selected_event_list_length.3 \
+xcb_x_print_print_input_selected_reply.3 \
+xcb_x_print_print_input_selected_unchecked.3 \
+xcb_x_print_print_put_document_data.3 \
+xcb_x_print_print_put_document_data_checked.3 \
+xcb_x_print_print_query_screens.3 \
+xcb_x_print_print_query_screens_reply.3 \
+xcb_x_print_print_query_screens_roots.3 \
+xcb_x_print_print_query_screens_roots_end.3 \
+xcb_x_print_print_query_screens_roots_length.3 \
+xcb_x_print_print_query_screens_unchecked.3 \
+xcb_x_print_print_query_version.3 \
+xcb_x_print_print_query_version_reply.3 \
+xcb_x_print_print_query_version_unchecked.3 \
+xcb_x_print_print_rehash_printer_list.3 \
+xcb_x_print_print_rehash_printer_list_checked.3 \
+xcb_x_print_print_select_input.3 \
+xcb_x_print_print_select_input_checked.3 \
+xcb_x_print_print_set_attributes.3 \
+xcb_x_print_print_set_attributes_checked.3 \
+xcb_x_print_print_set_context.3 \
+xcb_x_print_print_set_context_checked.3 \
+xcb_x_print_print_set_image_resolution.3 \
+xcb_x_print_print_set_image_resolution_reply.3 \
+xcb_x_print_print_set_image_resolution_unchecked.3 \
+xcb_x_print_print_start_doc.3 \
+xcb_x_print_print_start_doc_checked.3 \
+xcb_x_print_print_start_job.3 \
+xcb_x_print_print_start_job_checked.3 \
+xcb_x_print_print_start_page.3 \
+xcb_x_print_print_start_page_checked.3 \
+xcb_xc_misc_get_version.3 \
+xcb_xc_misc_get_version_reply.3 \
+xcb_xc_misc_get_version_unchecked.3 \
+xcb_xc_misc_get_xid_list.3 \
+xcb_xc_misc_get_xid_list_ids.3 \
+xcb_xc_misc_get_xid_list_ids_end.3 \
+xcb_xc_misc_get_xid_list_ids_length.3 \
+xcb_xc_misc_get_xid_list_reply.3 \
+xcb_xc_misc_get_xid_list_unchecked.3 \
+xcb_xc_misc_get_xid_range.3 \
+xcb_xc_misc_get_xid_range_reply.3 \
+xcb_xc_misc_get_xid_range_unchecked.3 \
+xcb_xevie_end.3 \
+xcb_xevie_end_reply.3 \
+xcb_xevie_end_unchecked.3 \
+xcb_xevie_query_version.3 \
+xcb_xevie_query_version_reply.3 \
+xcb_xevie_query_version_unchecked.3 \
+xcb_xevie_select_input.3 \
+xcb_xevie_select_input_reply.3 \
+xcb_xevie_select_input_unchecked.3 \
+xcb_xevie_send.3 \
+xcb_xevie_send_reply.3 \
+xcb_xevie_send_unchecked.3 \
+xcb_xevie_start.3 \
+xcb_xevie_start_reply.3 \
+xcb_xevie_start_unchecked.3 \
+xcb_xf86dri_auth_connection.3 \
+xcb_xf86dri_auth_connection_reply.3 \
+xcb_xf86dri_auth_connection_unchecked.3 \
+xcb_xf86dri_close_connection.3 \
+xcb_xf86dri_close_connection_checked.3 \
+xcb_xf86dri_create_context.3 \
+xcb_xf86dri_create_context_reply.3 \
+xcb_xf86dri_create_context_unchecked.3 \
+xcb_xf86dri_create_drawable.3 \
+xcb_xf86dri_create_drawable_reply.3 \
+xcb_xf86dri_create_drawable_unchecked.3 \
+xcb_xf86dri_destroy_context.3 \
+xcb_xf86dri_destroy_context_checked.3 \
+xcb_xf86dri_destroy_drawable.3 \
+xcb_xf86dri_destroy_drawable_checked.3 \
+xcb_xf86dri_get_client_driver_name.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
+xcb_xf86dri_get_client_driver_name_reply.3 \
+xcb_xf86dri_get_client_driver_name_unchecked.3 \
+xcb_xf86dri_get_device_info.3 \
+xcb_xf86dri_get_device_info_device_private.3 \
+xcb_xf86dri_get_device_info_device_private_end.3 \
+xcb_xf86dri_get_device_info_device_private_length.3 \
+xcb_xf86dri_get_device_info_reply.3 \
+xcb_xf86dri_get_device_info_unchecked.3 \
+xcb_xf86dri_get_drawable_info.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
+xcb_xf86dri_get_drawable_info_clip_rects.3 \
+xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
+xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
+xcb_xf86dri_get_drawable_info_reply.3 \
+xcb_xf86dri_get_drawable_info_unchecked.3 \
+xcb_xf86dri_open_connection.3 \
+xcb_xf86dri_open_connection_bus_id.3 \
+xcb_xf86dri_open_connection_bus_id_end.3 \
+xcb_xf86dri_open_connection_bus_id_length.3 \
+xcb_xf86dri_open_connection_reply.3 \
+xcb_xf86dri_open_connection_unchecked.3 \
+xcb_xf86dri_query_direct_rendering_capable.3 \
+xcb_xf86dri_query_direct_rendering_capable_reply.3 \
+xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
+xcb_xf86dri_query_version.3 \
+xcb_xf86dri_query_version_reply.3 \
+xcb_xf86dri_query_version_unchecked.3 \
+xcb_xfixes_change_cursor.3 \
+xcb_xfixes_change_cursor_by_name.3 \
+xcb_xfixes_change_cursor_by_name_checked.3 \
+xcb_xfixes_change_cursor_checked.3 \
+xcb_xfixes_change_save_set.3 \
+xcb_xfixes_change_save_set_checked.3 \
+xcb_xfixes_copy_region.3 \
+xcb_xfixes_copy_region_checked.3 \
+xcb_xfixes_create_region.3 \
+xcb_xfixes_create_region_checked.3 \
+xcb_xfixes_create_region_from_bitmap.3 \
+xcb_xfixes_create_region_from_bitmap_checked.3 \
+xcb_xfixes_create_region_from_gc.3 \
+xcb_xfixes_create_region_from_gc_checked.3 \
+xcb_xfixes_create_region_from_picture.3 \
+xcb_xfixes_create_region_from_picture_checked.3 \
+xcb_xfixes_create_region_from_window.3 \
+xcb_xfixes_create_region_from_window_checked.3 \
+xcb_xfixes_cursor_notify_event_t.3 \
+xcb_xfixes_destroy_region.3 \
+xcb_xfixes_destroy_region_checked.3 \
+xcb_xfixes_expand_region.3 \
+xcb_xfixes_expand_region_checked.3 \
+xcb_xfixes_fetch_region.3 \
+xcb_xfixes_fetch_region_rectangles.3 \
+xcb_xfixes_fetch_region_rectangles_iterator.3 \
+xcb_xfixes_fetch_region_rectangles_length.3 \
+xcb_xfixes_fetch_region_reply.3 \
+xcb_xfixes_fetch_region_unchecked.3 \
+xcb_xfixes_get_cursor_image.3 \
+xcb_xfixes_get_cursor_image_and_name.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
+xcb_xfixes_get_cursor_image_and_name_name.3 \
+xcb_xfixes_get_cursor_image_and_name_name_end.3 \
+xcb_xfixes_get_cursor_image_and_name_name_length.3 \
+xcb_xfixes_get_cursor_image_and_name_reply.3 \
+xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
+xcb_xfixes_get_cursor_image_cursor_image.3 \
+xcb_xfixes_get_cursor_image_cursor_image_end.3 \
+xcb_xfixes_get_cursor_image_cursor_image_length.3 \
+xcb_xfixes_get_cursor_image_reply.3 \
+xcb_xfixes_get_cursor_image_unchecked.3 \
+xcb_xfixes_get_cursor_name.3 \
+xcb_xfixes_get_cursor_name_name.3 \
+xcb_xfixes_get_cursor_name_name_end.3 \
+xcb_xfixes_get_cursor_name_name_length.3 \
+xcb_xfixes_get_cursor_name_reply.3 \
+xcb_xfixes_get_cursor_name_unchecked.3 \
+xcb_xfixes_hide_cursor.3 \
+xcb_xfixes_hide_cursor_checked.3 \
+xcb_xfixes_intersect_region.3 \
+xcb_xfixes_intersect_region_checked.3 \
+xcb_xfixes_invert_region.3 \
+xcb_xfixes_invert_region_checked.3 \
+xcb_xfixes_query_version.3 \
+xcb_xfixes_query_version_reply.3 \
+xcb_xfixes_query_version_unchecked.3 \
+xcb_xfixes_region_extents.3 \
+xcb_xfixes_region_extents_checked.3 \
+xcb_xfixes_select_cursor_input.3 \
+xcb_xfixes_select_cursor_input_checked.3 \
+xcb_xfixes_select_selection_input.3 \
+xcb_xfixes_select_selection_input_checked.3 \
+xcb_xfixes_selection_notify_event_t.3 \
+xcb_xfixes_set_cursor_name.3 \
+xcb_xfixes_set_cursor_name_checked.3 \
+xcb_xfixes_set_gc_clip_region.3 \
+xcb_xfixes_set_gc_clip_region_checked.3 \
+xcb_xfixes_set_picture_clip_region.3 \
+xcb_xfixes_set_picture_clip_region_checked.3 \
+xcb_xfixes_set_region.3 \
+xcb_xfixes_set_region_checked.3 \
+xcb_xfixes_set_window_shape_region.3 \
+xcb_xfixes_set_window_shape_region_checked.3 \
+xcb_xfixes_show_cursor.3 \
+xcb_xfixes_show_cursor_checked.3 \
+xcb_xfixes_subtract_region.3 \
+xcb_xfixes_subtract_region_checked.3 \
+xcb_xfixes_translate_region.3 \
+xcb_xfixes_translate_region_checked.3 \
+xcb_xfixes_union_region.3 \
+xcb_xfixes_union_region_checked.3 \
+xcb_xinerama_get_screen_count.3 \
+xcb_xinerama_get_screen_count_reply.3 \
+xcb_xinerama_get_screen_count_unchecked.3 \
+xcb_xinerama_get_screen_size.3 \
+xcb_xinerama_get_screen_size_reply.3 \
+xcb_xinerama_get_screen_size_unchecked.3 \
+xcb_xinerama_get_state.3 \
+xcb_xinerama_get_state_reply.3 \
+xcb_xinerama_get_state_unchecked.3 \
+xcb_xinerama_is_active.3 \
+xcb_xinerama_is_active_reply.3 \
+xcb_xinerama_is_active_unchecked.3 \
+xcb_xinerama_query_screens.3 \
+xcb_xinerama_query_screens_reply.3 \
+xcb_xinerama_query_screens_screen_info.3 \
+xcb_xinerama_query_screens_screen_info_iterator.3 \
+xcb_xinerama_query_screens_screen_info_length.3 \
+xcb_xinerama_query_screens_unchecked.3 \
+xcb_xinerama_query_version.3 \
+xcb_xinerama_query_version_reply.3 \
+xcb_xinerama_query_version_unchecked.3 \
+xcb_xkb_access_x_notify_event_t.3 \
+xcb_xkb_action_message_event_t.3 \
+xcb_xkb_bell.3 \
+xcb_xkb_bell_checked.3 \
+xcb_xkb_bell_notify_event_t.3 \
+xcb_xkb_compat_map_notify_event_t.3 \
+xcb_xkb_controls_notify_event_t.3 \
+xcb_xkb_extension_device_notify_event_t.3 \
+xcb_xkb_get_compat_map.3 \
+xcb_xkb_get_compat_map_group_rtrn.3 \
+xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
+xcb_xkb_get_compat_map_group_rtrn_length.3 \
+xcb_xkb_get_compat_map_reply.3 \
+xcb_xkb_get_compat_map_si_rtrn.3 \
+xcb_xkb_get_compat_map_si_rtrn_end.3 \
+xcb_xkb_get_compat_map_si_rtrn_length.3 \
+xcb_xkb_get_compat_map_unchecked.3 \
+xcb_xkb_get_controls.3 \
+xcb_xkb_get_controls_reply.3 \
+xcb_xkb_get_controls_unchecked.3 \
+xcb_xkb_get_device_info.3 \
+xcb_xkb_get_device_info_btn_actions.3 \
+xcb_xkb_get_device_info_btn_actions_iterator.3 \
+xcb_xkb_get_device_info_btn_actions_length.3 \
+xcb_xkb_get_device_info_leds_iterator.3 \
+xcb_xkb_get_device_info_leds_length.3 \
+xcb_xkb_get_device_info_name.3 \
+xcb_xkb_get_device_info_name_end.3 \
+xcb_xkb_get_device_info_name_length.3 \
+xcb_xkb_get_device_info_reply.3 \
+xcb_xkb_get_device_info_unchecked.3 \
+xcb_xkb_get_geometry.3 \
+xcb_xkb_get_geometry_colors_iterator.3 \
+xcb_xkb_get_geometry_colors_length.3 \
+xcb_xkb_get_geometry_doodads_iterator.3 \
+xcb_xkb_get_geometry_doodads_length.3 \
+xcb_xkb_get_geometry_key_aliases.3 \
+xcb_xkb_get_geometry_key_aliases_iterator.3 \
+xcb_xkb_get_geometry_key_aliases_length.3 \
+xcb_xkb_get_geometry_label_font.3 \
+xcb_xkb_get_geometry_properties_iterator.3 \
+xcb_xkb_get_geometry_properties_length.3 \
+xcb_xkb_get_geometry_reply.3 \
+xcb_xkb_get_geometry_sections_iterator.3 \
+xcb_xkb_get_geometry_sections_length.3 \
+xcb_xkb_get_geometry_shapes_iterator.3 \
+xcb_xkb_get_geometry_shapes_length.3 \
+xcb_xkb_get_geometry_unchecked.3 \
+xcb_xkb_get_indicator_map.3 \
+xcb_xkb_get_indicator_map_maps.3 \
+xcb_xkb_get_indicator_map_maps_iterator.3 \
+xcb_xkb_get_indicator_map_maps_length.3 \
+xcb_xkb_get_indicator_map_reply.3 \
+xcb_xkb_get_indicator_map_unchecked.3 \
+xcb_xkb_get_indicator_state.3 \
+xcb_xkb_get_indicator_state_reply.3 \
+xcb_xkb_get_indicator_state_unchecked.3 \
+xcb_xkb_get_kbd_by_name.3 \
+xcb_xkb_get_kbd_by_name_replies.3 \
+xcb_xkb_get_kbd_by_name_reply.3 \
+xcb_xkb_get_kbd_by_name_unchecked.3 \
+xcb_xkb_get_map.3 \
+xcb_xkb_get_map_map.3 \
+xcb_xkb_get_map_reply.3 \
+xcb_xkb_get_map_unchecked.3 \
+xcb_xkb_get_named_indicator.3 \
+xcb_xkb_get_named_indicator_reply.3 \
+xcb_xkb_get_named_indicator_unchecked.3 \
+xcb_xkb_get_names.3 \
+xcb_xkb_get_names_reply.3 \
+xcb_xkb_get_names_unchecked.3 \
+xcb_xkb_get_names_value_list.3 \
+xcb_xkb_get_state.3 \
+xcb_xkb_get_state_reply.3 \
+xcb_xkb_get_state_unchecked.3 \
+xcb_xkb_indicator_map_notify_event_t.3 \
+xcb_xkb_indicator_state_notify_event_t.3 \
+xcb_xkb_latch_lock_state.3 \
+xcb_xkb_latch_lock_state_checked.3 \
+xcb_xkb_list_components.3 \
+xcb_xkb_list_components_compat_maps_iterator.3 \
+xcb_xkb_list_components_compat_maps_length.3 \
+xcb_xkb_list_components_geometries_iterator.3 \
+xcb_xkb_list_components_geometries_length.3 \
+xcb_xkb_list_components_keycodes_iterator.3 \
+xcb_xkb_list_components_keycodes_length.3 \
+xcb_xkb_list_components_keymaps_iterator.3 \
+xcb_xkb_list_components_keymaps_length.3 \
+xcb_xkb_list_components_reply.3 \
+xcb_xkb_list_components_symbols_iterator.3 \
+xcb_xkb_list_components_symbols_length.3 \
+xcb_xkb_list_components_types_iterator.3 \
+xcb_xkb_list_components_types_length.3 \
+xcb_xkb_list_components_unchecked.3 \
+xcb_xkb_map_notify_event_t.3 \
+xcb_xkb_names_notify_event_t.3 \
+xcb_xkb_new_keyboard_notify_event_t.3 \
+xcb_xkb_per_client_flags.3 \
+xcb_xkb_per_client_flags_reply.3 \
+xcb_xkb_per_client_flags_unchecked.3 \
+xcb_xkb_select_events.3 \
+xcb_xkb_select_events_checked.3 \
+xcb_xkb_set_compat_map.3 \
+xcb_xkb_set_compat_map_checked.3 \
+xcb_xkb_set_controls.3 \
+xcb_xkb_set_controls_checked.3 \
+xcb_xkb_set_debugging_flags.3 \
+xcb_xkb_set_debugging_flags_reply.3 \
+xcb_xkb_set_debugging_flags_unchecked.3 \
+xcb_xkb_set_device_info.3 \
+xcb_xkb_set_device_info_checked.3 \
+xcb_xkb_set_geometry.3 \
+xcb_xkb_set_geometry_checked.3 \
+xcb_xkb_set_indicator_map.3 \
+xcb_xkb_set_indicator_map_checked.3 \
+xcb_xkb_set_map.3 \
+xcb_xkb_set_map_checked.3 \
+xcb_xkb_set_named_indicator.3 \
+xcb_xkb_set_named_indicator_checked.3 \
+xcb_xkb_set_names.3 \
+xcb_xkb_set_names_checked.3 \
+xcb_xkb_state_notify_event_t.3 \
+xcb_xkb_use_extension.3 \
+xcb_xkb_use_extension_reply.3 \
+xcb_xkb_use_extension_unchecked.3 \
+xcb_xv_get_port_attribute.3 \
+xcb_xv_get_port_attribute_reply.3 \
+xcb_xv_get_port_attribute_unchecked.3 \
+xcb_xv_get_still.3 \
+xcb_xv_get_still_checked.3 \
+xcb_xv_get_video.3 \
+xcb_xv_get_video_checked.3 \
+xcb_xv_grab_port.3 \
+xcb_xv_grab_port_reply.3 \
+xcb_xv_grab_port_unchecked.3 \
+xcb_xv_list_image_formats.3 \
+xcb_xv_list_image_formats_format.3 \
+xcb_xv_list_image_formats_format_iterator.3 \
+xcb_xv_list_image_formats_format_length.3 \
+xcb_xv_list_image_formats_reply.3 \
+xcb_xv_list_image_formats_unchecked.3 \
+xcb_xv_port_notify_event_t.3 \
+xcb_xv_put_image.3 \
+xcb_xv_put_image_checked.3 \
+xcb_xv_put_still.3 \
+xcb_xv_put_still_checked.3 \
+xcb_xv_put_video.3 \
+xcb_xv_put_video_checked.3 \
+xcb_xv_query_adaptors.3 \
+xcb_xv_query_adaptors_info_iterator.3 \
+xcb_xv_query_adaptors_info_length.3 \
+xcb_xv_query_adaptors_reply.3 \
+xcb_xv_query_adaptors_unchecked.3 \
+xcb_xv_query_best_size.3 \
+xcb_xv_query_best_size_reply.3 \
+xcb_xv_query_best_size_unchecked.3 \
+xcb_xv_query_encodings.3 \
+xcb_xv_query_encodings_info_iterator.3 \
+xcb_xv_query_encodings_info_length.3 \
+xcb_xv_query_encodings_reply.3 \
+xcb_xv_query_encodings_unchecked.3 \
+xcb_xv_query_extension.3 \
+xcb_xv_query_extension_reply.3 \
+xcb_xv_query_extension_unchecked.3 \
+xcb_xv_query_image_attributes.3 \
+xcb_xv_query_image_attributes_offsets.3 \
+xcb_xv_query_image_attributes_offsets_end.3 \
+xcb_xv_query_image_attributes_offsets_length.3 \
+xcb_xv_query_image_attributes_pitches.3 \
+xcb_xv_query_image_attributes_pitches_end.3 \
+xcb_xv_query_image_attributes_pitches_length.3 \
+xcb_xv_query_image_attributes_reply.3 \
+xcb_xv_query_image_attributes_unchecked.3 \
+xcb_xv_query_port_attributes.3 \
+xcb_xv_query_port_attributes_attributes_iterator.3 \
+xcb_xv_query_port_attributes_attributes_length.3 \
+xcb_xv_query_port_attributes_reply.3 \
+xcb_xv_query_port_attributes_unchecked.3 \
+xcb_xv_select_port_notify.3 \
+xcb_xv_select_port_notify_checked.3 \
+xcb_xv_select_video_notify.3 \
+xcb_xv_select_video_notify_checked.3 \
+xcb_xv_set_port_attribute.3 \
+xcb_xv_set_port_attribute_checked.3 \
+xcb_xv_shm_put_image.3 \
+xcb_xv_shm_put_image_checked.3 \
+xcb_xv_stop_video.3 \
+xcb_xv_stop_video_checked.3 \
+xcb_xv_ungrab_port.3 \
+xcb_xv_ungrab_port_checked.3 \
+xcb_xv_video_notify_event_t.3 \
+xcb_xvmc_create_context.3 \
+xcb_xvmc_create_context_priv_data.3 \
+xcb_xvmc_create_context_priv_data_end.3 \
+xcb_xvmc_create_context_priv_data_length.3 \
+xcb_xvmc_create_context_reply.3 \
+xcb_xvmc_create_context_unchecked.3 \
+xcb_xvmc_create_subpicture.3 \
+xcb_xvmc_create_subpicture_priv_data.3 \
+xcb_xvmc_create_subpicture_priv_data_end.3 \
+xcb_xvmc_create_subpicture_priv_data_length.3 \
+xcb_xvmc_create_subpicture_reply.3 \
+xcb_xvmc_create_subpicture_unchecked.3 \
+xcb_xvmc_create_surface.3 \
+xcb_xvmc_create_surface_priv_data.3 \
+xcb_xvmc_create_surface_priv_data_end.3 \
+xcb_xvmc_create_surface_priv_data_length.3 \
+xcb_xvmc_create_surface_reply.3 \
+xcb_xvmc_create_surface_unchecked.3 \
+xcb_xvmc_destroy_context.3 \
+xcb_xvmc_destroy_context_checked.3 \
+xcb_xvmc_destroy_subpicture.3 \
+xcb_xvmc_destroy_subpicture_checked.3 \
+xcb_xvmc_destroy_surface.3 \
+xcb_xvmc_destroy_surface_checked.3 \
+xcb_xvmc_list_subpicture_types.3 \
+xcb_xvmc_list_subpicture_types_reply.3 \
+xcb_xvmc_list_subpicture_types_types.3 \
+xcb_xvmc_list_subpicture_types_types_iterator.3 \
+xcb_xvmc_list_subpicture_types_types_length.3 \
+xcb_xvmc_list_subpicture_types_unchecked.3 \
+xcb_xvmc_list_surface_types.3 \
+xcb_xvmc_list_surface_types_reply.3 \
+xcb_xvmc_list_surface_types_surfaces.3 \
+xcb_xvmc_list_surface_types_surfaces_iterator.3 \
+xcb_xvmc_list_surface_types_surfaces_length.3 \
+xcb_xvmc_list_surface_types_unchecked.3 \
+xcb_xvmc_query_version.3 \
+xcb_xvmc_query_version_reply.3 \
+xcb_xvmc_query_version_unchecked.3 \

Property changes on: x11/libxcb/manpages
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxcb/pkg-plist
===================================================================
--- x11/libxcb/pkg-plist	(revision 316007)
+++ x11/libxcb/pkg-plist	(working copy)
@@ -18,6 +18,7 @@
 include/xcb/xevie.h
 include/xcb/xf86dri.h
 include/xcb/xfixes.h
+include/xcb/xkb.h
 include/xcb/xinerama.h
 include/xcb/xinput.h
 include/xcb/xprint.h
Index: x11/libxkbfile/Makefile
===================================================================
--- x11/libxkbfile/Makefile	(revision 316007)
+++ x11/libxkbfile/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libxkbfile
-# Date Created:			7 May 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libxkbfile
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libxkbfile/distinfo
===================================================================
--- x11/libxkbfile/distinfo	(revision 316007)
+++ x11/libxkbfile/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
-SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
+SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
+SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
Index: x11/libxkbui/Makefile
===================================================================
--- x11/libxkbui/Makefile	(revision 316007)
+++ x11/libxkbui/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libxkbui
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libxkbui
 PORTVERSION=	1.0.2
Index: x11/listres/Makefile
===================================================================
--- x11/listres/Makefile	(revision 316007)
+++ x11/listres/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	List resources in widgets
 
 XORG_CAT=	app
-USE_XORG=	xproto xt xmu xaw xorg-macros
+USE_XORG=	xproto xt xmu xaw
 
 PLIST_FILES=	bin/listres
 
Index: x11/luit/Makefile
===================================================================
--- x11/luit/Makefile	(revision 316007)
+++ x11/luit/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	luit
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	luit
 PORTVERSION=	1.1.0
Index: x11/mkcomposecache/Makefile
===================================================================
--- x11/mkcomposecache/Makefile	(revision 316007)
+++ x11/mkcomposecache/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mkcomposecache
-# Date Created:				30 Jan 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	mkcomposecache
 PORTVERSION=	1.2.1
Index: x11/pixman/Makefile
===================================================================
--- x11/pixman/Makefile	(revision 316007)
+++ x11/pixman/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pixman
-PORTVERSION=	0.24.2
+PORTVERSION=	0.28.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,9 +15,9 @@
 
 OPTIONS_DEFINE=	SIMD
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if !${PORT_OPTIONS:MSIMD}
+.if empty(PORT_OPTIONS:MSIMD)
 CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
 . if ! ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--disable-mmx
@@ -27,4 +27,4 @@
 . endif
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11/pixman/distinfo
===================================================================
--- x11/pixman/distinfo	(revision 316007)
+++ x11/pixman/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
-SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
+SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
+SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
Index: x11/printproto/Makefile
===================================================================
--- x11/printproto/Makefile	(revision 316007)
+++ x11/printproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	printproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	printproto
 PORTVERSION=	1.0.5
Index: x11/randrproto/Makefile
===================================================================
--- x11/randrproto/Makefile	(revision 316007)
+++ x11/randrproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	randrproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	randrproto
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/randrproto/distinfo
===================================================================
--- x11/randrproto/distinfo	(revision 316007)
+++ x11/randrproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
-SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
+SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
+SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
Index: x11/recordproto/Makefile
===================================================================
--- x11/recordproto/Makefile	(revision 316007)
+++ x11/recordproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	recordproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	recordproto
-PORTVERSION=	1.14.1
+PORTVERSION=	1.14.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/recordproto/distinfo
===================================================================
--- x11/recordproto/distinfo	(revision 316007)
+++ x11/recordproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
-SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
+SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
+SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
Index: x11/renderproto/Makefile
===================================================================
--- x11/renderproto/Makefile	(revision 316007)
+++ x11/renderproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	renderproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	renderproto
 PORTVERSION=	0.11.1
Index: x11/resourceproto/Makefile
===================================================================
--- x11/resourceproto/Makefile	(revision 316007)
+++ x11/resourceproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	resourceproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	resourceproto
 PORTVERSION=	1.2.0
Index: x11/rstart/Makefile
===================================================================
--- x11/rstart/Makefile	(revision 316007)
+++ x11/rstart/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Sample implementation of a Remote Start client
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 MAN1=		rstart.1 rstartd.1
 
Index: x11/scripts/Makefile
===================================================================
--- x11/scripts/Makefile	(revision 316007)
+++ x11/scripts/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	scripts
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	scripts
 PORTVERSION=	1.0.1
Index: x11/scrnsaverproto/Makefile
===================================================================
--- x11/scrnsaverproto/Makefile	(revision 316007)
+++ x11/scrnsaverproto/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	scrnsaverproto
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	scrnsaverproto
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/scrnsaverproto/distinfo
===================================================================
--- x11/scrnsaverproto/distinfo	(revision 316007)
+++ x11/scrnsaverproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
-SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
+SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
+SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
Index: x11/sessreg/Makefile
===================================================================
--- x11/sessreg/Makefile	(revision 316007)
+++ x11/sessreg/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Manage utmp/wtmp entries for non-init X clients
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/sessreg
 
Index: x11/smproxy/Makefile
===================================================================
--- x11/smproxy/Makefile	(revision 316007)
+++ x11/smproxy/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	smproxy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	smproxy
 PORTVERSION=	1.0.5
Index: x11/trapproto/Makefile
===================================================================
--- x11/trapproto/Makefile	(revision 316007)
+++ x11/trapproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	trapproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	trapproto
 PORTVERSION=	3.4.3
Index: x11/videoproto/Makefile
===================================================================
--- x11/videoproto/Makefile	(revision 316007)
+++ x11/videoproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	videoproto
-# Date Created:				09 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	videoproto
 PORTVERSION=	2.3.1
Index: x11/viewres/Makefile
===================================================================
--- x11/viewres/Makefile	(revision 316007)
+++ x11/viewres/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Graphical class browser for Xt
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		viewres.1
 
Index: x11/x11perf/Makefile
===================================================================
--- x11/x11perf/Makefile	(revision 316007)
+++ x11/x11perf/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	x11perf
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	x11perf
 PORTVERSION=	1.5.4
Index: x11/xbacklight/Makefile
===================================================================
--- x11/xbacklight/Makefile	(revision 316007)
+++ x11/xbacklight/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xbacklight
-# Date Created:				11 Sep 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xbacklight
 PORTVERSION=	1.1.2
Index: x11/xbiff/Makefile
===================================================================
--- x11/xbiff/Makefile	(revision 316007)
+++ x11/xbiff/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xbiff
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xbiff
 PORTVERSION=	1.0.3
Index: x11/xbitmaps/Makefile
===================================================================
--- x11/xbitmaps/Makefile	(revision 316007)
+++ x11/xbitmaps/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xbitmaps
-# Date Created:				17 Feb 2006
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xbitmaps
 PORTVERSION=	1.1.1
Index: x11/xcb-proto/Makefile
===================================================================
--- x11/xcb-proto/Makefile	(revision 316007)
+++ x11/xcb-proto/Makefile	(working copy)
@@ -1,17 +1,10 @@
-# New ports collection makefile for:	xcb-proto
-# Date Created:				2006-08-23
-# Whom:					Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8
 CATEGORIES=	x11 python
-MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
-		http://distfiles.pirateparty.in/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ashish
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
@@ -19,7 +12,7 @@
 BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
 
 USE_BZIP2=	yes
-USES=	pathfix
+USES=		pathfix
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
 
Index: x11/xcb-proto/distinfo
===================================================================
--- x11/xcb-proto/distinfo	(revision 316007)
+++ x11/xcb-proto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
-SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
+SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
+SIZE (xcb-proto-1.8.tar.bz2) = 125072
Index: x11/xclipboard/Makefile
===================================================================
--- x11/xclipboard/Makefile	(revision 316007)
+++ x11/xclipboard/Makefile	(working copy)
@@ -11,7 +11,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xclipboard.1 xcutsel.1
 
Index: x11/xcmiscproto/Makefile
===================================================================
--- x11/xcmiscproto/Makefile	(revision 316007)
+++ x11/xcmiscproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xcmiscproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xcmiscproto
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xcmiscproto/distinfo
===================================================================
--- x11/xcmiscproto/distinfo	(revision 316007)
+++ x11/xcmiscproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
-SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
+SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
+SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
Index: x11/xdbedizzy/Makefile
===================================================================
--- x11/xdbedizzy/Makefile	(revision 316007)
+++ x11/xdbedizzy/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xdbedizzy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xdbedizzy
 PORTVERSION=	1.1.0
Index: x11/xditview/Makefile
===================================================================
--- x11/xditview/Makefile	(revision 316007)
+++ x11/xditview/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xditview.1
 
Index: x11/xdpyinfo/Makefile
===================================================================
--- x11/xdpyinfo/Makefile	(revision 316007)
+++ x11/xdpyinfo/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xdpyinfo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xdpyinfo
 PORTVERSION=	1.3.0
Index: x11/xdriinfo/Makefile
===================================================================
--- x11/xdriinfo/Makefile	(revision 316007)
+++ x11/xdriinfo/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xdriinfo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xdriinfo
 PORTVERSION=	1.0.4
Index: x11/xedit/Makefile
===================================================================
--- x11/xedit/Makefile	(revision 316007)
+++ x11/xedit/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Simple text editor for X
 
 XORG_CAT=	app
-USE_XORG=	xt xaw7 xorg-macros
+USE_XORG=	xt xaw7
 
 MAN1=		xedit.1
 
Index: x11/xextproto/Makefile
===================================================================
--- x11/xextproto/Makefile	(revision 316007)
+++ x11/xextproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xextproto
-# Date Created:				07 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xextproto
-PORTVERSION=	7.2.0
+PORTVERSION=	7.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xextproto/distinfo
===================================================================
--- x11/xextproto/distinfo	(revision 316007)
+++ x11/xextproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
-SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
+SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
+SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
Index: x11/xeyes/Makefile
===================================================================
--- x11/xeyes/Makefile	(revision 316007)
+++ x11/xeyes/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xeyes
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xeyes
 PORTVERSION=	1.1.1
Index: x11/xf86dga/Makefile
===================================================================
--- x11/xf86dga/Makefile	(revision 316007)
+++ x11/xf86dga/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86dga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86dga
 PORTVERSION=	1.0.3
Index: x11/xf86dgaproto/Makefile
===================================================================
--- x11/xf86dgaproto/Makefile	(revision 316007)
+++ x11/xf86dgaproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86dgaproto
 PORTVERSION=	2.1
Index: x11/xf86driproto/Makefile
===================================================================
--- x11/xf86driproto/Makefile	(revision 316007)
+++ x11/xf86driproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86driproto
 PORTVERSION=	2.1.1
Index: x11/xf86miscproto/Makefile
===================================================================
--- x11/xf86miscproto/Makefile	(revision 316007)
+++ x11/xf86miscproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86miscproto
 PORTVERSION=	0.9.3
Index: x11/xf86rushproto/Makefile
===================================================================
--- x11/xf86rushproto/Makefile	(revision 316007)
+++ x11/xf86rushproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86rushproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86rushproto
 PORTVERSION=	1.1.2
Index: x11/xf86vidmodeproto/Makefile
===================================================================
--- x11/xf86vidmodeproto/Makefile	(revision 316007)
+++ x11/xf86vidmodeproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86vidmodeproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86vidmodeproto
 PORTVERSION=	2.3.1
Index: x11/xfd/Makefile
===================================================================
--- x11/xfd/Makefile	(revision 316007)
+++ x11/xfd/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xfd
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfd
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xfd/distinfo
===================================================================
--- x11/xfd/distinfo	(revision 316007)
+++ x11/xfd/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
-SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
+SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
+SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
Index: x11/xfindproxy/Makefile
===================================================================
--- x11/xfindproxy/Makefile	(revision 316007)
+++ x11/xfindproxy/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xfindproxy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfindproxy
 PORTVERSION=	1.0.2
Index: x11/xfwp/Makefile
===================================================================
--- x11/xfwp/Makefile	(revision 316007)
+++ x11/xfwp/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xfwp
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfwp
 PORTVERSION=	1.0.2
Index: x11/xineramaproto/Makefile
===================================================================
--- x11/xineramaproto/Makefile	(revision 316007)
+++ x11/xineramaproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xineramaproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xineramaproto
 PORTVERSION=	1.2.1
Index: x11/xinit/Makefile
===================================================================
--- x11/xinit/Makefile	(revision 316007)
+++ x11/xinit/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xinit
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xinit
 PORTVERSION=	1.3.2
Index: x11/xinput/Makefile
===================================================================
--- x11/xinput/Makefile	(revision 316007)
+++ x11/xinput/Makefile	(working copy)
@@ -1,19 +1,15 @@
-# New ports collection makefile for:	xinput
-# Date created:			05 July 2003
-# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
-#
+# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xinput
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Very useful utility for configuring and testing XInput devices
 
 XORG_CAT=	app
-USE_XORG=	inputproto x11 xi xext
+USE_XORG=	inputproto x11 xi xext xrandr xinerama
 
 PLIST_FILES=	bin/xinput
 
Index: x11/xinput/distinfo
===================================================================
--- x11/xinput/distinfo	(revision 316007)
+++ x11/xinput/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
-SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
+SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
+SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
Index: x11/xkbcomp/Makefile
===================================================================
--- x11/xkbcomp/Makefile	(revision 316007)
+++ x11/xkbcomp/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	x11 xkbfile xorg-macros
+USE_XORG=	x11 xkbfile
 USES=		pathfix
 
 PLIST_FILES=	bin/xkbcomp \
Index: x11/xkbprint/Makefile
===================================================================
--- x11/xkbprint/Makefile	(revision 316007)
+++ x11/xkbprint/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xkbprint
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xkbprint
 PORTVERSION=	1.0.3
Index: x11/xkbutils/Makefile
===================================================================
--- x11/xkbutils/Makefile	(revision 316007)
+++ x11/xkbutils/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
+USE_XORG=	xkbfile x11 xaw inputproto
 
 MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
 
Index: x11/xkeyboard-config/Makefile
===================================================================
--- x11/xkeyboard-config/Makefile	(revision 316007)
+++ x11/xkeyboard-config/Makefile	(working copy)
@@ -1,12 +1,12 @@
-# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.5.1
+PORTVERSION=	2.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
+MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 LICENSE=	MIT
 
@@ -14,12 +14,14 @@
 		xsltproc:${PORTSDIR}/textproc/libxslt
 XORG_CAT=	data
 
-USES=		pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intlhack
+USES=		pathfix
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=yes
+
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -34,10 +36,7 @@
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
-CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
-		XGETTEXT="/bin/echo '(GNU '" \
-		MSGMERGE="/bin/echo '(GNU '"
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
Index: x11/xkeyboard-config/distinfo
===================================================================
--- x11/xkeyboard-config/distinfo	(revision 316007)
+++ x11/xkeyboard-config/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
-SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
+SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
+SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
Index: x11/xkeyboard-config/pkg-plist
===================================================================
--- x11/xkeyboard-config/pkg-plist	(revision 316007)
+++ x11/xkeyboard-config/pkg-plist	(working copy)
@@ -1,28 +1,23 @@
 libdata/pkgconfig/xkeyboard-config.pc
-share/X11/xkb/compat.dir
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
 share/X11/xkb/compat/caps
 share/X11/xkb/compat/complete
-share/X11/xkb/compat/default
 share/X11/xkb/compat/iso9995
 share/X11/xkb/compat/japan
-share/X11/xkb/compat/keypad
 share/X11/xkb/compat/ledcaps
 share/X11/xkb/compat/lednum
 share/X11/xkb/compat/ledscroll
 share/X11/xkb/compat/level5
 share/X11/xkb/compat/misc
 share/X11/xkb/compat/mousekeys
-share/X11/xkb/compat/norepeat
 share/X11/xkb/compat/olpc
 share/X11/xkb/compat/pc
 share/X11/xkb/compat/pc98
 share/X11/xkb/compat/xfree86
 share/X11/xkb/compat/xtest
 share/X11/xkb/compiled
-share/X11/xkb/geometry.dir
 share/X11/xkb/geometry/README
 share/X11/xkb/geometry/amiga
 share/X11/xkb/geometry/ataritt
@@ -52,7 +47,6 @@
 share/X11/xkb/geometry/thinkpad
 share/X11/xkb/geometry/typematrix
 share/X11/xkb/geometry/winbook
-share/X11/xkb/keycodes.dir
 share/X11/xkb/keycodes/README
 share/X11/xkb/keycodes/aliases
 share/X11/xkb/keycodes/amiga
@@ -72,49 +66,6 @@
 share/X11/xkb/keycodes/sun
 share/X11/xkb/keycodes/xfree86
 share/X11/xkb/keycodes/xfree98
-share/X11/xkb/keymap.dir
-share/X11/xkb/keymap/README
-share/X11/xkb/keymap/amiga
-share/X11/xkb/keymap/ataritt
-share/X11/xkb/keymap/digital_vndr/us
-share/X11/xkb/keymap/macintosh
-share/X11/xkb/keymap/sgi_vndr/be
-share/X11/xkb/keymap/sgi_vndr/bg
-share/X11/xkb/keymap/sgi_vndr/ca
-share/X11/xkb/keymap/sgi_vndr/ch
-share/X11/xkb/keymap/sgi_vndr/cz
-share/X11/xkb/keymap/sgi_vndr/de
-share/X11/xkb/keymap/sgi_vndr/dk
-share/X11/xkb/keymap/sgi_vndr/dvorak
-share/X11/xkb/keymap/sgi_vndr/es
-share/X11/xkb/keymap/sgi_vndr/fi
-share/X11/xkb/keymap/sgi_vndr/fr
-share/X11/xkb/keymap/sgi_vndr/gb
-share/X11/xkb/keymap/sgi_vndr/hu
-share/X11/xkb/keymap/sgi_vndr/it
-share/X11/xkb/keymap/sgi_vndr/jp
-share/X11/xkb/keymap/sgi_vndr/no
-share/X11/xkb/keymap/sgi_vndr/pl
-share/X11/xkb/keymap/sgi_vndr/pt
-share/X11/xkb/keymap/sgi_vndr/ru
-share/X11/xkb/keymap/sgi_vndr/se
-share/X11/xkb/keymap/sgi_vndr/sk
-share/X11/xkb/keymap/sgi_vndr/th
-share/X11/xkb/keymap/sgi_vndr/us
-share/X11/xkb/keymap/sony
-share/X11/xkb/keymap/sun_vndr/all
-share/X11/xkb/keymap/sun_vndr/de
-share/X11/xkb/keymap/sun_vndr/es
-share/X11/xkb/keymap/sun_vndr/fi
-share/X11/xkb/keymap/sun_vndr/fr
-share/X11/xkb/keymap/sun_vndr/no
-share/X11/xkb/keymap/sun_vndr/pl
-share/X11/xkb/keymap/sun_vndr/ru
-share/X11/xkb/keymap/sun_vndr/se
-share/X11/xkb/keymap/sun_vndr/uk
-share/X11/xkb/keymap/sun_vndr/us
-share/X11/xkb/keymap/xfree86
-share/X11/xkb/keymap/xfree98
 share/X11/xkb/rules/README
 share/X11/xkb/rules/base
 share/X11/xkb/rules/base.extras.xml
@@ -129,13 +80,6 @@
 share/X11/xkb/rules/xorg
 share/X11/xkb/rules/xorg.lst
 share/X11/xkb/rules/xorg.xml
-share/X11/xkb/semantics.dir
-share/X11/xkb/semantics/basic
-share/X11/xkb/semantics/complete
-share/X11/xkb/semantics/default
-share/X11/xkb/semantics/xtest
-share/X11/xkb/symbols.dir
-share/X11/xkb/symbols/ad
 share/X11/xkb/symbols/af
 share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
@@ -230,6 +174,7 @@
 share/X11/xkb/symbols/macintosh_vndr/se
 share/X11/xkb/symbols/macintosh_vndr/us
 share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/md
 share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
 share/X11/xkb/symbols/ml
@@ -258,6 +203,11 @@
 share/X11/xkb/symbols/rupeesign
 share/X11/xkb/symbols/se
 share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/sharp_vndr/sl-c3x00
+share/X11/xkb/symbols/sharp_vndr/ws003sh
+share/X11/xkb/symbols/sharp_vndr/ws007sh
+share/X11/xkb/symbols/sharp_vndr/ws011sh
+share/X11/xkb/symbols/sharp_vndr/ws020sh
 share/X11/xkb/symbols/shift
 share/X11/xkb/symbols/si
 share/X11/xkb/symbols/sk
@@ -293,7 +243,6 @@
 share/X11/xkb/symbols/sun_vndr/sk
 share/X11/xkb/symbols/sun_vndr/solaris
 share/X11/xkb/symbols/sun_vndr/tr
-share/X11/xkb/symbols/sun_vndr/tuv
 share/X11/xkb/symbols/sun_vndr/tw
 share/X11/xkb/symbols/sun_vndr/ua
 share/X11/xkb/symbols/sun_vndr/us
@@ -313,7 +262,6 @@
 share/X11/xkb/symbols/xfree68_vndr/amiga
 share/X11/xkb/symbols/xfree68_vndr/ataritt
 share/X11/xkb/symbols/za
-share/X11/xkb/types.dir
 share/X11/xkb/types/README
 share/X11/xkb/types/basic
 share/X11/xkb/types/cancel
@@ -343,6 +291,7 @@
 %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
@@ -366,17 +315,18 @@
 %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/crh
 @exec mkdir -p /var/lib/xkb
-@dirrmtry share/locale/crh
 @dirrm share/X11/xkb/types
 @dirrm share/X11/xkb/symbols/xfree68_vndr
 @dirrm share/X11/xkb/symbols/sun_vndr
 @dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sharp_vndr
 @dirrm share/X11/xkb/symbols/sgi_vndr
 @dirrm share/X11/xkb/symbols/nokia_vndr
 @dirrm share/X11/xkb/symbols/nec_vndr
@@ -385,12 +335,7 @@
 @dirrm share/X11/xkb/symbols/fujitsu_vndr
 @dirrm share/X11/xkb/symbols/digital_vndr
 @dirrm share/X11/xkb/symbols
-@dirrm share/X11/xkb/semantics
 @dirrm share/X11/xkb/rules
-@dirrm share/X11/xkb/keymap/sun_vndr
-@dirrm share/X11/xkb/keymap/sgi_vndr
-@dirrm share/X11/xkb/keymap/digital_vndr
-@dirrm share/X11/xkb/keymap
 @dirrm share/X11/xkb/keycodes/sgi_vndr
 @dirrm share/X11/xkb/keycodes/digital_vndr
 @dirrm share/X11/xkb/keycodes
Index: x11/xkill/Makefile
===================================================================
--- x11/xkill/Makefile	(revision 316007)
+++ x11/xkill/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xkill
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xkill
 PORTVERSION=	1.0.3
Index: x11/xload/Makefile
===================================================================
--- x11/xload/Makefile	(revision 316007)
+++ x11/xload/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xload.1
 
Index: x11/xlogo/Makefile
===================================================================
--- x11/xlogo/Makefile	(revision 316007)
+++ x11/xlogo/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
+USE_XORG=	xrender xft xext xt xaw xp xprintutil
 
 MAN1=		xlogo.1
 
Index: x11/xlsclients/Makefile
===================================================================
--- x11/xlsclients/Makefile	(revision 316007)
+++ x11/xlsclients/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xlsclients
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xlsclients
 PORTVERSION=	1.1.2
Index: x11/xmag/Makefile
===================================================================
--- x11/xmag/Makefile	(revision 316007)
+++ x11/xmag/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xmag.1
 
Index: x11/xman/Makefile
===================================================================
--- x11/xman/Makefile	(revision 316007)
+++ x11/xman/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xman
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xman
 PORTVERSION=	1.1.2
Index: x11/xmh/Makefile
===================================================================
--- x11/xmh/Makefile	(revision 316007)
+++ x11/xmh/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmh
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmh
 PORTVERSION=	1.0.2
Index: x11/xmore/Makefile
===================================================================
--- x11/xmore/Makefile	(revision 316007)
+++ x11/xmore/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmore
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmore
 PORTVERSION=	1.0.2
Index: x11/xorg/Makefile
===================================================================
--- x11/xorg/Makefile	(revision 316007)
+++ x11/xorg/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg
-# Date created:		18 Jun 2004
-# Whom:			anholt
-#
+# Created by: anholt
 # $FreeBSD$
-#
 
 PORTNAME=	xorg
-PORTVERSION=	7.5.2
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -23,8 +19,10 @@
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
 		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
+.include <bsd.port.options.mk>
+
 # doc
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
 .endif
 
@@ -57,8 +55,4 @@
 .endif
 .endif
 
-.if ${ARCH} != "alpha"
-RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-.endif
-
 .include <bsd.port.post.mk>
Index: x11/xorg-apps/Makefile
===================================================================
--- x11/xorg-apps/Makefile	(revision 316007)
+++ x11/xorg-apps/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-apps
-PORTVERSION=	7.5.2
-PORTREVISION=	1
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -39,8 +38,8 @@
 .include <bsd.port.options.mk>
 
 .for comp in ${COMPONENTS}
-. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
-.  if ${comp:M:}==""
+. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
+.  if ${comp:M*\:*}==""
 port=${comp}
 check=${comp:C/.*\///} # doesn't work
 .  else
Index: x11/xorg-cf-files/Makefile
===================================================================
--- x11/xorg-cf-files/Makefile	(revision 316007)
+++ x11/xorg-cf-files/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xorg-cf-files
-# Date created:				Nov 18 2006
-# Whom:					Dave Grochowski
-#
+# Created by: Dave Grochowski
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-cf-files
 PORTVERSION=	1.0.4
Index: x11/xorg-docs/Makefile
===================================================================
--- x11/xorg-docs/Makefile	(revision 316007)
+++ x11/xorg-docs/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xorg-docs
-# Date Created:				Nov 2 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-docs
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/xorg-docs/distinfo
===================================================================
--- x11/xorg-docs/distinfo	(revision 316007)
+++ x11/xorg-docs/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
-SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
+SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
+SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
Index: x11/xorg-libraries/Makefile
===================================================================
--- x11/xorg-libraries/Makefile	(revision 316007)
+++ x11/xorg-libraries/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-libraries
-# Date created:		29 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-libraries
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11/xplsprinters/Makefile
===================================================================
--- x11/xplsprinters/Makefile	(revision 316007)
+++ x11/xplsprinters/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xplsprinters
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xplsprinters
 PORTVERSION=	1.0.1
Index: x11/xprehashprinterlist/Makefile
===================================================================
--- x11/xprehashprinterlist/Makefile	(revision 316007)
+++ x11/xprehashprinterlist/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xprehashprinterlist
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xprehashprinterlist
 PORTVERSION=	1.0.1
Index: x11/xprop/Makefile
===================================================================
--- x11/xprop/Makefile	(revision 316007)
+++ x11/xprop/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xprop
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xprop
 PORTVERSION=	1.2.1
Index: x11/xproto/Makefile
===================================================================
--- x11/xproto/Makefile	(revision 316007)
+++ x11/xproto/Makefile	(working copy)
@@ -1,20 +1,15 @@
-# New ports collection makefile for:   xproto
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xproto
-PORTVERSION=	7.0.22
+PORTVERSION=	7.0.24
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 protocol headers
 
 XORG_CAT=	proto
-USE_GNOME=	pkgconfig
 
-CONFIGURE_ARGS+=--disable-specs
+CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
 
 .include <bsd.port.mk>
Index: x11/xproto/distinfo
===================================================================
--- x11/xproto/distinfo	(revision 316007)
+++ x11/xproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
-SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
+SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
+SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
Index: x11/xproxymanagementprotocol/Makefile
===================================================================
--- x11/xproxymanagementprotocol/Makefile	(revision 316007)
+++ x11/xproxymanagementprotocol/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   xproxymanagementprotocol
-# Date Created:			Jun 21 2006
-# Whom:				Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xproxymanagementprotocol
 PORTVERSION=	1.0.3
Index: x11/xrandr/Makefile
===================================================================
--- x11/xrandr/Makefile	(revision 316007)
+++ x11/xrandr/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xrandr
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrandr
-PORTVERSION=	1.3.5
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xrandr/distinfo
===================================================================
--- x11/xrandr/distinfo	(revision 316007)
+++ x11/xrandr/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
-SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
+SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
+SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
Index: x11/xrdb/Makefile
===================================================================
--- x11/xrdb/Makefile	(revision 316007)
+++ x11/xrdb/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xrdb
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrdb
 PORTVERSION=	1.0.9
Index: x11/xrefresh/Makefile
===================================================================
--- x11/xrefresh/Makefile	(revision 316007)
+++ x11/xrefresh/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xrefresh
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrefresh
 PORTVERSION=	1.0.4
Index: x11/xrx/Makefile
===================================================================
--- x11/xrx/Makefile	(revision 316007)
+++ x11/xrx/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xrx
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrx
 PORTVERSION=	1.0.4
Index: x11/xset/Makefile
===================================================================
--- x11/xset/Makefile	(revision 316007)
+++ x11/xset/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xset
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xset
 PORTVERSION=	1.2.2
Index: x11/xsetmode/Makefile
===================================================================
--- x11/xsetmode/Makefile	(revision 316007)
+++ x11/xsetmode/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xsetmode
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xsetmode
 PORTVERSION=	1.0.0
Index: x11/xsetpointer/Makefile
===================================================================
--- x11/xsetpointer/Makefile	(revision 316007)
+++ x11/xsetpointer/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xsetpointer
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xsetpointer
 PORTVERSION=	1.0.1
Index: x11/xsm/Makefile
===================================================================
--- x11/xsm/Makefile	(revision 316007)
+++ x11/xsm/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	X Session Manager
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xsm.1
 
Index: x11/xstdcmap/Makefile
===================================================================
--- x11/xstdcmap/Makefile	(revision 316007)
+++ x11/xstdcmap/Makefile	(working copy)
@@ -10,7 +10,7 @@
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xmu x11 xorg-macros
+USE_XORG=	xmu x11
 
 PLIST_FILES=	bin/xstdcmap
 
Index: x11/xtrans/Makefile
===================================================================
--- x11/xtrans/Makefile	(revision 316007)
+++ x11/xtrans/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xtrans
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xtrans
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xtrans/distinfo
===================================================================
--- x11/xtrans/distinfo	(revision 316007)
+++ x11/xtrans/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
-SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
+SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
+SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
Index: x11/xtrans/pkg-plist
===================================================================
--- x11/xtrans/pkg-plist	(revision 316007)
+++ x11/xtrans/pkg-plist	(working copy)
@@ -8,5 +8,4 @@
 include/X11/Xtrans/transport.c
 libdata/pkgconfig/xtrans.pc
 share/aclocal/xtrans.m4
-@dirrmtry %%DOCSDIR%%
 @dirrm include/X11/Xtrans
Index: x11/xtrap/Makefile
===================================================================
--- x11/xtrap/Makefile	(revision 316007)
+++ x11/xtrap/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xtrap
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xtrap
 PORTVERSION=	1.0.2
Index: x11/xvidtune/Makefile
===================================================================
--- x11/xvidtune/Makefile	(revision 316007)
+++ x11/xvidtune/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xvidtune
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xvidtune
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xvidtune/distinfo
===================================================================
--- x11/xvidtune/distinfo	(revision 316007)
+++ x11/xvidtune/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
-SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
+SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
+SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
Index: x11/xvinfo/Makefile
===================================================================
--- x11/xvinfo/Makefile	(revision 316007)
+++ x11/xvinfo/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Print out X-Video extension adaptor information
 
 XORG_CAT=	app
-USE_XORG=	xv x11 xorg-macros
+USE_XORG=	xv x11
 
 PLIST_FILES=	bin/xvinfo
 
Index: x11/xvmcinfo/Makefile
===================================================================
--- x11/xvmcinfo/Makefile	(revision 316007)
+++ x11/xvmcinfo/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xvmcinfo
-# Date Created:				6 Dec 2008
-# Whom:					bms
-#
+# Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xvmcinfo
 PORTVERSION=	0.1
Index: x11/xwininfo/Makefile
===================================================================
--- x11/xwininfo/Makefile	(revision 316007)
+++ x11/xwininfo/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xwininfo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xwininfo
 PORTVERSION=	1.1.2
Index: x11-clocks/oclock/Makefile
===================================================================
--- x11-clocks/oclock/Makefile	(revision 316007)
+++ x11-clocks/oclock/Makefile	(working copy)
@@ -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
Index: x11-clocks/xclock/Makefile
===================================================================
--- x11-clocks/xclock/Makefile	(revision 316007)
+++ x11-clocks/xclock/Makefile	(working copy)
@@ -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
Index: x11-drivers/xf86-input-acecad/Makefile
===================================================================
--- x11-drivers/xf86-input-acecad/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
@@ -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 @@
 COMMENT=	X.Org acecad input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		acecad.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-egalax/Makefile
===================================================================
--- x11-drivers/xf86-input-egalax/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
@@ -25,7 +25,7 @@
 .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>
Index: x11-drivers/xf86-input-elographics/Makefile
===================================================================
--- x11-drivers/xf86-input-elographics/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
@@ -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 @@
 COMMENT=	X.Org elographics input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		elographics.4x
 
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-fpit/Makefile
===================================================================
--- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
+++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
@@ -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>

Property changes on: x11-drivers/xf86-input-fpit/Makefile
___________________________________________________________________
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-input-fpit/distinfo
===================================================================
--- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
+++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
@@ -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

Property changes on: x11-drivers/xf86-input-fpit/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-input-fpit/pkg-descr
===================================================================
--- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
+++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-fpit driver.
+
+WWW: http://www.x.org

Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-input-fpit/pkg-plist
===================================================================
--- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
+++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
@@ -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

Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-input-hyperpen/Makefile
===================================================================
--- x11-drivers/xf86-input-hyperpen/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-hyperpen
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-hyperpen
 PORTVERSION=	${HYPERVER}
@@ -14,17 +9,13 @@
 COMMENT=	X.Org hyperpen input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 
 .if defined(WITH_NEW_XORG)
 HYPERVER=	1.4.1
 HYPERREVISION=	0
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
-
 .else
 HYPERVER=	1.3.0
-HYPERREVISION=	6
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
+HYPERREVISION=	5
 .endif
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
===================================================================
--- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 316007)
+++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
@@ -1,75 +0,0 @@
---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
-+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
-@@ -719,6 +719,9 @@
- {
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     if (xf86HypOpen(local) != Success) {
- 	if (local->fd >= 0) {
-@@ -730,6 +733,9 @@
- /* Set the real values */
-     InitValuatorAxisStruct(pHyp,
- 			   0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[0],
-+#endif
- 			   0, /* min val */
- 			   priv->hypXSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -737,6 +743,9 @@
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[1],
-+#endif
- 			   0, /* min val */
- 			   priv->hypYSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -744,6 +753,9 @@
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[2],
-+#endif
- 			   0, /* min val */
- 			   511, /* max val */
- 			   512, /* resolution */
-@@ -765,8 +777,10 @@
-     int			loop;
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
--
--
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom btn_labels[4] = { 0 };
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     switch (what) {
- 	case DEVICE_INIT:
-@@ -779,6 +793,9 @@
- 
- 	    if (InitButtonClassDeviceStruct(pHyp,
- 					    nbbuttons,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+					    btn_labels,
-+#endif
- 					    map) == FALSE) {
- 		ErrorF("unable to allocate Button class device\n");
- 		return !Success;
-@@ -802,6 +819,9 @@
- 
- 	    if (InitValuatorClassDeviceStruct(pHyp,
- 		   nbaxes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+		   axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- 		   xf86GetMotionEvents,
- #endif
Index: x11-drivers/xf86-input-joystick/Makefile
===================================================================
--- x11-drivers/xf86-input-joystick/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-joystick
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-joystick
 PORTVERSION=	${JOYVER}
@@ -14,11 +9,10 @@
 COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		joystick.4x
 
 .if defined(WITH_NEW_XORG)
-JOYVER=		1.6.0
+JOYVER=		1.6.2
 JOYREVISION=	0
 .else
 JOYVER=		1.5.0
Index: x11-drivers/xf86-input-joystick/distinfo
===================================================================
--- x11-drivers/xf86-input-joystick/distinfo	(revision 316007)
+++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
 SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
-SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
-SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
+SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
+SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
Index: x11-drivers/xf86-input-keyboard/Makefile
===================================================================
--- x11-drivers/xf86-input-keyboard/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	xf86-input-keyboard
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org keyboard input driver
 
 XORG_CAT=	driver
-USE_XORG=	kbproto xextproto videoproto
+USE_XORG=	kbproto
 MAN4=		kbd.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-keyboard/distinfo
===================================================================
--- x11-drivers/xf86-input-keyboard/distinfo	(revision 316007)
+++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
-SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
+SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
+SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
Index: x11-drivers/xf86-input-magictouch/Makefile
===================================================================
--- x11-drivers/xf86-input-magictouch/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-magictouch
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-magictouch
 PORTVERSION=	1.0.0.5
Index: x11-drivers/xf86-input-mouse/Makefile
===================================================================
--- x11-drivers/xf86-input-mouse/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
@@ -1,18 +1,14 @@
-# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org mouse input driver
 
-CONFIGURE_ARGS+=--disable-silent-rules
-
 XORG_CAT=	driver
-USE_XORG=       xextproto videoproto
+USES=		pathfix
 MAN4=		mousedrv.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-mouse/distinfo
===================================================================
--- x11-drivers/xf86-input-mouse/distinfo	(revision 316007)
+++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
-SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
+SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
+SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
===================================================================
--- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 316007)
+++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
@@ -1,64 +1,57 @@
---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
-+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /*
-  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
-  *
-@@ -71,15 +70,20 @@
+--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
+@@ -71,15 +71,20 @@
  static const char *FindDevice(InputInfoPtr, const char *, int);
  
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
++#if !defined(XPS2_SUPPORT)
 +#define XPS2_SUPPORT
 +#endif
  /* These are for FreeBSD and DragonFly */
- #define DEFAULT_MOUSE_DEV		"/dev/mouse"
- #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
- #define DEFAULT_PS2_DEV			"/dev/psm0"
-+#define DEFAULT_USB_DEV			"/dev/ums0"
+ #define DEFAULT_MOUSE_DEV               "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
+ #define DEFAULT_PS2_DEV                 "/dev/psm0"
++#define DEFAULT_USB_DEV                 "/dev/ums0"
  
  static const char *mouseDevs[] = {
- 	DEFAULT_MOUSE_DEV,
- 	DEFAULT_SYSMOUSE_DEV,
- 	DEFAULT_PS2_DEV,
-+	DEFAULT_USB_DEV,
- 	NULL
+         DEFAULT_MOUSE_DEV,
+         DEFAULT_SYSMOUSE_DEV,
+         DEFAULT_PS2_DEV,
++        DEFAULT_USB_DEV,
+         NULL
  };
  #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-@@ -100,7 +104,11 @@
+@@ -100,7 +105,11 @@
  #if defined(__NetBSD__)
      return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
  #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
 +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
 +#ifdef XPS2_SUPPORT
-+	MSE_XPS2 |
++        MSE_XPS2 |
 +#endif
-+	MSE_AUTO | MSE_MISC;
++        MSE_AUTO | MSE_MISC;
  #else
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
  #endif
-@@ -179,10 +187,31 @@
- 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
- 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
+@@ -180,9 +189,30 @@
+         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
  };
--	
-+
+ 
 +#ifdef XPS2_SUPPORT
 +static struct {
-+	int dmodel;
-+	char *name;
++        int dmodel;
++        char *name;
 +} ps2proto[] = {
-+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
-+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
-+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
-+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
-+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
-+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
-+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
-+	{ MOUSE_MODEL_4D,		"IMPS/2" },
-+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
++        { MOUSE_MODEL_4D,               "IMPS/2" },
++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
 +};
 +#endif
 +
@@ -72,56 +65,52 @@
      int i;
      mousehw_t hw;
      mousemode_t mode;
-@@ -190,10 +219,16 @@
+@@ -190,7 +220,13 @@
      if (pInfo->fd == -1)
- 	return NULL;
+         return NULL;
  
 +#ifdef XPS2_SUPPORT
      /* set the driver operation level, if applicable */
 +    dev = xf86FindOptionValue(pInfo->options, "Device");
 +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
-+	i = 2;
++        i = 2;
 +    else
 +#endif
      i = 1;
      ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
--    
-+
-     /* interrogate the driver and get some intelligence on the device. */
-     hw.iftype = MOUSE_IF_UNKNOWN;
-     hw.model = MOUSE_MODEL_GENERIC;
-@@ -209,9 +244,18 @@
- 		    protoPara[0] = mode.syncmask[0];
- 		    protoPara[1] = mode.syncmask[1];
- 		}
-+		proto = devproto[i].name;
+ 
+@@ -209,9 +245,18 @@
+                     protoPara[0] = mode.syncmask[0];
+                     protoPara[1] = mode.syncmask[1];
+                 }
++                proto = devproto[i].name;
 +#ifdef XPS2_SUPPORT
-+		if (mode.protocol == MOUSE_PROTO_PS2)
-+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
-+			if (hw.model == ps2proto[i].dmodel) {
-+			    proto = ps2proto[i].name;
-+			    break;
-+			}
++                if (mode.protocol == MOUSE_PROTO_PS2)
++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
++                        if (hw.model == ps2proto[i].dmodel) {
++                           proto = ps2proto[i].name;
++                           break;
++                }
 +#endif
- 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
--			    pInfo->name, devproto[i].name);
--		return devproto[i].name;
-+			    pInfo->name, proto);
-+		return proto;
- 	    }
- 	}
+                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
+-                            pInfo->name, devproto[i].name);
+-                return devproto[i].name;
++                            pInfo->name, proto);
++                return proto;
+             }
+         }
      }
-@@ -234,41 +278,41 @@
- 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
- 	/*
- 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
--	 * everytime it is opened we enforce protocol level 1 again at
-+	 * everytime it is closed we enforce protocol level 1 again at
- 	 * this point.
- 	 */
- 	mode.level = 1;
+@@ -234,41 +279,41 @@
+         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+         /*
+          * As the FreeBSD sysmouse driver defaults to protocol level 0
+-         * everytime it is opened we enforce protocol level 1 again at
++         * everytime it is closed we enforce protocol level 1 again at
+          * this point.
+          */
+         mode.level = 1;
      } else
--	mode.level = -1;
+-        mode.level = -1;
 -#else
 -    mode.level = -1;
  #endif
@@ -151,26 +140,26 @@
 +    unsigned int i;
  
 -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
--	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
--	    if (kill(pid, 0) == 0) {
--		fclose(f);
--		return TRUE;
--	    }
+-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
+-            if (kill(pid, 0) == 0) {
+-                fclose(f);
+-                return TRUE;
+-            }
 +    if (dev)
-+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 +    else
-+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 +    if ((f = popen(cmd, "r")) != NULL) {
-+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
-+	    pclose(f);
-+	    return TRUE;
- 	}
--	fclose(f);
-+	pclose(f);
++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
++            pclose(f);
++            return TRUE;
+         }
+-        fclose(f);
++        pclose(f);
      }
      return FALSE;
  }
-@@ -276,17 +320,17 @@
+@@ -276,17 +321,17 @@
  static const char *
  FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
  {
@@ -182,63 +171,63 @@
      struct stat sb;
  
      for (pdev = mouseDevs; *pdev; pdev++) {
--	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
--	if (fd == -1) {
-+	SYSCALL (ret = stat(*pdev, &sb));
-+	if (ret == -1) {
+-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+-        if (fd == -1) {
++        SYSCALL (ret = stat(*pdev, &sb));
++        if (ret == -1) {
  #ifdef DEBUG
--	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
-+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
+-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
  #endif
- 	} else {
- 	    /*
-@@ -295,28 +339,32 @@
- 	     * the test for whether /dev/sysmouse is usable can be made.
- 	     */
- 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
--		if (fstat(fd, &devMouseStat) == 0)
--		    devMouse = TRUE;
--		close(fd);
-+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
-+		devMouse = TRUE;
- 		continue;
- 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
- 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
--		if (devMouse && fstat(fd, &sb) == 0 && 
--		    devMouseStat.st_dev == sb.st_dev &&
-+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
- 		    devMouseStat.st_ino == sb.st_ino) {
- 		    /* If the same, use /dev/sysmouse. */
- 		    devMouse = FALSE;
- 		}
--		close(fd);
--		if (MousedRunning())
-+		if (MousedRunning(NULL))
- 		    break;
--		else {
+         } else {
+             /*
+@@ -295,28 +340,32 @@
+              * the test for whether /dev/sysmouse is usable can be made.
+              */
+             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+-                if (fstat(fd, &devMouseStat) == 0)
+-                    devMouse = TRUE;
+-                close(fd);
++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++                devMouse = TRUE;
+                 continue;
+             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
+-                if (devMouse && fstat(fd, &sb) == 0 &&
+-                    devMouseStat.st_dev == sb.st_dev &&
++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+                     devMouseStat.st_ino == sb.st_ino) {
+                     /* If the same, use /dev/sysmouse. */
+                     devMouse = FALSE;
+                 }
+-                close(fd);
+-                if (MousedRunning())
++                if (MousedRunning(NULL))
+                     break;
+-                else {
 -#ifdef DEBUG
--	    	    ErrorF("moused isn't running\n");
+-                    ErrorF("moused isn't running\n");
 -#endif
--		}
- 	    } else {
--		close(fd);
-+		/* Check if /dev/mouse is the same as this device. */
-+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
-+		    devMouseStat.st_ino == sb.st_ino) {
-+		    /* If the same, use this device. */
-+		    devMouse = FALSE;
-+		}
-+		if (MousedRunning(*pdev))
-+		    continue;
-+		/* ums(4) does not support anything but SysMouse protocol. */
-+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
-+		    xf86NameCmp(protocol, "auto") != 0 &&
-+		    xf86NameCmp(protocol, "sysmouse") != 0)
-+		    continue;
- 		break;
- 	    }
- 	}
-@@ -782,7 +830,9 @@
+-                }
+             } else {
+-                close(fd);
++                /* Check if /dev/mouse is the same as this device. */
++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
++                    devMouseStat.st_ino == sb.st_ino) {
++                    /* If the same, use this device. */
++                    devMouse = FALSE;
++                }
++                if (MousedRunning(*pdev))
++                    continue;
++                /* ums(4) does not support anything but SysMouse protocol. */
++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++                    xf86NameCmp(protocol, "auto") != 0 &&
++                    xf86NameCmp(protocol, "sysmouse") != 0)
++                    continue;
+                 break;
+             }
+         }
+@@ -764,7 +813,9 @@
      p->CheckProtocol = CheckProtocol;
  #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
      p->SetupAuto = SetupAuto;
Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
===================================================================
--- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
+++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
+@@ -279,7 +279,7 @@
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+ @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
+ @DRIVER_NAME@_drv_ladir = @inputdir@
+ 
+ # We have to list all the mouse drivers here, even if we don't build them, so

Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
===================================================================
--- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 316007)
+++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
@@ -1,11 +1,182 @@
---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
-+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
-@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
-     pInfo->private_flags = 0;
-     pInfo->always_core_feedback = NULL;
+--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
+@@ -280,13 +280,39 @@
  
-+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
+     pMse = pInfo->private;
+ 
+-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
++    if (i != 0)
++        pMse->buttons = i;
+     if (!pMse->buttons) {
+         pMse->buttons = MSE_DFLTBUTTONS;
+         buttons_from = X_DEFAULT;
+     }
+     origButtons = pMse->buttons;
+ 
++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
++    if (s) {
++        int b, n = 0;
++        char *s1 = s;
++        /* keep getting numbers which are buttons */
++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
++            /* check sanity for a button */
++            if (b < 0 || b > MSE_MAXBUTTONS) {
++                xf86Msg(X_WARNING,
++                        "ButtonMapping: Invalid button number = %d\n", b);
++                break;
++           };
++           pMse->buttonMap[n++] = 1 << (b-1);
++           if (b > pMse->buttons) pMse->buttons = b;
++        }
++        free(s);
++    }
++    /* get maximum of mapped buttons */
++    for (i = pMse->buttons-1; i >= 0; i--) {
++        int f = ffs (pMse->buttonMap[i]);
++        if (f > pMse->buttons)
++            pMse->buttons = f;
++    }
 +
-     if (NewMousePreInit(drv, pInfo, flags) == Success)
-     {
-         /* Check if SendDragEvents has been disabled. */
+     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
+                                               "Emulate3Buttons", FALSE);
+     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
+@@ -298,6 +324,8 @@
+                                              "Emulate3Timeout", 50);
+     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
+         MessageType from = X_CONFIG;
++	if (pMse->buttons < 3)
++            pMse->buttons = 3;
+         if (pMse->emulate3ButtonsSoft)
+             from = X_DEFAULT;
+         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+@@ -305,6 +333,8 @@
+     }
+ 
+     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
++    if (pMse->chordMiddle && pMse->buttons < 3)
++	    pMse->buttons = 3;
+     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
+     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
+         pMse->invX = -1;
+@@ -315,7 +345,7 @@
+     } else
+         pMse->invY = 1;
+     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
+-
++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+ 
+     if (pMse->pDragLock)
+         free(pMse->pDragLock);
+@@ -425,14 +455,17 @@
+         free(s);
+     }
+ 
+-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
+     if (s) {
+         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+         char *msg = NULL;
+ 
+         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
+         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
+-        if (!xf86NameCmp(s, "x")) {
++        if (!xf86NameCmp(s, "off")) {
++            msg = xstrdup("off");
++	} else if (!xf86NameCmp(s, "x")) {
+             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
+             msg = xstrdup("X axis");
+         } else if (!xf86NameCmp(s, "y")) {
+@@ -568,29 +601,6 @@
+                 pInfo->name, wheelButton, pMse->wheelInertia,
+                 pMse->wheelButtonTimeout);
+     }
+-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
+-    if (s) {
+-       int b, n = 0;
+-       char *s1 = s;
+-       /* keep getting numbers which are buttons */
+-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
+-           /* check sanity for a button */
+-           if (b < 0 || b > MSE_MAXBUTTONS) {
+-               xf86Msg(X_WARNING,
+-                       "ButtonMapping: Invalid button number = %d\n", b);
+-               break;
+-           };
+-           pMse->buttonMap[n++] = 1 << (b-1);
+-           if (b > pMse->buttons) pMse->buttons = b;
+-       }
+-       free(s);
+-    }
+-    /* get maximum of mapped buttons */
+-    for (i = pMse->buttons-1; i >= 0; i--) {
+-        int f = ffs (pMse->buttonMap[i]);
+-        if (f > pMse->buttons)
+-            pMse->buttons = f;
+-    }
+     if (origButtons != pMse->buttons)
+         buttons_from = X_CONFIG;
+     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
+@@ -668,7 +678,6 @@
+     }
+     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
+     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
+-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+ }
+ 
+ static void
+@@ -959,6 +968,8 @@
+     /* Default Mapping: 1 2 3 8 9 10 11 ... */
+     for (i = 0; i < MSE_MAXBUTTONS; i++)
+         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
++    pMse->hasZ = 1;
++    pMse->hasW = 0;
+ 
+     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
+ 
+@@ -2137,7 +2148,7 @@
+ 
+     if (pMse->emulateWheel) {
+         /* Emulate wheel button handling */
+-        if(pMse->wheelButton == 0)
++        if (pMse->wheelButton == 0)
+             wheelButtonMask = 0;
+         else
+             wheelButtonMask = 1 << (pMse->wheelButton - 1);
+@@ -2221,6 +2232,9 @@
+                         }
+                     }
+                 }
++            } else {
++                pMse->wheelXDistance = 0;
++                pMse->wheelYDistance = 0;
+             }
+ 
+             /* Absorb the mouse movement while the wheel button is pressed. */
+@@ -2238,7 +2252,7 @@
+     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
+         buttonTimer(pInfo);
+ 
+-    if (dx || dy)
++    if ((dx || dy) && !pMse->disableXY)
+         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+ 
+     if (change) {
+@@ -2448,11 +2462,11 @@
+ 
+     /* Accumulate the scaled dx, dy in the private variables
+        fracdx,fracdy and return the integer number part */
+-    if (mousepriv) {
+-        mousepriv->fracdx += mousepriv->sensitivity*dx;
+-        mousepriv->fracdy += mousepriv->sensitivity*dy;
+-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
+-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
++    if (pMse->sensitivity != 0) {
++        pMse->fracdx += pMse->sensitivity*dx;
++        pMse->fracdy += pMse->sensitivity*dy;
++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
+     }
+ 
+     /* If mouse wheel movement has to be mapped on a button, we need to
Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
===================================================================
--- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
+++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
@@ -0,0 +1,25 @@
+--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
+@@ -217,10 +217,13 @@
+     Bool                emulate3ButtonsSoft;
+     int                 emulate3Timeout;/* Timeout for 3 button emulation */
+     Bool                chordMiddle;
++    Bool                disableXY;
+     Bool                flipXY;
+     int                 invX;
+     int                 invY;
+     int                 resolution;
++    Bool                hasW;
++    Bool                hasZ;
+     int                 negativeZ;      /* button mask */
+     int                 positiveZ;      /* button mask */
+     int                 negativeW;      /* button mask */
+@@ -259,6 +262,8 @@
+     int                 doubleClickOldSourceState;
+     int                 lastMappedButtons;
+     int                 buttonMap[MSE_MAXBUTTONS];
++    float               fracdx,fracdy;
++    float               sensitivity;
+ } MouseDevRec, *MouseDevPtr;
+ 
+ #endif /* _XF86OSMOUSE_H_ */

Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
===================================================================
--- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
+++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
+@@ -63,8 +63,6 @@
+     int         acc;
+     CARD32      pnpLast;
+     Bool        disablePnPauto;
+-    float       fracdx,fracdy;
+-    float       sensitivity;
+ } mousePrivRec, *mousePrivPtr;
+ 
+ /* mouse proto flags */

Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-input-mouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-mouse/pkg-plist	(revision 316007)
+++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
@@ -1,5 +1,8 @@
+include/xorg/xf86-mouse-properties.h
 lib/xorg/modules/input/mouse_drv.la
 lib/xorg/modules/input/mouse_drv.so
+libdata/pkgconfig/xorg-mouse.pc
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
+@dirrmtry include/xorg
Index: x11-drivers/xf86-input-mutouch/Makefile
===================================================================
--- x11-drivers/xf86-input-mutouch/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-mutouch
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-mutouch
 PORTVERSION=	1.3.0
@@ -13,7 +8,6 @@
 COMMENT=	X.Org mutouch input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		mutouch.4x
 
 .if !defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-penmount/Makefile
===================================================================
--- x11-drivers/xf86-input-penmount/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-penmount
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-penmount
 PORTVERSION=	${PEN_VERSION}
@@ -14,7 +9,6 @@
 COMMENT=	X.Org penmount input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		penmount.4x
 
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-synaptics/Makefile
===================================================================
--- x11-drivers/xf86-input-synaptics/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xf86-input-synaptics
-# Date Created:				25 Sep 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.5.0
+PORTVERSION=	${SYNAPTICS_VERSION}
+PORTREVISION=	${SYNAPTICS_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,25 +10,47 @@
 
 CONFLICTS=	synaptics-[0-9]*
 
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+OPTIONS_DEFINE=	HAL
+OPTIONS_DEFAULT=HAL
 
-USES=	pathfix
-USE_XORG=	x11 xextproto videoproto
+.include <bsd.port.options.mk>
+
+USES=		pathfix
+USE_XORG=	x11
 XORG_CAT=	driver
 
+.if ${PORT_OPTIONS:MHAL}
+PLIST_SUB+=	HAL=""
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.else
+PLIST_SUB+=	HAL="@comment "
+.endif
+
 MAN1=		syndaemon.1 \
 		synclient.1
 MAN4=		synaptics.4x
 
-post-install:
-	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
-	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
-		${PREFIX}/share/hal/fdi/policy/10osvendor/
-
 .if defined(WITH_NEW_XORG)
+SYNAPTICS_VERSION=	1.7.0
+SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="" OLD="@comment "
 .else
+SYNAPTICS_VERSION=	1.6.2
+SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="@comment " OLD=""
+EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
 .endif
 
+post-install:
+.if ${PORT_OPTIONS:MHAL}
+	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
+	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+		${PREFIX}/share/hal/fdi/policy/10osvendor/
+.if !defined(WITH_NEW_XORG)
+	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
+	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+		${PREFIX}/share/hal/fdi/policy/20thirdparty/
+.endif
+.endif
+
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-synaptics/distinfo
===================================================================
--- x11-drivers/xf86-input-synaptics/distinfo	(revision 316007)
+++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
@@ -1,2 +1,4 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
-SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
+SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
+SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
+SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
===================================================================
--- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
+++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
+@@ -321,7 +321,7 @@
+ 	--with-sdkdir='$${includedir}/xorg' \
+ 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
+ 
+-SUBDIRS = include src man tools conf test
++SUBDIRS = include src man tools test
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xorg-synaptics.pc

Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: x11-drivers/xf86-input-synaptics/pkg-plist
===================================================================
--- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 316007)
+++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
@@ -1,18 +1,18 @@
 bin/synclient
 bin/syndaemon
 include/xorg/synaptics-properties.h
-include/xorg/synaptics.h
+%%OLD%%include/xorg/synaptics.h
 lib/xorg/modules/input/synaptics_drv.la
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
 %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
 @dirrmtry include/xorg
-@dirrmtry share/hal/fdi/policy/10osvendor
-@dirrmtry share/hal/fdi/policy
-@dirrmtry share/hal/fdi
-@dirrmtry share/hal
+%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
+%%HAL%%@dirrmtry share/hal/fdi/policy
+%%HAL%%@dirrmtry share/hal/fdi
+%%HAL%%@dirrmtry share/hal
Index: x11-drivers/xf86-input-vmmouse/Makefile
===================================================================
--- x11-drivers/xf86-input-vmmouse/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
@@ -1,18 +1,15 @@
-# New ports collection makefile for:	xf86-input-vmmouse
-# Date Created:				17 Feb 2006
-# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
-#
+# Created by: NIIMI Satoshi <sa2c@sa2c.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-vmmouse
-PORTVERSION=	12.6.9
-PORTREVISION=	2
+PORTVERSION=	13.0.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmmouse input driver
 
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+
 XORG_CAT=	driver
 CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
 USE_GMAKE=	yes
@@ -23,4 +20,10 @@
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
 
+.if defined(WITH_NEW_XORG)
+PLIST_SUB+=	NEW=""
+.else
+PLIST_SUB+=	NEW="@comment "
+.endif
+
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-vmmouse/distinfo
===================================================================
--- x11-drivers/xf86-input-vmmouse/distinfo	(revision 316007)
+++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
+SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
+SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
Index: x11-drivers/xf86-input-vmmouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 316007)
+++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
@@ -2,6 +2,7 @@
 libexec/hal/scripts/hal-probe-vmmouse
 lib/xorg/modules/input/vmmouse_drv.la
 lib/xorg/modules/input/vmmouse_drv.so
+%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
 share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-input-void/Makefile
===================================================================
--- x11-drivers/xf86-input-void/Makefile	(revision 316007)
+++ x11-drivers/xf86-input-void/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-input-void
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-input-void
 PORTVERSION=	${VOID_VERSION}
@@ -14,7 +9,6 @@
 COMMENT=	X.Org void input driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		void.4x
 
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-video-apm/Makefile
===================================================================
--- x11-drivers/xf86-video-apm/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-apm/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-apm
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-apm
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org apm display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		apm.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-apm/distinfo
===================================================================
--- x11-drivers/xf86-video-apm/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-apm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
-SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
+SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
+SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
Index: x11-drivers/xf86-video-ark/Makefile
===================================================================
--- x11-drivers/xf86-video-ark/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-ark/Makefile	(working copy)
@@ -1,19 +1,12 @@
-# New ports collection makefile for:	xf86-video-ark
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-ark
-PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTVERSION=	0.7.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ark display driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-ark/distinfo
===================================================================
--- x11-drivers/xf86-video-ark/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-ark/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
-SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
+SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
+SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
Index: x11-drivers/xf86-video-ati/Makefile
===================================================================
--- x11-drivers/xf86-video-ati/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-ati/Makefile	(working copy)
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	xf86-video-ati
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.14.3
-PORTREVISION=	1
+PORTVERSION=	6.14.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,7 +9,7 @@
 
 USE_GL=		gl
 XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
 MAN4=		ati.4x radeon.4x
 
 CONFIGURE_ARGS+=--disable-kms
Index: x11-drivers/xf86-video-ati/distinfo
===================================================================
--- x11-drivers/xf86-video-ati/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-ati/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
-SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
+SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
+SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
===================================================================
--- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 316007)
+++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
@@ -1,17 +1,15 @@
---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
-+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
-@@ -982,10 +982,9 @@
+--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
+@@ -967,10 +967,9 @@
  
  	    for (; nwords > 0; --nwords, ++d, ++s)
  #ifdef __powerpc__
 -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
  #else
--	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
 +		*d = (*s >> 8) | (*s << 8);
  #endif
  	    return;
- 	}
-
-
+         }
Index: x11-drivers/xf86-video-ati613/Makefile
===================================================================
--- x11-drivers/xf86-video-ati613/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-ati613/Makefile	(working copy)
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xf86-video-ati613
-PORTVERSION=	6.13.2
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-DISTNAME=	xf86-video-ati-${PORTVERSION}
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-DEPRECATED=	Old version, use xf86-video-ati instead
-EXPIRATION_DATE=2013-05-10
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4=		ati.4x radeon.4x
-
-.if defined(WITH_NEW_XORG)
-IGNORE=		Please use x11-drivers/xf86-video-ati
-.endif
-
-.include <bsd.port.mk>
Index: x11-drivers/xf86-video-ati613/distinfo
===================================================================
--- x11-drivers/xf86-video-ati613/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-ati613/distinfo	(working copy)
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
-SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
Index: x11-drivers/xf86-video-ati613/pkg-descr
===================================================================
--- x11-drivers/xf86-video-ati613/pkg-descr	(revision 316007)
+++ x11-drivers/xf86-video-ati613/pkg-descr	(working copy)
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-ati driver.
Index: x11-drivers/xf86-video-ati613/pkg-plist
===================================================================
--- x11-drivers/xf86-video-ati613/pkg-plist	(revision 316007)
+++ x11-drivers/xf86-video-ati613/pkg-plist	(working copy)
@@ -1,14 +0,0 @@
-lib/xorg/modules/drivers/ati_drv.la
-lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
-lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.la
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.la
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.la
-lib/xorg/modules/multimedia/theatre_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules/multimedia
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
Index: x11-drivers/xf86-video-chips/Makefile
===================================================================
--- x11-drivers/xf86-video-chips/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-chips/Makefile	(working copy)
@@ -1,19 +1,13 @@
-# New ports collection makefile for:	xf86-video-chips
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org chips display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		chips.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-chips/distinfo
===================================================================
--- x11-drivers/xf86-video-chips/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-chips/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
-SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
+SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
+SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
===================================================================
--- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
+++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
@@ -0,0 +1,13 @@
+--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
+@@ -3,7 +3,7 @@
+ noinst_PROGRAMS = dRegs mRegs modClock memClock
+ endif
+ 
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h

Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
===================================================================
--- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
+++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
@@ -0,0 +1,15 @@
+--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
+@@ -238,9 +238,9 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
+ all: all-am
+ 

Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
===================================================================
--- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
+++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
@@ -0,0 +1,63 @@
+--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
+@@ -0,0 +1,60 @@
++#ifdef __NetBSD__
++#  include <sys/types.h>
++#  include <machine/pio.h>
++#  include <machine/sysarch.h>
++#else
++#  if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * #    include <sys/io.h>
++ */
++int iopl(int level);
++#  endif
++#  if defined(SVR4) && defined(i386)
++#    include <sys/types.h>
++#    ifdef NCR
++       /* broken NCR <sys/sysi86.h> */
++#      define __STDC
++#      include <sys/sysi86.h>
++#      undef __STDC
++#    else
++#      include <sys/sysi86.h>
++#    endif
++#    ifdef SVR4
++#      if !defined(sun)
++#        include <sys/seg.h>
++#      endif
++#    endif
++#    include <sys/v86.h>
++#    if defined(sun)
++#      include <sys/psw.h>
++#    endif
++#  endif
++#  include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++#  define SET_IOPL() i386_iopl(3)
++#  define RESET_IOPL() i386_iopl(0)
++#else
++#  if defined(SVR4) && defined(i386)
++#    ifndef SI86IOPL
++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++#    else
++#      define SET_IOPL() sysi86(SI86IOPL,3)
++#      define RESET_IOPL() sysi86(SI86IOPL,0)
++#    endif
++#  else
++#    ifdef linux
++#      define SET_IOPL() iopl(3)
++#      define RESET_IOPL() iopl(0)
++#    else
++#      define SET_IOPL() (void)0
++#      define RESET_IOPL() (void)0
++#    endif
++#  endif
++#endif

Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-video-cirrus/Makefile
===================================================================
--- x11-drivers/xf86-video-cirrus/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-cirrus
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-cirrus
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.5.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org cirrus display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		cirrus.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-cirrus/distinfo
===================================================================
--- x11-drivers/xf86-video-cirrus/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
-SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
+SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
+SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
Index: x11-drivers/xf86-video-cyrix/Makefile
===================================================================
--- x11-drivers/xf86-video-cyrix/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-video-cyrix
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
Index: x11-drivers/xf86-video-dummy/Makefile
===================================================================
--- x11-drivers/xf86-video-dummy/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
@@ -1,18 +1,13 @@
-# New ports collection makefile for:	xf86-video-dummy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-dummy
-PORTVERSION=	0.3.5
+PORTVERSION=	0.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org dummy display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xf86dgaproto
+USE_XORG=	xf86dgaproto
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-dummy/distinfo
===================================================================
--- x11-drivers/xf86-video-dummy/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
-SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
+SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
+SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
Index: x11-drivers/xf86-video-fbdev/Makefile
===================================================================
--- x11-drivers/xf86-video-fbdev/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-fbdev
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-fbdev
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.3
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,6 @@
 COMMENT=	X.Org fbdev display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto
 MAN4=		fbdev.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-fbdev/distinfo
===================================================================
--- x11-drivers/xf86-video-fbdev/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
-SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
+SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
Index: x11-drivers/xf86-video-glint/Makefile
===================================================================
--- x11-drivers/xf86-video-glint/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-glint/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-glint
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,7 +10,7 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
+USE_XORG=	xf86driproto xf86dgaproto glproto
 MAN4=		glint.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-glint/distinfo
===================================================================
--- x11-drivers/xf86-video-glint/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-glint/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
-SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
+SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
+SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
Index: x11-drivers/xf86-video-i128/Makefile
===================================================================
--- x11-drivers/xf86-video-i128/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-i128/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-i128
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-i128
-PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTVERSION=	1.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org i128 display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		i128.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i128/distinfo
===================================================================
--- x11-drivers/xf86-video-i128/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-i128/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
-SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
+SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
+SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
Index: x11-drivers/xf86-video-i740/Makefile
===================================================================
--- x11-drivers/xf86-video-i740/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-i740/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-i740
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-i740
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.3.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org i740 display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		i740.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i740/distinfo
===================================================================
--- x11-drivers/xf86-video-i740/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-i740/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
-SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
+SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
+SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
Index: x11-drivers/xf86-video-imstt/Makefile
===================================================================
--- x11-drivers/xf86-video-imstt/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-video-imstt
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-imstt
 PORTVERSION=	1.1.0
Index: x11-drivers/xf86-video-intel/Makefile
===================================================================
--- x11-drivers/xf86-video-intel/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-intel/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86-video-intel
-# Date Created:				28 May 2007
-# Whom:					lesi@FreeBSD.org
-#
+# Created by: lesi@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	${INTEL_VERSION}
@@ -18,15 +14,29 @@
 
 USE_LDCONFIG=	yes
 XORG_CAT=	driver
-USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
+USE_XORG=	glproto \
+		pixman \
+		x11 \
+		xext \
+		xf86driproto \
+		xineramaproto \
+		xrender \
+		xvmc
+
 MAN4=		intel.4x
 
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=	2.17.0
-INTEL_REVISION=	1
+INTEL_VERSION=	2.21.6
+INTEL_REVISION=	0
+CONFIGURE_ARGS+=	--enable-sna
 MAKE_JOBS_UNSAFE=yes
 PLIST_SUB+=	OLD="@comment "
-EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
+EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
+		${PATCHDIR}/extra-src_sna_compiler.h \
+		${PATCHDIR}/extra-src_sna_kgem.c \
+		${PATCHDIR}/extra-src__sna__sna_threads.c \
+		${PATCHDIR}/extra-i915kms
+LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
 INTEL_REVISION=	4
Index: x11-drivers/xf86-video-intel/distinfo
===================================================================
--- x11-drivers/xf86-video-intel/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-intel/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
-SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
+SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
+SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
Index: x11-drivers/xf86-video-intel/files/extra-clang
===================================================================
--- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
+++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
@@ -0,0 +1,53 @@
+--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
+@@ -1691,7 +1691,7 @@
+ static drmModeEncoderPtr
+ intel_get_kencoder(struct intel_mode *mode, int num)
+ {
+-	struct intel_output *iterator;
++	struct intel_output *iterator = NULL;
+ 	int id = mode->mode_res->encoders[num];
+ 
+ 	list_for_each_entry(iterator, &mode->outputs, link)
+--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
+@@ -119,7 +119,7 @@
+ static void intel_batch_do_flush(ScrnInfoPtr scrn)
+ {
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
+-	struct intel_pixmap *priv;
++	struct intel_pixmap *priv = NULL;
+ 
+ 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
+ 		priv->dirty = 0;
+--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
+@@ -410,7 +410,7 @@
+ 	int n, nboxes;
+ 	BoxPtr boxes, free_boxes = NULL;
+ 	pixman_region16_t *region = &damage->region;
+-	struct sna_damage_box *iter;
++	struct sna_damage_box *iter = NULL;
+ 
+ 	assert(damage->mode != DAMAGE_ALL);
+ 	assert(damage->dirty);
+@@ -1671,7 +1671,7 @@
+ {
+ 	int n, nboxes;
+ 	BoxPtr boxes;
+-	struct sna_damage_box *iter;
++	struct sna_damage_box *iter = NULL;
+ 
+ 	RegionCopy(r, &damage->region);
+ 	if (!damage->dirty)
+--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
+@@ -944,7 +944,7 @@
+ 
+ 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
+ 		int ok = 0;
+-		RegionPtr region;
++		RegionPtr region = NULL;
+ 
+ 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
+ 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {

Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-video-intel/files/extra-i915kms
===================================================================
--- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 316007)
+++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
@@ -1,11 +1,13 @@
---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
-+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
-@@ -334,7 +334,7 @@
- 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
+--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
+@@ -393,8 +393,8 @@
  		 dev->domain, dev->bus, dev->dev, dev->func);
  
--	intel->drmSubFD = drmOpen("i915", busid);
-+	intel->drmSubFD = drmOpen("i915kms", busid);
- 	if (intel->drmSubFD == -1) {
- 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- 			   "[drm] Failed to open DRM device for %s: %s\n",
+ 	ret = drmCheckModesettingSupported(id);
+-	if (ret) {
+-		if (xf86LoadKernelModule("i915"))
++	if (ret || 1) {
++		if (xf86LoadKernelModule("i915kms"))
+ 			ret = drmCheckModesettingSupported(id);
+ 		if (ret)
+ 			return FALSE;
Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
===================================================================
--- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
+++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
@@ -0,0 +1,14 @@
+--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
+@@ -94,7 +94,11 @@
+ 		size_t len = 0;
+ 		char *line = NULL;
+ 		uint32_t processors = 0, cores = 0;
++#ifdef __GLIBC__
+ 		while (getline(&line, &len, file) != -1) {
++#else
++		while ((line = fgetln(file, &len)) != (char *) NULL) {
++#endif
+ 			int id;
+ 			if (sscanf(line, "physical id : %d", &id) == 1) {
+ 				if (id >= 32)

Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
===================================================================
--- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
+++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
@@ -0,0 +1,18 @@
+--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
+@@ -37,7 +37,6 @@
+ #define must_check __attribute__((warn_unused_result))
+ #define constant __attribute__((const))
+ #define pure __attribute__((pure))
+-#define __packed__ __attribute__((__packed__))
+ #define flatten __attribute__((flatten))
+ #else
+ #define likely(expr) (expr)
+@@ -48,7 +47,6 @@
+ #define must_check
+ #define constant
+ #define pure
+-#define __packed__
+ #define flatten
+ #endif
+ 

Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
===================================================================
--- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
+++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
@@ -0,0 +1,91 @@
+--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
+@@ -658,7 +658,11 @@
+ 	if (file) {
+ 		size_t len = 0;
+ 		char *line = NULL;
++#ifdef __GLIBC__
+ 		while (getline(&line, &len, file) != -1) {
++#else
++		while ((line = fgetln(file, &len)) != (char *) NULL) {
++#endif
+ 			int mb;
+ 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
+ 				/* Paranoid check against gargantuan caches */
+@@ -1666,7 +1670,8 @@
+ static struct kgem_bo *
+ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
+ {
+-	struct kgem_bo *bo, *first = NULL;
++	struct kgem_bo *bo = NULL;
++	struct kgem_bo *first = NULL;
+ 
+ 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
+ 
+@@ -1868,7 +1873,8 @@
+ 
+ static bool kgem_retire__flushing(struct kgem *kgem)
+ {
+-	struct kgem_bo *bo, *next;
++	struct kgem_bo *bo = NULL;
++	struct kgem_bo *next;
+ 	bool retired = false;
+ 
+ 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
+@@ -2073,7 +2079,8 @@
+ static void kgem_commit(struct kgem *kgem)
+ {
+ 	struct kgem_request *rq = kgem->next_request;
+-	struct kgem_bo *bo, *next;
++	struct kgem_bo *bo = NULL;
++	struct kgem_bo *next;
+ 
+ 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
+ 		assert(next->request.prev == &bo->request);
+@@ -2154,7 +2161,8 @@
+ 
+ static void kgem_finish_buffers(struct kgem *kgem)
+ {
+-	struct kgem_buffer *bo, *next;
++	struct kgem_buffer *bo = NULL;
++	struct kgem_buffer *next;
+ 
+ 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
+ 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
+@@ -2963,7 +2971,8 @@
+ static struct kgem_bo *
+ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
+ {
+-	struct kgem_bo *bo, *first = NULL;
++	struct kgem_bo *bo = NULL;
++	struct kgem_bo *first = NULL;
+ 	bool use_active = (flags & CREATE_INACTIVE) == 0;
+ 	struct list *cache;
+ 
+@@ -3521,7 +3530,7 @@
+ 			       uint32_t flags)
+ {
+ 	struct list *cache;
+-	struct kgem_bo *bo;
++	struct kgem_bo *bo = NULL;
+ 	uint32_t pitch, tiled_height, size;
+ 	uint32_t handle;
+ 	int i, bucket, retry;
+@@ -4834,7 +4843,7 @@
+ void kgem_clear_dirty(struct kgem *kgem)
+ {
+ 	struct list * const buffers = &kgem->next_request->buffers;
+-	struct kgem_bo *bo;
++	struct kgem_bo *bo = NULL;
+ 
+ 	list_for_each_entry(bo, buffers, request) {
+ 		if (!bo->dirty)
+@@ -5072,7 +5081,7 @@
+ 				   uint32_t size, uint32_t flags,
+ 				   void **ret)
+ {
+-	struct kgem_buffer *bo;
++	struct kgem_buffer *bo = NULL;
+ 	unsigned offset, alloc;
+ 	struct kgem_bo *old;
+ 

Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-drivers/xf86-video-mach64/Makefile
===================================================================
--- x11-drivers/xf86-video-mach64/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-mach64
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.9.0
+PORTVERSION=	6.9.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,6 +10,6 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
+USE_XORG=	glproto xf86driproto xf86miscproto
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-mach64/distinfo
===================================================================
--- x11-drivers/xf86-video-mach64/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
-SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
+SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
+SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
Index: x11-drivers/xf86-video-mga/Makefile
===================================================================
--- x11-drivers/xf86-video-mga/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-mga/Makefile	(working copy)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	xf86-video-mga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.4.13
-PORTEPOCH=	2
+PORTVERSION=	1.6.1
+PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,7 +11,7 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto glproto
+USE_XORG=	xf86driproto glproto
 MAN4=		mga.4x
 
 pre-patch:
Index: x11-drivers/xf86-video-mga/distinfo
===================================================================
--- x11-drivers/xf86-video-mga/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-mga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
-SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
+SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
+SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
Index: x11-drivers/xf86-video-neomagic/Makefile
===================================================================
--- x11-drivers/xf86-video-neomagic/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-neomagic
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-neomagic
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.7
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,7 @@
 COMMENT=	X.Org neomagic display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86dgaproto
+USE_XORG=	xf86dgaproto
 MAN4=		neomagic.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-neomagic/distinfo
===================================================================
--- x11-drivers/xf86-video-neomagic/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
-SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
+SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
Index: x11-drivers/xf86-video-newport/Makefile
===================================================================
--- x11-drivers/xf86-video-newport/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-newport/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-newport
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-newport
-PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTVERSION=	0.2.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org newport display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto
 MAN4=		newport.4x
 
 post-patch:
Index: x11-drivers/xf86-video-newport/distinfo
===================================================================
--- x11-drivers/xf86-video-newport/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-newport/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
-SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
+SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
+SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
Index: x11-drivers/xf86-video-nouveau/Makefile
===================================================================
--- x11-drivers/xf86-video-nouveau/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86-video-nouveau
-# Date Created:				29 Jan 2009
-# Whom:					Anonymous <swell.k@gmail.com>
-#
+# Created by: Anonymous <swell.k@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-nouveau
 PORTVERSION=	0.0.10.${SNAPDATE}
@@ -16,7 +12,7 @@
 COMMENT=	Free nouveau display driver for nvidia-based cards
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86driproto glproto
+USE_XORG=	xf86driproto glproto
 MAN4=		nouveau.4x
 
 MAKE_JOBS_SAFE=	yes
Index: x11-drivers/xf86-video-nv/Makefile
===================================================================
--- x11-drivers/xf86-video-nv/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-nv/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-nv
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-nv
-PORTVERSION=	2.1.18
+PORTVERSION=	2.1.20
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,6 @@
 COMMENT=	X.Org nv display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		nv.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-nv/distinfo
===================================================================
--- x11-drivers/xf86-video-nv/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-nv/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
-SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
+SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
+SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
Index: x11-drivers/xf86-video-openchrome/Makefile
===================================================================
--- x11-drivers/xf86-video-openchrome/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
@@ -1,15 +1,8 @@
-# New ports collection makefile for:	xf86-video-openchrome
-# Date Created:				17 Sep 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-openchrome
-PORTVERSION=	0.2.904
-PORTREVISION=	3
+PORTVERSION=	0.3.2
 CATEGORIES=	x11-drivers
-MASTER_SITES=	http://www.openchrome.org/releases/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org openChrome display driver
@@ -17,7 +10,7 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
+USE_XORG=	xf86driproto xvmc glproto
 MAN4=		openchrome.4x
 
 MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
Index: x11-drivers/xf86-video-openchrome/distinfo
===================================================================
--- x11-drivers/xf86-video-openchrome/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
+SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
+SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
===================================================================
--- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 316007)
+++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
@@ -1,32 +0,0 @@
---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
-+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
-@@ -36,6 +36,11 @@
- #include "via_driver.h" /* for HAVE_DEBUG */
- #include "via_vgahw.h"
- 
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+#define PIOOFFSET 0
-+#endif
- 
- static CARD8
- ViaVgahwIn(vgaHWPtr hwp, int address)
-@@ -43,7 +48,7 @@
-     if (hwp->MMIOBase)
-         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
-     else
--        return inb(hwp->PIOOffset + address);
-+        return inb(PIOOFFSET + address);
- }
- 
- static void
-@@ -52,7 +57,7 @@
-     if (hwp->MMIOBase)
-         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
-     else
--        outb(hwp->PIOOffset + address, value);
-+        outb(PIOOFFSET + address, value);
- }
- 
- /*
Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
===================================================================
--- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 316007)
+++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
@@ -1,83 +0,0 @@
-Fix Xvideo crash in X.org server 1.10
-
-http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
-
---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
-+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
-@@ -763,67 +763,6 @@
-     return 0;
- }
- 
--
--/*
-- * This one gets called, for example, on panning.
-- */
--
--static int
--viaReputImage(ScrnInfoPtr pScrn,
--        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
--        DrawablePtr pDraw)
--{
--
--    DDUPDATEOVERLAY UpdateOverlay_Video;
--    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
--    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
--    VIAPtr pVia = VIAPTR(pScrn);
--
--    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
--        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
--        if (pPriv->autoPaint) {
--            if (pDraw->type == DRAWABLE_WINDOW) {
--                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
--            } else {
--                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
--                    clipBoxes);
--            }
--        }
--    }
--
--    if (drw_x == pPriv->old_drw_x &&
--        drw_y == pPriv->old_drw_y &&
--        pVia->swov.oldPanningX == pVia->swov.panning_x &&
--        pVia->swov.oldPanningY == pVia->swov.panning_y) {
--        viaXvError(pScrn, pPriv, xve_none);
--        return Success;
--    }
--
--    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
--    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
--    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
--    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
--
--    lpUpdateOverlay->DstLeft = drw_x;
--    lpUpdateOverlay->DstTop = drw_y;
--    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
--    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
--    pPriv->old_drw_x = drw_x;
--    pPriv->old_drw_y = drw_y;
--
--    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
--
--    if (pScrn->bitsPerPixel == 8)
--        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
--    else
--        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
--
--    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
--
--    viaXvError(pScrn, pPriv, xve_none);
--    return Success;
--}
--
- static unsigned
- viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
- {
-@@ -884,7 +823,7 @@
-         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
-         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
-         viaAdaptPtr[i]->PutImage = viaPutImage;
--        viaAdaptPtr[i]->ReputImage = viaReputImage;
-+        viaAdaptPtr[i]->ReputImage = NULL;
-         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
-         for (j = 0; j < numPorts; ++j) {
-             viaPortPriv[j].dmaBounceBuffer = NULL;
Index: x11-drivers/xf86-video-r128/Makefile
===================================================================
--- x11-drivers/xf86-video-r128/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-r128/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-r128
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-r128
-PORTVERSION=	6.8.1
+PORTVERSION=	6.8.4
 PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
@@ -15,7 +10,7 @@
 
 USE_GL=		gl
 XORG_CAT=	driver
-USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
+USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
 MAN4=		r128.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-r128/distinfo
===================================================================
--- x11-drivers/xf86-video-r128/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-r128/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
-SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
+SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
+SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
Index: x11-drivers/xf86-video-rendition/Makefile
===================================================================
--- x11-drivers/xf86-video-rendition/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-rendition
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-rendition
-PORTVERSION=	4.2.4
+PORTVERSION=	4.2.5
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,6 @@
 COMMENT=	X.Org rendition display driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		rendition.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-rendition/distinfo
===================================================================
--- x11-drivers/xf86-video-rendition/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
+SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
+SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
Index: x11-drivers/xf86-video-s3/Makefile
===================================================================
--- x11-drivers/xf86-video-s3/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-s3/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-s3
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-s3
-PORTVERSION=	0.6.3
-PORTREVISION=	3
+PORTVERSION=	0.6.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org s3 display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		s3.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3/distinfo
===================================================================
--- x11-drivers/xf86-video-s3/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-s3/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
+SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
+SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
Index: x11-drivers/xf86-video-s3virge/Makefile
===================================================================
--- x11-drivers/xf86-video-s3virge/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-s3virge
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-s3virge
-PORTVERSION=	1.10.4
-PORTREVISION=	2
+PORTVERSION=	1.10.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org s3virge display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		s3virge.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3virge/distinfo
===================================================================
--- x11-drivers/xf86-video-s3virge/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
-SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
+SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
Index: x11-drivers/xf86-video-savage/Makefile
===================================================================
--- x11-drivers/xf86-video-savage/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-savage/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-savage
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,7 +11,7 @@
 
 WITH_FBSD10_FIX=yes
 XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto glproto
+USE_XORG=	xf86driproto glproto
 MAN4=		savage.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-savage/distinfo
===================================================================
--- x11-drivers/xf86-video-savage/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-savage/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
-SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
+SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
+SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
Index: x11-drivers/xf86-video-siliconmotion/Makefile
===================================================================
--- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
@@ -1,19 +1,13 @@
-# New ports collection makefile for:	xf86-video-siliconmotion
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org siliconmotion display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		siliconmotion.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-siliconmotion/distinfo
===================================================================
--- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
Index: x11-drivers/xf86-video-sis/Makefile
===================================================================
--- x11-drivers/xf86-video-sis/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-sis/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-sis
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.3
+PORTVERSION=	0.10.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -17,11 +12,7 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
 MAN4=		sis.4x
 
-post-patch:
-	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
-		${WRKSRC}/configure
-	
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-sis/distinfo
===================================================================
--- x11-drivers/xf86-video-sis/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-sis/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
-SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
+SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
+SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
Index: x11-drivers/xf86-video-sunffb/Makefile
===================================================================
--- x11-drivers/xf86-video-sunffb/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-video-sunffb
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.1
Index: x11-drivers/xf86-video-tdfx/Makefile
===================================================================
--- x11-drivers/xf86-video-tdfx/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-tdfx
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-tdfx
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.5
 PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
@@ -16,7 +11,7 @@
 USE_GL=		gl
 
 XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto glproto
+USE_XORG=	xf86driproto glproto
 MAN4=		tdfx.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tdfx/distinfo
===================================================================
--- x11-drivers/xf86-video-tdfx/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
-SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
+SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
Index: x11-drivers/xf86-video-tga/Makefile
===================================================================
--- x11-drivers/xf86-video-tga/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-tga/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-tga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-tga
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
@@ -14,6 +9,6 @@
 COMMENT=	X.Org tga display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86dgaproto
+USE_XORG=	xf86dgaproto
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tga/distinfo
===================================================================
--- x11-drivers/xf86-video-tga/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-tga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
-SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
+SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
+SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
Index: x11-drivers/xf86-video-trident/Makefile
===================================================================
--- x11-drivers/xf86-video-trident/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-trident/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-trident
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.6
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,7 @@
 COMMENT=	X.Org trident display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86dgaproto
+USE_XORG=	xf86dgaproto
 MAN4=		trident.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-trident/distinfo
===================================================================
--- x11-drivers/xf86-video-trident/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-trident/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
-SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
+SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
+SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
Index: x11-drivers/xf86-video-tseng/Makefile
===================================================================
--- x11-drivers/xf86-video-tseng/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-tseng
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-tseng
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,6 @@
 COMMENT=	X.Org tseng display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		tseng.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tseng/distinfo
===================================================================
--- x11-drivers/xf86-video-tseng/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
-SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
+SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
+SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
Index: x11-drivers/xf86-video-vesa/Makefile
===================================================================
--- x11-drivers/xf86-video-vesa/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	xf86-video-vesa
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-vesa
-PORTVERSION=	2.3.0
-PORTREVISION=	2
+PORTVERSION=	2.3.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vesa display driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto videoproto
 MAN4=		vesa.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-vesa/distinfo
===================================================================
--- x11-drivers/xf86-video-vesa/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
-SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
+SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
+SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
Index: x11-drivers/xf86-video-via/Makefile
===================================================================
--- x11-drivers/xf86-video-via/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-via/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86-video-via
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-via
 PORTVERSION=	0.2.2
Index: x11-drivers/xf86-video-vmware/Makefile
===================================================================
--- x11-drivers/xf86-video-vmware/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	xf86-video-vmware
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-vmware
-PORTVERSION=	12.0.2
-PORTREVISION=	1
+PORTVERSION=	13.0.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-vmware/distinfo
===================================================================
--- x11-drivers/xf86-video-vmware/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
-SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
+SHA256 (xorg/driver/xf86-video-vmware-13.0.0.tar.bz2) = 44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6
+SIZE (xorg/driver/xf86-video-vmware-13.0.0.tar.bz2) = 445703
Index: x11-drivers/xf86-video-voodoo/Makefile
===================================================================
--- x11-drivers/xf86-video-voodoo/Makefile	(revision 316007)
+++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-video-voodoo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-voodoo
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
@@ -14,7 +9,7 @@
 COMMENT=	X.Org voodoo display driver
 
 XORG_CAT=	driver
-USE_XORG=	xf86dgaproto xextproto videoproto
+USE_XORG=	xf86dgaproto
 MAN4=		voodoo.4x
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-voodoo/distinfo
===================================================================
--- x11-drivers/xf86-video-voodoo/distinfo	(revision 316007)
+++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
-SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
+SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
Index: x11-drivers/xorg-drivers/Makefile
===================================================================
--- x11-drivers/xorg-drivers/Makefile	(revision 316007)
+++ x11-drivers/xorg-drivers/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-drivers
-PORTVERSION=	7.5.2
+PORTVERSION=	7.7
 CATEGORIES=	x11-drivers
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -92,10 +92,9 @@
 OPENCHROME_DESC=	Install openchrome video driver
 SUNFFB_DESC=		Install sunffb video driver
 
-# these drivers module name are different then the plugin they install
-QUIRKS=		keyboard:kbd
+# these drivers have a different module name compared to the plugin they install
+QUIRKS=		keyboard:kbd jamstudio:js_x
 
-
 .include <bsd.port.options.mk>
 
 # Manual add arch specific drivers so they be added to depend lines.
Index: x11-fonts/bdftopcf/Makefile
===================================================================
--- x11-fonts/bdftopcf/Makefile	(revision 316007)
+++ x11-fonts/bdftopcf/Makefile	(working copy)
@@ -9,7 +9,7 @@
 COMMENT=	Convert X font from BDF to PCF
 
 XORG_CAT=	app
-USE_XORG=	xfont xorg-macros
+USE_XORG=	xfont
 
 PLIST_FILES=	bin/bdftopcf
 MAN1=		bdftopcf.1
Index: x11-fonts/encodings/Makefile
===================================================================
--- x11-fonts/encodings/Makefile	(revision 316007)
+++ x11-fonts/encodings/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    encodings
-# Date created:				Oct 29 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	encodings
 PORTVERSION=	1.0.4
Index: x11-fonts/font-adobe-100dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-100dpi/Makefile	(revision 316007)
+++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-100dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-adobe-75dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-75dpi/Makefile	(revision 316007)
+++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-75dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 316007)
+++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-100dpi
 PORTVERSION=	1.0.4
Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 316007)
+++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-75dpi
 PORTVERSION=	1.0.4
Index: x11-fonts/font-adobe-utopia-type1/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 316007)
+++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-type1
 PORTVERSION=	1.0.4
Index: x11-fonts/font-alias/Makefile
===================================================================
--- x11-fonts/font-alias/Makefile	(revision 316007)
+++ x11-fonts/font-alias/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-alias
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-alias
 PORTVERSION=	1.0.3
Index: x11-fonts/font-arabic-misc/Makefile
===================================================================
--- x11-fonts/font-arabic-misc/Makefile	(revision 316007)
+++ x11-fonts/font-arabic-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-arabic-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-arabic-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-100dpi/Makefile
===================================================================
--- x11-fonts/font-bh-100dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-100dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-75dpi/Makefile
===================================================================
--- x11-fonts/font-bh-75dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-75dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
===================================================================
--- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-lucidatypewriter-100dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
===================================================================
--- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-lucidatypewriter-75dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-ttf/Makefile
===================================================================
--- x11-fonts/font-bh-ttf/Makefile	(revision 316007)
+++ x11-fonts/font-bh-ttf/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-ttf
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-ttf
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bh-type1/Makefile
===================================================================
--- x11-fonts/font-bh-type1/Makefile	(revision 316007)
+++ x11-fonts/font-bh-type1/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-type1
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bitstream-100dpi/Makefile
===================================================================
--- x11-fonts/font-bitstream-100dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-100dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bitstream-75dpi/Makefile
===================================================================
--- x11-fonts/font-bitstream-75dpi/Makefile	(revision 316007)
+++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-75dpi
 PORTVERSION=	1.0.3
Index: x11-fonts/font-bitstream-speedo/Makefile
===================================================================
--- x11-fonts/font-bitstream-speedo/Makefile	(revision 316007)
+++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-bitstream-speedo
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-speedo
 PORTVERSION=	1.0.2
Index: x11-fonts/font-bitstream-type1/Makefile
===================================================================
--- x11-fonts/font-bitstream-type1/Makefile	(revision 316007)
+++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-type1
 PORTVERSION=	1.0.3
Index: x11-fonts/font-cronyx-cyrillic/Makefile
===================================================================
--- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 316007)
+++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-cronyx-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-cronyx-cyrillic
 PORTVERSION=	1.0.3
Index: x11-fonts/font-cursor-misc/Makefile
===================================================================
--- x11-fonts/font-cursor-misc/Makefile	(revision 316007)
+++ x11-fonts/font-cursor-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-cursor-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-cursor-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-daewoo-misc/Makefile
===================================================================
--- x11-fonts/font-daewoo-misc/Makefile	(revision 316007)
+++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-daewoo-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-daewoo-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-dec-misc/Makefile
===================================================================
--- x11-fonts/font-dec-misc/Makefile	(revision 316007)
+++ x11-fonts/font-dec-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-dec-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-dec-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-ibm-type1/Makefile
===================================================================
--- x11-fonts/font-ibm-type1/Makefile	(revision 316007)
+++ x11-fonts/font-ibm-type1/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-ibm-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-ibm-type1
 PORTVERSION=	1.0.3
Index: x11-fonts/font-isas-misc/Makefile
===================================================================
--- x11-fonts/font-isas-misc/Makefile	(revision 316007)
+++ x11-fonts/font-isas-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-isas-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-isas-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-jis-misc/Makefile
===================================================================
--- x11-fonts/font-jis-misc/Makefile	(revision 316007)
+++ x11-fonts/font-jis-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-jis-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-jis-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-micro-misc/Makefile
===================================================================
--- x11-fonts/font-micro-misc/Makefile	(revision 316007)
+++ x11-fonts/font-micro-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-micro-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-micro-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-misc-cyrillic/Makefile
===================================================================
--- x11-fonts/font-misc-cyrillic/Makefile	(revision 316007)
+++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-misc-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-cyrillic
 PORTVERSION=	1.0.3
Index: x11-fonts/font-misc-ethiopic/Makefile
===================================================================
--- x11-fonts/font-misc-ethiopic/Makefile	(revision 316007)
+++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-misc-ethiopic
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-ethiopic
 PORTVERSION=	1.0.3
Index: x11-fonts/font-misc-meltho/Makefile
===================================================================
--- x11-fonts/font-misc-meltho/Makefile	(revision 316007)
+++ x11-fonts/font-misc-meltho/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-misc-meltho
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-meltho
 PORTVERSION=	1.0.3
Index: x11-fonts/font-misc-misc/Makefile
===================================================================
--- x11-fonts/font-misc-misc/Makefile	(revision 316007)
+++ x11-fonts/font-misc-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-misc-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-misc
 PORTVERSION=	1.1.2
Index: x11-fonts/font-mutt-misc/Makefile
===================================================================
--- x11-fonts/font-mutt-misc/Makefile	(revision 316007)
+++ x11-fonts/font-mutt-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-mutt-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-mutt-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-schumacher-misc/Makefile
===================================================================
--- x11-fonts/font-schumacher-misc/Makefile	(revision 316007)
+++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-schumacher-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-schumacher-misc
 PORTVERSION=	1.1.2
Index: x11-fonts/font-screen-cyrillic/Makefile
===================================================================
--- x11-fonts/font-screen-cyrillic/Makefile	(revision 316007)
+++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-screen-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-screen-cyrillic
 PORTVERSION=	1.0.4
Index: x11-fonts/font-sony-misc/Makefile
===================================================================
--- x11-fonts/font-sony-misc/Makefile	(revision 316007)
+++ x11-fonts/font-sony-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-sony-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-sony-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-sun-misc/Makefile
===================================================================
--- x11-fonts/font-sun-misc/Makefile	(revision 316007)
+++ x11-fonts/font-sun-misc/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-sun-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-sun-misc
 PORTVERSION=	1.0.3
Index: x11-fonts/font-util/Makefile
===================================================================
--- x11-fonts/font-util/Makefile	(revision 316007)
+++ x11-fonts/font-util/Makefile	(working copy)
@@ -11,7 +11,6 @@
 XORG_CAT=	font
 
 USE_PKGCONFIG=	build
-USE_XORG=	xorg-macros
 
 MAN1=		bdftruncate.1 ucs2any.1
 
Index: x11-fonts/font-winitzki-cyrillic/Makefile
===================================================================
--- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 316007)
+++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-winitzki-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-winitzki-cyrillic
 PORTVERSION=	1.0.3
Index: x11-fonts/font-xfree86-type1/Makefile
===================================================================
--- x11-fonts/font-xfree86-type1/Makefile	(revision 316007)
+++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-xfree86-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-xfree86-type1
 PORTVERSION=	1.0.4
Index: x11-fonts/fontcacheproto/Makefile
===================================================================
--- x11-fonts/fontcacheproto/Makefile	(revision 316007)
+++ x11-fonts/fontcacheproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fontcacheproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fontcacheproto
 PORTVERSION=	0.1.3
Index: x11-fonts/fontsproto/Makefile
===================================================================
--- x11-fonts/fontsproto/Makefile	(revision 316007)
+++ x11-fonts/fontsproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	fontsproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fontsproto
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-fonts/fontsproto/distinfo
===================================================================
--- x11-fonts/fontsproto/distinfo	(revision 316007)
+++ x11-fonts/fontsproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
-SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
+SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
+SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
Index: x11-fonts/fonttosfnt/Makefile
===================================================================
--- x11-fonts/fonttosfnt/Makefile	(revision 316007)
+++ x11-fonts/fonttosfnt/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	fonttosfnt
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	fonttosfnt
 PORTVERSION=	1.0.4
Index: x11-fonts/fslsfonts/Makefile
===================================================================
--- x11-fonts/fslsfonts/Makefile	(revision 316007)
+++ x11-fonts/fslsfonts/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	List fonts served by the X font server
 
 XORG_CAT=	app
-USE_XORG=	x11 libfs xorg-macros
+USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/fslsfonts
 
Index: x11-fonts/libFS/Makefile
===================================================================
--- x11-fonts/libFS/Makefile	(revision 316007)
+++ x11-fonts/libFS/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libFS
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libFS
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-fonts/libFS/distinfo
===================================================================
--- x11-fonts/libFS/distinfo	(revision 316007)
+++ x11-fonts/libFS/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
-SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
+SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
+SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
Index: x11-fonts/libXfont/Makefile
===================================================================
--- x11-fonts/libXfont/Makefile	(revision 316007)
+++ x11-fonts/libXfont/Makefile	(working copy)
@@ -1,18 +1,13 @@
-# New ports collection makefile for:   libXfont
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.5
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X font library
+COMMENT=	X font libary
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
Index: x11-fonts/libXfont/distinfo
===================================================================
--- x11-fonts/libXfont/distinfo	(revision 316007)
+++ x11-fonts/libXfont/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
-SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
+SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
+SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
===================================================================
--- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 316007)
+++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
@@ -1,101 +0,0 @@
-From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@britannica.bec.de>
-Date: Sun, 21 Aug 2011 16:51:53 +0000
-Subject: Do proper input validation to fix for CVE-2011-2895.
-
-It ensures that all valid input can be decompressed, checks that the
-overflow conditions doesn't happen and generally tightens the
-validation of the LZW stream and doesn't pessimize the inner loop for
-no good reason. It's derived from a change in libarchive from 2004.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Tomas Hoger <thoger@redhat.com>
-
---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
-+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
-@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
- #define FIRST	257	/* first free entry */
- #define	CLEAR	256	/* table clear output code */
- 
--#define STACK_SIZE  8192
-+#define STACK_SIZE  65300
- 
- typedef struct _compressedFILE {
-     BufFilePtr	    file;
-@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
- 	file->tab_suffix[code] = (char_type) code;
-     }
-     file->free_ent = ((file->block_compress) ? FIRST : 256 );
-+    file->oldcode = -1;
-     file->clear_flg = 0;
-     file->offset = 0;
-     file->size = 0;
-     file->stackp = file->de_stack;
-     bzero(file->buf, BITS);
--    file->finchar = file->oldcode = getcode (file);
--    if (file->oldcode != -1)
--	*file->stackp++ = file->finchar;
-     return BufFileCreate ((char *) file,
- 			  BufCompressedFill,
- 			  0,
-@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
- 	if (buf == bufend)
- 	    break;
- 
--	if (oldcode == -1)
--	    break;
--
- 	code = getcode (file);
- 	if (code == -1)
- 	    break;
-@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
- 	    for ( code = 255; code >= 0; code-- )
- 	    	file->tab_prefix[code] = 0;
- 	    file->clear_flg = 1;
--	    file->free_ent = FIRST - 1;
--	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
--	    	break;
-+	    file->free_ent = FIRST;
-+	    oldcode = -1;
-+	    continue;
-     	}
-     	incode = code;
-     	/*
-      	 * Special case for KwKwK string.
-      	 */
-     	if ( code >= file->free_ent ) {
-+	    if ( code > file->free_ent || oldcode == -1 ) {
-+		/* Bad stream. */
-+		return BUFFILEEOF;
-+	    }
- 	    *stackp++ = finchar;
- 	    code = oldcode;
-     	}
--    
-+
-+	/*
-+	 * The above condition ensures that code < free_ent.
-+	 * The construction of tab_prefixof in turn guarantees that
-+	 * each iteration decreases code and therefore stack usage is
-+	 * bound by 1 << BITS - 256.
-+	 */
-+
-     	/*
-      	 * Generate output characters in reverse order
-      	 */
-     	while ( code >= 256 )
-     	{
--	    if (stackp - de_stack >= STACK_SIZE - 1)
--		return BUFFILEEOF;
- 	    *stackp++ = file->tab_suffix[code];
- 	    code = file->tab_prefix[code];
-     	}
-@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
-     	/*
-      	 * Generate the new entry.
-      	 */
--    	if ( (code=file->free_ent) < file->maxmaxcode ) {
-+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
- 	    file->tab_prefix[code] = (unsigned short)oldcode;
- 	    file->tab_suffix[code] = finchar;
- 	    file->free_ent = code+1;
Index: x11-fonts/libXfontcache/Makefile
===================================================================
--- x11-fonts/libXfontcache/Makefile	(revision 316007)
+++ x11-fonts/libXfontcache/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXfontcache
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
Index: x11-fonts/libfontenc/Makefile
===================================================================
--- x11-fonts/libfontenc/Makefile	(revision 316007)
+++ x11-fonts/libfontenc/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libfontenc
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libfontenc
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-fonts/libfontenc/distinfo
===================================================================
--- x11-fonts/libfontenc/distinfo	(revision 316007)
+++ x11-fonts/libfontenc/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
-SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
+SHA256 (xorg/lib/libfontenc-1.1.1.tar.bz2) = de72812f1856bb63bd2226ec8c2e2301931d3c72bd0f08b0d63a0cdf0722017f
+SIZE (xorg/lib/libfontenc-1.1.1.tar.bz2) = 289688
Index: x11-fonts/mkfontdir/Makefile
===================================================================
--- x11-fonts/mkfontdir/Makefile	(revision 316007)
+++ x11-fonts/mkfontdir/Makefile	(working copy)
@@ -8,7 +8,6 @@
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Create an index of X font files in a directory
 
-USE_XORG=	xorg-macros
 RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 XORG_CAT=	app
Index: x11-fonts/mkfontscale/Makefile
===================================================================
--- x11-fonts/mkfontscale/Makefile	(revision 316007)
+++ x11-fonts/mkfontscale/Makefile	(working copy)
@@ -11,7 +11,7 @@
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 XORG_CAT=	app
-USE_XORG=	xproto fontenc xorg-macros
+USE_XORG=	xproto fontenc
 
 PLIST_FILES=	bin/mkfontscale
 MAN1=		mkfontscale.1
Index: x11-fonts/showfont/Makefile
===================================================================
--- x11-fonts/showfont/Makefile	(revision 316007)
+++ x11-fonts/showfont/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Font dumper for the X font server
 
 XORG_CAT=	app
-USE_XORG=	libfs xorg-macros
+USE_XORG=	libfs
 
 PLIST_FILES=	bin/showfont
 
Index: x11-fonts/xf86bigfontproto/Makefile
===================================================================
--- x11-fonts/xf86bigfontproto/Makefile	(revision 316007)
+++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86bigfontproto
 PORTVERSION=	1.2.0
Index: x11-fonts/xfontsel/Makefile
===================================================================
--- x11-fonts/xfontsel/Makefile	(revision 316007)
+++ x11-fonts/xfontsel/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Point and click selection of X11 font names
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xfontsel.1
 
Index: x11-fonts/xfs/Makefile
===================================================================
--- x11-fonts/xfs/Makefile	(revision 316007)
+++ x11-fonts/xfs/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xfs
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfs
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -17,7 +12,7 @@
 USE_GMAKE=	yes
 USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
-CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
+CONFIGURE_ARGS=	--without-xmlto --without-fop
 
 MAN1=		xfs.1
 
Index: x11-fonts/xfs/distinfo
===================================================================
--- x11-fonts/xfs/distinfo	(revision 316007)
+++ x11-fonts/xfs/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
-SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
+SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
+SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
Index: x11-fonts/xfsinfo/Makefile
===================================================================
--- x11-fonts/xfsinfo/Makefile	(revision 316007)
+++ x11-fonts/xfsinfo/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	X font server information utility
 
 XORG_CAT=	app
-USE_XORG=	x11 libfs xorg-macros
+USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/xfsinfo
 
Index: x11-fonts/xlsfonts/Makefile
===================================================================
--- x11-fonts/xlsfonts/Makefile	(revision 316007)
+++ x11-fonts/xlsfonts/Makefile	(working copy)
@@ -8,7 +8,7 @@
 COMMENT=	Server font list displayer for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/xlsfonts
 
Index: x11-fonts/xorg-fonts/Makefile
===================================================================
--- x11-fonts/xorg-fonts/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-fonts
-# Date created:				Jun 22 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-100dpi/Makefile
===================================================================
--- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-100dpi
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-75dpi/Makefile
===================================================================
--- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-75dpi
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-cyrillic/Makefile
===================================================================
--- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-cyrillic
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
===================================================================
--- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-miscbitmaps
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-truetype/Makefile
===================================================================
--- x11-fonts/xorg-fonts-truetype/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-truetype
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-fonts/xorg-fonts-type1/Makefile
===================================================================
--- x11-fonts/xorg-fonts-type1/Makefile	(revision 316007)
+++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-type1
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: x11-servers/mga_hal/Makefile
===================================================================
--- x11-servers/mga_hal/Makefile	(revision 316007)
+++ x11-servers/mga_hal/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mga_hal
-# Date created:				12 Jan 2005
-# Whom:					anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mga_hal
 PORTVERSION=	4.4.0
Index: x11-servers/xephyr/Makefile
===================================================================
--- x11-servers/xephyr/Makefile	(revision 316007)
+++ x11-servers/xephyr/Makefile	(working copy)
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	xephyr
-# Date created:				2008-05-18
-# Whom:					Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xephyr
 PORTREVISION=	0
 
-COMMENT=	A kdrive based X server from X.Org
+COMMENT=	X server from X.Org based on kdrive
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
@@ -22,8 +17,7 @@
 
 CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
 		--without-xmlto --disable-docs --disable-devel-docs \
-		--disable-xorg --disable-xnest \
-		--localstatedir=/var --without-dtrace
+		--disable-xnest --localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr
Index: x11-servers/xorg-dmx/Makefile
===================================================================
--- x11-servers/xorg-dmx/Makefile	(revision 316007)
+++ x11-servers/xorg-dmx/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xorg-dmx
-# Date created:		13 Mar 2005
-# Whom:			lesi@FreeBSD.org
-#
+# Created by: lesi@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-dmx
 PORTREVISION=	0
@@ -21,7 +17,7 @@
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
 		xau dmx xtst xres pixman xtrans
 
-CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
+CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
 		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=/var --without-dtrace
 
Index: x11-servers/xorg-dmx/pkg-plist
===================================================================
--- x11-servers/xorg-dmx/pkg-plist	(revision 316007)
+++ x11-servers/xorg-dmx/pkg-plist	(working copy)
@@ -11,5 +11,3 @@
 bin/dmxwininfo
 bin/vdltodmx
 bin/xdmxconfig
-%%NEW%%@dirrmtry share/X11/xorg.conf.d
-%%NEW%%@dirrmtry share/X11
Index: x11-servers/xorg-nestserver/Makefile
===================================================================
--- x11-servers/xorg-nestserver/Makefile	(revision 316007)
+++ x11-servers/xorg-nestserver/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-nestserver
-# Date created:		21 July 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-nestserver
-PORTREVISION=	1
 
 COMMENT=	Nesting X server from X.Org
 
@@ -20,7 +15,7 @@
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile	(revision 316007)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -1,45 +1,42 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME?=	xorg-server
 PORTVERSION=	${XORG_VERSION}
 PORTREVISION?=	${XORG_REVISION}
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
-DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
+MASTER_SITES=	XORG
+MASTER_SITE_SUBDIR=	individual/xserver
+DISTNAME=	xorg-server-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT?=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
+RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
 SLAVE_PORT?=	no
 
 .if defined(WITH_NEW_XORG)
-XORG_VERSION=	1.10.6
-XORG_REVISION=	2
+XORG_VERSION=	1.12.4
+XORG_REVISION=	0
 PLIST_SUB+=	OLD="@comment " NEW=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
-		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
-		${FILESDIR}/extra-clang
+EXTRA_PATCHES+=	${FILESDIR}/extra-clang
 .else
 XORG_VERSION=	1.7.7
 XORG_REVISION=	6
 PLIST_SUB+=	OLD="" NEW="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
-EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
+		${FILESDIR}/extra-os-utils.c \
+		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
+		${FILESDIR}/extra-Xserver-os-xprintf.c \
+		${FILESDIR}/extra-servermd.h
 .endif
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
@@ -48,8 +45,7 @@
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
 		resourceproto fontsproto inputproto xf86dgaproto \
 		videoproto compositeproto trapproto recordproto xineramaproto \
-		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
-		xorg-macros
+		xinerama evieproto xfont fontenc xkbui pixman pciaccess
 
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
@@ -96,7 +92,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 CONFIGURE_ARGS+=	--enable-config-hal=yes
 .else
 CONFIGURE_ARGS+=	--enable-config-hal=no
@@ -115,8 +111,12 @@
 .endif
 
 .if ${ARCH} == i386
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
+.if defined(WITH_NEW_XORG)
+EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
 .endif
+.endif
 
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
@@ -166,6 +166,7 @@
 
 .if ${SLAVE_PORT} == "no"
 pre-su-install:
+# The .xorg dir is so it loads the rigth libglx library.
 	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${PREFIX}/lib/xorg/modules/extensions/.xorg/
Index: x11-servers/xorg-server/distinfo
===================================================================
--- x11-servers/xorg-server/distinfo	(revision 316007)
+++ x11-servers/xorg-server/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
-SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
-SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
+SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
+SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
===================================================================
--- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
+++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
@@ -0,0 +1,13 @@
+--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
+@@ -52,6 +52,10 @@
+ 	pVidMem->mapMem = sparc64MapVidMem;
+ 	pVidMem->unmapMem = sparc64UnmapVidMem;
+ 	pVidMem->initialised = TRUE;
++
++#if defined(__FreeBSD__)
++	pci_system_init_dev_mem(xf86Info.screenFd);
++#endif
+ }
+ 
+ static pointer

Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
===================================================================
--- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
+++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
@@ -0,0 +1,12 @@
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
+--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
+@@ -39,7 +39,7 @@
+ # ifdef __va_copy
+ #  define va_copy __va_copy
+ # else
+-#  error "no working va_copy was found"
++#  define va_copy(dest, src) ((dest) = (src))
+ # endif
+ #endif
+     

Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
___________________________________________________________________
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-servers/xorg-server/files/extra-arch-i386
===================================================================
--- x11-servers/xorg-server/files/extra-arch-i386	(revision 316007)
+++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
-@@ -1021,7 +1021,7 @@
- 
- #    if !defined(__SUNPRO_C)
- #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#     ifdef GCCUSESGAS
-+#     if defined(GCCUSESGAS) || defined(__clang__)
- 
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of these
Index: x11-servers/xorg-server/files/extra-clang
===================================================================
--- x11-servers/xorg-server/files/extra-clang	(revision 316007)
+++ x11-servers/xorg-server/files/extra-clang	(working copy)
@@ -1,53 +1,75 @@
---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
-+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
-@@ -479,7 +479,7 @@
- MatchAttrToken(const char *attr, struct list *patterns,
-                int (*compare)(const char *attr, const char *pattern))
+--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
+@@ -5189,7 +5189,8 @@
+ InitEvents(void)
  {
+     int i;
+-    QdEventPtr qe, tmp;
++    QdEventPtr qe = NULL;
++    QdEventPtr tmp;
+ 
+     inputInfo.numDevices = 0;
+     inputInfo.devices = (DeviceIntPtr) NULL;
+--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
+@@ -524,7 +524,7 @@
+ MatchAttrToken(const char *attr, struct xorg_list *patterns,
+                int (*compare) (const char *attr, const char *pattern))
+ {
 -    const xf86MatchGroup *group;
 +    const xf86MatchGroup *group = NULL;
  
      /* If there are no patterns, accept the match */
-     if (list_is_empty(patterns))
---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
-+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
-@@ -338,7 +338,8 @@
-     XF86ConfInputClassPtr prev;
- 
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group = NULL;
-+        xf86MatchGroup *next;
-         char **list;
- 
-         TestFree(ptr->identifier);
---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
-+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
-@@ -201,7 +201,7 @@
+     if (xorg_list_is_empty(patterns))
+--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
+@@ -239,7 +239,7 @@
  static DRI2DrawableRefPtr
  DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
  {
 -    DRI2DrawableRefPtr ref;
 +    DRI2DrawableRefPtr ref = NULL;
  
-     list_for_each_entry(ref, &pPriv->reference_list, link) {
- 	if (ref->id == id)
-@@ -267,7 +267,8 @@
+     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
+         if (ref->id == id)
+@@ -306,7 +306,8 @@
  {
      DRI2DrawablePtr pPriv = p;
-     DRI2ScreenPtr   ds = pPriv->dri2_screen;
+     DRI2ScreenPtr ds = pPriv->dri2_screen;
 -    DRI2DrawableRefPtr ref, next;
 +    DRI2DrawableRefPtr ref = NULL;
-+    DRI2DrawableRefPtr  next;
++    DRI2DrawableRefPtr next;
      WindowPtr pWin;
      PixmapPtr pPixmap;
      DrawablePtr pDraw;
-@@ -534,7 +535,7 @@
+@@ -587,7 +588,7 @@
  DRI2InvalidateDrawable(DrawablePtr pDraw)
  {
      DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
 -    DRI2DrawableRefPtr ref;
 +    DRI2DrawableRefPtr ref = NULL;
  
-     if (!pPriv)
+     if (!pPriv || !pPriv->needInvalidate)
          return;
+--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
+@@ -187,7 +187,7 @@
+ {
+     struct parent parent = { 0 };
+     struct child child[3];
+-    struct child *c;
++    struct child *c = NULL;
+     int i = 0;
+ 
+     xorg_list_init(&parent.children);
+--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
+@@ -1143,7 +1143,7 @@
+ barrier_find_nearest(CursorScreenPtr cs, int dir,
+                      int x1, int y1, int x2, int y2)
+ {
+-    struct PointerBarrierClient *c;
++    struct PointerBarrierClient *c = NULL;
+     struct PointerBarrier *nearest = NULL;
+     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
+ 
Index: x11-servers/xorg-server/files/extra-dix_events.c
===================================================================
--- x11-servers/xorg-server/files/extra-dix_events.c	(revision 316007)
+++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
@@ -1,89 +0,0 @@
---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
-+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
-@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE = &core;
-                 count = 1;
--                mask = grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count = 1;
--
--                /* FIXME: EventToXI2 returns NULL for enter events, so
--                 * dereferencing the event is bad. Internal event types are
--                 * aligned with core events, so the else clause is valid.
--                 * long-term we should use internal events for enter/focus
--                 * as well */
--                if (xE)
--                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
--                else if (event->type == XI_Enter || event->type == XI_FocusIn)
--                    mask = grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
--                            mask |= icp->xi2mask[device->id][evtype/8];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->type, rc);
-                     continue;
-                 }
--                mask = grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            mask |= icp->mask[device->id];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- 
--                TryClientEvents(rClient(grab), device, xE, count, mask,
-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab);
-             }
- 
Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
===================================================================
--- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 316007)
+++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
@@ -1,54 +0,0 @@
---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
-+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
-@@ -0,0 +1,51 @@
-+/*
-+ * Copyright 2011 Apple Inc.
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation on the rights to use, copy, modify, merge,
-+ * publish, distribute, sublicense, and/or sell copies of the Software,
-+ * and to permit persons to whom the Software is furnished to do so,
-+ * subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
-+ * portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#ifndef __compsize_h__
-+#define __compsize_h__
-+
-+extern GLint __glColorTableParameterfv_size(GLenum pname);
-+extern GLint __glColorTableParameteriv_size(GLenum pname);
-+extern GLint __glConvolutionParameterfv_size(GLenum pname);
-+extern GLint __glConvolutionParameteriv_size(GLenum pname);
-+extern GLint __glFogfv_size(GLenum pname);
-+extern GLint __glFogiv_size(GLenum pname);
-+extern GLint __glLightModelfv_size(GLenum pname);
-+extern GLint __glLightModeliv_size(GLenum pname);
-+extern GLint __glLightfv_size(GLenum pname);
-+extern GLint __glLightiv_size(GLenum pname);
-+extern GLint __glMaterialfv_size(GLenum pname);
-+extern GLint __glMaterialiv_size(GLenum pname);
-+extern GLint __glTexEnvfv_size(GLenum e);
-+extern GLint __glTexEnviv_size(GLenum e);
-+extern GLint __glTexGendv_size(GLenum e);
-+extern GLint __glTexGenfv_size(GLenum e);
-+extern GLint __glTexGeniv_size(GLenum e);
-+extern GLint __glTexParameterfv_size(GLenum e);
-+extern GLint __glTexParameteriv_size(GLenum e);
-+
-+#endif /* !__compsize_h__ */
Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
===================================================================
--- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 316007)
+++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
@@ -1,40 +0,0 @@
---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
-+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
-@@ -0,0 +1,37 @@
-+/*
-+ * Copyright 2011 Apple Inc.
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation on the rights to use, copy, modify, merge,
-+ * publish, distribute, sublicense, and/or sell copies of the Software,
-+ * and to permit persons to whom the Software is furnished to do so,
-+ * subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
-+ * portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#ifndef __GLX_cmds_h__
-+#define __GLX_cmds_h__
-+
-+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
-+
-+#endif /* !__GLX_cmds_h__ */
Index: x11-servers/xorg-server/files/extra-new-arch-i386
===================================================================
--- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
+++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
+@@ -1335,7 +1335,7 @@
+ 
+ #if !defined(__SUNPRO_C)
+ #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+-#ifdef GCCUSESGAS
++#if defined(GCCUSESGAS) || defined(__clang__)
+ 
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of these

Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-servers/xorg-server/files/extra-old-arch-i386
===================================================================
--- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
+++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
+@@ -1021,7 +1021,7 @@
+ 
+ #    if !defined(__SUNPRO_C)
+ #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+-#     ifdef GCCUSESGAS
++#     if defined(GCCUSESGAS) || defined(__clang__)
+ 
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of these

Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-servers/xorg-server/files/extra-os-utils.c
===================================================================
--- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
+++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
@@ -0,0 +1,20 @@
+--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
+@@ -315,7 +315,7 @@
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+   (void) write(lfd, pid_str, 11);
+-  (void) chmod(tmp, 0444);
++  (void) fchmod(tmp, 0444);
+   (void) close(lfd);
+ 
+   /*
+@@ -336,7 +336,7 @@
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd = open(LockFile, O_RDONLY);
++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile); 

Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
===================================================================
--- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 316007)
+++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
@@ -1,20 +0,0 @@
---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
-+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
-@@ -315,7 +315,7 @@
-     FatalError("Could not create lock file in %s\n", tmp);
-   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
-   (void) write(lfd, pid_str, 11);
--  (void) chmod(tmp, 0444);
-+  (void) fchmod(tmp, 0444);
-   (void) close(lfd);
- 
-   /*
-@@ -336,7 +336,7 @@
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile); 
Index: x11-servers/xorg-server/files/extra-servermd.h
===================================================================
--- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
+++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
@@ -0,0 +1,11 @@
+--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
++++ include/servermd.h	Sun Jan  8 14:06:22 2006
+@@ -216,7 +216,7 @@
+     defined(__sparc__) || defined(__mc68000__)
+ 
+ #if defined(__sparc) || defined(__sparc__)
+-# if !defined(sparc)
++# if !defined(sparc) && !defined(__FreeBSD__)
+ #  define sparc 1
+ # endif
+ #endif

Property changes on: x11-servers/xorg-server/files/extra-servermd.h
___________________________________________________________________
Added: svn:eolstyle
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
===================================================================
--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 316007)
+++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
@@ -1,13 +0,0 @@
---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
-+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
-@@ -52,6 +52,10 @@
- 	pVidMem->mapMem = sparc64MapVidMem;
- 	pVidMem->unmapMem = sparc64UnmapVidMem;
- 	pVidMem->initialised = TRUE;
-+
-+#if defined(__FreeBSD__)
-+	pci_system_init_dev_mem(xf86Info.screenFd);
-+#endif
- }
- 
- static pointer
Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
===================================================================
--- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 316007)
+++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
@@ -1,12 +0,0 @@
-diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
-+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
-@@ -39,7 +39,7 @@
- # ifdef __va_copy
- #  define va_copy __va_copy
- # else
--#  error "no working va_copy was found"
-+#  define va_copy(dest, src) ((dest) = (src))
- # endif
- #endif
-     
Index: x11-servers/xorg-server/files/patch-servermd.h
===================================================================
--- x11-servers/xorg-server/files/patch-servermd.h	(revision 316007)
+++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
@@ -1,11 +0,0 @@
---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
-+++ include/servermd.h	Sun Jan  8 14:06:22 2006
-@@ -216,7 +216,7 @@
-     defined(__sparc__) || defined(__mc68000__)
- 
- #if defined(__sparc) || defined(__sparc__)
--# if !defined(sparc)
-+# if !defined(sparc) && !defined(__FreeBSD__)
- #  define sparc 1
- # endif
- #endif
Index: x11-servers/xorg-server/pkg-plist
===================================================================
--- x11-servers/xorg-server/pkg-plist	(revision 316007)
+++ x11-servers/xorg-server/pkg-plist	(working copy)
@@ -12,6 +12,7 @@
 %%OLD%%include/xorg/bstorestr.h
 %%NEW%%include/xorg/callback.h
 %%OLD%%include/xorg/cfb8_16.h
+%%NEW%%include/xorg/client.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -83,6 +84,7 @@
 include/xorg/msp3430.h
 include/xorg/opaque.h
 include/xorg/os.h
+%%NEW%%include/xorg/optionstr.h
 include/xorg/panoramiXsrv.h
 include/xorg/panoramiX.h
 include/xorg/picture.h
@@ -138,6 +140,7 @@
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
 include/xorg/xf86Opt.h
+%%NEW%%include/xorg/xf86Optionstr.h
 include/xorg/xf86Optrec.h
 include/xorg/xf86Parser.h
 include/xorg/xf86Pci.h
@@ -225,7 +228,7 @@
 libdata/pkgconfig/xorg-server.pc
 share/aclocal/xorg-server.m4
 %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
-%%NEW%%@dirrm share/doc/xorg-server
+@comment %%NEW%%@dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions/.xorg
 @dirrm lib/xorg/modules/extensions
Index: x11-servers/xorg-vfbserver/Makefile
===================================================================
--- x11-servers/xorg-vfbserver/Makefile	(revision 316007)
+++ x11-servers/xorg-vfbserver/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-vfbserver
-# Date created:		17 June 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: anholt@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-vfbserver
-PORTREVISION=	1
 
 COMMENT=	X virtual framebuffer server from X.Org
 
@@ -20,8 +15,8 @@
 		xineramaproto xinerama evieproto xkbfile xfont fontenc \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
-		--without-xmlto --disable-docs --disable-devel-docs \
+CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
+		--without-xmlto --disable-docs --disable-devel1-docs \
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
Index: x11-themes/xcursor-themes/Makefile
===================================================================
--- x11-themes/xcursor-themes/Makefile	(revision 316007)
+++ x11-themes/xcursor-themes/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xcursor-themes
-# Date Created:				Nov 2 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xcursor-themes
 PORTVERSION=	1.0.3
Index: x11-toolkits/libXaw/Makefile
===================================================================
--- x11-toolkits/libXaw/Makefile	(revision 316007)
+++ x11-toolkits/libXaw/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXaw
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXaw
-PORTVERSION=	1.0.9
+PORTVERSION=	1.0.11
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 
@@ -16,16 +12,8 @@
 XORG_CAT=	lib
 USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--without-xmlto
+CONFIGURE_ARGS+=--without-xmlto
 
-PORTDOCS=	*
-
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=--disable-specs
-post-configure:
-	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
-.endif
-
 MAN3=		Xaw.3
 
 .include <bsd.port.mk>
Index: x11-toolkits/libXaw/distinfo
===================================================================
--- x11-toolkits/libXaw/distinfo	(revision 316007)
+++ x11-toolkits/libXaw/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
-SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
+SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
+SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
Index: x11-toolkits/libXaw/pkg-plist
===================================================================
--- x11-toolkits/libXaw/pkg-plist	(revision 316007)
+++ x11-toolkits/libXaw/pkg-plist	(working copy)
@@ -82,4 +82,51 @@
 lib/libXaw7.so.7
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
+%%DOCSDIR%%/AsciiSink.xml
+%%DOCSDIR%%/AsciiSource.xml
+%%DOCSDIR%%/AsciiText.xml
+%%DOCSDIR%%/Box.xml
+%%DOCSDIR%%/CH1.xml
+%%DOCSDIR%%/CH2.xml
+%%DOCSDIR%%/CH3.xml
+%%DOCSDIR%%/CH4.xml
+%%DOCSDIR%%/CH5.xml
+%%DOCSDIR%%/CH6.xml
+%%DOCSDIR%%/CH7.xml
+%%DOCSDIR%%/Command.xml
+%%DOCSDIR%%/Dialog.xml
+%%DOCSDIR%%/Form.xml
+%%DOCSDIR%%/Grip.xml
+%%DOCSDIR%%/Label.xml
+%%DOCSDIR%%/List.xml
+%%DOCSDIR%%/MenuButton.xml
+%%DOCSDIR%%/Paned.xml
+%%DOCSDIR%%/Panner.xml
+%%DOCSDIR%%/Porthole.xml
+%%DOCSDIR%%/Repeater.xml
+%%DOCSDIR%%/Scrollbar.xml
+%%DOCSDIR%%/Simple.xml
+%%DOCSDIR%%/SimpleMenu.xml
+%%DOCSDIR%%/Sme.xml
+%%DOCSDIR%%/SmeBSB.xml
+%%DOCSDIR%%/SmeLine.xml
+%%DOCSDIR%%/StripChart.xml
+%%DOCSDIR%%/TPage_Credits.xml
+%%DOCSDIR%%/Template.xml
+%%DOCSDIR%%/Template_private_header_file.xml
+%%DOCSDIR%%/Template_public_header_file.xml
+%%DOCSDIR%%/Template_widget_source_file.xml
+%%DOCSDIR%%/Text.xml
+%%DOCSDIR%%/TextActions.xml
+%%DOCSDIR%%/TextActions_default_translation_bindings.xml
+%%DOCSDIR%%/TextActions_text_widget_actions.xml
+%%DOCSDIR%%/TextCustom.xml
+%%DOCSDIR%%/TextFuncs.xml
+%%DOCSDIR%%/TextSink.xml
+%%DOCSDIR%%/TextSource.xml
+%%DOCSDIR%%/Toggle.xml
+%%DOCSDIR%%/Tree.xml
+%%DOCSDIR%%/Viewport.xml
+%%DOCSDIR%%/libXaw.xml
+@dirrmtry %%DOCSDIR%%
 @dirrmtry include/X11/Xaw
Index: x11-toolkits/libXmu/Makefile
===================================================================
--- x11-toolkits/libXmu/Makefile	(revision 316007)
+++ x11-toolkits/libXmu/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXmu
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXmu
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
Index: x11-toolkits/libXmu/distinfo
===================================================================
--- x11-toolkits/libXmu/distinfo	(revision 316007)
+++ x11-toolkits/libXmu/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
-SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
+SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
+SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
Index: x11-toolkits/libXt/Makefile
===================================================================
--- x11-toolkits/libXt/Makefile	(revision 316007)
+++ x11-toolkits/libXt/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXt
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXt
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
@@ -15,6 +11,7 @@
 
 XORG_CAT=	lib
 USE_XORG=	x11 sm xproto:both kbproto
+CONFIGURE_ARGS=	--disable-specs
 
 MAN3=	MenuPopdown.3 \
 	MenuPopup.3 \
Index: x11-toolkits/libXt/distinfo
===================================================================
--- x11-toolkits/libXt/distinfo	(revision 316007)
+++ x11-toolkits/libXt/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
-SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
+SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
+SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
Index: x11-wm/twm/Makefile
===================================================================
--- x11-wm/twm/Makefile	(revision 316007)
+++ x11-wm/twm/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	twm
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	twm
 PORTVERSION=	1.0.7
Index: x11-wm/xcompmgr/Makefile
===================================================================
--- x11-wm/xcompmgr/Makefile	(revision 316007)
+++ x11-wm/xcompmgr/Makefile	(working copy)
@@ -9,7 +9,7 @@
 COMMENT=	A sample X compositing manager
 
 XORG_CAT=	app
-USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
+USE_XORG=	x11 xcomposite xfixes xdamage xrender
 
 PLIST_FILES=	bin/${PORTNAME}
 
--- xorg-7.7.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: zeising 
Responsible-Changed-When: Wed Apr 17 21:31:00 UTC 2013 
Responsible-Changed-Why:  
Assign to portmgr pending exp-run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177942 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Mon, 22 Apr 2013 19:58:42 +0200

 This is a multi-part message in MIME format.
 --------------020607070300010309090002
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Attached is an updated patch for this exp-run.  It is also available at
 the URL in the original submission.
 Regards!
 -- 
 Niclas Zeising
 
 --------------020607070300010309090002
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 316248)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1962,8 +1962,14 @@
  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
 @@ -1982,6 +1988,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -1998,6 +2005,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 316248)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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.
 +USE_PKGCONFIG=	build
 +
 +# 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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 316248)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,12 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201304xx:
 +  AFFECTS: users of x11/xorg and all xorg ports
 +  AUTHOR zeising@FreeBSD.org
 +
 +  xorg, including libraries, was updated.
 +
  20130408:
    AFFECTS: users of astro/libkgeomap, graphics/digikam-kde4, graphics/kipi-plugins-kde4
    AUTHOR: makc@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 316248)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 316248)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 316248)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
  
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_ICONV=	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_PKGCONFIG=	build
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 316248)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -41,7 +40,7 @@
  USE_GMAKE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	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
  USE_PKGCONFIG=	build
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 316248)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  USE_ZIP=	yes
  USE_ICONV=	yes
  USE_SDL=	sdl
 -USE_XORG=	x11 xau xdmcp
 +USE_XORG=	x11 xau xcb xdmcp
  USE_WX=		2.6+
  WX_COMPS=	python:lib
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 316248)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,13 +12,12 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USE_GETTEXT=	yes
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 316248)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,14 +13,13 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  USE_AUTOTOOLS=	libtool
  USE_GETTEXT=	yes
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 316248)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 316248)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -29,7 +28,7 @@
  USES=		cmake:outsource
  USE_DOS2UNIX=	yes
  USE_ICONV=	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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 316248)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -32,8 +31,8 @@
  USE_ICONV=	yes
  USE_GNOME=	gdkpixbuf2 gtk20
  USE_PKGCONFIG=	build
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 316248)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USE_GNOME=	gdkpixbuf2 gtk20 libxml2
 @@ -43,8 +42,8 @@
  USE_GMAKE=	yes
  USE_ICONV=	yes
  USE_PKGCONFIG=	build
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .if !defined(WITHOUT_NLS)
  USE_GETTEXT=	yes
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 316248)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USE_ICONV=	yes
 @@ -33,7 +32,7 @@
  GNU_CONFIGURE=	yes
  USE_PKGCONFIG=	build
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 316248)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -29,7 +28,7 @@
  USE_ICONV=	yes
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 316248)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 316248)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,18 @@
  
  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
 +USE_PKGCONFIG=	build
  
 +# 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 +39,14 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 316248)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 316248)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 316248)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 316248)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 316248)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 316248)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 316248)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 316248)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 316248)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,16 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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_PKGCONFIG=	build
  USE_XORG=	xproto
  
  PLIST_FILES=	bin/makedepend
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 316248)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 316248)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 316248)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 316248)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -36,7 +35,7 @@
  USE_GMAKE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	yes
 -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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 316248)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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=	gdkpixbuf2 gtk20
  USE_PERL5=	yes
 @@ -31,7 +30,7 @@
  CONFIGURE_ENV=	ac_cv_have_isinff=no
  CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings
  USE_PKGCONFIG=	build
 -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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 316248)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 316248)
 +++ games/capitalism/Makefile	(working copy)
 @@ -19,12 +19,11 @@
  		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_GETTEXT=	yes
  USE_ICONV=	yes
 -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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 316248)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,15 +19,14 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_PKGCONFIG=	build
  USE_GETTEXT=	yes
  USE_ICONV=	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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 316248)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  
  CXXFLAGS+=	-fPIC
  USE_GETTEXT=	yes
  USE_ICONV=	yes
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 316248)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,7 +18,6 @@
  		fftw3:${PORTSDIR}/math/fftw3 \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USE_BZIP2=	yes
 @@ -26,7 +25,7 @@
  USES=		cmake
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 316248)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  COMMENT=	OpenGL hardware acceleration drivers for the DRI
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 -		expat.6:${PORTSDIR}/textproc/expat2
 +		expat:${PORTSDIR}/textproc/expat2
  
  USE_PKGCONFIG=	build
  USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
  
 -ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 316248)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 316248)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 316248)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# vim:ts=8:sw=8
 -# New ports collection makefile for:	freeglut
 -# Date created:		Wed Apr 23 2003
 -# Whom:			thierry@pompo.net
 -#
 +# Created by: thierry@pompo.net
  # $FreeBSD$
 -#
  
  PORTNAME=	freeglut
 -PORTVERSION=	2.8.0
 +PORTVERSION=	2.8.1
  CATEGORIES=	graphics
  MASTER_SITES=	SF
  
 @@ -33,6 +28,8 @@
  	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"		\
 @@ -44,14 +41,14 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 316248)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 316248)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 316248)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 316248)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 316248)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,17 +11,15 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  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=""
 @@ -31,8 +29,8 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -44,22 +42,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -67,12 +62,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +PATCHDIR=		${MASTERDIR}/files
 +DESCR=			${.CURDIR}/pkg-descr
 +PLIST=			${.CURDIR}/pkg-plist
 +WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
  
  .if !defined(ARCH)
  ARCH!=			uname -p
 @@ -84,38 +83,25 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 316248)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 316248)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 316248)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 316248)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 316248)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 316248)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 316248)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -13,16 +12,8 @@
  
  do-install:
  	@${MKDIR} ${PREFIX}/include/GL/
 -	cd ${WRKSRC}/src/glu; ${GMAKE} install
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  	cd ${WRKSRC}/src/glu; ${GMAKE} install
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 316248)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 316248)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,25 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 +USE_PKGCONFIG=	yes
 +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
  
 -do-install:
 -	cd ${WRKSRC}/src/glw; ${GMAKE} install
 -
 -.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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 316248)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 316248)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 316248)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 316248)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 316248)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 316248)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,15 +27,14 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
  USE_PKGCONFIG=	build
  USE_GETTEXT=	yes
  USE_ICONV=	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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 316248)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 316248)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 316248)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mozc-server
 -# Date created:				26 June 2010
 -# Whom:					Daichi GOTO <daichi@freebsd.org>
 -#
 +# Created by: Daichi GOTO <daichi@freebsd.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mozc
  PORTVERSION=	1.6.1187.102
 @@ -157,8 +153,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 -LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb
 +USE_XORG+=	xcb
 +LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
  		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
 Index: mail/claws-mail/Makefile
 ===================================================================
 --- mail/claws-mail/Makefile	(revision 316248)
 +++ mail/claws-mail/Makefile	(working copy)
 @@ -30,7 +30,6 @@
  		p11-kit:${PORTSDIR}/security/p11-kit \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
  RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
  
  CONFLICTS=	sylpheed-claws
 @@ -38,7 +37,7 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	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
  USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
  GNU_CONFIGURE=	yes
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 316248)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 316248)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 316248)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 316248)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	vdr-plugin-softhddevie
 -# Date created:		Sun Apr 29 17:00:02 CEST 2012
 -# Whom:			Juergen Lock <nox@freebsd.org>
 -#
 +# Created by: Juergen Lock <nox@freebsd.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	vdr-plugin-softhddevice
  PORTVERSION=	0.5.1
 @@ -18,12 +14,11 @@
  
  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
  
  USE_PKGCONFIG=	build
 -USE_XORG+=	xv x11 xinerama
 +USE_XORG+=	xv x11 xcb xinerama
  USE_GL+=	gl glu
  PATCH_STRIP=	-p1
  HAVE_CONFIGURE=	yes
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 316248)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -626,9 +626,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 316248)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -12,8 +12,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -33,7 +32,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 316248)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 316248)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -25,15 +25,14 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
  
  WRKSRC=		${WRKDIR}/trunk
  USE_ICONV=	yes
  USE_GETTEXT=	yes
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 316248)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
  # TODO enable devel/libexecinfo
  # TODO ntrack and ntrack-qt (needs porting) ?
 @@ -48,7 +47,7 @@
  USE_PKGCONFIG=	build
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 316248)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,13 +17,12 @@
  		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
  
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 316248)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  GNU_CONFIGURE=	yes
  USE_GETTEXT=	yes
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 316248)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  		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
  
  LICENSE=	GPLv3
  
 @@ -24,7 +23,7 @@
  USES=		cmake
  USE_GETTEXT=	yes
  USE_ICONV=	yes
 -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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 316248)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	gsmartcontrol
 -# Date created:		2009-03-25
 -# Whom:			Pawel Pekala <c0rn@o2.pl>
 -#
 +# Created by: Pawel Pekala <c0rn@o2.pl>
  # $FreeBSD$
 -#
  
  PORTNAME=	gsmartcontrol
  PORTVERSION=	0.8.7
 @@ -26,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -37,7 +32,7 @@
  USE_ICONV=	yes
  USE_PKGCONFIG=	build
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 316248)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,15 +18,14 @@
  		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
  
  GNU_CONFIGURE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	yes
  USE_PKGCONFIG=	build
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 316248)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -36,7 +35,7 @@
  USE_GETTEXT=	yes
  USE_ICONV=	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 \
  		xrandr xrender
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--disable-inotify
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 316248)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 316248)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 316248)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 316248)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 316248)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 316248)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 316248)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 316248)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 316248)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 316248)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 316248)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 316248)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 316248)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 316248)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 316248)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 316248)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 316248)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	yes
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 316248)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 316248)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 316248)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,17 +1,17 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Input extension headers
  
 +USE_XORG=	xorg-macros
 +USE_PKGCONFIG=	build
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 316248)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 316248)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 316248)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 316248)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 316248)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 316248)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 316248)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 316248)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 316248)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 316248)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 316248)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 316248)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 316248)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXScrnSaver/pkg-plist
 ===================================================================
 --- x11/libXScrnSaver/pkg-plist	(revision 316248)
 +++ x11/libXScrnSaver/pkg-plist	(working copy)
 @@ -5,3 +5,4 @@
  lib/libXss.a
  libdata/pkgconfig/xscrnsaver.pc
  @dirrmtry include/X11/extensions
 +
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 316248)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 316248)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 316248)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 316248)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 316248)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 316248)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 316248)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 316248)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 316248)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 316248)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 316248)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 316248)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 316248)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 316248)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 316248)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 316248)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 316248)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 316248)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 316248)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 316248)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 316248)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 316248)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 316248)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 316248)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 316248)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 316248)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 316248)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 316248)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 316248)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 316248)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 316248)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 316248)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 316248)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 316248)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 316248)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 316248)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 316248)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 316248)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 316248)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 316248)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 316248)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 316248)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 316248)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 316248)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 316248)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 316248)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 316248)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 316248)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 316248)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 316248)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 316248)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 316248)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 316248)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 316248)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 316248)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 316248)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 316248)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 316248)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 316248)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,9 +15,9 @@
  
  OPTIONS_DEFINE=	SIMD
  
 -.include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if empty(PORT_OPTIONS:MSIMD)
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 @@ -27,4 +27,4 @@
  . endif
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 316248)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 316248)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 316248)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 316248)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 316248)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 316248)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 316248)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 316248)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 316248)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 316248)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 316248)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 316248)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 316248)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 316248)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_PKGCONFIG=	build
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 316248)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 316248)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 316248)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 316248)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 316248)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 316248)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 316248)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 316248)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 316248)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,17 +1,10 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	ashish@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
 @@ -19,7 +12,7 @@
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 316248)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 316248)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 316248)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 316248)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 316248)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 316248)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 316248)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 316248)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 316248)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 316248)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 316248)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 316248)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 316248)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 316248)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 316248)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 316248)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 316248)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 316248)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 316248)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 316248)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 316248)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 316248)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 316248)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 316248)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 316248)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 316248)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 316248)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 316248)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 316248)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 316248)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 316248)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 316248)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 316248)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 316248)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 316248)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -34,10 +36,7 @@
  USE_GETTEXT=	yes
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 316248)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 316248)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 316248)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 316248)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 316248)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 316248)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 316248)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 316248)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 316248)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 316248)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 316248)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 316248)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 316248)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -39,8 +38,8 @@
  .include <bsd.port.options.mk>
  
  .for comp in ${COMPONENTS}
 -. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
 -.  if ${comp:M:}==""
 +. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
 +.  if ${comp:M*\:*}==""
  port=${comp}
  check=${comp:C/.*\///} # doesn't work
  .  else
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 316248)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 316248)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 316248)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 316248)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 316248)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 316248)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 316248)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 316248)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 316248)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 316248)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 316248)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 316248)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 316248)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 316248)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 316248)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 316248)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 316248)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 316248)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 316248)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 316248)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 316248)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 316248)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 316248)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 316248)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 316248)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 316248)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 316248)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 316248)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 316248)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 316248)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 316248)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 316248)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,17 +9,13 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
 -HYPERREVISION=	6
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 +HYPERREVISION=	5
  .endif
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 316248)
 +++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
 @@ -1,75 +0,0 @@
 ---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
 -+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
 -@@ -719,6 +719,9 @@
 - {
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     if (xf86HypOpen(local) != Success) {
 - 	if (local->fd >= 0) {
 -@@ -730,6 +733,9 @@
 - /* Set the real values */
 -     InitValuatorAxisStruct(pHyp,
 - 			   0,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[0],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypXSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -737,6 +743,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   1,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[1],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypYSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -744,6 +753,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   2,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[2],
 -+#endif
 - 			   0, /* min val */
 - 			   511, /* max val */
 - 			   512, /* resolution */
 -@@ -765,8 +777,10 @@
 -     int			loop;
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 --
 --
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom btn_labels[4] = { 0 };
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     switch (what) {
 - 	case DEVICE_INIT:
 -@@ -779,6 +793,9 @@
 - 
 - 	    if (InitButtonClassDeviceStruct(pHyp,
 - 					    nbbuttons,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+					    btn_labels,
 -+#endif
 - 					    map) == FALSE) {
 - 		ErrorF("unable to allocate Button class device\n");
 - 		return !Success;
 -@@ -802,6 +819,9 @@
 - 
 - 	    if (InitValuatorClassDeviceStruct(pHyp,
 - 		   nbaxes,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+		   axis_labels,
 -+#endif
 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 - 		   xf86GetMotionEvents,
 - #endif
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 316248)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 316248)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 316248)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 316248)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 316248)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 316248)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.0
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.2
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 316248)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 316248)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 316248)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 316248)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 316248)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 316248)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-ati613/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati613/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-ati613/Makefile	(working copy)
 @@ -1,25 +0,0 @@
 -# $FreeBSD$
 -
 -PORTNAME=	xf86-video-ati613
 -PORTVERSION=	6.13.2
 -PORTREVISION=	1
 -CATEGORIES=	x11-drivers
 -DISTNAME=	xf86-video-ati-${PORTVERSION}
 -
 -MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X.Org ati display driver
 -
 -DEPRECATED=	Old version, use xf86-video-ati instead
 -EXPIRATION_DATE=2013-05-10
 -
 -USE_GL=		gl
 -
 -XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 -MAN4=		ati.4x radeon.4x
 -
 -.if defined(WITH_NEW_XORG)
 -IGNORE=		Please use x11-drivers/xf86-video-ati
 -.endif
 -
 -.include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ati613/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati613/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-ati613/distinfo	(working copy)
 @@ -1,2 +0,0 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
 -SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
 Index: x11-drivers/xf86-video-ati613/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-descr	(revision 316248)
 +++ x11-drivers/xf86-video-ati613/pkg-descr	(working copy)
 @@ -1 +0,0 @@
 -This package contains the X.Org xf86-video-ati driver.
 Index: x11-drivers/xf86-video-ati613/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-plist	(revision 316248)
 +++ x11-drivers/xf86-video-ati613/pkg-plist	(working copy)
 @@ -1,14 +0,0 @@
 -lib/xorg/modules/drivers/ati_drv.la
 -lib/xorg/modules/drivers/ati_drv.so
 -lib/xorg/modules/drivers/radeon_drv.la
 -lib/xorg/modules/drivers/radeon_drv.so
 -lib/xorg/modules/multimedia/theatre200_drv.la
 -lib/xorg/modules/multimedia/theatre200_drv.so
 -lib/xorg/modules/multimedia/theatre_detect_drv.la
 -lib/xorg/modules/multimedia/theatre_detect_drv.so
 -lib/xorg/modules/multimedia/theatre_drv.la
 -lib/xorg/modules/multimedia/theatre_drv.so
 -@dirrmtry lib/xorg/modules/drivers
 -@dirrmtry lib/xorg/modules/multimedia
 -@dirrmtry lib/xorg/modules
 -@dirrmtry lib/xorg
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 316248)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 316248)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 316248)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  
  WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 316248)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 316248)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 316248)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 -QUIRKS=		keyboard:kbd
 +# these drivers have a different module name compared to the plugin they install
 +QUIRKS=		keyboard:kbd jamstudio:js_x
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 316248)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 316248)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 316248)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 316248)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 316248)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 316248)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 316248)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 316248)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 316248)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 316248)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 316248)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 316248)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 316248)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 316248)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 316248)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -11,7 +11,6 @@
  XORG_CAT=	font
  
  USE_PKGCONFIG=	build
 -USE_XORG=	xorg-macros
  
  MAN1=		bdftruncate.1 ucs2any.1
  
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 316248)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 316248)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 316248)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 316248)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 316248)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 316248)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 316248)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 316248)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 316248)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 316248)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X font library
 +COMMENT=	X font libary
  
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 316248)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 316248)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 316248)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 316248)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 316248)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.1.tar.bz2) = de72812f1856bb63bd2226ec8c2e2301931d3c72bd0f08b0d63a0cdf0722017f
 +SIZE (xorg/lib/libfontenc-1.1.1.tar.bz2) = 289688
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 316248)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 316248)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 316248)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 316248)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 316248)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 316248)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 316248)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 316248)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 316248)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 316248)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 316248)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 316248)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 316248)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 316248)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 316248)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 316248)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,7 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir is so it loads the rigth libglx library.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 316248)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 316248)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 316248)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 316248)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 316248)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 316248)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 316248)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 316248)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 316248)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -31,8 +30,8 @@
  USE_PKGCONFIG=	build
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=        pathfix
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 316248)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 316248)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 316248)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 316248)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 316248)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 316248)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 316248)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 316248)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,16 +18,15 @@
  		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_BZIP2=	yes
  USES=		cmake
  USE_PKGCONFIG=	build
  USE_ICONV=	yes
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 316248)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -41,7 +40,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 316248)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 316248)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USE_PKGCONFIG=	build
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 316248)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 316248)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   scrotwm
 -# Date created:                June 29, 2009
 -# Whom:                        Aragon Gouveia <aragon@phat.za.net>
 -#
 +# Created by: Aragon Gouveia <aragon@phat.za.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	spectrwm
  PORTVERSION=	2.2.0
 @@ -17,13 +13,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 316248)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 316248)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------020607070300010309090002--
Responsible-Changed-From-To: portmgr->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Apr 22 23:24:04 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177942 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Tue, 23 Apr 2013 10:35:56 +0200

 This is a multi-part message in MIME format.
 --------------080902060202020409050607
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Here is another updated patch which takes into account USES=gettext and
 USES=pkgconfig.
 Regards!
 -- 
 Niclas Zeising
 
 --------------080902060202020409050607
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 316317)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1964,8 +1964,14 @@
  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
 @@ -1984,6 +1990,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -2000,6 +2007,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 316317)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 316317)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,12 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201304xx:
 +  AFFECTS: users of x11/xorg and all xorg ports
 +  AUTHOR zeising@FreeBSD.org
 +
 +  xorg, including libraries, was updated.
 +
  20130423:
    AFFECTS: users of mail/postfix
    AUTHOR: sahil@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 316317)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 316317)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 316317)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
  
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_ICONV=	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_PKGCONFIG=	build
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 316317)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -42,7 +41,7 @@
  USE_GMAKE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 316317)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  USE_ZIP=	yes
  USE_ICONV=	yes
  USE_SDL=	sdl
 -USE_XORG=	x11 xau xdmcp
 +USE_XORG=	x11 xau xcb xdmcp
  USE_WX=		2.6+
  WX_COMPS=	python:lib
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 316317)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,13 +12,12 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USE_GETTEXT=	yes
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 316317)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,14 +13,13 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  USE_AUTOTOOLS=	libtool
  USE_GETTEXT=	yes
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 316317)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 316317)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -29,7 +28,7 @@
  USES=		cmake:outsource
  USE_DOS2UNIX=	yes
  USE_ICONV=	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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 316317)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -32,8 +31,8 @@
  USE_GETTEXT=	yes
  USE_ICONV=	yes
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 316317)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig
 @@ -43,8 +42,8 @@
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
  USE_ICONV=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .if !defined(WITHOUT_NLS)
  USE_GETTEXT=	yes
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 316317)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig
 @@ -33,7 +32,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 316317)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -29,7 +28,7 @@
  USE_ICONV=	yes
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 316317)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 316317)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,17 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 316317)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 316317)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 316317)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 316317)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 316317)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 316317)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 316317)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 316317)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 316317)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 316317)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 316317)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 316317)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 316317)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -36,7 +35,7 @@
  USE_GMAKE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	yes
 -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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 316317)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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=	gdkpixbuf2 gtk20
  USE_PERL5=	yes
 @@ -31,7 +30,7 @@
  CONFIGURE_ENV=	ac_cv_have_isinff=no
  CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings
  USE_PKGCONFIG=	build
 -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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 316317)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 316317)
 +++ games/capitalism/Makefile	(working copy)
 @@ -19,12 +19,11 @@
  		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_GETTEXT=	yes
  USE_ICONV=	yes
 -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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 316317)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,15 +19,14 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_PKGCONFIG=	build
  USE_GETTEXT=	yes
  USE_ICONV=	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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 316317)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  
  CXXFLAGS+=	-fPIC
  USE_GETTEXT=	yes
  USE_ICONV=	yes
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 316317)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,7 +18,6 @@
  		fftw3:${PORTSDIR}/math/fftw3 \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USE_BZIP2=	yes
 @@ -26,7 +25,7 @@
  USES=		cmake
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 316317)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  COMMENT=	OpenGL hardware acceleration drivers for the DRI
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 -		expat.6:${PORTSDIR}/textproc/expat2
 +		expat:${PORTSDIR}/textproc/expat2
  
 -USE_PKGCONFIG=	build
 +USES=		pkgconfig
  USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
  
 -ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 316317)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 316317)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 316317)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# vim:ts=8:sw=8
 -# New ports collection makefile for:	freeglut
 -# Date created:		Wed Apr 23 2003
 -# Whom:			thierry@pompo.net
 -#
 +# Created by: thierry@pompo.net
  # $FreeBSD$
 -#
  
  PORTNAME=	freeglut
 -PORTVERSION=	2.8.0
 +PORTVERSION=	2.8.1
  CATEGORIES=	graphics
  MASTER_SITES=	SF
  
 @@ -33,6 +28,8 @@
  	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"		\
 @@ -44,14 +41,14 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 316317)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 316317)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 316317)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 316317)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/Makefile
 ===================================================================
 --- graphics/libGL/Makefile	(revision 316317)
 +++ graphics/libGL/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
  		expat.6:${PORTSDIR}/textproc/expat2
  
 -USE_PKGCONFIG=	build
 +USES=		pkgconfig
  USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
  
  SUB_FILES=	pkg-install pkg-deinstall
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 316317)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,17 +11,15 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  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=""
 @@ -31,8 +29,8 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -44,22 +42,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -67,12 +62,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +PATCHDIR=		${MASTERDIR}/files
 +DESCR=			${.CURDIR}/pkg-descr
 +PLIST=			${.CURDIR}/pkg-plist
 +WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
  
  .if !defined(ARCH)
  ARCH!=			uname -p
 @@ -84,38 +83,25 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 316317)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 316317)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 316317)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 316317)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 316317)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 316317)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 316317)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -13,16 +12,8 @@
  
  do-install:
  	@${MKDIR} ${PREFIX}/include/GL/
 -	cd ${WRKSRC}/src/glu; ${GMAKE} install
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  	cd ${WRKSRC}/src/glu; ${GMAKE} install
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 316317)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 316317)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
  
 -do-install:
 -	cd ${WRKSRC}/src/glw; ${GMAKE} install
 -
 -.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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 316317)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 316317)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 316317)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 316317)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 316317)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 316317)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,15 +27,14 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
  USE_PKGCONFIG=	build
  USE_GETTEXT=	yes
  USE_ICONV=	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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 316317)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 316317)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 316317)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -149,8 +149,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 +USE_XORG+=	xcb
  LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb \
  		zinnia.0:${PORTSDIR}/japanese/zinnia
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 Index: mail/claws-mail/Makefile
 ===================================================================
 --- mail/claws-mail/Makefile	(revision 316317)
 +++ mail/claws-mail/Makefile	(working copy)
 @@ -30,7 +30,6 @@
  		p11-kit:${PORTSDIR}/security/p11-kit \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
  RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
  
  CONFLICTS=	sylpheed-claws
 @@ -38,7 +37,7 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	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
  USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
  GNU_CONFIGURE=	yes
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 316317)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 316317)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 316317)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 316317)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	vdr-plugin-softhddevie
 -# Date created:		Sun Apr 29 17:00:02 CEST 2012
 -# Whom:			Juergen Lock <nox@freebsd.org>
 -#
 +# Created by: Juergen Lock <nox@freebsd.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	vdr-plugin-softhddevice
  PORTVERSION=	0.5.1
 @@ -18,12 +14,11 @@
  
  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
  
  USE_PKGCONFIG=	build
 -USE_XORG+=	xv x11 xinerama
 +USE_XORG+=	xv x11 xcb xinerama
  USE_GL+=	gl glu
  PATCH_STRIP=	-p1
  HAVE_CONFIGURE=	yes
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 316317)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -626,9 +626,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 316317)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -12,8 +12,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -33,7 +32,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 316317)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 316317)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -25,15 +25,14 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
  
  WRKSRC=		${WRKDIR}/trunk
  USE_ICONV=	yes
  USE_GETTEXT=	yes
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 316317)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
  # TODO enable devel/libexecinfo
  # TODO ntrack and ntrack-qt (needs porting) ?
 @@ -48,7 +47,7 @@
  USE_PKGCONFIG=	build
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 316317)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,13 +17,12 @@
  		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
  
  USE_ICONV=	yes
  USE_GETTEXT=	yes
 -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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 316317)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  GNU_CONFIGURE=	yes
  USE_GETTEXT=	yes
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 316317)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  		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
  
  LICENSE=	GPLv3
  
 @@ -24,7 +23,7 @@
  USES=		cmake
  USE_GETTEXT=	yes
  USE_ICONV=	yes
 -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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 316317)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	gsmartcontrol
 -# Date created:		2009-03-25
 -# Whom:			Pawel Pekala <c0rn@o2.pl>
 -#
 +# Created by: Pawel Pekala <c0rn@o2.pl>
  # $FreeBSD$
 -#
  
  PORTNAME=	gsmartcontrol
  PORTVERSION=	0.8.7
 @@ -26,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -37,7 +32,7 @@
  USE_ICONV=	yes
  USE_PKGCONFIG=	build
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 316317)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,15 +18,14 @@
  		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
  
  GNU_CONFIGURE=	yes
  USE_GETTEXT=	yes
  USE_ICONV=	yes
  USE_PKGCONFIG=	build
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 316317)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -36,7 +35,7 @@
  USE_GETTEXT=	yes
  USE_ICONV=	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 \
  		xrandr xrender
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--disable-inotify
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 316317)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 316317)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 316317)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 316317)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 316317)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 316317)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 316317)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 316317)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 316317)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 316317)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 316317)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 316317)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 316317)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 316317)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 316317)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 316317)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 316317)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	yes
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 316317)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 316317)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 316317)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,17 +1,16 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Input extension headers
  
 +USE_XORG=	xorg-macros
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 316317)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 316317)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 316317)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 316317)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 316317)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 316317)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 316317)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 316317)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 316317)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 316317)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 316317)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 316317)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 316317)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXScrnSaver/pkg-plist
 ===================================================================
 --- x11/libXScrnSaver/pkg-plist	(revision 316317)
 +++ x11/libXScrnSaver/pkg-plist	(working copy)
 @@ -5,3 +5,4 @@
  lib/libXss.a
  libdata/pkgconfig/xscrnsaver.pc
  @dirrmtry include/X11/extensions
 +
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 316317)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 316317)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 316317)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 316317)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 316317)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 316317)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 316317)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 316317)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 316317)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 316317)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 316317)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 316317)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 316317)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 316317)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 316317)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 316317)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 316317)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 316317)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 316317)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 316317)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 316317)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 316317)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 316317)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 316317)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 316317)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 316317)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 316317)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 316317)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 316317)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 316317)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 316317)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 316317)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 316317)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 316317)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 316317)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 316317)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 316317)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 316317)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 316317)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 316317)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 316317)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 316317)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 316317)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 316317)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 316317)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 316317)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 316317)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 316317)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 316317)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 316317)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 316317)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 316317)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 316317)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 316317)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 316317)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 316317)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 316317)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 316317)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 316317)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,9 +15,9 @@
  
  OPTIONS_DEFINE=	SIMD
  
 -.include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if empty(PORT_OPTIONS:MSIMD)
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 @@ -27,4 +27,4 @@
  . endif
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 316317)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 316317)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 316317)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 316317)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 316317)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 316317)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 316317)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 316317)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 316317)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 316317)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 316317)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 316317)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 316317)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 316317)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_PKGCONFIG=	build
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 316317)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 316317)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 316317)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 316317)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 316317)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 316317)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 316317)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 316317)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 316317)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,17 +1,10 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	ashish@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
 @@ -19,7 +12,7 @@
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 316317)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 316317)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 316317)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 316317)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 316317)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 316317)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 316317)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 316317)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 316317)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 316317)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 316317)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 316317)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 316317)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 316317)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 316317)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 316317)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 316317)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 316317)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 316317)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 316317)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 316317)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 316317)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 316317)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 316317)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 316317)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 316317)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 316317)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 316317)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 316317)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 316317)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 316317)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 316317)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 316317)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 316317)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 316317)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -30,14 +32,11 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MNLS}
 +USES+=		gettext
  USE_ICONV=	yes
 -USE_GETTEXT=	yes
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 316317)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 316317)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 316317)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 316317)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 316317)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 316317)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 316317)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 316317)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 316317)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 316317)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 316317)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 316317)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 316317)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -39,8 +38,8 @@
  .include <bsd.port.options.mk>
  
  .for comp in ${COMPONENTS}
 -. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
 -.  if ${comp:M:}==""
 +. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
 +.  if ${comp:M*\:*}==""
  port=${comp}
  check=${comp:C/.*\///} # doesn't work
  .  else
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 316317)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 316317)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 316317)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 316317)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 316317)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 316317)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 316317)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 316317)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 316317)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 316317)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 316317)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 316317)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 316317)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 316317)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 316317)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 316317)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 316317)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 316317)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 316317)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 316317)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 316317)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 316317)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 316317)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 316317)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 316317)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 316317)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 316317)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 316317)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 316317)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 316317)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 316317)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 316317)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,17 +9,13 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
 -HYPERREVISION=	6
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 +HYPERREVISION=	5
  .endif
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 316317)
 +++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
 @@ -1,75 +0,0 @@
 ---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
 -+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
 -@@ -719,6 +719,9 @@
 - {
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     if (xf86HypOpen(local) != Success) {
 - 	if (local->fd >= 0) {
 -@@ -730,6 +733,9 @@
 - /* Set the real values */
 -     InitValuatorAxisStruct(pHyp,
 - 			   0,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[0],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypXSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -737,6 +743,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   1,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[1],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypYSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -744,6 +753,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   2,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[2],
 -+#endif
 - 			   0, /* min val */
 - 			   511, /* max val */
 - 			   512, /* resolution */
 -@@ -765,8 +777,10 @@
 -     int			loop;
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 --
 --
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom btn_labels[4] = { 0 };
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     switch (what) {
 - 	case DEVICE_INIT:
 -@@ -779,6 +793,9 @@
 - 
 - 	    if (InitButtonClassDeviceStruct(pHyp,
 - 					    nbbuttons,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+					    btn_labels,
 -+#endif
 - 					    map) == FALSE) {
 - 		ErrorF("unable to allocate Button class device\n");
 - 		return !Success;
 -@@ -802,6 +819,9 @@
 - 
 - 	    if (InitValuatorClassDeviceStruct(pHyp,
 - 		   nbaxes,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+		   axis_labels,
 -+#endif
 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 - 		   xf86GetMotionEvents,
 - #endif
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 316317)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 316317)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 316317)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 316317)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 316317)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 316317)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.0
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.2
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 316317)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 316317)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 316317)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 316317)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 316317)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 316317)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-ati613/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati613/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-ati613/Makefile	(working copy)
 @@ -1,25 +0,0 @@
 -# $FreeBSD$
 -
 -PORTNAME=	xf86-video-ati613
 -PORTVERSION=	6.13.2
 -PORTREVISION=	1
 -CATEGORIES=	x11-drivers
 -DISTNAME=	xf86-video-ati-${PORTVERSION}
 -
 -MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X.Org ati display driver
 -
 -DEPRECATED=	Old version, use xf86-video-ati instead
 -EXPIRATION_DATE=2013-05-10
 -
 -USE_GL=		gl
 -
 -XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 -MAN4=		ati.4x radeon.4x
 -
 -.if defined(WITH_NEW_XORG)
 -IGNORE=		Please use x11-drivers/xf86-video-ati
 -.endif
 -
 -.include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ati613/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati613/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-ati613/distinfo	(working copy)
 @@ -1,2 +0,0 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
 -SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
 Index: x11-drivers/xf86-video-ati613/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-descr	(revision 316317)
 +++ x11-drivers/xf86-video-ati613/pkg-descr	(working copy)
 @@ -1 +0,0 @@
 -This package contains the X.Org xf86-video-ati driver.
 Index: x11-drivers/xf86-video-ati613/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-plist	(revision 316317)
 +++ x11-drivers/xf86-video-ati613/pkg-plist	(working copy)
 @@ -1,14 +0,0 @@
 -lib/xorg/modules/drivers/ati_drv.la
 -lib/xorg/modules/drivers/ati_drv.so
 -lib/xorg/modules/drivers/radeon_drv.la
 -lib/xorg/modules/drivers/radeon_drv.so
 -lib/xorg/modules/multimedia/theatre200_drv.la
 -lib/xorg/modules/multimedia/theatre200_drv.so
 -lib/xorg/modules/multimedia/theatre_detect_drv.la
 -lib/xorg/modules/multimedia/theatre_detect_drv.so
 -lib/xorg/modules/multimedia/theatre_drv.la
 -lib/xorg/modules/multimedia/theatre_drv.so
 -@dirrmtry lib/xorg/modules/drivers
 -@dirrmtry lib/xorg/modules/multimedia
 -@dirrmtry lib/xorg/modules
 -@dirrmtry lib/xorg
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 316317)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 316317)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 316317)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  
  WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 316317)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 316317)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 316317)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 -QUIRKS=		keyboard:kbd
 +# these drivers have a different module name compared to the plugin they install
 +QUIRKS=		keyboard:kbd jamstudio:js_x
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 316317)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 316317)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 316317)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 316317)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 316317)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 316317)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 316317)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 316317)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 316317)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 316317)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 316317)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 316317)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 316317)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 316317)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 316317)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USE_PKGCONFIG=	build
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 316317)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 316317)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 316317)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 316317)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 316317)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 316317)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 316317)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 316317)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 316317)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 316317)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X font library
 +COMMENT=	X font libary
  
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 316317)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 316317)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 316317)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 316317)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 316317)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.1.tar.bz2) = de72812f1856bb63bd2226ec8c2e2301931d3c72bd0f08b0d63a0cdf0722017f
 +SIZE (xorg/lib/libfontenc-1.1.1.tar.bz2) = 289688
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 316317)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 316317)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 316317)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 316317)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 316317)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 316317)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 316317)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 316317)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 316317)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 316317)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 316317)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 316317)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 316317)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 316317)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 316317)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 316317)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,7 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir is so it loads the rigth libglx library.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 316317)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 316317)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 316317)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 316317)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 316317)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 316317)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 316317)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 316317)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 316317)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -31,8 +30,8 @@
  USE_PKGCONFIG=	build
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=        pathfix
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 316317)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 316317)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 316317)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 316317)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 316317)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 316317)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 316317)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 316317)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,16 +18,15 @@
  		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_BZIP2=	yes
  USES=		cmake
  USE_PKGCONFIG=	build
  USE_ICONV=	yes
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 316317)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -41,7 +40,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 316317)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 316317)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USE_PKGCONFIG=	build
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 316317)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison pkgconfig
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 316317)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   scrotwm
 -# Date created:                June 29, 2009
 -# Whom:                        Aragon Gouveia <aragon@phat.za.net>
 -#
 +# Created by: Aragon Gouveia <aragon@phat.za.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	spectrwm
  PORTVERSION=	2.2.0
 @@ -17,13 +13,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 316317)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 316317)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------080902060202020409050607--

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc: miwi@FreeBSD.org, portmgr@FreeBSD.org
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Sat, 27 Apr 2013 09:56:15 +0200

 This is a multi-part message in MIME format.
 --------------030406080702020709090000
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Attached is an updated patch which includes some updates and switches
 USE_ICONV to USES=iconv.  It is also available at
 http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------030406080702020709090000
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 316651)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1933,8 +1933,14 @@
  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
 @@ -1953,6 +1959,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -1969,6 +1976,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 316651)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 316651)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,12 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201304xx:
 +  AFFECTS: users of x11/xorg and all xorg ports
 +  AUTHOR zeising@FreeBSD.org
 +
 +  xorg, including libraries, was updated.
 +
  20130424:
    AFFECTS: users of print/psutils-a4 or print/psutils-letter
    AUTHOR: hrs@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 316651)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 316651)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 316651)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,15 +19,14 @@
  		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
  RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
  
  USES=		pkgconfig
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_ICONV=	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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 316651)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -41,7 +40,7 @@
  USE_AUTOTOOLS=	libtool
  USE_GMAKE=	yes
  USE_ICONV=	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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 316651)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  USE_ZIP=	yes
  USE_ICONV=	yes
  USE_SDL=	sdl
 -USE_XORG=	x11 xau xdmcp
 +USE_XORG=	x11 xau xcb xdmcp
  USE_WX=		2.6+
  WX_COMPS=	python:lib
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 316651)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,13 +12,12 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 316651)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,14 +13,13 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  USE_AUTOTOOLS=	libtool
  USES=		gettext
  USE_GNOME=	gtk12
  USE_ICONV=	yes
 -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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 316651)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 316651)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -29,7 +28,7 @@
  USES=		cmake:outsource
  USE_DOS2UNIX=	yes
  USE_ICONV=	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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 316651)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -31,8 +30,8 @@
  USE_GL=		glu
  USE_ICONV=	yes
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 316651)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig
 @@ -43,8 +42,8 @@
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
  USE_ICONV=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .if !defined(WITHOUT_NLS)
  USES+=		gettext
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 316651)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig
 @@ -33,7 +32,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 316651)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -29,7 +28,7 @@
  USE_ICONV=	yes
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 316651)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 316651)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,17 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 316651)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 316651)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 316651)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 316651)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 316651)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 316651)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 316651)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 316651)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 316651)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 316651)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 316651)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 316651)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 316651)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -36,7 +35,7 @@
  USE_GMAKE=	yes
  USES=		gettext
  USE_ICONV=	yes
 -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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 316651)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -30,7 +29,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 316651)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  USE_ICONV=	yes
  USES=		gettext
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 316651)
 +++ games/capitalism/Makefile	(working copy)
 @@ -19,12 +19,11 @@
  		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
  
  USES=		gettext
  USE_ICONV=	yes
 -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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 316651)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  USES=		pkgconfig gettext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 316651)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,15 +17,14 @@
  		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
  
  CXXFLAGS+=	-fPIC
  USES=		gettext
  USE_ICONV=	yes
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 316651)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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
  USE_ICONV=	yes
 -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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 316651)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 316651)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 316651)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 316651)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 316651)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 316651)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 316651)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 316651)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 316651)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,17 +11,15 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  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=""
 @@ -31,8 +29,8 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -44,22 +42,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -67,12 +62,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +PATCHDIR=		${MASTERDIR}/files
 +DESCR=			${.CURDIR}/pkg-descr
 +PLIST=			${.CURDIR}/pkg-plist
 +WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
  
  .if !defined(ARCH)
  ARCH!=			uname -p
 @@ -84,38 +83,25 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 316651)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 316651)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 316651)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 316651)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 316651)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 316651)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 316651)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -13,16 +12,8 @@
  
  do-install:
  	@${MKDIR} ${PREFIX}/include/GL/
 -	cd ${WRKSRC}/src/glu; ${GMAKE} install
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  	cd ${WRKSRC}/src/glu; ${GMAKE} install
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 316651)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 316651)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
  
 -do-install:
 -	cd ${WRKSRC}/src/glw; ${GMAKE} install
 -
 -.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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 316651)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 316651)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 316651)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 316651)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 316651)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 316651)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,14 +27,13 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  GNU_CONFIGURE=	yes
  USES=		pkgconfig gettext
  USE_GMAKE=	yes
  USE_ICONV=	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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 316651)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 316651)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 316651)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -145,8 +145,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 +USE_XORG+=	xcb
  LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb \
  		zinnia.0:${PORTSDIR}/japanese/zinnia
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 Index: mail/claws-mail/Makefile
 ===================================================================
 --- mail/claws-mail/Makefile	(revision 316651)
 +++ mail/claws-mail/Makefile	(working copy)
 @@ -30,7 +30,6 @@
  		p11-kit:${PORTSDIR}/security/p11-kit \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
  RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
  
  CONFLICTS=	sylpheed-claws
 @@ -38,7 +37,7 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	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
  USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
  GNU_CONFIGURE=	yes
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 316651)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 316651)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 316651)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 316651)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 316651)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -635,9 +635,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 316651)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -12,8 +12,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -32,7 +31,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 316651)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 316651)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -25,15 +25,14 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
  
  WRKSRC=		${WRKDIR}/trunk
  USE_ICONV=	yes
  USES=		gettext
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 316651)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
  # TODO enable devel/libexecinfo
  # TODO ntrack and ntrack-qt (needs porting) ?
 @@ -46,7 +45,7 @@
  USE_BZIP2=	yes
  USES=		cmake pkgconfig gettext
  USE_ICONV=	yes
 -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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 316651)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,13 +17,12 @@
  		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
  
  USE_ICONV=	yes
  USES=		gettext
 -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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 316651)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 316651)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  		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
  
  LICENSE=	GPLv3
  
 @@ -23,7 +22,7 @@
  USE_BZIP2=	yes
  USES=		cmake gettext
  USE_ICONV=	yes
 -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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 316651)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -32,7 +31,7 @@
  USE_BZIP2=	yes
  USE_ICONV=	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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 316651)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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
  
  GNU_CONFIGURE=	yes
  USE_ICONV=	yes
  USES=		pkgconfig gettext
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 316651)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -36,7 +35,7 @@
  USES=		gettext
  USE_ICONV=	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 \
  		xrandr xrender
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--disable-inotify
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 316651)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 316651)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 316651)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 316651)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 316651)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 316651)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 316651)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 316651)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 316651)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 316651)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 316651)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 316651)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 316651)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 316651)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 316651)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 316651)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 316651)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_ICONV=	yes
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 316651)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 316651)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 316651)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,17 +1,16 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Input extension headers
  
 +USE_XORG=	xorg-macros
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 316651)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 316651)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 316651)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 316651)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 316651)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 316651)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 316651)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 316651)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 316651)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 316651)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 316651)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 316651)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 316651)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXScrnSaver/pkg-plist
 ===================================================================
 --- x11/libXScrnSaver/pkg-plist	(revision 316651)
 +++ x11/libXScrnSaver/pkg-plist	(working copy)
 @@ -5,3 +5,4 @@
  lib/libXss.a
  libdata/pkgconfig/xscrnsaver.pc
  @dirrmtry include/X11/extensions
 +
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 316651)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 316651)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 316651)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 316651)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 316651)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 316651)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 316651)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 316651)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 316651)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 316651)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 316651)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 316651)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 316651)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 316651)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 316651)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 316651)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 316651)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 316651)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 316651)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 316651)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 316651)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 316651)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 316651)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 316651)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 316651)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 316651)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 316651)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 316651)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 316651)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 316651)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 316651)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 316651)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 316651)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 316651)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 316651)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 316651)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 316651)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 316651)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 316651)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 316651)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 316651)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 316651)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 316651)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 316651)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 316651)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 316651)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 316651)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 316651)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 316651)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 316651)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 316651)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 316651)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 316651)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 316651)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 316651)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 316651)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 316651)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 316651)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 316651)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,9 +15,9 @@
  
  OPTIONS_DEFINE=	SIMD
  
 -.include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if empty(PORT_OPTIONS:MSIMD)
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 @@ -27,4 +27,4 @@
  . endif
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 316651)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 316651)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 316651)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 316651)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 316651)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 316651)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 316651)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 316651)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 316651)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 316651)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 316651)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 316651)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 316651)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 316651)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 316651)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 316651)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 316651)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 316651)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 316651)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 316651)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 316651)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 316651)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 316651)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,17 +1,10 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	ashish@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
 @@ -19,7 +12,7 @@
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 316651)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 316651)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 316651)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 316651)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 316651)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 316651)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 316651)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 316651)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 316651)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 316651)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 316651)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 316651)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 316651)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 316651)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 316651)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 316651)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 316651)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 316651)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 316651)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 316651)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 316651)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 316651)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 316651)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 316651)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 316651)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 316651)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 316651)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 316651)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 316651)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 316651)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 316651)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 316651)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 316651)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 316651)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 316651)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -30,14 +32,10 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MNLS}
 -USE_ICONV=	yes
 -USES+=		gettext
 +USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 316651)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 316651)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 316651)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 316651)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 316651)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 316651)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 316651)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 316651)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 316651)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 316651)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 316651)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 316651)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 316651)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -39,8 +38,8 @@
  .include <bsd.port.options.mk>
  
  .for comp in ${COMPONENTS}
 -. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
 -.  if ${comp:M:}==""
 +. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
 +.  if ${comp:M*\:*}==""
  port=${comp}
  check=${comp:C/.*\///} # doesn't work
  .  else
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 316651)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 316651)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 316651)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 316651)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 316651)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 316651)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 316651)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 316651)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 316651)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 316651)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 316651)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 316651)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 316651)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 316651)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 316651)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 316651)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 316651)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 316651)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 316651)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 316651)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 316651)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 316651)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 316651)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 316651)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 316651)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 316651)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 316651)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 316651)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 316651)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 316651)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 316651)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 316651)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,17 +9,13 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
 -HYPERREVISION=	6
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 +HYPERREVISION=	5
  .endif
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 316651)
 +++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
 @@ -1,75 +0,0 @@
 ---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
 -+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
 -@@ -719,6 +719,9 @@
 - {
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     if (xf86HypOpen(local) != Success) {
 - 	if (local->fd >= 0) {
 -@@ -730,6 +733,9 @@
 - /* Set the real values */
 -     InitValuatorAxisStruct(pHyp,
 - 			   0,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[0],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypXSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -737,6 +743,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   1,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[1],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypYSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -744,6 +753,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   2,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[2],
 -+#endif
 - 			   0, /* min val */
 - 			   511, /* max val */
 - 			   512, /* resolution */
 -@@ -765,8 +777,10 @@
 -     int			loop;
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 --
 --
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom btn_labels[4] = { 0 };
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     switch (what) {
 - 	case DEVICE_INIT:
 -@@ -779,6 +793,9 @@
 - 
 - 	    if (InitButtonClassDeviceStruct(pHyp,
 - 					    nbbuttons,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+					    btn_labels,
 -+#endif
 - 					    map) == FALSE) {
 - 		ErrorF("unable to allocate Button class device\n");
 - 		return !Success;
 -@@ -802,6 +819,9 @@
 - 
 - 	    if (InitValuatorClassDeviceStruct(pHyp,
 - 		   nbaxes,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+		   axis_labels,
 -+#endif
 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 - 		   xf86GetMotionEvents,
 - #endif
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 316651)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 316651)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 316651)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 316651)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 316651)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 316651)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.0
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.2
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 316651)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 316651)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 316651)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 316651)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 316651)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 316651)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-ati613/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati613/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-ati613/Makefile	(working copy)
 @@ -1,25 +0,0 @@
 -# $FreeBSD$
 -
 -PORTNAME=	xf86-video-ati613
 -PORTVERSION=	6.13.2
 -PORTREVISION=	1
 -CATEGORIES=	x11-drivers
 -DISTNAME=	xf86-video-ati-${PORTVERSION}
 -
 -MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X.Org ati display driver
 -
 -DEPRECATED=	Old version, use xf86-video-ati instead
 -EXPIRATION_DATE=2013-05-10
 -
 -USE_GL=		gl
 -
 -XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 -MAN4=		ati.4x radeon.4x
 -
 -.if defined(WITH_NEW_XORG)
 -IGNORE=		Please use x11-drivers/xf86-video-ati
 -.endif
 -
 -.include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ati613/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati613/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-ati613/distinfo	(working copy)
 @@ -1,2 +0,0 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
 -SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
 Index: x11-drivers/xf86-video-ati613/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-descr	(revision 316651)
 +++ x11-drivers/xf86-video-ati613/pkg-descr	(working copy)
 @@ -1 +0,0 @@
 -This package contains the X.Org xf86-video-ati driver.
 Index: x11-drivers/xf86-video-ati613/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-video-ati613/pkg-plist	(revision 316651)
 +++ x11-drivers/xf86-video-ati613/pkg-plist	(working copy)
 @@ -1,14 +0,0 @@
 -lib/xorg/modules/drivers/ati_drv.la
 -lib/xorg/modules/drivers/ati_drv.so
 -lib/xorg/modules/drivers/radeon_drv.la
 -lib/xorg/modules/drivers/radeon_drv.so
 -lib/xorg/modules/multimedia/theatre200_drv.la
 -lib/xorg/modules/multimedia/theatre200_drv.so
 -lib/xorg/modules/multimedia/theatre_detect_drv.la
 -lib/xorg/modules/multimedia/theatre_detect_drv.so
 -lib/xorg/modules/multimedia/theatre_drv.la
 -lib/xorg/modules/multimedia/theatre_drv.so
 -@dirrmtry lib/xorg/modules/drivers
 -@dirrmtry lib/xorg/modules/multimedia
 -@dirrmtry lib/xorg/modules
 -@dirrmtry lib/xorg
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 316651)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 316651)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 316651)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  
  WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 316651)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 316651)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 316651)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 -QUIRKS=		keyboard:kbd
 +# these drivers have a different module name compared to the plugin they install
 +QUIRKS=		keyboard:kbd jamstudio:js_x
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 316651)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 316651)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 316651)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 316651)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 316651)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 316651)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 316651)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 316651)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 316651)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 316651)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 316651)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 316651)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 316651)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 316651)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 316651)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 316651)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 316651)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 316651)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 316651)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 316651)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 316651)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 316651)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 316651)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 316651)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 316651)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X font library
 +COMMENT=	X font libary
  
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 316651)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 316651)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 316651)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 316651)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 316651)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 316651)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 316651)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 316651)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 316651)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 316651)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 316651)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 316651)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 316651)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 316651)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 316651)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 316651)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 316651)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 316651)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 316651)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 316651)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 316651)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,7 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir is so it loads the rigth libglx library.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 316651)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 316651)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 316651)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 316651)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 316651)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 316651)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 316651)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 316651)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 316651)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -29,8 +28,8 @@
  USE_ICONV=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 316651)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 316651)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 316651)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 316651)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 316651)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 316651)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 316651)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 316651)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,15 +18,14 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig
  USE_ICONV=	yes
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 316651)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -41,7 +40,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 316651)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 316651)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 316651)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison pkgconfig
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 316651)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   scrotwm
 -# Date created:                June 29, 2009
 -# Whom:                        Aragon Gouveia <aragon@phat.za.net>
 -#
 +# Created by: Aragon Gouveia <aragon@phat.za.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	spectrwm
  PORTVERSION=	2.2.0
 @@ -17,13 +13,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 316651)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 316651)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------030406080702020709090000--

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc: miwi@FreeBSD.org
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Fri, 10 May 2013 20:16:06 +0200

 This is a multi-part message in MIME format.
 --------------050009060107080103070200
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Attached is an updated patch, no big changes, just to catch up with the
 latest stuff in the regular ports tree.  Also available at
 http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------050009060107080103070200
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 317827)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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
 @@ -1923,6 +1929,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -1939,6 +1946,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 317827)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 317827)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,12 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  AFFECTS: users of x11/xorg and all xorg ports
 +  AUTHOR zeising@FreeBSD.org
 +
 +  xorg, including libraries, was updated.
 +
  20130507:
    AFFECTS: users of comms/usbmuxd or comms/libimobiledevice
    AUTHOR: avilla@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 317827)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 317827)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 317827)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 317827)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 317827)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 317827)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 317827)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 317827)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 317827)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 317827)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 317827)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -42,8 +41,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 317827)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 317827)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 317827)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 317827)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,17 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 317827)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 317827)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 317827)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 317827)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 317827)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 317827)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 317827)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 317827)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 317827)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 317827)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 317827)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 317827)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 317827)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 317827)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 317827)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 317827)
 +++ games/capitalism/Makefile	(working copy)
 @@ -21,11 +21,10 @@
  		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
  
  USES=		gettext 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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 317827)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 317827)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 317827)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 317827)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 317827)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 317827)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 317827)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 317827)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 317827)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 317827)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 317827)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 317827)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 317827)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 317827)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 317827)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 317827)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 317827)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 317827)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 317827)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -19,11 +18,4 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 317827)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 317827)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 317827)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 317827)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 317827)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 317827)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 317827)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 317827)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 317827)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 317827)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 317827)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -144,8 +144,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 +USE_XORG+=	xcb
  LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb \
  		zinnia.0:${PORTSDIR}/japanese/zinnia
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 Index: mail/claws-mail/Makefile
 ===================================================================
 --- mail/claws-mail/Makefile	(revision 317827)
 +++ mail/claws-mail/Makefile	(working copy)
 @@ -30,14 +30,13 @@
  		p11-kit:${PORTSDIR}/security/p11-kit \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
  RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
  
  CONFLICTS=	sylpheed-claws
  
  USE_BZIP2=	yes
  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
  USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
  GNU_CONFIGURE=	yes
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 317827)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 317827)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 317827)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 317827)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 317827)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 317827)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -13,8 +13,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -33,7 +32,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 317827)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 317827)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 317827)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 317827)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 317827)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 317827)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 317827)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 317827)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 317827)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 317827)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 317827)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 317827)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 317827)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 317827)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 317827)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 317827)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 317827)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 317827)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 317827)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 317827)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 317827)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 317827)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 317827)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 317827)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 317827)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 317827)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 317827)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 317827)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 317827)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,17 +1,16 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Input extension headers
  
 +USE_XORG=	xorg-macros
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 317827)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 317827)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 317827)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 317827)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 317827)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 317827)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 317827)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 317827)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 317827)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 317827)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 317827)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 317827)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 317827)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXScrnSaver/pkg-plist
 ===================================================================
 --- x11/libXScrnSaver/pkg-plist	(revision 317827)
 +++ x11/libXScrnSaver/pkg-plist	(working copy)
 @@ -5,3 +5,4 @@
  lib/libXss.a
  libdata/pkgconfig/xscrnsaver.pc
  @dirrmtry include/X11/extensions
 +
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 317827)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 317827)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 317827)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 317827)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 317827)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 317827)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 317827)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 317827)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 317827)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 317827)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 317827)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 317827)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 317827)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 317827)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 317827)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 317827)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 317827)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 317827)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 317827)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 317827)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 317827)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 317827)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 317827)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 317827)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 317827)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 317827)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 317827)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 317827)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 317827)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 317827)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 317827)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 317827)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 317827)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 317827)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 317827)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 317827)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 317827)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 317827)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 317827)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 317827)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 317827)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 317827)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 317827)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 317827)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 317827)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 317827)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 317827)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 317827)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 317827)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 317827)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 317827)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 317827)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 317827)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 317827)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 317827)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 317827)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 317827)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 317827)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 317827)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,9 +15,9 @@
  
  OPTIONS_DEFINE=	SIMD
  
 -.include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if empty(PORT_OPTIONS:MSIMD)
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 @@ -27,4 +27,4 @@
  . endif
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 317827)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 317827)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 317827)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 317827)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 317827)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 317827)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 317827)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 317827)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 317827)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 317827)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 317827)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 317827)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 317827)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 317827)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 317827)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 317827)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 317827)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 317827)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 317827)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 317827)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 317827)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 317827)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 317827)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,17 +1,10 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	ashish@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
 @@ -19,7 +12,7 @@
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 317827)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 317827)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 317827)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 317827)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 317827)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 317827)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 317827)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 317827)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 317827)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 317827)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 317827)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 317827)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 317827)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 317827)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 317827)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 317827)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 317827)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 317827)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 317827)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 317827)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 317827)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 317827)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 317827)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 317827)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 317827)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 317827)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 317827)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 317827)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 317827)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 317827)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 317827)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 317827)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 317827)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 317827)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 317827)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 317827)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 317827)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 317827)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 317827)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 317827)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 317827)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 317827)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 317827)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 317827)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 317827)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 317827)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 317827)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 317827)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 317827)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 317827)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 317827)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 317827)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 317827)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 317827)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 317827)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 317827)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 317827)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 317827)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 317827)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 317827)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 317827)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 317827)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 317827)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 317827)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 317827)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 317827)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 317827)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 317827)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 317827)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 317827)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 317827)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 317827)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 317827)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 317827)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 317827)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 317827)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 317827)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 317827)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 317827)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 317827)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,17 +9,13 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
 -HYPERREVISION=	6
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 +HYPERREVISION=	5
  .endif
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 317827)
 +++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
 @@ -1,75 +0,0 @@
 ---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
 -+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
 -@@ -719,6 +719,9 @@
 - {
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     if (xf86HypOpen(local) != Success) {
 - 	if (local->fd >= 0) {
 -@@ -730,6 +733,9 @@
 - /* Set the real values */
 -     InitValuatorAxisStruct(pHyp,
 - 			   0,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[0],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypXSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -737,6 +743,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   1,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[1],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypYSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -744,6 +753,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   2,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[2],
 -+#endif
 - 			   0, /* min val */
 - 			   511, /* max val */
 - 			   512, /* resolution */
 -@@ -765,8 +777,10 @@
 -     int			loop;
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 --
 --
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom btn_labels[4] = { 0 };
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     switch (what) {
 - 	case DEVICE_INIT:
 -@@ -779,6 +793,9 @@
 - 
 - 	    if (InitButtonClassDeviceStruct(pHyp,
 - 					    nbbuttons,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+					    btn_labels,
 -+#endif
 - 					    map) == FALSE) {
 - 		ErrorF("unable to allocate Button class device\n");
 - 		return !Success;
 -@@ -802,6 +819,9 @@
 - 
 - 	    if (InitValuatorClassDeviceStruct(pHyp,
 - 		   nbaxes,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+		   axis_labels,
 -+#endif
 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 - 		   xf86GetMotionEvents,
 - #endif
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 317827)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 317827)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 317827)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 317827)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 317827)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 317827)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.0
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.2
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 317827)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 317827)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 317827)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 317827)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 317827)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 317827)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 317827)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 317827)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 317827)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  
  WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 317827)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 317827)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 317827)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 -QUIRKS=		keyboard:kbd
 +# these drivers have a different module name compared to the plugin they install
 +QUIRKS=		keyboard:kbd jamstudio:js_x
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 317827)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 317827)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 317827)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 317827)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 317827)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 317827)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 317827)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 317827)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 317827)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 317827)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 317827)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 317827)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 317827)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 317827)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 317827)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 317827)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 317827)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 317827)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 317827)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 317827)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 317827)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 317827)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 317827)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 317827)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 317827)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X font library
 +COMMENT=	X font libary
  
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 317827)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 317827)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 317827)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 317827)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 317827)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 317827)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 317827)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 317827)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 317827)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 317827)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 317827)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 317827)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 317827)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 317827)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 317827)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 317827)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 317827)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 317827)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 317827)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 317827)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 317827)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,7 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir is so it loads the rigth libglx library.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 317827)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 317827)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 317827)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 317827)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 317827)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 317827)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 317827)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 317827)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 317827)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 317827)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 317827)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 317827)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 317827)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 317827)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 317827)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 317827)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 317827)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 317827)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 317827)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 317827)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 317827)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 317827)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 317827)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 317827)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------050009060107080103070200--
 

From: Niclas Zeising <zeising@daemonic.se>
To: bug-followup@FreeBSD.org, zeising@FreeBSD.org
Cc:  
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Tue, 14 May 2013 10:52:18 +0200

 This is a multi-part message in MIME format.
 --------------030704030000070709010606
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Here is an updated patch to sync with the latest ports tree.
 Also available at
 http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------030704030000070709010606
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 318142)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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
 @@ -1923,6 +1929,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -1939,6 +1946,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 318142)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 318142)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,12 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  AFFECTS: users of x11/xorg and all xorg ports
 +  AUTHOR zeising@FreeBSD.org
 +
 +  xorg, including libraries, was updated.
 +
  20130512:
    AFFECTS: users of devel/hs-git-annex
    AUTHOR: haskell@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 318142)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 318142)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 318142)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 318142)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 318142)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 318142)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 318142)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 318142)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 318142)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 318142)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 318142)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -42,8 +41,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 318142)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 318142)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 318142)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 318142)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,17 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 318142)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 318142)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 318142)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 318142)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 318142)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 318142)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 318142)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 318142)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 318142)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 318142)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 318142)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 318142)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 318142)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 318142)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 318142)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 318142)
 +++ games/capitalism/Makefile	(working copy)
 @@ -21,11 +21,10 @@
  		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
  
  USES=		gettext 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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 318142)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 318142)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 318142)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 318142)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 318142)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 318142)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 318142)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 318142)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 318142)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 318142)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 318142)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 318142)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 318142)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 318142)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 318142)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 318142)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 318142)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 318142)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 318142)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -19,11 +18,4 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 318142)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 318142)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 318142)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 318142)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 318142)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 318142)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 318142)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 318142)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 318142)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 318142)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 318142)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -144,8 +144,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 +USE_XORG+=	xcb
  LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb \
  		zinnia.0:${PORTSDIR}/japanese/zinnia
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 318142)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 318142)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 318142)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 318142)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 318142)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 318142)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -13,8 +13,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -33,7 +32,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 318142)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 318142)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 318142)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 318142)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 318142)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 318142)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 318142)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 318142)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 318142)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 318142)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 318142)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 318142)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 318142)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 318142)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 318142)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 318142)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 318142)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 318142)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 318142)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 318142)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 318142)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 318142)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 318142)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 318142)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 318142)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 318142)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 318142)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 318142)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 318142)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,17 +1,16 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Input extension headers
  
 +USE_XORG=	xorg-macros
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 318142)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 318142)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 318142)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 318142)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 318142)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 318142)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 318142)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 318142)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 318142)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 318142)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 318142)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 318142)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 318142)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXScrnSaver/pkg-plist
 ===================================================================
 --- x11/libXScrnSaver/pkg-plist	(revision 318142)
 +++ x11/libXScrnSaver/pkg-plist	(working copy)
 @@ -5,3 +5,4 @@
  lib/libXss.a
  libdata/pkgconfig/xscrnsaver.pc
  @dirrmtry include/X11/extensions
 +
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 318142)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 318142)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 318142)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 318142)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 318142)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 318142)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 318142)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 318142)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 318142)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 318142)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 318142)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 318142)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 318142)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 318142)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 318142)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 318142)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 318142)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 318142)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 318142)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 318142)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 318142)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 318142)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 318142)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 318142)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 318142)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 318142)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 318142)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 318142)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 318142)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 318142)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 318142)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 318142)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 318142)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 318142)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 318142)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 318142)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 318142)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 318142)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 318142)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 318142)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 318142)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 318142)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 318142)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 318142)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 318142)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 318142)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 318142)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 318142)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 318142)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 318142)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 318142)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 318142)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 318142)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 318142)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 318142)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 318142)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 318142)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 318142)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 318142)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,9 +15,9 @@
  
  OPTIONS_DEFINE=	SIMD
  
 -.include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if empty(PORT_OPTIONS:MSIMD)
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 @@ -27,4 +27,4 @@
  . endif
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 318142)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 318142)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 318142)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 318142)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 318142)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 318142)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 318142)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 318142)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 318142)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 318142)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 318142)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 318142)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 318142)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 318142)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 318142)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 318142)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 318142)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 318142)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 318142)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 318142)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 318142)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 318142)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 318142)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,17 +1,10 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	ashish@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
 @@ -19,7 +12,7 @@
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 318142)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 318142)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 318142)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 318142)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 318142)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 318142)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 318142)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 318142)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 318142)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 318142)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 318142)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 318142)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 318142)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 318142)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 318142)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 318142)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 318142)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 318142)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 318142)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 318142)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 318142)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 318142)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 318142)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 318142)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 318142)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 318142)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 318142)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 318142)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 318142)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 318142)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 318142)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 318142)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 318142)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 318142)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 318142)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 318142)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 318142)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 318142)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 318142)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 318142)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 318142)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 318142)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 318142)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 318142)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 318142)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 318142)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 318142)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 318142)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 318142)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 318142)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 318142)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 318142)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 318142)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 318142)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 318142)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 318142)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 318142)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 318142)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 318142)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 318142)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 318142)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 318142)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 318142)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 318142)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 318142)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 318142)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 318142)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 318142)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 318142)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 318142)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 318142)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 318142)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 318142)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 318142)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 318142)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 318142)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 318142)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 318142)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 318142)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 318142)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,17 +9,13 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
 -HYPERREVISION=	6
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 +HYPERREVISION=	5
  .endif
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(revision 318142)
 +++ x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	(working copy)
 @@ -1,75 +0,0 @@
 ---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
 -+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
 -@@ -719,6 +719,9 @@
 - {
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     if (xf86HypOpen(local) != Success) {
 - 	if (local->fd >= 0) {
 -@@ -730,6 +733,9 @@
 - /* Set the real values */
 -     InitValuatorAxisStruct(pHyp,
 - 			   0,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[0],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypXSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -737,6 +743,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   1,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[1],
 -+#endif
 - 			   0, /* min val */
 - 			   priv->hypYSize, /* max val */
 - 			   LPI2CPM(priv->hypRes), /* resolution */
 -@@ -744,6 +753,9 @@
 - 			   LPI2CPM(priv->hypRes)); /* max_res */
 -     InitValuatorAxisStruct(pHyp,
 - 			   2,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+			   axis_labels[2],
 -+#endif
 - 			   0, /* min val */
 - 			   511, /* max val */
 - 			   512, /* resolution */
 -@@ -765,8 +777,10 @@
 -     int			loop;
 -     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
 -     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
 --
 --
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+    Atom btn_labels[4] = { 0 };
 -+    Atom axis_labels[3] = { 0 };
 -+#endif
 - 
 -     switch (what) {
 - 	case DEVICE_INIT:
 -@@ -779,6 +793,9 @@
 - 
 - 	    if (InitButtonClassDeviceStruct(pHyp,
 - 					    nbbuttons,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+					    btn_labels,
 -+#endif
 - 					    map) == FALSE) {
 - 		ErrorF("unable to allocate Button class device\n");
 - 		return !Success;
 -@@ -802,6 +819,9 @@
 - 
 - 	    if (InitValuatorClassDeviceStruct(pHyp,
 - 		   nbaxes,
 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
 -+		   axis_labels,
 -+#endif
 - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 - 		   xf86GetMotionEvents,
 - #endif
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 318142)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 318142)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 318142)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 318142)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 318142)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 318142)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.1
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.4
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 318142)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 318142)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 318142)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 318142)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 318142)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 318142)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 318142)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 318142)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 318142)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  
  WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 318142)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 318142)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 318142)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 -QUIRKS=		keyboard:kbd
 +# these drivers have a different module name compared to the plugin they install
 +QUIRKS=		keyboard:kbd jamstudio:js_x
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 318142)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 318142)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 318142)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 318142)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 318142)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 318142)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 318142)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 318142)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 318142)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 318142)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 318142)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 318142)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 318142)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 318142)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 318142)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 318142)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 318142)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 318142)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 318142)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 318142)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 318142)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 318142)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 318142)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 318142)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 318142)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 -COMMENT=	X font library
 +COMMENT=	X font libary
  
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 318142)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 318142)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 318142)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 318142)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 318142)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 318142)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 318142)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 318142)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 318142)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 318142)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 318142)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 318142)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 318142)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 318142)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 318142)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 318142)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 318142)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 318142)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 318142)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 318142)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 318142)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,7 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir is so it loads the rigth libglx library.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 318142)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 318142)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 318142)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 318142)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 318142)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 318142)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 318142)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 318142)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 318142)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 318142)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 318142)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 318142)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 318142)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 318142)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 318142)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 318142)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 318142)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 318142)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 318142)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 318142)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 318142)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 318142)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 318142)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 318142)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------030704030000070709010606--
 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc: miwii@freebsd.org
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Tue, 14 May 2013 12:48:10 +0200

 This is a multi-part message in MIME format.
 --------------050502070401070202000006
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Here is yet another updated patch, with a bunch of minor fixes.
 Regards!
 -- 
 Niclas Zeising
 
 --------------050502070401070202000006
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 318156)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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
 @@ -1923,6 +1929,7 @@
  
  PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
  
 +_GL_gl_USE_XORG=		glproto dri2proto
  _GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
  _GL_glew_LIB_DEPENDS=		GLEW.1:${PORTSDIR}/graphics/glew
  _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
 @@ -1939,6 +1946,8 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 318156)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 318156)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,16 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  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=,  however, xorg-server has been
 +  updated and you need to recompile all drivers.
 +
  20130512:
    AFFECTS: users of devel/hs-git-annex
    AUTHOR: haskell@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 318156)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 318156)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 318156)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 318156)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 318156)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 318156)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 318156)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 318156)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 318156)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 318156)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 318156)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -42,8 +41,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 318156)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 318156)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 318156)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 318156)
 +++ devel/imake/Makefile	(working copy)
 @@ -1,8 +1,8 @@
 -# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 +# Created by: anholt
  # $FreeBSD$
  
  PORTNAME=	imake
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  PORTEPOCH=	1
  CATEGORIES=	devel
  
 @@ -11,13 +11,17 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 318156)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 318156)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 318156)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 318156)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 318156)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 318156)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 318156)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 318156)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 318156)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 318156)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 318156)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 318156)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 318156)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 318156)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 318156)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 318156)
 +++ games/capitalism/Makefile	(working copy)
 @@ -21,11 +21,10 @@
  		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
  
  USES=		gettext 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
  INSTALLS_ICONS=	yes
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 318156)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 318156)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 318156)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 318156)
 +++ graphics/dri/Makefile	(working copy)
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 318156)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 318156)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 318156)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 318156)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 318156)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 318156)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 318156)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 318156)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 318156)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 318156)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 318156)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 318156)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 318156)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 318156)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 318156)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -2,7 +2,6 @@
  # $FreeBSD$
  
  PORTNAME=	libGLU
 -PORTREVISION=	2
  PORTVERSION=	${MESAVERSION}
  CATEGORIES=	graphics
  
 @@ -19,11 +18,4 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 318156)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 318156)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -2,25 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 318156)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 318156)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 318156)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 318156)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 318156)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 318156)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 318156)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 318156)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 318156)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -144,8 +144,8 @@
  
  # ibus_mozc
  .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 +USE_XORG+=	xcb
  LIB_DEPENDS+=	ibus-1.0.401:${PORTSDIR}/textproc/ibus \
 -		xcb-xfixes.0:${PORTSDIR}/x11/libxcb \
  		zinnia.0:${PORTSDIR}/japanese/zinnia
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 318156)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 318156)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 318156)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 318156)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 318156)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/tigervnc/Makefile
 ===================================================================
 --- net/tigervnc/Makefile	(revision 318156)
 +++ net/tigervnc/Makefile	(working copy)
 @@ -13,8 +13,7 @@
  COMMENT=	TigerVNC is an advanced VNC implementation
  
  PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
 -BUILD_DEPENDS+=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
 -		${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
  
  CONFLICTS=	tridiavnc-[0-9]* \
  		tightvnc-[0-9]* \
 @@ -33,7 +32,7 @@
  USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
  		inputproto kbproto pixman randrproto renderproto resourceproto \
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 -		xfont xproto xrandr xtrans xtst
 +		xfont xproto xrandr xtrans xtst xorg-macros
  
  MAN1+=		vncpasswd.1 \
  		x0vncserver.1 \
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 318156)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 318156)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 318156)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 318156)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 318156)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 318156)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 318156)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 318156)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 318156)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 318156)
 +++ x11/appres/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	appres
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	appres
  PORTVERSION=	1.0.3
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 318156)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 318156)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 318156)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 318156)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 318156)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 318156)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 318156)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 318156)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 318156)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 318156)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 318156)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 318156)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 318156)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 318156)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 318156)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 318156)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 318156)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 318156)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 318156)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,4 +10,6 @@
  
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 318156)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 318156)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 318156)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 318156)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 318156)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 318156)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 318156)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 318156)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 318156)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 318156)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 318156)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 318156)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 318156)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 318156)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 318156)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 318156)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 318156)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 318156)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 318156)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 318156)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 318156)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 318156)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 318156)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 318156)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 318156)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 318156)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 318156)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 318156)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 318156)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 318156)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 318156)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 318156)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 318156)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 318156)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 318156)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 318156)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 318156)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 318156)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 318156)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 318156)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 318156)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 318156)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 318156)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 318156)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 318156)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 318156)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 318156)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 318156)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 318156)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 318156)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 318156)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 318156)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 318156)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 318156)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 318156)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 318156)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 318156)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 318156)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 318156)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 318156)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 318156)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 318156)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 318156)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 318156)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 318156)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 318156)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 318156)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 318156)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 318156)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 318156)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 318156)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 318156)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,7 +17,7 @@
  
  .include <bsd.port.options.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if ! {PORT_OPTIONS:MSIMD}
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 318156)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 318156)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 318156)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 318156)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 318156)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 318156)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 318156)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 318156)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 318156)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 318156)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 318156)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 318156)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 318156)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 318156)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 318156)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 318156)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 318156)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 318156)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 318156)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 318156)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 318156)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 318156)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 318156)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,25 +1,18 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
 -MAINTAINER=	ashish@FreeBSD.org
 +MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
  
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 318156)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 318156)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 318156)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 318156)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 318156)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 318156)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb org-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 318156)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 318156)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 318156)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 318156)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 318156)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 318156)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 318156)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 318156)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 318156)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 318156)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 318156)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 318156)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 318156)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 318156)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 318156)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 318156)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 318156)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 318156)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 318156)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 318156)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 318156)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 318156)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 318156)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 318156)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 318156)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 318156)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 318156)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 318156)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 318156)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 318156)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 318156)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 318156)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 318156)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 318156)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 318156)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 318156)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 318156)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 318156)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 318156)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 318156)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 318156)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: anholt
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 318156)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 318156)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 318156)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 318156)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 318156)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 318156)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 318156)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 318156)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 318156)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 318156)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 318156)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 318156)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 318156)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 318156)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 318156)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 318156)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrefresh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrefresh
  PORTVERSION=	1.0.4
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 318156)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 318156)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 318156)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 318156)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 318156)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 318156)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 318156)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 318156)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 318156)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 318156)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 318156)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 318156)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 318156)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 318156)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 318156)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
  PORTVERSION=	1.1.2
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 318156)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 318156)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,13 +9,10 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
  HYPERREVISION=	6
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 318156)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 318156)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 318156)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 318156)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 318156)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 318156)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.1
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.4
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 318156)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 318156)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 318156)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 318156)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 318156)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 318156)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 318156)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 318156)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 318156)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,9 +9,8 @@
  
  USE_GL=		gl
  
 -WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 318156)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 318156)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 318156)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 +# these drivers have a different module name compared to the plugin they install
  QUIRKS=		keyboard:kbd
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 318156)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 318156)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 318156)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 318156)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 318156)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 318156)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 318156)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 318156)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 318156)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 318156)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 318156)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 318156)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 318156)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 318156)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 318156)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 318156)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 318156)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 318156)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 318156)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 318156)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 318156)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 318156)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 318156)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 318156)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 318156)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 318156)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 318156)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 318156)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 318156)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 318156)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 318156)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 318156)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 318156)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 318156)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 318156)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 318156)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 318156)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 318156)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 318156)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 318156)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 318156)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 318156)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 318156)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 318156)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 318156)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 318156)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,8 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir because else the xorg-server might not load the correct 
 +# libglx module.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 318156)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 318156)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 318156)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 318156)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 318156)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 318156)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 318156)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: anholt@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 318156)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 318156)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 318156)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 318156)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 318156)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 318156)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 318156)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 318156)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 318156)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 318156)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 318156)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 318156)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 318156)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 318156)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  LICENSE=	BSD
  
  BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -30,7 +29,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		bison pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 318156)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 318156)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 318156)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------050502070401070202000006--
 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org, zeising@FreeBSD.org
Cc:  
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Mon, 20 May 2013 21:52:03 +0200

 This is a multi-part message in MIME format.
 --------------050905020604000101050804
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Here is an updated patch based on findings during the first exp-run.  It
 also includes some general updates.  It would be great if this patch
 could get a second run!  The patch is also available at
 http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------050905020604000101050804
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 318622)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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 @@
  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 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 318622)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 318622)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,16 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  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=,  however, xorg-server has been
 +  updated and you need to recompile all drivers.
 +
  20130520:
    AFFECTS: users of textproc/elasticsearch
    AUTHOR: tj@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 318622)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 318622)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 318622)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 318622)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 318622)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 318622)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 318622)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 318622)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 318622)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 318622)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 318622)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -32,8 +32,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -41,8 +40,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 318622)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 318622)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 318622)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 318622)
 +++ devel/imake/Makefile	(working copy)
 @@ -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 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 318622)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 318622)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 318622)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 318622)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 318622)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 318622)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 318622)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 318622)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 318622)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 318622)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 318622)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 318622)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 318622)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 318622)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 318622)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 318622)
 +++ games/capitalism/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 318622)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 318622)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 318622)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 318622)
 +++ graphics/dri/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	dri
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 318622)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 318622)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 318622)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 318622)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 318622)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 318622)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 318622)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/Makefile
 ===================================================================
 --- graphics/libGL/Makefile	(revision 318622)
 +++ graphics/libGL/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGL
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 318622)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 318622)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 318622)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 318622)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 318622)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 318622)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 318622)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 318622)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -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 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 318622)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 318622)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -1,26 +1,25 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 318622)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 318622)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 318622)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 318622)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 318622)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 318622)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 318622)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 318622)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 318622)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -180,12 +180,12 @@
  
  # 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 \
 -		xcb-xfixes:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
  		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 318622)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 318622)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 318622)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 318622)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 318622)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 318622)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 318622)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 318622)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 318622)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 318622)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 318622)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 318622)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 318622)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 318622)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 318622)
 +++ x11/appres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Program to list application's resources
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros xt
 +USE_XORG=	x11 xt
  
  MAN1=		appres.1
  PLIST_FILES=	bin/appres
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 318622)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 318622)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 318622)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/bitmap/Makefile
 ===================================================================
 --- x11/bitmap/Makefile	(revision 318622)
 +++ x11/bitmap/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Bitmap editor and converter utilities for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xaw xbitmaps xmu xproto xorg-macros
 +USE_XORG=	x11 xaw xbitmaps xmu xproto
  MAN1=		atobm.1 bitmap.1 bmtoa.1
  
  .include <bsd.port.mk>
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 318622)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 318622)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 318622)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 318622)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 318622)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 318622)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 318622)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 318622)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 318622)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 318622)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 318622)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 318622)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 318622)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 318622)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 318622)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 318622)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,4 +10,6 @@
  
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 318622)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 318622)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 318622)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 318622)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 318622)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 318622)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 318622)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 318622)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 318622)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 318622)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 318622)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 318622)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 318622)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 318622)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 318622)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 318622)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 318622)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 318622)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 318622)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 318622)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 318622)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 318622)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 318622)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 318622)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 318622)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 318622)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 318622)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 318622)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 318622)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 318622)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 318622)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 318622)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 318622)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 318622)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 318622)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 318622)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 318622)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 318622)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 318622)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 318622)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 318622)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 318622)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 318622)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 318622)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 318622)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 318622)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 318622)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 318622)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 318622)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 318622)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 318622)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 318622)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 318622)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 318622)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 318622)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 318622)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 318622)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 318622)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 318622)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 318622)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 318622)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 318622)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 318622)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 318622)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 318622)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 318622)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 318622)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 318622)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 318622)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 318622)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 318622)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 318622)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,7 +17,7 @@
  
  .include <bsd.port.options.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if ! {PORT_OPTIONS:MSIMD}
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 318622)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 318622)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 318622)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 318622)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 318622)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 318622)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 318622)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 318622)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 318622)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 318622)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 318622)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 318622)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 318622)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 318622)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 318622)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 318622)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 318622)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 318622)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 318622)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 318622)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 318622)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 318622)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 318622)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,25 +1,18 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
 -MAINTAINER=	ashish@FreeBSD.org
 +MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
  
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 318622)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 318622)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 318622)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 318622)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 318622)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 318622)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 318622)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 318622)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 318622)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 318622)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 318622)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 318622)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdpyinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdpyinfo
  PORTVERSION=	1.3.0
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 318622)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 318622)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 318622)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 318622)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 318622)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 318622)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 318622)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 318622)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 318622)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 318622)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 318622)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 318622)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 318622)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 318622)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 318622)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 318622)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 318622)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 318622)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 318622)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 318622)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 318622)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 318622)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 318622)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 318622)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 318622)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 318622)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 318622)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 318622)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 318622)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 318622)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 318622)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 318622)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 318622)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 318622)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 318622)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 318622)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 318622)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 318622)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 318622)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 318622)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 318622)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 318622)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 318622)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 318622)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 318622)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 318622)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 318622)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 318622)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 318622)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 318622)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 318622)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xrefresh
  
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 318622)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 318622)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 318622)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 318622)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 318622)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 318622)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 318622)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 318622)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 318622)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 318622)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 318622)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 318622)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 318622)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 318622)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 318622)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Window information utility for X
  
  XORG_CAT=	app
 -USE_XORG=	xmuu xext x11
 +USES=		iconv
 +USE_XORG=	x11 xcb xproto xorg-macros
  
  PLIST_FILES=	bin/xwininfo
  
 Index: x11/xwininfo/distinfo
 ===================================================================
 --- x11/xwininfo/distinfo	(revision 318622)
 +++ x11/xwininfo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xwininfo-1.1.2.tar.bz2) = 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a
 -SIZE (xorg/app/xwininfo-1.1.2.tar.bz2) = 135415
 +SHA256 (xorg/app/xwininfo-1.1.3.tar.bz2) = 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8
 +SIZE (xorg/app/xwininfo-1.1.3.tar.bz2) = 157512
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 318622)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 318622)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,13 +9,10 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
  HYPERREVISION=	6
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 318622)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 318622)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 318622)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 318622)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 318622)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 318622)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.1
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.4
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 318622)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 318622)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 318622)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 318622)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 318622)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 318622)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 318622)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 318622)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 318622)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rdc/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rdc/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-rdc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-rdc
 -# Date created:				14 April 2010
 -# Whom:					stas
 -#
 +# Created by: stas
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rdc
  PORTVERSION=	0.9
 @@ -17,6 +13,10 @@
  XORG_CAT=	driver
  USE_XORG=	xvmc xf86driproto xextproto x11 glproto
  
 +.if defined(WITH_NEW_XORG)
 +IGNORE=         does not build with X server 1.12
 +.endif
 +
  do-install:
  	${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
  	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,9 +9,8 @@
  
  USE_GL=		gl
  
 -WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 318622)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 318622)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 318622)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 +# these drivers have a different module name compared to the plugin they install
  QUIRKS=		keyboard:kbd
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 318622)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 318622)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 318622)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 318622)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 318622)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 318622)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 318622)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 318622)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 318622)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 318622)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 318622)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 318622)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 318622)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 318622)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 318622)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 318622)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 318622)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 318622)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 318622)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 318622)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 318622)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 318622)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 318622)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 318622)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 318622)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 318622)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 318622)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 318622)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 318622)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 318622)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 318622)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 318622)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 318622)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 318622)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 318622)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 318622)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 318622)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 318622)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 318622)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 318622)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 318622)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 318622)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 318622)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 318622)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 318622)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 318622)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,8 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir because else the xorg-server might not load the correct 
 +# libglx module.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 318622)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 318622)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 318622)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 318622)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 318622)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 318622)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 318622)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 318622)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 318622)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 318622)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 318622)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 318622)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 318622)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 318622)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 318622)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 318622)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 318622)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 318622)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 318622)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 318622)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 318622)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  
  LICENSE=	BSD
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -29,7 +28,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 318622)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/transset/Makefile
 ===================================================================
 --- x11-wm/transset/Makefile	(revision 318622)
 +++ x11-wm/transset/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  COMMENT=	Make your windows transparent
  
  XORG_CAT=	app
 -USE_XORG=	x11 xproto xorg-macros
 +USE_XORG=	x11 xproto
  MAKE_JOBS_SAFE=	yes
  
  MAN1=		transset.1
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 318622)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 318622)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------050905020604000101050804--
 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org, zeising@FreeBSD.org
Cc:  
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Tue, 21 May 2013 11:58:46 +0200

 This is a multi-part message in MIME format.
 --------------090406090005020204070202
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi!
 Another updated patch with some small changes.
 Also available at
 http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------090406090005020204070202
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 318668)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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 @@
  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 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 318668)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 318668)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,16 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  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=,  however, xorg-server has been
 +  updated and you need to recompile all drivers.
 +
  20130520:
    AFFECTS: users of textproc/elasticsearch
    AUTHOR: tj@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 318668)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 318668)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 318668)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 318668)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 318668)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 318668)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 318668)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 318668)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 318668)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 318668)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 318668)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -32,8 +32,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -41,8 +40,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 318668)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 318668)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 318668)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 318668)
 +++ devel/imake/Makefile	(working copy)
 @@ -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 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 318668)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 318668)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 318668)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 318668)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 318668)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 318668)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 318668)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 318668)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 318668)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 318668)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 318668)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 318668)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 318668)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 318668)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 318668)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 318668)
 +++ games/capitalism/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 318668)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 318668)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 318668)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 318668)
 +++ graphics/dri/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	dri
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 318668)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 318668)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 318668)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 318668)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 318668)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 318668)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 318668)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/Makefile
 ===================================================================
 --- graphics/libGL/Makefile	(revision 318668)
 +++ graphics/libGL/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGL
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 318668)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 318668)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 318668)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 318668)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 318668)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 318668)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 318668)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 318668)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -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 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 318668)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 318668)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -1,26 +1,25 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 318668)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 318668)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 318668)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 318668)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 318668)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 318668)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 318668)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 318668)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 318668)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -180,12 +180,12 @@
  
  # 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 \
 -		xcb-xfixes:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
  		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 318668)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 318668)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 318668)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 318668)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 318668)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 318668)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 318668)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 318668)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 318668)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 318668)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 318668)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 318668)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 318668)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 318668)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 318668)
 +++ x11/appres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Program to list application's resources
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros xt
 +USE_XORG=	x11 xt
  
  MAN1=		appres.1
  PLIST_FILES=	bin/appres
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 318668)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 318668)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 318668)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/bitmap/Makefile
 ===================================================================
 --- x11/bitmap/Makefile	(revision 318668)
 +++ x11/bitmap/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Bitmap editor and converter utilities for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xaw xbitmaps xmu xproto xorg-macros
 +USE_XORG=	x11 xaw xbitmaps xmu xproto
  MAN1=		atobm.1 bitmap.1 bmtoa.1
  
  .include <bsd.port.mk>
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 318668)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 318668)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 318668)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 318668)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 318668)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 318668)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 318668)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 318668)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 318668)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 318668)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 318668)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 318668)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 318668)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 318668)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 318668)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 318668)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,4 +10,6 @@
  
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 318668)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 318668)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 318668)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 318668)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 318668)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 318668)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 318668)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 318668)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 318668)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 318668)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 318668)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 318668)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 318668)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 318668)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 318668)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 318668)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 318668)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 318668)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 318668)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 318668)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 318668)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 318668)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 318668)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 318668)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 318668)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 318668)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 318668)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 318668)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 318668)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 318668)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 318668)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 318668)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 318668)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 318668)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 318668)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 318668)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 318668)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 318668)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 318668)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 318668)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 318668)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 318668)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 318668)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 318668)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 318668)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 318668)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 318668)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 318668)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 318668)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 318668)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 318668)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 318668)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 318668)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 318668)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 318668)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 318668)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 318668)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 318668)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 318668)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 318668)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 318668)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 318668)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 318668)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 318668)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 318668)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 318668)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 318668)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 318668)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 318668)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 318668)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 318668)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 318668)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,7 +17,7 @@
  
  .include <bsd.port.options.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if ! {PORT_OPTIONS:MSIMD}
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 318668)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 318668)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 318668)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 318668)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 318668)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 318668)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 318668)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 318668)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 318668)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 318668)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 318668)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 318668)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 318668)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 318668)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 318668)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 318668)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 318668)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 318668)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 318668)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 318668)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 318668)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 318668)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 318668)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,25 +1,18 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
 -MAINTAINER=	ashish@FreeBSD.org
 +MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
  
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 318668)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 318668)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 318668)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 318668)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 318668)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 318668)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 318668)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 318668)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 318668)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 318668)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 318668)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 318668)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -10,8 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG=	dmx x11 xcomposite xext xinerama xorg-macros xproto xrender \
 +USE_XORG=	dmx x11 xcb xcomposite xext xinerama xproto xrender \
  		xtst xxf86dga xxf86misc xxf86vm
  
  PLIST_FILES=	bin/xdpyinfo
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 318668)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 318668)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 318668)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 318668)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 318668)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 318668)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 318668)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 318668)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 318668)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 318668)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 318668)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 318668)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 318668)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 318668)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 318668)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 318668)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 318668)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 318668)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 318668)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 318668)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 318668)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 318668)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 318668)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 318668)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 318668)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 318668)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 318668)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 318668)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 318668)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 318668)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 318668)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 318668)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 318668)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 318668)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 318668)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 318668)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 318668)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 318668)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 318668)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 318668)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 318668)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 318668)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 318668)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 318668)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 318668)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 318668)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 318668)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 318668)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 318668)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 318668)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 318668)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xrefresh
  
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 318668)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 318668)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 318668)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 318668)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 318668)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 318668)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 318668)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 318668)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 318668)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 318668)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 318668)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 318668)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 318668)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 318668)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 318668)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Window information utility for X
  
  XORG_CAT=	app
 -USE_XORG=	xmuu xext x11
 +USES=		iconv
 +USE_XORG=	x11 xcb xproto xorg-macros
  
  PLIST_FILES=	bin/xwininfo
  
 Index: x11/xwininfo/distinfo
 ===================================================================
 --- x11/xwininfo/distinfo	(revision 318668)
 +++ x11/xwininfo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xwininfo-1.1.2.tar.bz2) = 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a
 -SIZE (xorg/app/xwininfo-1.1.2.tar.bz2) = 135415
 +SHA256 (xorg/app/xwininfo-1.1.3.tar.bz2) = 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8
 +SIZE (xorg/app/xwininfo-1.1.3.tar.bz2) = 157512
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 318668)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 318668)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,13 +9,10 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
  HYPERREVISION=	6
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 318668)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 318668)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 318668)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 318668)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 318668)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 318668)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.1
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.4
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 318668)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 318668)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 318668)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 318668)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 318668)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 318668)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 318668)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 318668)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 318668)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rdc/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rdc/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-rdc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-rdc
 -# Date created:				14 April 2010
 -# Whom:					stas
 -#
 +# Created by: stas
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rdc
  PORTVERSION=	0.9
 @@ -17,6 +13,10 @@
  XORG_CAT=	driver
  USE_XORG=	xvmc xf86driproto xextproto x11 glproto
  
 +.if defined(WITH_NEW_XORG)
 +IGNORE=         does not build with X server 1.12
 +.endif
 +
  do-install:
  	${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
  	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,9 +9,8 @@
  
  USE_GL=		gl
  
 -WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 318668)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 318668)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 318668)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 +# these drivers have a different module name compared to the plugin they install
  QUIRKS=		keyboard:kbd
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 318668)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 318668)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 318668)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 318668)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 318668)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 318668)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 318668)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 318668)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 318668)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 318668)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 318668)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 318668)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 318668)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 318668)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 318668)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 318668)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 318668)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 318668)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 318668)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 318668)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 318668)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 318668)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 318668)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 318668)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 318668)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 318668)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 318668)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 318668)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 318668)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 318668)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 318668)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 318668)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 318668)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 318668)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 318668)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 318668)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 318668)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 318668)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 318668)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 318668)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 318668)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 318668)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 318668)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 318668)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 318668)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 318668)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,8 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir because else the xorg-server might not load the correct 
 +# libglx module.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 318668)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 318668)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 318668)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 318668)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 318668)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 318668)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 318668)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 318668)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 318668)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 318668)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 318668)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 318668)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 318668)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 318668)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 318668)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 318668)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 318668)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 318668)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 318668)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 318668)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 318668)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  
  LICENSE=	BSD
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -29,7 +28,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 318668)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/transset/Makefile
 ===================================================================
 --- x11-wm/transset/Makefile	(revision 318668)
 +++ x11-wm/transset/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  COMMENT=	Make your windows transparent
  
  XORG_CAT=	app
 -USE_XORG=	x11 xproto xorg-macros
 +USE_XORG=	x11 xproto
  MAKE_JOBS_SAFE=	yes
  
  MAN1=		transset.1
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 318668)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 318668)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------090406090005020204070202--
 

From: Niclas Zeising <zeising@freebsd.org>
To: bug-followup@FreeBSD.org
Cc: miwi@FreeBSD.org
Subject: Re: ports/177942: [exp-run] update of xorg ports to 7.7
Date: Wed, 22 May 2013 10:58:20 +0200

 This is a multi-part message in MIME format.
 --------------070303090004000601080003
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Updated patch, again.
 Should apply on a clean ports tree.
 Also available from http://people.freebsd.org/~zeising/xorg-7.7.diff
 Regards!
 -- 
 Niclas Zeising
 
 --------------070303090004000601080003
 Content-Type: text/x-patch;
  name="xorg-7.7.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="xorg-7.7.diff"
 
 Index: Mk/bsd.port.mk
 ===================================================================
 --- Mk/bsd.port.mk	(revision 318748)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -1903,8 +1903,14 @@
  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 @@
  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 @@
  		!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
 Index: Mk/bsd.xorg.mk
 ===================================================================
 --- Mk/bsd.xorg.mk	(revision 318748)
 +++ Mk/bsd.xorg.mk	(working copy)
 @@ -17,14 +17,14 @@
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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 @@
  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 @@
  . 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 @@
  .  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 @@
  .  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 @@
  . 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 @@
  				xaw6 \
  				xaw7 \
  				xbitmaps \
 +				xcb \
  				xcmiscproto \
  				xcomposite \
  				xcursor \
 @@ -274,6 +283,7 @@
  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
 Index: UPDATING
 ===================================================================
 --- UPDATING	(revision 318748)
 +++ UPDATING	(working copy)
 @@ -5,6 +5,16 @@
  You should get into the habit of checking this file for changes each time
  you update your ports collection, before attempting any port upgrades.
  
 +201305xx:
 +  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=,  however, xorg-server has been
 +  updated and you need to recompile all drivers.
 +
  20130520:
    AFFECTS: users of textproc/elasticsearch
    AUTHOR: tj@FreeBSD.org
 Index: astro/boinc-astropulse/Makefile
 ===================================================================
 --- astro/boinc-astropulse/Makefile	(revision 318748)
 +++ astro/boinc-astropulse/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/boinc-setiathome-enhanced/Makefile
 ===================================================================
 --- astro/boinc-setiathome-enhanced/Makefile	(revision 318748)
 +++ astro/boinc-setiathome-enhanced/Makefile	(working copy)
 @@ -43,10 +43,9 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 Index: astro/viking/Makefile
 ===================================================================
 --- astro/viking/Makefile	(revision 318748)
 +++ astro/viking/Makefile	(working copy)
 @@ -19,14 +19,13 @@
  		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
  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
 Index: audio/arts/Makefile
 ===================================================================
 --- audio/arts/Makefile	(revision 318748)
 +++ audio/arts/Makefile	(working copy)
 @@ -27,8 +27,7 @@
  		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
  
  DEPRECATED=	Depends on QT3; unmaintained
  EXPIRATION_DATE=	2013-07-01
 @@ -40,7 +39,7 @@
  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
 Index: audio/py-karaoke/Makefile
 ===================================================================
 --- audio/py-karaoke/Makefile	(revision 318748)
 +++ audio/py-karaoke/Makefile	(working copy)
 @@ -15,8 +15,7 @@
  
  BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		aa:${PORTSDIR}/graphics/aalib \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
  		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
  		${PYNUMPY}
 @@ -27,7 +26,7 @@
  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
  
 Index: audio/xmms-curses/Makefile
 ===================================================================
 --- audio/xmms-curses/Makefile	(revision 318748)
 +++ audio/xmms-curses/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xmms-curses
  PORTVERSION=	0.2.2
 @@ -16,12 +12,11 @@
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 Index: audio/xmms-flac/Makefile
 ===================================================================
 --- audio/xmms-flac/Makefile	(revision 318748)
 +++ audio/xmms-flac/Makefile	(working copy)
 @@ -13,13 +13,12 @@
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 Index: cad/brlcad/Makefile
 ===================================================================
 --- cad/brlcad/Makefile	(revision 318748)
 +++ cad/brlcad/Makefile	(working copy)
 @@ -18,12 +18,11 @@
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: cad/openvsp/Makefile
 ===================================================================
 --- cad/openvsp/Makefile	(revision 318748)
 +++ cad/openvsp/Makefile	(working copy)
 @@ -16,8 +16,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  USE_GITHUB=	yes
  GH_PROJECT=	OpenVSP
 @@ -28,7 +27,7 @@
  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
 Index: cad/pdnmesh/Makefile
 ===================================================================
 --- cad/pdnmesh/Makefile	(revision 318748)
 +++ cad/pdnmesh/Makefile	(working copy)
 @@ -20,8 +20,7 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
  ATLAS_DESC=	Enable ATLAS support
 @@ -30,8 +29,8 @@
  USE_FORTRAN=	yes
  USE_GL=		glu
  USE_GNOME=	gdkpixbuf2 gtk20
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 Index: cad/repsnapper/Makefile
 ===================================================================
 --- cad/repsnapper/Makefile	(revision 318748)
 +++ cad/repsnapper/Makefile	(working copy)
 @@ -32,8 +32,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  MAKE_JOBS_SAFE=	yes
  USES=		pkgconfig iconv
 @@ -41,8 +40,8 @@
  USE_GL=		glu glut
  USE_AUTOTOOLS=	automake libtool
  USE_GMAKE=	yes
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 Index: comms/efax-gtk/Makefile
 ===================================================================
 --- comms/efax-gtk/Makefile	(revision 318748)
 +++ comms/efax-gtk/Makefile	(working copy)
 @@ -23,8 +23,7 @@
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
  
  USES=		pkgconfig iconv
 @@ -32,7 +31,7 @@
  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
  
 Index: deskutils/nagaina/Makefile
 ===================================================================
 --- deskutils/nagaina/Makefile	(revision 318748)
 +++ deskutils/nagaina/Makefile	(working copy)
 @@ -18,8 +18,7 @@
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@
  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
 Index: devel/gccmakedep/Makefile
 ===================================================================
 --- devel/gccmakedep/Makefile	(revision 318748)
 +++ devel/gccmakedep/Makefile	(working copy)
 @@ -16,16 +16,13 @@
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 Index: devel/imake/Makefile
 ===================================================================
 --- devel/imake/Makefile	(revision 318748)
 +++ devel/imake/Makefile	(working copy)
 @@ -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 @@
  
  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 @@
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 Index: devel/imake/distinfo
 ===================================================================
 --- devel/imake/distinfo	(revision 318748)
 +++ devel/imake/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 Index: devel/imake/files/patch-xmkmf.cpp
 ===================================================================
 --- devel/imake/files/patch-xmkmf.cpp	(revision 318748)
 +++ devel/imake/files/patch-xmkmf.cpp	(working copy)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 Index: devel/libpciaccess/Makefile
 ===================================================================
 --- devel/libpciaccess/Makefile	(revision 318748)
 +++ devel/libpciaccess/Makefile	(working copy)
 @@ -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
 Index: devel/libpciaccess/distinfo
 ===================================================================
 --- devel/libpciaccess/distinfo	(revision 318748)
 +++ devel/libpciaccess/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 Index: devel/libpciaccess/files/patch-src-common_init.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-common_init.c	(revision 318748)
 +++ devel/libpciaccess/files/patch-src-common_init.c	(working copy)
 @@ -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
 - }
 Index: devel/libpciaccess/files/patch-src-freebsd_pci.c
 ===================================================================
 --- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 318748)
 +++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 - 
 -     int fd, err = 0;
 - 
 -+#if defined(__sparc64__)
 -+    fd = screenfd;
 ++}
 ++
 ++#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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
  +#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);
 ++}
 ++
 ++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
 - 
 -     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");
 - 	}
 -     }
 ++}
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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)
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++	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,
 + };
 + 
 + /**
 Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
 ===================================================================
 --- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 318748)
 +++ devel/libpciaccess/files/patch-src-pciaccess_private.h	(working copy)
 @@ -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 );
 Index: devel/lndir/Makefile
 ===================================================================
 --- devel/lndir/Makefile	(revision 318748)
 +++ devel/lndir/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  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
  
 Index: devel/makedepend/Makefile
 ===================================================================
 --- devel/makedepend/Makefile	(revision 318748)
 +++ devel/makedepend/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 Index: devel/makedepend/distinfo
 ===================================================================
 --- devel/makedepend/distinfo	(revision 318748)
 +++ devel/makedepend/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 Index: devel/xorg-macros/Makefile
 ===================================================================
 --- devel/xorg-macros/Makefile	(revision 318748)
 +++ devel/xorg-macros/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 Index: devel/xorg-macros/distinfo
 ===================================================================
 --- devel/xorg-macros/distinfo	(revision 318748)
 +++ devel/xorg-macros/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 Index: emulators/catapult/Makefile
 ===================================================================
 --- emulators/catapult/Makefile	(revision 318748)
 +++ emulators/catapult/Makefile	(working copy)
 @@ -24,8 +24,7 @@
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
  
  OPTIONS_DEFINE=	DEBUG DOCS
 @@ -35,7 +34,7 @@
  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}" \
 Index: emulators/tme/Makefile
 ===================================================================
 --- emulators/tme/Makefile	(revision 318748)
 +++ emulators/tme/Makefile	(working copy)
 @@ -19,8 +19,7 @@
  		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
  
  USES=		pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 @@ -29,7 +28,7 @@
  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
 Index: finance/homebank/Makefile
 ===================================================================
 --- finance/homebank/Makefile	(revision 318748)
 +++ finance/homebank/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 Index: games/capitalism/Makefile
 ===================================================================
 --- games/capitalism/Makefile	(revision 318748)
 +++ games/capitalism/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
 Index: games/klavaro/Makefile
 ===================================================================
 --- games/klavaro/Makefile	(revision 318748)
 +++ games/klavaro/Makefile	(working copy)
 @@ -19,13 +19,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
  
  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
 Index: games/spellathon/Makefile
 ===================================================================
 --- games/spellathon/Makefile	(revision 318748)
 +++ games/spellathon/Makefile	(working copy)
 @@ -17,14 +17,13 @@
  		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
  
  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
  
 Index: graphics/converseen/Makefile
 ===================================================================
 --- graphics/converseen/Makefile	(revision 318748)
 +++ graphics/converseen/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
 Index: graphics/dri/Makefile
 ===================================================================
 --- graphics/dri/Makefile	(revision 318748)
 +++ graphics/dri/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	dri
 @@ -10,27 +10,30 @@
  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 \
 -		SAVAGE SIS SWRAST TDFX UNICHROME
 +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
  
 +.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"
 -BROKEN=		does not install on ia64
 +OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
 +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 @@
  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 @@
  .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 @@
  do-install:
  	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: graphics/dri/distinfo
 ===================================================================
 --- graphics/dri/distinfo	(revision 318748)
 +++ graphics/dri/distinfo	(working copy)
 @@ -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
 Index: graphics/dri/pkg-plist
 ===================================================================
 --- graphics/dri/pkg-plist	(revision 318748)
 +++ graphics/dri/pkg-plist	(working copy)
 @@ -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
 -%%MGA_DRIVER%%lib/dri/mga_dri.so
 -%%R128_DRIVER%%lib/dri/r128_dri.so
 +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
  %%R200_DRIVER%%lib/dri/r200_dri.so
 -%%R300_DRIVER%%lib/dri/r300_dri.so
 -%%R600_DRIVER%%lib/dri/r600_dri.so
 +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
  %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 -%%SIS_DRIVER%%lib/dri/sis_dri.so
 +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
 +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
  %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
 -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
 +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
  libdata/pkgconfig/dri.pc
  @dirrm lib/dri
  @dirrmtry include/GL/internal
 Index: graphics/freeglut/Makefile
 ===================================================================
 --- graphics/freeglut/Makefile	(revision 318748)
 +++ graphics/freeglut/Makefile	(working copy)
 @@ -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 @@
  	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 @@
  		${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}
 Index: graphics/freeglut/distinfo
 ===================================================================
 --- graphics/freeglut/distinfo	(revision 318748)
 +++ graphics/freeglut/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
 -SIZE (freeglut-2.8.0.tar.gz) = 979459
 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
 +SIZE (freeglut-2.8.1.tar.gz) = 1005343
 Index: graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
 ===================================================================
 --- graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(revision 318748)
 +++ graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c	(working copy)
 @@ -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;
 Index: graphics/freeglut/pkg-message
 ===================================================================
 --- graphics/freeglut/pkg-message	(revision 0)
 +++ graphics/freeglut/pkg-message	(working copy)
 @@ -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.
 
 Property changes on: graphics/freeglut/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/glfw/Makefile
 ===================================================================
 --- graphics/glfw/Makefile	(revision 318748)
 +++ graphics/glfw/Makefile	(working copy)
 @@ -12,15 +12,14 @@
  LICENSE=	ZLIB
  
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		drm:${PORTSDIR}/graphics/libdrm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		drm:${PORTSDIR}/graphics/libdrm
  
  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
 Index: graphics/grx/Makefile
 ===================================================================
 --- graphics/grx/Makefile	(revision 318748)
 +++ graphics/grx/Makefile	(working copy)
 @@ -13,15 +13,14 @@
  LICENSE=	LGPL20 MIT
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  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 \
 Index: graphics/libGL/Makefile
 ===================================================================
 --- graphics/libGL/Makefile	(revision 318748)
 +++ graphics/libGL/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGL
 Index: graphics/libGL/bsd.mesalib.mk
 ===================================================================
 --- graphics/libGL/bsd.mesalib.mk	(revision 318748)
 +++ graphics/libGL/bsd.mesalib.mk	(working copy)
 @@ -11,11 +11,9 @@
  #
  #    - graphics/libGL
  #    - graphics/libGLU
 -#    - graphics/libGLw
  #    - graphics/dri
  #
  # $FreeBSD$
 -#
  
  .MAKE.FreeBSD_UL=	yes
  
 @@ -23,7 +21,7 @@
  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 @@
  PLIST_SUB+=	OLD="" NEW="@comment "
  .endif
  
 -MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
 -DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 +MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 +DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
  MAINTAINER?=	x11@FreeBSD.org
  
  BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 @@ -46,22 +44,19 @@
  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__radeon__radeon_span.c
 +		${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c
  .else
  EXTRA_PATCHES+=	${PATCHDIR}/extra-configure-old \
  		${PATCHDIR}/extra-mach64_context.h-old \
 @@ -69,12 +64,16 @@
  		${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
 -WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 +MASTERDIR=		${.CURDIR}/../../graphics/libGL
 +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 @@
  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
 +
 Index: graphics/libGL/distinfo
 ===================================================================
 --- graphics/libGL/distinfo	(revision 318748)
 +++ graphics/libGL/distinfo	(working copy)
 @@ -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
 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
 +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571
 Index: graphics/libGL/files/extra-configure
 ===================================================================
 --- graphics/libGL/files/extra-configure	(revision 318748)
 +++ graphics/libGL/files/extra-configure	(working copy)
 @@ -1,42 +1,40 @@
 ---- configure.orig	2011-11-17 19:46:34.000000000 +0000
 -+++ configure	2012-06-28 12:53:09.000000000 +0000
 -@@ -7817,10 +7817,35 @@
 -             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
 -         fi
 +--- configure.orig	2012-07-10 17:30:46.000000000 +0200
 ++++ configure	2012-09-01 13:27:22.000000000 +0200
 +@@ -9017,9 +9017,34 @@
 +         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
 +         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 \
 --                radeon tdfx unichrome savage sis swrast"
 +-            DRI_DIRS="i915 i965 nouveau r200 radeon 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 \
 -+                    radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
  +            fi
  +            ;;
  +        i*86)
  +            if test "x$DRI_DIRS" = "xyes"; then
 -+                DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
 -+                    r600 radeon savage tdfx unichrome sis swrast"
 ++                DRI_DIRS="i915 i965 nouveau r200 radeon 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"
 Index: graphics/libGL/files/extra-mach64_context.h
 ===================================================================
 --- graphics/libGL/files/extra-mach64_context.h	(revision 318748)
 +++ graphics/libGL/files/extra-mach64_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-sis_context.h
 ===================================================================
 --- graphics/libGL/files/extra-sis_context.h	(revision 318748)
 +++ graphics/libGL/files/extra-sis_context.h	(working copy)
 @@ -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
 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
 ===================================================================
 --- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(revision 318748)
 +++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c	(working copy)
 @@ -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 )
 Index: graphics/libGL/pkg-plist
 ===================================================================
 --- graphics/libGL/pkg-plist	(revision 318748)
 +++ graphics/libGL/pkg-plist	(working copy)
 @@ -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
 Index: graphics/libGLU/Makefile
 ===================================================================
 --- graphics/libGLU/Makefile	(revision 318748)
 +++ graphics/libGLU/Makefile	(working copy)
 @@ -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 @@
  	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
  
  .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>
 +.include <bsd.port.mk>
 Index: graphics/libGLU/distinfo
 ===================================================================
 --- graphics/libGLU/distinfo	(revision 318748)
 +++ graphics/libGLU/distinfo	(working copy)
 @@ -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
 Index: graphics/libGLw/Makefile
 ===================================================================
 --- graphics/libGLw/Makefile	(revision 318748)
 +++ graphics/libGLw/Makefile	(working copy)
 @@ -1,26 +1,25 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	libGLw
 -PORTVERSION=	${MESAVERSION}
 -PORTREVISION=	2
 +PORTVERSION=	8.0.0
  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
 -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>
 +.include <bsd.port.mk>
 Index: graphics/libGLw/distinfo
 ===================================================================
 --- graphics/libGLw/distinfo	(revision 318748)
 +++ graphics/libGLw/distinfo	(working copy)
 @@ -1,4 +1,2 @@
 -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
 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136
 Index: graphics/libGLw/pkg-plist
 ===================================================================
 --- graphics/libGLw/pkg-plist	(revision 318748)
 +++ graphics/libGLw/pkg-plist	(working copy)
 @@ -2,7 +2,7 @@
  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
 Index: graphics/libdrm/Makefile
 ===================================================================
 --- graphics/libdrm/Makefile	(revision 318748)
 +++ graphics/libdrm/Makefile	(working copy)
 @@ -10,24 +10,27 @@
  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
 -KMS_DESC=	Enable experimental KMS support
 +USE_GMAKE=	yes
  
 +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>
  
  .if ${PORT_OPTIONS:MKMS}
 @@ -38,12 +41,34 @@
  PLIST_SUB+=	KMS="@comment "
  .endif
  
 -LIBDRM_VERSION=	2.4.31
 -LIBDRM_REVISION=1
 +.if ${PORT_OPTIONS:MMANPAGES}
 +BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 +		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 @@
  
  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>
 Index: graphics/libdrm/distinfo
 ===================================================================
 --- graphics/libdrm/distinfo	(revision 318748)
 +++ graphics/libdrm/distinfo	(working copy)
 @@ -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
 -SIZE (libdrm-2.4.31.tar.bz2) = 475677
 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2
 +SIZE (libdrm-2.4.44.tar.bz2) = 538416
 Index: graphics/libdrm/files/extra-configure
 ===================================================================
 --- graphics/libdrm/files/extra-configure	(revision 0)
 +++ graphics/libdrm/files/extra-configure	(working copy)
 @@ -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 \
 
 Property changes on: graphics/libdrm/files/extra-configure
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
 @@ -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 $@ $<
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
 @@ -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;
 + 
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_modetest.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ===================================================================
 --- graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(revision 0)
 +++ graphics/libdrm/files/extra-tests_modetest_strchrnul.c	(working copy)
 @@ -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 */
 ++}
 ++
 
 Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: graphics/libdrm/pkg-plist
 ===================================================================
 --- graphics/libdrm/pkg-plist	(revision 318748)
 +++ graphics/libdrm/pkg-plist	(working copy)
 @@ -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
 -include/nouveau/nouveau_channel.h
 +%%OLD%%include/nouveau/nouveau_bo.h
 +%%OLD%%include/nouveau/nouveau_channel.h
  %%OLD%%include/nouveau/nouveau_class.h
 -include/nouveau/nouveau_device.h
 -include/nouveau/nouveau_grobj.h
 -include/nouveau/nouveau_notifier.h
 -include/nouveau/nouveau_pushbuf.h
 -%%NEW%%include/nouveau/nouveau_reloc.h
 -include/nouveau/nouveau_resource.h
 -%%NEW%%include/nouveau/nv04_pushbuf.h
 -%%NEW%%include/nouveau/nvc0_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_device.h
 +%%OLD%%include/nouveau/nouveau_grobj.h
 +%%OLD%%include/nouveau/nouveau_notifier.h
 +%%OLD%%include/nouveau/nouveau_pushbuf.h
 +%%OLD%%include/nouveau/nouveau_resource.h
  include/xf86drm.h
  include/xf86drmMode.h
  lib/libdrm.la
 @@ -58,7 +56,8 @@
  %%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_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
 Index: graphics/libreatlas/Makefile
 ===================================================================
 --- graphics/libreatlas/Makefile	(revision 318748)
 +++ graphics/libreatlas/Makefile	(working copy)
 @@ -27,13 +27,12 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		freexl:${PORTSDIR}/textproc/freexl \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 Index: graphics/mesa-demos/Makefile
 ===================================================================
 --- graphics/mesa-demos/Makefile	(revision 318748)
 +++ graphics/mesa-demos/Makefile	(working copy)
 @@ -1,4 +1,4 @@
 -# Created by: anholt@FreeBSD.org
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	mesa-demos
 Index: graphics/zbar/Makefile
 ===================================================================
 --- graphics/zbar/Makefile	(revision 318748)
 +++ graphics/zbar/Makefile	(working copy)
 @@ -31,8 +31,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 Index: japanese/mozc-server/Makefile
 ===================================================================
 --- japanese/mozc-server/Makefile	(revision 318748)
 +++ japanese/mozc-server/Makefile	(working copy)
 @@ -180,12 +180,12 @@
  
  # 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 \
 -		xcb-xfixes:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus
  RUN_DEPENDS+=	mozc_server:${PORTSDIR}/japanese/mozc-server \
  		mozc_tool:${PORTSDIR}/japanese/mozc-tool \
  		mozc_server_start:${PORTSDIR}/japanese/mozc-additions \
 Index: math/xspread/Makefile
 ===================================================================
 --- math/xspread/Makefile	(revision 318748)
 +++ math/xspread/Makefile	(working copy)
 @@ -31,9 +31,8 @@
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -USE_XORG=	x11 xau xdmcp xt
 -LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +USE_XORG=	x11 xau xcb xdmcp xt
 +LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 Index: misc/nut/Makefile
 ===================================================================
 --- misc/nut/Makefile	(revision 318748)
 +++ misc/nut/Makefile	(working copy)
 @@ -35,9 +35,8 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
 +		fltk_images:${PORTSDIR}/x11-toolkits/fltk
 +USE_XORG+=	x11 xau xcb xdmcp xext xft xinerama xrender
  MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
  PLIST_FILES+=	bin/Nut
  DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
 Index: multimedia/freetuxtv/Makefile
 ===================================================================
 --- multimedia/freetuxtv/Makefile	(revision 318748)
 +++ multimedia/freetuxtv/Makefile	(working copy)
 @@ -22,11 +22,10 @@
  		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
 Index: multimedia/vdr-plugin-softhddevice/Makefile
 ===================================================================
 --- multimedia/vdr-plugin-softhddevice/Makefile	(revision 318748)
 +++ multimedia/vdr-plugin-softhddevice/Makefile	(working copy)
 @@ -14,12 +14,11 @@
  
  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
 Index: multimedia/vlc/Makefile
 ===================================================================
 --- multimedia/vlc/Makefile	(revision 318748)
 +++ multimedia/vlc/Makefile	(working copy)
 @@ -636,9 +636,8 @@
  .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
 Index: net/x11vnc/Makefile
 ===================================================================
 --- net/x11vnc/Makefile	(revision 318748)
 +++ net/x11vnc/Makefile	(working copy)
 @@ -14,10 +14,10 @@
  
  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
 Index: net-p2p/retroshare/Makefile
 ===================================================================
 --- net-p2p/retroshare/Makefile	(revision 318748)
 +++ net-p2p/retroshare/Makefile	(working copy)
 @@ -26,14 +26,13 @@
  		gpg-error:${PORTSDIR}/security/libgpg-error \
  		gpgme:${PORTSDIR}/security/gpgme \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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
 Index: polish/kadu/Makefile
 ===================================================================
 --- polish/kadu/Makefile	(revision 318748)
 +++ polish/kadu/Makefile	(working copy)
 @@ -33,8 +33,7 @@
  		qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
  		enchant:${PORTSDIR}/textproc/enchant \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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 @@
  
  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
 Index: polish/qnapi/Makefile
 ===================================================================
 --- polish/qnapi/Makefile	(revision 318748)
 +++ polish/qnapi/Makefile	(working copy)
 @@ -17,12 +17,11 @@
  		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}
 Index: print/photoprint/Makefile
 ===================================================================
 --- print/photoprint/Makefile	(revision 318748)
 +++ print/photoprint/Makefile	(working copy)
 @@ -20,13 +20,12 @@
  		pixman:${PORTSDIR}/x11/pixman \
  		png15:${PORTSDIR}/graphics/png \
  		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		tiff:${PORTSDIR}/graphics/tiff \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		tiff:${PORTSDIR}/graphics/tiff
  
  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
  
 Index: science/massxpert/Makefile
 ===================================================================
 --- science/massxpert/Makefile	(revision 318748)
 +++ science/massxpert/Makefile	(working copy)
 @@ -14,15 +14,14 @@
  		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
  
  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
 Index: sysutils/gsmartcontrol/Makefile
 ===================================================================
 --- sysutils/gsmartcontrol/Makefile	(revision 318748)
 +++ sysutils/gsmartcontrol/Makefile	(working copy)
 @@ -22,8 +22,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
  		smartctl:${PORTSDIR}/sysutils/smartmontools
  
 @@ -31,7 +30,7 @@
  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
  
 Index: sysutils/gtk-imonc/Makefile
 ===================================================================
 --- sysutils/gtk-imonc/Makefile	(revision 318748)
 +++ sysutils/gtk-imonc/Makefile	(working copy)
 @@ -18,13 +18,12 @@
  		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
  
  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
  
 Index: sysutils/nitrogen/Makefile
 ===================================================================
 --- sysutils/nitrogen/Makefile	(revision 318748)
 +++ sysutils/nitrogen/Makefile	(working copy)
 @@ -25,8 +25,7 @@
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
  		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 -		pangomm:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm:${PORTSDIR}/x11-toolkits/pangomm
  RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
  		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
  
 @@ -35,7 +34,7 @@
  
  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
 Index: x11/appres/Makefile
 ===================================================================
 --- x11/appres/Makefile	(revision 318748)
 +++ x11/appres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Program to list application's resources
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros xt
 +USE_XORG=	x11 xt
  
  MAN1=		appres.1
  PLIST_FILES=	bin/appres
 Index: x11/beforelight/Makefile
 ===================================================================
 --- x11/beforelight/Makefile	(revision 318748)
 +++ x11/beforelight/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	A sample screen saver for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 +USE_XORG=	x11 xscrnsaver xt xaw7 xt
  
  MAN1=		beforelight.1
  
 Index: x11/bigreqsproto/Makefile
 ===================================================================
 --- x11/bigreqsproto/Makefile	(revision 318748)
 +++ x11/bigreqsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	bigreqsproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	bigreqsproto
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/bigreqsproto/distinfo
 ===================================================================
 --- x11/bigreqsproto/distinfo	(revision 318748)
 +++ x11/bigreqsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
 -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
 +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
 Index: x11/bitmap/Makefile
 ===================================================================
 --- x11/bitmap/Makefile	(revision 318748)
 +++ x11/bitmap/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Bitmap editor and converter utilities for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xaw xbitmaps xmu xproto xorg-macros
 +USE_XORG=	x11 xaw xbitmaps xmu xproto
  MAN1=		atobm.1 bitmap.1 bmtoa.1
  
  .include <bsd.port.mk>
 Index: x11/compositeproto/Makefile
 ===================================================================
 --- x11/compositeproto/Makefile	(revision 318748)
 +++ x11/compositeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	compositeproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	compositeproto
  PORTVERSION=	0.4.2
 Index: x11/damageproto/Makefile
 ===================================================================
 --- x11/damageproto/Makefile	(revision 318748)
 +++ x11/damageproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	damageproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	damageproto
  PORTVERSION=	1.2.1
 Index: x11/dmxproto/Makefile
 ===================================================================
 --- x11/dmxproto/Makefile	(revision 318748)
 +++ x11/dmxproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	dmxproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	dmxproto
  PORTVERSION=	2.3.1
 Index: x11/dri2proto/Makefile
 ===================================================================
 --- x11/dri2proto/Makefile	(revision 318748)
 +++ x11/dri2proto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	dri2proto
 -# Date Created:				Jul 28 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	dri2proto
 -PORTVERSION=	2.6
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/dri2proto/distinfo
 ===================================================================
 --- x11/dri2proto/distinfo	(revision 318748)
 +++ x11/dri2proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
 Index: x11/editres/Makefile
 ===================================================================
 --- x11/editres/Makefile	(revision 318748)
 +++ x11/editres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Dynamic resource editor for X Toolkit Applications
  
  XORG_CAT=	app
 -USE_XORG=	x11 xt xmu xaw xorg-macros
 +USE_XORG=	x11 xt xmu xaw
  
  MAN1=		editres.1
  
 Index: x11/evieext/Makefile
 ===================================================================
 --- x11/evieext/Makefile	(revision 318748)
 +++ x11/evieext/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	evieext
 -# Date Created:				25 Apr 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	evieext
  PORTVERSION=	1.1.1
 Index: x11/fixesproto/Makefile
 ===================================================================
 --- x11/fixesproto/Makefile	(revision 318748)
 +++ x11/fixesproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fixesproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fixesproto
  PORTVERSION=	5.0
 Index: x11/fstobdf/Makefile
 ===================================================================
 --- x11/fstobdf/Makefile	(revision 318748)
 +++ x11/fstobdf/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	fstobdf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fstobdf
 -PORTVERSION=	1.0.4
 +PORTVERSION=	1.0.5
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/fstobdf/distinfo
 ===================================================================
 --- x11/fstobdf/distinfo	(revision 318748)
 +++ x11/fstobdf/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
 -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
 Index: x11/glproto/Makefile
 ===================================================================
 --- x11/glproto/Makefile	(revision 318748)
 +++ x11/glproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	glproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	glproto
 -PORTVERSION=	1.4.15
 +PORTVERSION=	1.4.16
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/glproto/distinfo
 ===================================================================
 --- x11/glproto/distinfo	(revision 318748)
 +++ x11/glproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
 +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
 Index: x11/i3lock/Makefile
 ===================================================================
 --- x11/i3lock/Makefile	(revision 318748)
 +++ x11/i3lock/Makefile	(working copy)
 @@ -16,7 +16,6 @@
  LICENSE=	BSD
  
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 -		xcb.2:${PORTSDIR}/x11/libxcb \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		ev.4:${PORTSDIR}/devel/libev
 @@ -32,7 +31,7 @@
  
  LDFLAGS+=	-liconv
  MAKE_JOBS_SAFE=	yes
 -USE_XORG=	x11 xt xproto xext
 +USE_XORG=	x11 xcb xt xproto xext
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USES=		iconv
 Index: x11/iceauth/Makefile
 ===================================================================
 --- x11/iceauth/Makefile	(revision 318748)
 +++ x11/iceauth/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	iceauth
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	iceauth
  PORTVERSION=	1.0.5
 Index: x11/ico/Makefile
 ===================================================================
 --- x11/ico/Makefile	(revision 318748)
 +++ x11/ico/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Displays a wire-frame rotating plyhedron
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/ico
  
 Index: x11/inputproto/Makefile
 ===================================================================
 --- x11/inputproto/Makefile	(revision 318748)
 +++ x11/inputproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	inputproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	inputproto
 -PORTVERSION=	2.0.2
 +PORTVERSION=	2.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,4 +10,6 @@
  
  XORG_CAT=	proto
  
 +CONFIGURE_ARGS=	--without-asciidoc
 +
  .include <bsd.port.mk>
 Index: x11/inputproto/distinfo
 ===================================================================
 --- x11/inputproto/distinfo	(revision 318748)
 +++ x11/inputproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
 +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
 Index: x11/inputproto/pkg-plist
 ===================================================================
 --- x11/inputproto/pkg-plist	(revision 318748)
 +++ x11/inputproto/pkg-plist	(working copy)
 @@ -3,7 +3,4 @@
  include/X11/extensions/XI2proto.h
  include/X11/extensions/XIproto.h
  libdata/pkgconfig/inputproto.pc
 -%%DOCSDIR%%/XI2proto.txt
 -%%DOCSDIR%%/XIproto.txt
 -@dirrm %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/kbproto/Makefile
 ===================================================================
 --- x11/kbproto/Makefile	(revision 318748)
 +++ x11/kbproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	kbproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	kbproto
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/kbproto/distinfo
 ===================================================================
 --- x11/kbproto/distinfo	(revision 318748)
 +++ x11/kbproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
 Index: x11/kbproto/pkg-plist
 ===================================================================
 --- x11/kbproto/pkg-plist	(revision 318748)
 +++ x11/kbproto/pkg-plist	(working copy)
 @@ -4,4 +4,38 @@
  include/X11/extensions/XKBsrv.h
  include/X11/extensions/XKBstr.h
  libdata/pkgconfig/kbproto.pc
 +%%DOCSDIR%%/XKBproto-1.svg
 +%%DOCSDIR%%/XKBproto-10.svg
 +%%DOCSDIR%%/XKBproto-11.svg
 +%%DOCSDIR%%/XKBproto-2.svg
 +%%DOCSDIR%%/XKBproto-3.svg
 +%%DOCSDIR%%/XKBproto-4.svg
 +%%DOCSDIR%%/XKBproto-5.svg
 +%%DOCSDIR%%/XKBproto-6.svg
 +%%DOCSDIR%%/XKBproto-7.svg
 +%%DOCSDIR%%/XKBproto-8.svg
 +%%DOCSDIR%%/XKBproto-9.svg
 +%%DOCSDIR%%/acknowledgements.xml
 +%%DOCSDIR%%/appA.xml
 +%%DOCSDIR%%/appB.xml
 +%%DOCSDIR%%/appC.xml
 +%%DOCSDIR%%/appD.xml
 +%%DOCSDIR%%/ch01.xml
 +%%DOCSDIR%%/ch02.xml
 +%%DOCSDIR%%/ch03.xml
 +%%DOCSDIR%%/ch04.xml
 +%%DOCSDIR%%/ch05.xml
 +%%DOCSDIR%%/ch06.xml
 +%%DOCSDIR%%/ch07.xml
 +%%DOCSDIR%%/ch08.xml
 +%%DOCSDIR%%/ch09.xml
 +%%DOCSDIR%%/ch10.xml
 +%%DOCSDIR%%/ch11.xml
 +%%DOCSDIR%%/ch12.xml
 +%%DOCSDIR%%/ch13.xml
 +%%DOCSDIR%%/ch14.xml
 +%%DOCSDIR%%/ch15.xml
 +%%DOCSDIR%%/ch16.xml
 +%%DOCSDIR%%/xkbproto.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/extensions
 Index: x11/libICE/Makefile
 ===================================================================
 --- x11/libICE/Makefile	(revision 318748)
 +++ x11/libICE/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libICE
 -# Date Created:			09 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libICE
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libICE/distinfo
 ===================================================================
 --- x11/libICE/distinfo	(revision 318748)
 +++ x11/libICE/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
 +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
 Index: x11/libSM/Makefile
 ===================================================================
 --- x11/libSM/Makefile	(revision 318748)
 +++ x11/libSM/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libSM
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -12,7 +12,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	ice xproto:both xtrans xorg-macros
 +USE_XORG=	ice xproto:both xtrans
  
  CONFIGURE_ARGS+=--disable-docs --without-xmlto
  
 Index: x11/libSM/distinfo
 ===================================================================
 --- x11/libSM/distinfo	(revision 318748)
 +++ x11/libSM/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
 -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
 +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
 Index: x11/libX11/Makefile
 ===================================================================
 --- x11/libX11/Makefile	(revision 318748)
 +++ x11/libX11/Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libX11
 -PORTVERSION=	1.4.4
 +PORTVERSION=	1.5.0
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -11,13 +11,11 @@
  
  LICENSE=	MIT
  
 -BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 -
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both \
 -		xorg-macros
 +		xcb
 +USE_PERL5_BUILD=yes
  
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
 Index: x11/libX11/distinfo
 ===================================================================
 --- x11/libX11/distinfo	(revision 318748)
 +++ x11/libX11/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
 -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
 Index: x11/libXScrnSaver/Makefile
 ===================================================================
 --- x11/libXScrnSaver/Makefile	(revision 318748)
 +++ x11/libXScrnSaver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXScrnSaver
 -# Date Created:				15 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXScrnSaver
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXScrnSaver/distinfo
 ===================================================================
 --- x11/libXScrnSaver/distinfo	(revision 318748)
 +++ x11/libXScrnSaver/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
 -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
 Index: x11/libXTrap/Makefile
 ===================================================================
 --- x11/libXTrap/Makefile	(revision 318748)
 +++ x11/libXTrap/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libXTrap
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXTrap
 -PORTVERSION=	1.0.0
 +PORTVERSION=	1.0.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXTrap/distinfo
 ===================================================================
 --- x11/libXTrap/distinfo	(revision 318748)
 +++ x11/libXTrap/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
 -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
 +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
 Index: x11/libXau/Makefile
 ===================================================================
 --- x11/libXau/Makefile	(revision 318748)
 +++ x11/libXau/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXau
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXau
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXau/distinfo
 ===================================================================
 --- x11/libXau/distinfo	(revision 318748)
 +++ x11/libXau/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
 -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
 +SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) = 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
 +SIZE (xorg/lib/libXau-1.0.7.tar.bz2) = 274681
 Index: x11/libXcomposite/Makefile
 ===================================================================
 --- x11/libXcomposite/Makefile	(revision 318748)
 +++ x11/libXcomposite/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcomposite
 -PORTVERSION=	0.4.3
 +PORTVERSION=	0.4.4
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXcomposite/distinfo
 ===================================================================
 --- x11/libXcomposite/distinfo	(revision 318748)
 +++ x11/libXcomposite/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
 -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
 Index: x11/libXcomposite/pkg-plist
 ===================================================================
 --- x11/libXcomposite/pkg-plist	(revision 318748)
 +++ x11/libXcomposite/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXcomposite.so
  lib/libXcomposite.so.1
  libdata/pkgconfig/xcomposite.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXcursor/Makefile
 ===================================================================
 --- x11/libXcursor/Makefile	(revision 318748)
 +++ x11/libXcursor/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXcursor
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXcursor
 -PORTVERSION=	1.1.12
 +PORTVERSION=	1.1.13
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXcursor/distinfo
 ===================================================================
 --- x11/libXcursor/distinfo	(revision 318748)
 +++ x11/libXcursor/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
 +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
 Index: x11/libXdamage/Makefile
 ===================================================================
 --- x11/libXdamage/Makefile	(revision 318748)
 +++ x11/libXdamage/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdamage
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdamage
 -PORTVERSION=	1.1.3
 +PORTVERSION=	1.1.4
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdamage/distinfo
 ===================================================================
 --- x11/libXdamage/distinfo	(revision 318748)
 +++ x11/libXdamage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
 +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
 Index: x11/libXdamage/pkg-plist
 ===================================================================
 --- x11/libXdamage/pkg-plist	(revision 318748)
 +++ x11/libXdamage/pkg-plist	(working copy)
 @@ -4,3 +4,4 @@
  lib/libXdamage.so
  lib/libXdamage.so.1
  libdata/pkgconfig/xdamage.pc
 +@dirrmtry include/X11/extensions
 Index: x11/libXdmcp/Makefile
 ===================================================================
 --- x11/libXdmcp/Makefile	(revision 318748)
 +++ x11/libXdmcp/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXdmcp
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXdmcp
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXdmcp/distinfo
 ===================================================================
 --- x11/libXdmcp/distinfo	(revision 318748)
 +++ x11/libXdmcp/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
 +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
 Index: x11/libXevie/Makefile
 ===================================================================
 --- x11/libXevie/Makefile	(revision 318748)
 +++ x11/libXevie/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXevie
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXevie
  PORTVERSION=	1.0.3
 Index: x11/libXext/Makefile
 ===================================================================
 --- x11/libXext/Makefile	(revision 318748)
 +++ x11/libXext/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXext
 -PORTVERSION=	1.3.0
 -PORTREVISION=	1
 +PORTVERSION=	1.3.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXext/distinfo
 ===================================================================
 --- x11/libXext/distinfo	(revision 318748)
 +++ x11/libXext/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
 Index: x11/libXfixes/Makefile
 ===================================================================
 --- x11/libXfixes/Makefile	(revision 318748)
 +++ x11/libXfixes/Makefile	(working copy)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfixes
  PORTVERSION=	5.0
 +PORTREVISION=	2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXi/Makefile
 ===================================================================
 --- x11/libXi/Makefile	(revision 318748)
 +++ x11/libXi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXi
 -# Date Created:			22 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXi
 -PORTVERSION=	1.4.5
 +PORTVERSION=	1.7.1
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 @@ -16,9 +12,14 @@
  LICENSE=	MIT
  
  XORG_CAT=	lib
 -USE_XORG=	xproto x11 xext xextproto inputproto:both
 +USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
  
 -CONFIGURE_ARGS+=--disable-specs --without-xmlto
 +CONFIGURE_ARGS+=--disable-docs \
 +		--disable-specs \
 +	       	--without-xmlto \
 +		--without-fop \
 +		--without-asciidoc \
 +		--without-xsltproc
  
  MAN3=		XAllowDeviceEvents.3 \
  		XChangeDeviceControl.3 \
 @@ -47,6 +48,8 @@
  		XGrabDevice.3\
  		XGrabDeviceButton.3\
  		XGrabDeviceKey.3\
 +		XIBarrierReleasePointer.3\
 +		XIBarrierReleasePointers.3\
  		XIChangeHierarchy.3\
  		XIChangeProperty.3\
  		XIDefineCursor.3\
 @@ -61,6 +64,7 @@
  		XIGrabEnter.3\
  		XIGrabFocusIn.3\
  		XIGrabKeycode.3\
 +		XIGrabTouchBegin.3 \
  		XIListProperties.3\
  		XIQueryDevice.3\
  		XIQueryPointer.3\
 @@ -74,6 +78,7 @@
  		XIUngrabEnter.3 \
  		XIUngrabFocusIn.3 \
  		XIUngrabKeycode.3 \
 +		XIUngrabTouchBegin.3 \
  		XIWarpPointer.3 \
  		XListDeviceProperties.3 \
  		XListInputDevices.3 \
 Index: x11/libXi/distinfo
 ===================================================================
 --- x11/libXi/distinfo	(revision 318748)
 +++ x11/libXi/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
 Index: x11/libXinerama/Makefile
 ===================================================================
 --- x11/libXinerama/Makefile	(revision 318748)
 +++ x11/libXinerama/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXinerama
 -# Date Created:			7 May, 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXinerama
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXinerama/distinfo
 ===================================================================
 --- x11/libXinerama/distinfo	(revision 318748)
 +++ x11/libXinerama/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
 -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
 +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
 Index: x11/libXp/Makefile
 ===================================================================
 --- x11/libXp/Makefile	(revision 318748)
 +++ x11/libXp/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXp
 -# Date Created:			4 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXp
  PORTVERSION=	1.0.1
 Index: x11/libXpm/Makefile
 ===================================================================
 --- x11/libXpm/Makefile	(revision 318748)
 +++ x11/libXpm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXpm
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXpm
 -PORTVERSION=	3.5.9
 +PORTVERSION=	3.5.10
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXpm/distinfo
 ===================================================================
 --- x11/libXpm/distinfo	(revision 318748)
 +++ x11/libXpm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
 -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
 Index: x11/libXprintAppUtil/Makefile
 ===================================================================
 --- x11/libXprintAppUtil/Makefile	(revision 318748)
 +++ x11/libXprintAppUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintAppUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintAppUtil
  PORTVERSION=	1.0.1
 Index: x11/libXprintUtil/Makefile
 ===================================================================
 --- x11/libXprintUtil/Makefile	(revision 318748)
 +++ x11/libXprintUtil/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXprintUtil
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXprintUtil
  PORTVERSION=	1.0.1
 Index: x11/libXrandr/Makefile
 ===================================================================
 --- x11/libXrandr/Makefile	(revision 318748)
 +++ x11/libXrandr/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXrandr
 -# Date Created:			9 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrandr
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrandr/distinfo
 ===================================================================
 --- x11/libXrandr/distinfo	(revision 318748)
 +++ x11/libXrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
 Index: x11/libXrender/Makefile
 ===================================================================
 --- x11/libXrender/Makefile	(revision 318748)
 +++ x11/libXrender/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   xrender
 -# Date Created:			2 Jul, 2003
 -# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
 -#
 +# Created by: Foxfair Hu <foxfair@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXrender
 -PORTVERSION=	0.9.6
 +PORTVERSION=	0.9.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXrender/distinfo
 ===================================================================
 --- x11/libXrender/distinfo	(revision 318748)
 +++ x11/libXrender/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
 Index: x11/libXres/Makefile
 ===================================================================
 --- x11/libXres/Makefile	(revision 318748)
 +++ x11/libXres/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXext
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXres
 -PORTVERSION=	1.0.5
 +PORTVERSION=	1.0.6
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXres/distinfo
 ===================================================================
 --- x11/libXres/distinfo	(revision 318748)
 +++ x11/libXres/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
 Index: x11/libXtrans/Makefile
 ===================================================================
 --- x11/libXtrans/Makefile	(revision 318748)
 +++ x11/libXtrans/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXtrans
 -# Date Created:			28 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtrans
  PORTVERSION=	0.1
 Index: x11/libXtst/Makefile
 ===================================================================
 --- x11/libXtst/Makefile	(revision 318748)
 +++ x11/libXtst/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXtst
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXtst
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXtst/distinfo
 ===================================================================
 --- x11/libXtst/distinfo	(revision 318748)
 +++ x11/libXtst/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
 Index: x11/libXv/Makefile
 ===================================================================
 --- x11/libXv/Makefile	(revision 318748)
 +++ x11/libXv/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXv
 -# Date Created:			13 Nov, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXv
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/libXv/distinfo
 ===================================================================
 --- x11/libXv/distinfo	(revision 318748)
 +++ x11/libXv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
 -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
 Index: x11/libXvMC/Makefile
 ===================================================================
 --- x11/libXvMC/Makefile	(revision 318748)
 +++ x11/libXvMC/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXvMC
 -# Date Created:			8 Feb 206
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXvMC
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXvMC/distinfo
 ===================================================================
 --- x11/libXvMC/distinfo	(revision 318748)
 +++ x11/libXvMC/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
 Index: x11/libXxf86dga/Makefile
 ===================================================================
 --- x11/libXxf86dga/Makefile	(revision 318748)
 +++ x11/libXxf86dga/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86dga
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86dga
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86dga/distinfo
 ===================================================================
 --- x11/libXxf86dga/distinfo	(revision 318748)
 +++ x11/libXxf86dga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
 Index: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ===================================================================
 --- x11/libXxf86dga/files/patch-src_XF86DGA2.c	(revision 0)
 +++ x11/libXxf86dga/files/patch-src_XF86DGA2.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
 ++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
 +@@ -21,6 +21,8 @@
 + #include <X11/extensions/extutil.h>
 + #include <stdio.h>
 + 
 ++#include <stdint.h>
 ++
 + 
 + /* If you change this, change the Bases[] array below as well */
 + #define MAX_HEADS 16
 +@@ -928,7 +930,7 @@
 +     if ((pMap->fd = open(name, O_RDWR)) < 0)
 + 	return False;
 +     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
 +-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
 ++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
 +     if (pMap->virtual == (void *)-1)
 + 	return False;
 +     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
 
 Property changes on: x11/libXxf86dga/files/patch-src_XF86DGA2.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11/libXxf86misc/Makefile
 ===================================================================
 --- x11/libXxf86misc/Makefile	(revision 318748)
 +++ x11/libXxf86misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libXxf86misc
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86misc
  PORTVERSION=	1.0.3
 Index: x11/libXxf86vm/Makefile
 ===================================================================
 --- x11/libXxf86vm/Makefile	(revision 318748)
 +++ x11/libXxf86vm/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXxf86vm
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXxf86vm
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libXxf86vm/distinfo
 ===================================================================
 --- x11/libXxf86vm/distinfo	(revision 318748)
 +++ x11/libXxf86vm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
 -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
 Index: x11/libdmx/Makefile
 ===================================================================
 --- x11/libdmx/Makefile	(revision 318748)
 +++ x11/libdmx/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libdmx
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libdmx
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libdmx/distinfo
 ===================================================================
 --- x11/libdmx/distinfo	(revision 318748)
 +++ x11/libdmx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
 +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
 Index: x11/liboldX/Makefile
 ===================================================================
 --- x11/liboldX/Makefile	(revision 318748)
 +++ x11/liboldX/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	liboldX
 -# Date Created:				Dec 16 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	liboldX
  PORTVERSION=	1.0.1
 Index: x11/libxcb/Makefile
 ===================================================================
 --- x11/libxcb/Makefile	(revision 318748)
 +++ x11/libxcb/Makefile	(working copy)
 @@ -1,18 +1,17 @@
 -# New ports collection makefile for:	libxcb
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxcb
 -PORTVERSION=	1.7
 +PORTVERSION=	1.9
  CATEGORIES=	x11 python
  MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) library
  
 +LICENSE=	MIT
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
  		xsltproc:${PORTSDIR}/textproc/libxslt \
  		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 @@ -21,15 +20,12 @@
  
  CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
  
 -LICENSE=	MIT
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_XORG=	xau xdmcp
 -USE_PYTHON_BUILD=	2.5-2.7
 +USE_PYTHON_BUILD=	2.5+
  
  GNU_CONFIGURE=	yes
  .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 @@ -46,8 +42,12 @@
  XPROTO_CFLAGS=	-I${LOCALBASE}/include
  XPROTO_LIBS=	-L${LOCALBASE}/lib
  
 +.include "${.CURDIR}/manpages"
 +
 +.include <bsd.port.options.mk>
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
  .endif
  
 Index: x11/libxcb/distinfo
 ===================================================================
 --- x11/libxcb/distinfo	(revision 318748)
 +++ x11/libxcb/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
 -SIZE (libxcb-1.7.tar.bz2) = 318619
 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 +SIZE (libxcb-1.9.tar.bz2) = 387612
 Index: x11/libxcb/manpages
 ===================================================================
 --- x11/libxcb/manpages	(revision 0)
 +++ x11/libxcb/manpages	(working copy)
 @@ -0,0 +1,2041 @@
 +MAN3 = \
 +xcb-examples.3 \
 +xcb-requests.3 \
 +xcb_alloc_color.3 \
 +xcb_alloc_color_cells.3 \
 +xcb_alloc_color_cells_masks.3 \
 +xcb_alloc_color_cells_masks_end.3 \
 +xcb_alloc_color_cells_masks_length.3 \
 +xcb_alloc_color_cells_pixels.3 \
 +xcb_alloc_color_cells_pixels_end.3 \
 +xcb_alloc_color_cells_pixels_length.3 \
 +xcb_alloc_color_cells_reply.3 \
 +xcb_alloc_color_cells_unchecked.3 \
 +xcb_alloc_color_planes.3 \
 +xcb_alloc_color_planes_pixels.3 \
 +xcb_alloc_color_planes_pixels_end.3 \
 +xcb_alloc_color_planes_pixels_length.3 \
 +xcb_alloc_color_planes_reply.3 \
 +xcb_alloc_color_planes_unchecked.3 \
 +xcb_alloc_color_reply.3 \
 +xcb_alloc_color_unchecked.3 \
 +xcb_alloc_named_color.3 \
 +xcb_alloc_named_color_reply.3 \
 +xcb_alloc_named_color_unchecked.3 \
 +xcb_allow_events.3 \
 +xcb_allow_events_checked.3 \
 +xcb_bell.3 \
 +xcb_bell_checked.3 \
 +xcb_big_requests_enable.3 \
 +xcb_big_requests_enable_reply.3 \
 +xcb_big_requests_enable_unchecked.3 \
 +xcb_button_press_event_t.3 \
 +xcb_button_release_event_t.3 \
 +xcb_change_active_pointer_grab.3 \
 +xcb_change_active_pointer_grab_checked.3 \
 +xcb_change_gc.3 \
 +xcb_change_gc_checked.3 \
 +xcb_change_hosts.3 \
 +xcb_change_hosts_checked.3 \
 +xcb_change_keyboard_control.3 \
 +xcb_change_keyboard_control_checked.3 \
 +xcb_change_keyboard_mapping.3 \
 +xcb_change_keyboard_mapping_checked.3 \
 +xcb_change_pointer_control.3 \
 +xcb_change_pointer_control_checked.3 \
 +xcb_change_property.3 \
 +xcb_change_property_checked.3 \
 +xcb_change_save_set.3 \
 +xcb_change_save_set_checked.3 \
 +xcb_change_window_attributes.3 \
 +xcb_change_window_attributes_checked.3 \
 +xcb_circulate_notify_event_t.3 \
 +xcb_circulate_request_event_t.3 \
 +xcb_circulate_window.3 \
 +xcb_circulate_window_checked.3 \
 +xcb_clear_area.3 \
 +xcb_clear_area_checked.3 \
 +xcb_client_message_event_t.3 \
 +xcb_close_font.3 \
 +xcb_close_font_checked.3 \
 +xcb_colormap_notify_event_t.3 \
 +xcb_composite_create_region_from_border_clip.3 \
 +xcb_composite_create_region_from_border_clip_checked.3 \
 +xcb_composite_get_overlay_window.3 \
 +xcb_composite_get_overlay_window_reply.3 \
 +xcb_composite_get_overlay_window_unchecked.3 \
 +xcb_composite_name_window_pixmap.3 \
 +xcb_composite_name_window_pixmap_checked.3 \
 +xcb_composite_query_version.3 \
 +xcb_composite_query_version_reply.3 \
 +xcb_composite_query_version_unchecked.3 \
 +xcb_composite_redirect_subwindows.3 \
 +xcb_composite_redirect_subwindows_checked.3 \
 +xcb_composite_redirect_window.3 \
 +xcb_composite_redirect_window_checked.3 \
 +xcb_composite_release_overlay_window.3 \
 +xcb_composite_release_overlay_window_checked.3 \
 +xcb_composite_unredirect_subwindows.3 \
 +xcb_composite_unredirect_subwindows_checked.3 \
 +xcb_composite_unredirect_window.3 \
 +xcb_composite_unredirect_window_checked.3 \
 +xcb_configure_notify_event_t.3 \
 +xcb_configure_request_event_t.3 \
 +xcb_configure_window.3 \
 +xcb_configure_window_checked.3 \
 +xcb_convert_selection.3 \
 +xcb_convert_selection_checked.3 \
 +xcb_copy_area.3 \
 +xcb_copy_area_checked.3 \
 +xcb_copy_colormap_and_free.3 \
 +xcb_copy_colormap_and_free_checked.3 \
 +xcb_copy_gc.3 \
 +xcb_copy_gc_checked.3 \
 +xcb_copy_plane.3 \
 +xcb_copy_plane_checked.3 \
 +xcb_create_colormap.3 \
 +xcb_create_colormap_checked.3 \
 +xcb_create_cursor.3 \
 +xcb_create_cursor_checked.3 \
 +xcb_create_gc.3 \
 +xcb_create_gc_checked.3 \
 +xcb_create_glyph_cursor.3 \
 +xcb_create_glyph_cursor_checked.3 \
 +xcb_create_notify_event_t.3 \
 +xcb_create_pixmap.3 \
 +xcb_create_pixmap_checked.3 \
 +xcb_create_window.3 \
 +xcb_create_window_checked.3 \
 +xcb_damage_add.3 \
 +xcb_damage_add_checked.3 \
 +xcb_damage_create.3 \
 +xcb_damage_create_checked.3 \
 +xcb_damage_destroy.3 \
 +xcb_damage_destroy_checked.3 \
 +xcb_damage_notify_event_t.3 \
 +xcb_damage_query_version.3 \
 +xcb_damage_query_version_reply.3 \
 +xcb_damage_query_version_unchecked.3 \
 +xcb_damage_subtract.3 \
 +xcb_damage_subtract_checked.3 \
 +xcb_delete_property.3 \
 +xcb_delete_property_checked.3 \
 +xcb_destroy_notify_event_t.3 \
 +xcb_destroy_subwindows.3 \
 +xcb_destroy_subwindows_checked.3 \
 +xcb_destroy_window.3 \
 +xcb_destroy_window_checked.3 \
 +xcb_dpms_capable.3 \
 +xcb_dpms_capable_reply.3 \
 +xcb_dpms_capable_unchecked.3 \
 +xcb_dpms_disable.3 \
 +xcb_dpms_disable_checked.3 \
 +xcb_dpms_enable.3 \
 +xcb_dpms_enable_checked.3 \
 +xcb_dpms_force_level.3 \
 +xcb_dpms_force_level_checked.3 \
 +xcb_dpms_get_timeouts.3 \
 +xcb_dpms_get_timeouts_reply.3 \
 +xcb_dpms_get_timeouts_unchecked.3 \
 +xcb_dpms_get_version.3 \
 +xcb_dpms_get_version_reply.3 \
 +xcb_dpms_get_version_unchecked.3 \
 +xcb_dpms_info.3 \
 +xcb_dpms_info_reply.3 \
 +xcb_dpms_info_unchecked.3 \
 +xcb_dpms_set_timeouts.3 \
 +xcb_dpms_set_timeouts_checked.3 \
 +xcb_dri2_authenticate.3 \
 +xcb_dri2_authenticate_reply.3 \
 +xcb_dri2_authenticate_unchecked.3 \
 +xcb_dri2_buffer_swap_complete_event_t.3 \
 +xcb_dri2_connect.3 \
 +xcb_dri2_connect_alignment_pad.3 \
 +xcb_dri2_connect_alignment_pad_end.3 \
 +xcb_dri2_connect_alignment_pad_length.3 \
 +xcb_dri2_connect_device_name.3 \
 +xcb_dri2_connect_device_name_end.3 \
 +xcb_dri2_connect_device_name_length.3 \
 +xcb_dri2_connect_driver_name.3 \
 +xcb_dri2_connect_driver_name_end.3 \
 +xcb_dri2_connect_driver_name_length.3 \
 +xcb_dri2_connect_reply.3 \
 +xcb_dri2_connect_unchecked.3 \
 +xcb_dri2_copy_region.3 \
 +xcb_dri2_copy_region_reply.3 \
 +xcb_dri2_copy_region_unchecked.3 \
 +xcb_dri2_create_drawable.3 \
 +xcb_dri2_create_drawable_checked.3 \
 +xcb_dri2_destroy_drawable.3 \
 +xcb_dri2_destroy_drawable_checked.3 \
 +xcb_dri2_get_buffers.3 \
 +xcb_dri2_get_buffers_buffers.3 \
 +xcb_dri2_get_buffers_buffers_iterator.3 \
 +xcb_dri2_get_buffers_buffers_length.3 \
 +xcb_dri2_get_buffers_reply.3 \
 +xcb_dri2_get_buffers_unchecked.3 \
 +xcb_dri2_get_buffers_with_format.3 \
 +xcb_dri2_get_buffers_with_format_buffers.3 \
 +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
 +xcb_dri2_get_buffers_with_format_buffers_length.3 \
 +xcb_dri2_get_buffers_with_format_reply.3 \
 +xcb_dri2_get_buffers_with_format_unchecked.3 \
 +xcb_dri2_get_msc.3 \
 +xcb_dri2_get_msc_reply.3 \
 +xcb_dri2_get_msc_unchecked.3 \
 +xcb_dri2_get_param.3 \
 +xcb_dri2_get_param_reply.3 \
 +xcb_dri2_get_param_unchecked.3 \
 +xcb_dri2_invalidate_buffers_event_t.3 \
 +xcb_dri2_query_version.3 \
 +xcb_dri2_query_version_reply.3 \
 +xcb_dri2_query_version_unchecked.3 \
 +xcb_dri2_swap_buffers.3 \
 +xcb_dri2_swap_buffers_reply.3 \
 +xcb_dri2_swap_buffers_unchecked.3 \
 +xcb_dri2_swap_interval.3 \
 +xcb_dri2_swap_interval_checked.3 \
 +xcb_dri2_wait_msc.3 \
 +xcb_dri2_wait_msc_reply.3 \
 +xcb_dri2_wait_msc_unchecked.3 \
 +xcb_dri2_wait_sbc.3 \
 +xcb_dri2_wait_sbc_reply.3 \
 +xcb_dri2_wait_sbc_unchecked.3 \
 +xcb_enter_notify_event_t.3 \
 +xcb_expose_event_t.3 \
 +xcb_fill_poly.3 \
 +xcb_fill_poly_checked.3 \
 +xcb_focus_in_event_t.3 \
 +xcb_focus_out_event_t.3 \
 +xcb_force_screen_saver.3 \
 +xcb_force_screen_saver_checked.3 \
 +xcb_free_colormap.3 \
 +xcb_free_colormap_checked.3 \
 +xcb_free_colors.3 \
 +xcb_free_colors_checked.3 \
 +xcb_free_cursor.3 \
 +xcb_free_cursor_checked.3 \
 +xcb_free_gc.3 \
 +xcb_free_gc_checked.3 \
 +xcb_free_pixmap.3 \
 +xcb_free_pixmap_checked.3 \
 +xcb_get_atom_name.3 \
 +xcb_get_atom_name_name.3 \
 +xcb_get_atom_name_name_end.3 \
 +xcb_get_atom_name_name_length.3 \
 +xcb_get_atom_name_reply.3 \
 +xcb_get_atom_name_unchecked.3 \
 +xcb_get_font_path.3 \
 +xcb_get_font_path_path_iterator.3 \
 +xcb_get_font_path_path_length.3 \
 +xcb_get_font_path_reply.3 \
 +xcb_get_font_path_unchecked.3 \
 +xcb_get_geometry.3 \
 +xcb_get_geometry_reply.3 \
 +xcb_get_geometry_unchecked.3 \
 +xcb_get_image.3 \
 +xcb_get_image_data.3 \
 +xcb_get_image_data_end.3 \
 +xcb_get_image_data_length.3 \
 +xcb_get_image_reply.3 \
 +xcb_get_image_unchecked.3 \
 +xcb_get_input_focus.3 \
 +xcb_get_input_focus_reply.3 \
 +xcb_get_input_focus_unchecked.3 \
 +xcb_get_keyboard_control.3 \
 +xcb_get_keyboard_control_reply.3 \
 +xcb_get_keyboard_control_unchecked.3 \
 +xcb_get_keyboard_mapping.3 \
 +xcb_get_keyboard_mapping_keysyms.3 \
 +xcb_get_keyboard_mapping_keysyms_end.3 \
 +xcb_get_keyboard_mapping_keysyms_length.3 \
 +xcb_get_keyboard_mapping_reply.3 \
 +xcb_get_keyboard_mapping_unchecked.3 \
 +xcb_get_modifier_mapping.3 \
 +xcb_get_modifier_mapping_keycodes.3 \
 +xcb_get_modifier_mapping_keycodes_end.3 \
 +xcb_get_modifier_mapping_keycodes_length.3 \
 +xcb_get_modifier_mapping_reply.3 \
 +xcb_get_modifier_mapping_unchecked.3 \
 +xcb_get_motion_events.3 \
 +xcb_get_motion_events_events.3 \
 +xcb_get_motion_events_events_iterator.3 \
 +xcb_get_motion_events_events_length.3 \
 +xcb_get_motion_events_reply.3 \
 +xcb_get_motion_events_unchecked.3 \
 +xcb_get_pointer_control.3 \
 +xcb_get_pointer_control_reply.3 \
 +xcb_get_pointer_control_unchecked.3 \
 +xcb_get_pointer_mapping.3 \
 +xcb_get_pointer_mapping_map.3 \
 +xcb_get_pointer_mapping_map_end.3 \
 +xcb_get_pointer_mapping_map_length.3 \
 +xcb_get_pointer_mapping_reply.3 \
 +xcb_get_pointer_mapping_unchecked.3 \
 +xcb_get_property.3 \
 +xcb_get_property_reply.3 \
 +xcb_get_property_unchecked.3 \
 +xcb_get_property_value.3 \
 +xcb_get_property_value_end.3 \
 +xcb_get_property_value_length.3 \
 +xcb_get_screen_saver.3 \
 +xcb_get_screen_saver_reply.3 \
 +xcb_get_screen_saver_unchecked.3 \
 +xcb_get_selection_owner.3 \
 +xcb_get_selection_owner_reply.3 \
 +xcb_get_selection_owner_unchecked.3 \
 +xcb_get_window_attributes.3 \
 +xcb_get_window_attributes_reply.3 \
 +xcb_get_window_attributes_unchecked.3 \
 +xcb_glx_are_textures_resident.3 \
 +xcb_glx_are_textures_resident_data.3 \
 +xcb_glx_are_textures_resident_data_end.3 \
 +xcb_glx_are_textures_resident_data_length.3 \
 +xcb_glx_are_textures_resident_reply.3 \
 +xcb_glx_are_textures_resident_unchecked.3 \
 +xcb_glx_change_drawable_attributes.3 \
 +xcb_glx_change_drawable_attributes_checked.3 \
 +xcb_glx_client_info.3 \
 +xcb_glx_client_info_checked.3 \
 +xcb_glx_copy_context.3 \
 +xcb_glx_copy_context_checked.3 \
 +xcb_glx_create_context.3 \
 +xcb_glx_create_context_attribs_arb.3 \
 +xcb_glx_create_context_attribs_arb_checked.3 \
 +xcb_glx_create_context_checked.3 \
 +xcb_glx_create_glx_pixmap.3 \
 +xcb_glx_create_glx_pixmap_checked.3 \
 +xcb_glx_create_new_context.3 \
 +xcb_glx_create_new_context_checked.3 \
 +xcb_glx_create_pbuffer.3 \
 +xcb_glx_create_pbuffer_checked.3 \
 +xcb_glx_create_pixmap.3 \
 +xcb_glx_create_pixmap_checked.3 \
 +xcb_glx_create_window.3 \
 +xcb_glx_create_window_checked.3 \
 +xcb_glx_delete_lists.3 \
 +xcb_glx_delete_lists_checked.3 \
 +xcb_glx_delete_queries_arb.3 \
 +xcb_glx_delete_queries_arb_checked.3 \
 +xcb_glx_delete_textures.3 \
 +xcb_glx_delete_textures_checked.3 \
 +xcb_glx_delete_window.3 \
 +xcb_glx_delete_window_checked.3 \
 +xcb_glx_destroy_context.3 \
 +xcb_glx_destroy_context_checked.3 \
 +xcb_glx_destroy_glx_pixmap.3 \
 +xcb_glx_destroy_glx_pixmap_checked.3 \
 +xcb_glx_destroy_pbuffer.3 \
 +xcb_glx_destroy_pbuffer_checked.3 \
 +xcb_glx_destroy_pixmap.3 \
 +xcb_glx_destroy_pixmap_checked.3 \
 +xcb_glx_end_list.3 \
 +xcb_glx_end_list_checked.3 \
 +xcb_glx_feedback_buffer.3 \
 +xcb_glx_feedback_buffer_checked.3 \
 +xcb_glx_finish.3 \
 +xcb_glx_finish_reply.3 \
 +xcb_glx_finish_unchecked.3 \
 +xcb_glx_flush.3 \
 +xcb_glx_flush_checked.3 \
 +xcb_glx_gen_lists.3 \
 +xcb_glx_gen_lists_reply.3 \
 +xcb_glx_gen_lists_unchecked.3 \
 +xcb_glx_gen_queries_arb.3 \
 +xcb_glx_gen_queries_arb_data.3 \
 +xcb_glx_gen_queries_arb_data_end.3 \
 +xcb_glx_gen_queries_arb_data_length.3 \
 +xcb_glx_gen_queries_arb_reply.3 \
 +xcb_glx_gen_queries_arb_unchecked.3 \
 +xcb_glx_gen_textures.3 \
 +xcb_glx_gen_textures_data.3 \
 +xcb_glx_gen_textures_data_end.3 \
 +xcb_glx_gen_textures_data_length.3 \
 +xcb_glx_gen_textures_reply.3 \
 +xcb_glx_gen_textures_unchecked.3 \
 +xcb_glx_get_booleanv.3 \
 +xcb_glx_get_booleanv_data.3 \
 +xcb_glx_get_booleanv_data_end.3 \
 +xcb_glx_get_booleanv_data_length.3 \
 +xcb_glx_get_booleanv_reply.3 \
 +xcb_glx_get_booleanv_unchecked.3 \
 +xcb_glx_get_clip_plane.3 \
 +xcb_glx_get_clip_plane_data.3 \
 +xcb_glx_get_clip_plane_data_end.3 \
 +xcb_glx_get_clip_plane_data_length.3 \
 +xcb_glx_get_clip_plane_reply.3 \
 +xcb_glx_get_clip_plane_unchecked.3 \
 +xcb_glx_get_color_table.3 \
 +xcb_glx_get_color_table_data.3 \
 +xcb_glx_get_color_table_data_end.3 \
 +xcb_glx_get_color_table_data_length.3 \
 +xcb_glx_get_color_table_parameterfv.3 \
 +xcb_glx_get_color_table_parameterfv_data.3 \
 +xcb_glx_get_color_table_parameterfv_data_end.3 \
 +xcb_glx_get_color_table_parameterfv_data_length.3 \
 +xcb_glx_get_color_table_parameterfv_reply.3 \
 +xcb_glx_get_color_table_parameterfv_unchecked.3 \
 +xcb_glx_get_color_table_parameteriv.3 \
 +xcb_glx_get_color_table_parameteriv_data.3 \
 +xcb_glx_get_color_table_parameteriv_data_end.3 \
 +xcb_glx_get_color_table_parameteriv_data_length.3 \
 +xcb_glx_get_color_table_parameteriv_reply.3 \
 +xcb_glx_get_color_table_parameteriv_unchecked.3 \
 +xcb_glx_get_color_table_reply.3 \
 +xcb_glx_get_color_table_unchecked.3 \
 +xcb_glx_get_compressed_tex_image_arb.3 \
 +xcb_glx_get_compressed_tex_image_arb_data.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_end.3 \
 +xcb_glx_get_compressed_tex_image_arb_data_length.3 \
 +xcb_glx_get_compressed_tex_image_arb_reply.3 \
 +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
 +xcb_glx_get_convolution_filter.3 \
 +xcb_glx_get_convolution_filter_data.3 \
 +xcb_glx_get_convolution_filter_data_end.3 \
 +xcb_glx_get_convolution_filter_data_length.3 \
 +xcb_glx_get_convolution_filter_reply.3 \
 +xcb_glx_get_convolution_filter_unchecked.3 \
 +xcb_glx_get_convolution_parameterfv.3 \
 +xcb_glx_get_convolution_parameterfv_data.3 \
 +xcb_glx_get_convolution_parameterfv_data_end.3 \
 +xcb_glx_get_convolution_parameterfv_data_length.3 \
 +xcb_glx_get_convolution_parameterfv_reply.3 \
 +xcb_glx_get_convolution_parameterfv_unchecked.3 \
 +xcb_glx_get_convolution_parameteriv.3 \
 +xcb_glx_get_convolution_parameteriv_data.3 \
 +xcb_glx_get_convolution_parameteriv_data_end.3 \
 +xcb_glx_get_convolution_parameteriv_data_length.3 \
 +xcb_glx_get_convolution_parameteriv_reply.3 \
 +xcb_glx_get_convolution_parameteriv_unchecked.3 \
 +xcb_glx_get_doublev.3 \
 +xcb_glx_get_doublev_data.3 \
 +xcb_glx_get_doublev_data_end.3 \
 +xcb_glx_get_doublev_data_length.3 \
 +xcb_glx_get_doublev_reply.3 \
 +xcb_glx_get_doublev_unchecked.3 \
 +xcb_glx_get_drawable_attributes.3 \
 +xcb_glx_get_drawable_attributes_attribs.3 \
 +xcb_glx_get_drawable_attributes_attribs_end.3 \
 +xcb_glx_get_drawable_attributes_attribs_length.3 \
 +xcb_glx_get_drawable_attributes_reply.3 \
 +xcb_glx_get_drawable_attributes_unchecked.3 \
 +xcb_glx_get_error.3 \
 +xcb_glx_get_error_reply.3 \
 +xcb_glx_get_error_unchecked.3 \
 +xcb_glx_get_fb_configs.3 \
 +xcb_glx_get_fb_configs_property_list.3 \
 +xcb_glx_get_fb_configs_property_list_end.3 \
 +xcb_glx_get_fb_configs_property_list_length.3 \
 +xcb_glx_get_fb_configs_reply.3 \
 +xcb_glx_get_fb_configs_unchecked.3 \
 +xcb_glx_get_floatv.3 \
 +xcb_glx_get_floatv_data.3 \
 +xcb_glx_get_floatv_data_end.3 \
 +xcb_glx_get_floatv_data_length.3 \
 +xcb_glx_get_floatv_reply.3 \
 +xcb_glx_get_floatv_unchecked.3 \
 +xcb_glx_get_histogram.3 \
 +xcb_glx_get_histogram_data.3 \
 +xcb_glx_get_histogram_data_end.3 \
 +xcb_glx_get_histogram_data_length.3 \
 +xcb_glx_get_histogram_parameterfv.3 \
 +xcb_glx_get_histogram_parameterfv_data.3 \
 +xcb_glx_get_histogram_parameterfv_data_end.3 \
 +xcb_glx_get_histogram_parameterfv_data_length.3 \
 +xcb_glx_get_histogram_parameterfv_reply.3 \
 +xcb_glx_get_histogram_parameterfv_unchecked.3 \
 +xcb_glx_get_histogram_parameteriv.3 \
 +xcb_glx_get_histogram_parameteriv_data.3 \
 +xcb_glx_get_histogram_parameteriv_data_end.3 \
 +xcb_glx_get_histogram_parameteriv_data_length.3 \
 +xcb_glx_get_histogram_parameteriv_reply.3 \
 +xcb_glx_get_histogram_parameteriv_unchecked.3 \
 +xcb_glx_get_histogram_reply.3 \
 +xcb_glx_get_histogram_unchecked.3 \
 +xcb_glx_get_integerv.3 \
 +xcb_glx_get_integerv_data.3 \
 +xcb_glx_get_integerv_data_end.3 \
 +xcb_glx_get_integerv_data_length.3 \
 +xcb_glx_get_integerv_reply.3 \
 +xcb_glx_get_integerv_unchecked.3 \
 +xcb_glx_get_lightfv.3 \
 +xcb_glx_get_lightfv_data.3 \
 +xcb_glx_get_lightfv_data_end.3 \
 +xcb_glx_get_lightfv_data_length.3 \
 +xcb_glx_get_lightfv_reply.3 \
 +xcb_glx_get_lightfv_unchecked.3 \
 +xcb_glx_get_lightiv.3 \
 +xcb_glx_get_lightiv_data.3 \
 +xcb_glx_get_lightiv_data_end.3 \
 +xcb_glx_get_lightiv_data_length.3 \
 +xcb_glx_get_lightiv_reply.3 \
 +xcb_glx_get_lightiv_unchecked.3 \
 +xcb_glx_get_mapdv.3 \
 +xcb_glx_get_mapdv_data.3 \
 +xcb_glx_get_mapdv_data_end.3 \
 +xcb_glx_get_mapdv_data_length.3 \
 +xcb_glx_get_mapdv_reply.3 \
 +xcb_glx_get_mapdv_unchecked.3 \
 +xcb_glx_get_mapfv.3 \
 +xcb_glx_get_mapfv_data.3 \
 +xcb_glx_get_mapfv_data_end.3 \
 +xcb_glx_get_mapfv_data_length.3 \
 +xcb_glx_get_mapfv_reply.3 \
 +xcb_glx_get_mapfv_unchecked.3 \
 +xcb_glx_get_mapiv.3 \
 +xcb_glx_get_mapiv_data.3 \
 +xcb_glx_get_mapiv_data_end.3 \
 +xcb_glx_get_mapiv_data_length.3 \
 +xcb_glx_get_mapiv_reply.3 \
 +xcb_glx_get_mapiv_unchecked.3 \
 +xcb_glx_get_materialfv.3 \
 +xcb_glx_get_materialfv_data.3 \
 +xcb_glx_get_materialfv_data_end.3 \
 +xcb_glx_get_materialfv_data_length.3 \
 +xcb_glx_get_materialfv_reply.3 \
 +xcb_glx_get_materialfv_unchecked.3 \
 +xcb_glx_get_materialiv.3 \
 +xcb_glx_get_materialiv_data.3 \
 +xcb_glx_get_materialiv_data_end.3 \
 +xcb_glx_get_materialiv_data_length.3 \
 +xcb_glx_get_materialiv_reply.3 \
 +xcb_glx_get_materialiv_unchecked.3 \
 +xcb_glx_get_minmax.3 \
 +xcb_glx_get_minmax_data.3 \
 +xcb_glx_get_minmax_data_end.3 \
 +xcb_glx_get_minmax_data_length.3 \
 +xcb_glx_get_minmax_parameterfv.3 \
 +xcb_glx_get_minmax_parameterfv_data.3 \
 +xcb_glx_get_minmax_parameterfv_data_end.3 \
 +xcb_glx_get_minmax_parameterfv_data_length.3 \
 +xcb_glx_get_minmax_parameterfv_reply.3 \
 +xcb_glx_get_minmax_parameterfv_unchecked.3 \
 +xcb_glx_get_minmax_parameteriv.3 \
 +xcb_glx_get_minmax_parameteriv_data.3 \
 +xcb_glx_get_minmax_parameteriv_data_end.3 \
 +xcb_glx_get_minmax_parameteriv_data_length.3 \
 +xcb_glx_get_minmax_parameteriv_reply.3 \
 +xcb_glx_get_minmax_parameteriv_unchecked.3 \
 +xcb_glx_get_minmax_reply.3 \
 +xcb_glx_get_minmax_unchecked.3 \
 +xcb_glx_get_pixel_mapfv.3 \
 +xcb_glx_get_pixel_mapfv_data.3 \
 +xcb_glx_get_pixel_mapfv_data_end.3 \
 +xcb_glx_get_pixel_mapfv_data_length.3 \
 +xcb_glx_get_pixel_mapfv_reply.3 \
 +xcb_glx_get_pixel_mapfv_unchecked.3 \
 +xcb_glx_get_pixel_mapuiv.3 \
 +xcb_glx_get_pixel_mapuiv_data.3 \
 +xcb_glx_get_pixel_mapuiv_data_end.3 \
 +xcb_glx_get_pixel_mapuiv_data_length.3 \
 +xcb_glx_get_pixel_mapuiv_reply.3 \
 +xcb_glx_get_pixel_mapuiv_unchecked.3 \
 +xcb_glx_get_pixel_mapusv.3 \
 +xcb_glx_get_pixel_mapusv_data.3 \
 +xcb_glx_get_pixel_mapusv_data_end.3 \
 +xcb_glx_get_pixel_mapusv_data_length.3 \
 +xcb_glx_get_pixel_mapusv_reply.3 \
 +xcb_glx_get_pixel_mapusv_unchecked.3 \
 +xcb_glx_get_polygon_stipple.3 \
 +xcb_glx_get_polygon_stipple_data.3 \
 +xcb_glx_get_polygon_stipple_data_end.3 \
 +xcb_glx_get_polygon_stipple_data_length.3 \
 +xcb_glx_get_polygon_stipple_reply.3 \
 +xcb_glx_get_polygon_stipple_unchecked.3 \
 +xcb_glx_get_query_objectiv_arb.3 \
 +xcb_glx_get_query_objectiv_arb_data.3 \
 +xcb_glx_get_query_objectiv_arb_data_end.3 \
 +xcb_glx_get_query_objectiv_arb_data_length.3 \
 +xcb_glx_get_query_objectiv_arb_reply.3 \
 +xcb_glx_get_query_objectiv_arb_unchecked.3 \
 +xcb_glx_get_query_objectuiv_arb.3 \
 +xcb_glx_get_query_objectuiv_arb_data.3 \
 +xcb_glx_get_query_objectuiv_arb_data_end.3 \
 +xcb_glx_get_query_objectuiv_arb_data_length.3 \
 +xcb_glx_get_query_objectuiv_arb_reply.3 \
 +xcb_glx_get_query_objectuiv_arb_unchecked.3 \
 +xcb_glx_get_queryiv_arb.3 \
 +xcb_glx_get_queryiv_arb_data.3 \
 +xcb_glx_get_queryiv_arb_data_end.3 \
 +xcb_glx_get_queryiv_arb_data_length.3 \
 +xcb_glx_get_queryiv_arb_reply.3 \
 +xcb_glx_get_queryiv_arb_unchecked.3 \
 +xcb_glx_get_separable_filter.3 \
 +xcb_glx_get_separable_filter_reply.3 \
 +xcb_glx_get_separable_filter_rows_and_cols.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_end.3 \
 +xcb_glx_get_separable_filter_rows_and_cols_length.3 \
 +xcb_glx_get_separable_filter_unchecked.3 \
 +xcb_glx_get_string.3 \
 +xcb_glx_get_string_reply.3 \
 +xcb_glx_get_string_string.3 \
 +xcb_glx_get_string_string_end.3 \
 +xcb_glx_get_string_string_length.3 \
 +xcb_glx_get_string_unchecked.3 \
 +xcb_glx_get_tex_envfv.3 \
 +xcb_glx_get_tex_envfv_data.3 \
 +xcb_glx_get_tex_envfv_data_end.3 \
 +xcb_glx_get_tex_envfv_data_length.3 \
 +xcb_glx_get_tex_envfv_reply.3 \
 +xcb_glx_get_tex_envfv_unchecked.3 \
 +xcb_glx_get_tex_enviv.3 \
 +xcb_glx_get_tex_enviv_data.3 \
 +xcb_glx_get_tex_enviv_data_end.3 \
 +xcb_glx_get_tex_enviv_data_length.3 \
 +xcb_glx_get_tex_enviv_reply.3 \
 +xcb_glx_get_tex_enviv_unchecked.3 \
 +xcb_glx_get_tex_gendv.3 \
 +xcb_glx_get_tex_gendv_data.3 \
 +xcb_glx_get_tex_gendv_data_end.3 \
 +xcb_glx_get_tex_gendv_data_length.3 \
 +xcb_glx_get_tex_gendv_reply.3 \
 +xcb_glx_get_tex_gendv_unchecked.3 \
 +xcb_glx_get_tex_genfv.3 \
 +xcb_glx_get_tex_genfv_data.3 \
 +xcb_glx_get_tex_genfv_data_end.3 \
 +xcb_glx_get_tex_genfv_data_length.3 \
 +xcb_glx_get_tex_genfv_reply.3 \
 +xcb_glx_get_tex_genfv_unchecked.3 \
 +xcb_glx_get_tex_geniv.3 \
 +xcb_glx_get_tex_geniv_data.3 \
 +xcb_glx_get_tex_geniv_data_end.3 \
 +xcb_glx_get_tex_geniv_data_length.3 \
 +xcb_glx_get_tex_geniv_reply.3 \
 +xcb_glx_get_tex_geniv_unchecked.3 \
 +xcb_glx_get_tex_image.3 \
 +xcb_glx_get_tex_image_data.3 \
 +xcb_glx_get_tex_image_data_end.3 \
 +xcb_glx_get_tex_image_data_length.3 \
 +xcb_glx_get_tex_image_reply.3 \
 +xcb_glx_get_tex_image_unchecked.3 \
 +xcb_glx_get_tex_level_parameterfv.3 \
 +xcb_glx_get_tex_level_parameterfv_data.3 \
 +xcb_glx_get_tex_level_parameterfv_data_end.3 \
 +xcb_glx_get_tex_level_parameterfv_data_length.3 \
 +xcb_glx_get_tex_level_parameterfv_reply.3 \
 +xcb_glx_get_tex_level_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_level_parameteriv.3 \
 +xcb_glx_get_tex_level_parameteriv_data.3 \
 +xcb_glx_get_tex_level_parameteriv_data_end.3 \
 +xcb_glx_get_tex_level_parameteriv_data_length.3 \
 +xcb_glx_get_tex_level_parameteriv_reply.3 \
 +xcb_glx_get_tex_level_parameteriv_unchecked.3 \
 +xcb_glx_get_tex_parameterfv.3 \
 +xcb_glx_get_tex_parameterfv_data.3 \
 +xcb_glx_get_tex_parameterfv_data_end.3 \
 +xcb_glx_get_tex_parameterfv_data_length.3 \
 +xcb_glx_get_tex_parameterfv_reply.3 \
 +xcb_glx_get_tex_parameterfv_unchecked.3 \
 +xcb_glx_get_tex_parameteriv.3 \
 +xcb_glx_get_tex_parameteriv_data.3 \
 +xcb_glx_get_tex_parameteriv_data_end.3 \
 +xcb_glx_get_tex_parameteriv_data_length.3 \
 +xcb_glx_get_tex_parameteriv_reply.3 \
 +xcb_glx_get_tex_parameteriv_unchecked.3 \
 +xcb_glx_get_visual_configs.3 \
 +xcb_glx_get_visual_configs_property_list.3 \
 +xcb_glx_get_visual_configs_property_list_end.3 \
 +xcb_glx_get_visual_configs_property_list_length.3 \
 +xcb_glx_get_visual_configs_reply.3 \
 +xcb_glx_get_visual_configs_unchecked.3 \
 +xcb_glx_is_direct.3 \
 +xcb_glx_is_direct_reply.3 \
 +xcb_glx_is_direct_unchecked.3 \
 +xcb_glx_is_list.3 \
 +xcb_glx_is_list_reply.3 \
 +xcb_glx_is_list_unchecked.3 \
 +xcb_glx_is_query_arb.3 \
 +xcb_glx_is_query_arb_reply.3 \
 +xcb_glx_is_query_arb_unchecked.3 \
 +xcb_glx_is_texture.3 \
 +xcb_glx_is_texture_reply.3 \
 +xcb_glx_is_texture_unchecked.3 \
 +xcb_glx_make_context_current.3 \
 +xcb_glx_make_context_current_reply.3 \
 +xcb_glx_make_context_current_unchecked.3 \
 +xcb_glx_make_current.3 \
 +xcb_glx_make_current_reply.3 \
 +xcb_glx_make_current_unchecked.3 \
 +xcb_glx_new_list.3 \
 +xcb_glx_new_list_checked.3 \
 +xcb_glx_pbuffer_clobber_event_t.3 \
 +xcb_glx_pixel_storef.3 \
 +xcb_glx_pixel_storef_checked.3 \
 +xcb_glx_pixel_storei.3 \
 +xcb_glx_pixel_storei_checked.3 \
 +xcb_glx_query_context.3 \
 +xcb_glx_query_context_attribs.3 \
 +xcb_glx_query_context_attribs_end.3 \
 +xcb_glx_query_context_attribs_length.3 \
 +xcb_glx_query_context_reply.3 \
 +xcb_glx_query_context_unchecked.3 \
 +xcb_glx_query_extensions_string.3 \
 +xcb_glx_query_extensions_string_reply.3 \
 +xcb_glx_query_extensions_string_unchecked.3 \
 +xcb_glx_query_server_string.3 \
 +xcb_glx_query_server_string_reply.3 \
 +xcb_glx_query_server_string_string.3 \
 +xcb_glx_query_server_string_string_end.3 \
 +xcb_glx_query_server_string_string_length.3 \
 +xcb_glx_query_server_string_unchecked.3 \
 +xcb_glx_query_version.3 \
 +xcb_glx_query_version_reply.3 \
 +xcb_glx_query_version_unchecked.3 \
 +xcb_glx_read_pixels.3 \
 +xcb_glx_read_pixels_data.3 \
 +xcb_glx_read_pixels_data_end.3 \
 +xcb_glx_read_pixels_data_length.3 \
 +xcb_glx_read_pixels_reply.3 \
 +xcb_glx_read_pixels_unchecked.3 \
 +xcb_glx_render.3 \
 +xcb_glx_render_checked.3 \
 +xcb_glx_render_large.3 \
 +xcb_glx_render_large_checked.3 \
 +xcb_glx_render_mode.3 \
 +xcb_glx_render_mode_data.3 \
 +xcb_glx_render_mode_data_end.3 \
 +xcb_glx_render_mode_data_length.3 \
 +xcb_glx_render_mode_reply.3 \
 +xcb_glx_render_mode_unchecked.3 \
 +xcb_glx_select_buffer.3 \
 +xcb_glx_select_buffer_checked.3 \
 +xcb_glx_set_client_info_2arb.3 \
 +xcb_glx_set_client_info_2arb_checked.3 \
 +xcb_glx_set_client_info_arb.3 \
 +xcb_glx_set_client_info_arb_checked.3 \
 +xcb_glx_swap_buffers.3 \
 +xcb_glx_swap_buffers_checked.3 \
 +xcb_glx_use_x_font.3 \
 +xcb_glx_use_x_font_checked.3 \
 +xcb_glx_vendor_private.3 \
 +xcb_glx_vendor_private_checked.3 \
 +xcb_glx_vendor_private_with_reply.3 \
 +xcb_glx_vendor_private_with_reply_data_2.3 \
 +xcb_glx_vendor_private_with_reply_data_2_end.3 \
 +xcb_glx_vendor_private_with_reply_data_2_length.3 \
 +xcb_glx_vendor_private_with_reply_reply.3 \
 +xcb_glx_vendor_private_with_reply_unchecked.3 \
 +xcb_glx_wait_gl.3 \
 +xcb_glx_wait_gl_checked.3 \
 +xcb_glx_wait_x.3 \
 +xcb_glx_wait_x_checked.3 \
 +xcb_grab_button.3 \
 +xcb_grab_button_checked.3 \
 +xcb_grab_key.3 \
 +xcb_grab_key_checked.3 \
 +xcb_grab_keyboard.3 \
 +xcb_grab_keyboard_reply.3 \
 +xcb_grab_keyboard_unchecked.3 \
 +xcb_grab_pointer.3 \
 +xcb_grab_pointer_reply.3 \
 +xcb_grab_pointer_unchecked.3 \
 +xcb_grab_server.3 \
 +xcb_grab_server_checked.3 \
 +xcb_graphics_exposure_event_t.3 \
 +xcb_gravity_notify_event_t.3 \
 +xcb_image_text_16.3 \
 +xcb_image_text_16_checked.3 \
 +xcb_image_text_8.3 \
 +xcb_image_text_8_checked.3 \
 +xcb_input_allow_device_events.3 \
 +xcb_input_allow_device_events_checked.3 \
 +xcb_input_change_device_dont_propagate_list.3 \
 +xcb_input_change_device_dont_propagate_list_checked.3 \
 +xcb_input_change_device_key_mapping.3 \
 +xcb_input_change_device_key_mapping_checked.3 \
 +xcb_input_change_device_notify_event_t.3 \
 +xcb_input_change_keyboard_device.3 \
 +xcb_input_change_keyboard_device_reply.3 \
 +xcb_input_change_keyboard_device_unchecked.3 \
 +xcb_input_change_pointer_device.3 \
 +xcb_input_change_pointer_device_reply.3 \
 +xcb_input_change_pointer_device_unchecked.3 \
 +xcb_input_close_device.3 \
 +xcb_input_close_device_checked.3 \
 +xcb_input_device_bell.3 \
 +xcb_input_device_bell_checked.3 \
 +xcb_input_device_button_press_event_t.3 \
 +xcb_input_device_button_release_event_t.3 \
 +xcb_input_device_button_state_notify_event_t.3 \
 +xcb_input_device_key_press_event_t.3 \
 +xcb_input_device_key_release_event_t.3 \
 +xcb_input_device_key_state_notify_event_t.3 \
 +xcb_input_device_mapping_notify_event_t.3 \
 +xcb_input_device_motion_notify_event_t.3 \
 +xcb_input_device_presence_notify_event_t.3 \
 +xcb_input_device_state_notify_event_t.3 \
 +xcb_input_device_valuator_event_t.3 \
 +xcb_input_focus_in_event_t.3 \
 +xcb_input_focus_out_event_t.3 \
 +xcb_input_get_device_button_mapping.3 \
 +xcb_input_get_device_button_mapping_map.3 \
 +xcb_input_get_device_button_mapping_map_end.3 \
 +xcb_input_get_device_button_mapping_map_length.3 \
 +xcb_input_get_device_button_mapping_reply.3 \
 +xcb_input_get_device_button_mapping_unchecked.3 \
 +xcb_input_get_device_control.3 \
 +xcb_input_get_device_control_reply.3 \
 +xcb_input_get_device_control_unchecked.3 \
 +xcb_input_get_device_dont_propagate_list.3 \
 +xcb_input_get_device_dont_propagate_list_classes.3 \
 +xcb_input_get_device_dont_propagate_list_classes_end.3 \
 +xcb_input_get_device_dont_propagate_list_classes_length.3 \
 +xcb_input_get_device_dont_propagate_list_reply.3 \
 +xcb_input_get_device_dont_propagate_list_unchecked.3 \
 +xcb_input_get_device_focus.3 \
 +xcb_input_get_device_focus_reply.3 \
 +xcb_input_get_device_focus_unchecked.3 \
 +xcb_input_get_device_key_mapping.3 \
 +xcb_input_get_device_key_mapping_keysyms.3 \
 +xcb_input_get_device_key_mapping_keysyms_end.3 \
 +xcb_input_get_device_key_mapping_keysyms_length.3 \
 +xcb_input_get_device_key_mapping_reply.3 \
 +xcb_input_get_device_key_mapping_unchecked.3 \
 +xcb_input_get_device_modifier_mapping.3 \
 +xcb_input_get_device_modifier_mapping_keymaps.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_end.3 \
 +xcb_input_get_device_modifier_mapping_keymaps_length.3 \
 +xcb_input_get_device_modifier_mapping_reply.3 \
 +xcb_input_get_device_modifier_mapping_unchecked.3 \
 +xcb_input_get_device_motion_events.3 \
 +xcb_input_get_device_motion_events_reply.3 \
 +xcb_input_get_device_motion_events_unchecked.3 \
 +xcb_input_get_extension_version.3 \
 +xcb_input_get_extension_version_reply.3 \
 +xcb_input_get_extension_version_unchecked.3 \
 +xcb_input_get_feedback_control.3 \
 +xcb_input_get_feedback_control_reply.3 \
 +xcb_input_get_feedback_control_unchecked.3 \
 +xcb_input_get_selected_extension_events.3 \
 +xcb_input_get_selected_extension_events_all_classes.3 \
 +xcb_input_get_selected_extension_events_all_classes_end.3 \
 +xcb_input_get_selected_extension_events_all_classes_length.3 \
 +xcb_input_get_selected_extension_events_reply.3 \
 +xcb_input_get_selected_extension_events_this_classes.3 \
 +xcb_input_get_selected_extension_events_this_classes_end.3 \
 +xcb_input_get_selected_extension_events_this_classes_length.3 \
 +xcb_input_get_selected_extension_events_unchecked.3 \
 +xcb_input_grab_device.3 \
 +xcb_input_grab_device_button.3 \
 +xcb_input_grab_device_button_checked.3 \
 +xcb_input_grab_device_key.3 \
 +xcb_input_grab_device_key_checked.3 \
 +xcb_input_grab_device_reply.3 \
 +xcb_input_grab_device_unchecked.3 \
 +xcb_input_list_input_devices.3 \
 +xcb_input_list_input_devices_devices.3 \
 +xcb_input_list_input_devices_devices_iterator.3 \
 +xcb_input_list_input_devices_devices_length.3 \
 +xcb_input_list_input_devices_reply.3 \
 +xcb_input_list_input_devices_unchecked.3 \
 +xcb_input_open_device.3 \
 +xcb_input_open_device_class_info.3 \
 +xcb_input_open_device_class_info_iterator.3 \
 +xcb_input_open_device_class_info_length.3 \
 +xcb_input_open_device_reply.3 \
 +xcb_input_open_device_unchecked.3 \
 +xcb_input_proximity_in_event_t.3 \
 +xcb_input_proximity_out_event_t.3 \
 +xcb_input_query_device_state.3 \
 +xcb_input_query_device_state_reply.3 \
 +xcb_input_query_device_state_unchecked.3 \
 +xcb_input_select_extension_event.3 \
 +xcb_input_select_extension_event_checked.3 \
 +xcb_input_send_extension_event.3 \
 +xcb_input_send_extension_event_checked.3 \
 +xcb_input_set_device_button_mapping.3 \
 +xcb_input_set_device_button_mapping_reply.3 \
 +xcb_input_set_device_button_mapping_unchecked.3 \
 +xcb_input_set_device_focus.3 \
 +xcb_input_set_device_focus_checked.3 \
 +xcb_input_set_device_mode.3 \
 +xcb_input_set_device_mode_reply.3 \
 +xcb_input_set_device_mode_unchecked.3 \
 +xcb_input_set_device_modifier_mapping.3 \
 +xcb_input_set_device_modifier_mapping_reply.3 \
 +xcb_input_set_device_modifier_mapping_unchecked.3 \
 +xcb_input_set_device_valuators.3 \
 +xcb_input_set_device_valuators_reply.3 \
 +xcb_input_set_device_valuators_unchecked.3 \
 +xcb_input_ungrab_device.3 \
 +xcb_input_ungrab_device_button.3 \
 +xcb_input_ungrab_device_button_checked.3 \
 +xcb_input_ungrab_device_checked.3 \
 +xcb_input_ungrab_device_key.3 \
 +xcb_input_ungrab_device_key_checked.3 \
 +xcb_install_colormap.3 \
 +xcb_install_colormap_checked.3 \
 +xcb_intern_atom.3 \
 +xcb_intern_atom_reply.3 \
 +xcb_intern_atom_unchecked.3 \
 +xcb_key_press_event_t.3 \
 +xcb_key_release_event_t.3 \
 +xcb_keymap_notify_event_t.3 \
 +xcb_kill_client.3 \
 +xcb_kill_client_checked.3 \
 +xcb_leave_notify_event_t.3 \
 +xcb_list_extensions.3 \
 +xcb_list_extensions_names_iterator.3 \
 +xcb_list_extensions_names_length.3 \
 +xcb_list_extensions_reply.3 \
 +xcb_list_extensions_unchecked.3 \
 +xcb_list_fonts.3 \
 +xcb_list_fonts_names_iterator.3 \
 +xcb_list_fonts_names_length.3 \
 +xcb_list_fonts_reply.3 \
 +xcb_list_fonts_unchecked.3 \
 +xcb_list_fonts_with_info.3 \
 +xcb_list_fonts_with_info_name.3 \
 +xcb_list_fonts_with_info_name_end.3 \
 +xcb_list_fonts_with_info_name_length.3 \
 +xcb_list_fonts_with_info_properties.3 \
 +xcb_list_fonts_with_info_properties_iterator.3 \
 +xcb_list_fonts_with_info_properties_length.3 \
 +xcb_list_fonts_with_info_reply.3 \
 +xcb_list_fonts_with_info_unchecked.3 \
 +xcb_list_hosts.3 \
 +xcb_list_hosts_hosts_iterator.3 \
 +xcb_list_hosts_hosts_length.3 \
 +xcb_list_hosts_reply.3 \
 +xcb_list_hosts_unchecked.3 \
 +xcb_list_installed_colormaps.3 \
 +xcb_list_installed_colormaps_cmaps.3 \
 +xcb_list_installed_colormaps_cmaps_end.3 \
 +xcb_list_installed_colormaps_cmaps_length.3 \
 +xcb_list_installed_colormaps_reply.3 \
 +xcb_list_installed_colormaps_unchecked.3 \
 +xcb_list_properties.3 \
 +xcb_list_properties_atoms.3 \
 +xcb_list_properties_atoms_end.3 \
 +xcb_list_properties_atoms_length.3 \
 +xcb_list_properties_reply.3 \
 +xcb_list_properties_unchecked.3 \
 +xcb_lookup_color.3 \
 +xcb_lookup_color_reply.3 \
 +xcb_lookup_color_unchecked.3 \
 +xcb_map_notify_event_t.3 \
 +xcb_map_request_event_t.3 \
 +xcb_map_subwindows.3 \
 +xcb_map_subwindows_checked.3 \
 +xcb_map_window.3 \
 +xcb_map_window_checked.3 \
 +xcb_mapping_notify_event_t.3 \
 +xcb_motion_notify_event_t.3 \
 +xcb_no_exposure_event_t.3 \
 +xcb_no_operation.3 \
 +xcb_no_operation_checked.3 \
 +xcb_open_font.3 \
 +xcb_open_font_checked.3 \
 +xcb_poly_arc.3 \
 +xcb_poly_arc_checked.3 \
 +xcb_poly_fill_arc.3 \
 +xcb_poly_fill_arc_checked.3 \
 +xcb_poly_fill_rectangle.3 \
 +xcb_poly_fill_rectangle_checked.3 \
 +xcb_poly_line.3 \
 +xcb_poly_line_checked.3 \
 +xcb_poly_point.3 \
 +xcb_poly_point_checked.3 \
 +xcb_poly_rectangle.3 \
 +xcb_poly_rectangle_checked.3 \
 +xcb_poly_segment.3 \
 +xcb_poly_segment_checked.3 \
 +xcb_poly_text_16.3 \
 +xcb_poly_text_16_checked.3 \
 +xcb_poly_text_8.3 \
 +xcb_poly_text_8_checked.3 \
 +xcb_property_notify_event_t.3 \
 +xcb_put_image.3 \
 +xcb_put_image_checked.3 \
 +xcb_query_best_size.3 \
 +xcb_query_best_size_reply.3 \
 +xcb_query_best_size_unchecked.3 \
 +xcb_query_colors.3 \
 +xcb_query_colors_colors.3 \
 +xcb_query_colors_colors_iterator.3 \
 +xcb_query_colors_colors_length.3 \
 +xcb_query_colors_reply.3 \
 +xcb_query_colors_unchecked.3 \
 +xcb_query_extension.3 \
 +xcb_query_extension_reply.3 \
 +xcb_query_extension_unchecked.3 \
 +xcb_query_font.3 \
 +xcb_query_font_char_infos.3 \
 +xcb_query_font_char_infos_iterator.3 \
 +xcb_query_font_char_infos_length.3 \
 +xcb_query_font_properties.3 \
 +xcb_query_font_properties_iterator.3 \
 +xcb_query_font_properties_length.3 \
 +xcb_query_font_reply.3 \
 +xcb_query_font_unchecked.3 \
 +xcb_query_keymap.3 \
 +xcb_query_keymap_reply.3 \
 +xcb_query_keymap_unchecked.3 \
 +xcb_query_pointer.3 \
 +xcb_query_pointer_reply.3 \
 +xcb_query_pointer_unchecked.3 \
 +xcb_query_text_extents.3 \
 +xcb_query_text_extents_reply.3 \
 +xcb_query_text_extents_unchecked.3 \
 +xcb_query_tree.3 \
 +xcb_query_tree_children.3 \
 +xcb_query_tree_children_end.3 \
 +xcb_query_tree_children_length.3 \
 +xcb_query_tree_reply.3 \
 +xcb_query_tree_unchecked.3 \
 +xcb_randr_add_output_mode.3 \
 +xcb_randr_add_output_mode_checked.3 \
 +xcb_randr_change_output_property.3 \
 +xcb_randr_change_output_property_checked.3 \
 +xcb_randr_configure_output_property.3 \
 +xcb_randr_configure_output_property_checked.3 \
 +xcb_randr_create_mode.3 \
 +xcb_randr_create_mode_reply.3 \
 +xcb_randr_create_mode_unchecked.3 \
 +xcb_randr_delete_output_mode.3 \
 +xcb_randr_delete_output_mode_checked.3 \
 +xcb_randr_delete_output_property.3 \
 +xcb_randr_delete_output_property_checked.3 \
 +xcb_randr_destroy_mode.3 \
 +xcb_randr_destroy_mode_checked.3 \
 +xcb_randr_get_crtc_gamma.3 \
 +xcb_randr_get_crtc_gamma_blue.3 \
 +xcb_randr_get_crtc_gamma_blue_end.3 \
 +xcb_randr_get_crtc_gamma_blue_length.3 \
 +xcb_randr_get_crtc_gamma_green.3 \
 +xcb_randr_get_crtc_gamma_green_end.3 \
 +xcb_randr_get_crtc_gamma_green_length.3 \
 +xcb_randr_get_crtc_gamma_red.3 \
 +xcb_randr_get_crtc_gamma_red_end.3 \
 +xcb_randr_get_crtc_gamma_red_length.3 \
 +xcb_randr_get_crtc_gamma_reply.3 \
 +xcb_randr_get_crtc_gamma_size.3 \
 +xcb_randr_get_crtc_gamma_size_reply.3 \
 +xcb_randr_get_crtc_gamma_size_unchecked.3 \
 +xcb_randr_get_crtc_gamma_unchecked.3 \
 +xcb_randr_get_crtc_info.3 \
 +xcb_randr_get_crtc_info_outputs.3 \
 +xcb_randr_get_crtc_info_outputs_end.3 \
 +xcb_randr_get_crtc_info_outputs_length.3 \
 +xcb_randr_get_crtc_info_possible.3 \
 +xcb_randr_get_crtc_info_possible_end.3 \
 +xcb_randr_get_crtc_info_possible_length.3 \
 +xcb_randr_get_crtc_info_reply.3 \
 +xcb_randr_get_crtc_info_unchecked.3 \
 +xcb_randr_get_crtc_transform.3 \
 +xcb_randr_get_crtc_transform_current_filter_name.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_current_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_current_params.3 \
 +xcb_randr_get_crtc_transform_current_params_end.3 \
 +xcb_randr_get_crtc_transform_current_params_length.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
 +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
 +xcb_randr_get_crtc_transform_pending_params.3 \
 +xcb_randr_get_crtc_transform_pending_params_end.3 \
 +xcb_randr_get_crtc_transform_pending_params_length.3 \
 +xcb_randr_get_crtc_transform_reply.3 \
 +xcb_randr_get_crtc_transform_unchecked.3 \
 +xcb_randr_get_output_info.3 \
 +xcb_randr_get_output_info_clones.3 \
 +xcb_randr_get_output_info_clones_end.3 \
 +xcb_randr_get_output_info_clones_length.3 \
 +xcb_randr_get_output_info_crtcs.3 \
 +xcb_randr_get_output_info_crtcs_end.3 \
 +xcb_randr_get_output_info_crtcs_length.3 \
 +xcb_randr_get_output_info_modes.3 \
 +xcb_randr_get_output_info_modes_end.3 \
 +xcb_randr_get_output_info_modes_length.3 \
 +xcb_randr_get_output_info_name.3 \
 +xcb_randr_get_output_info_name_end.3 \
 +xcb_randr_get_output_info_name_length.3 \
 +xcb_randr_get_output_info_reply.3 \
 +xcb_randr_get_output_info_unchecked.3 \
 +xcb_randr_get_output_primary.3 \
 +xcb_randr_get_output_primary_reply.3 \
 +xcb_randr_get_output_primary_unchecked.3 \
 +xcb_randr_get_output_property.3 \
 +xcb_randr_get_output_property_data.3 \
 +xcb_randr_get_output_property_data_end.3 \
 +xcb_randr_get_output_property_data_length.3 \
 +xcb_randr_get_output_property_reply.3 \
 +xcb_randr_get_output_property_unchecked.3 \
 +xcb_randr_get_panning.3 \
 +xcb_randr_get_panning_reply.3 \
 +xcb_randr_get_panning_unchecked.3 \
 +xcb_randr_get_screen_info.3 \
 +xcb_randr_get_screen_info_rates_iterator.3 \
 +xcb_randr_get_screen_info_rates_length.3 \
 +xcb_randr_get_screen_info_reply.3 \
 +xcb_randr_get_screen_info_sizes.3 \
 +xcb_randr_get_screen_info_sizes_iterator.3 \
 +xcb_randr_get_screen_info_sizes_length.3 \
 +xcb_randr_get_screen_info_unchecked.3 \
 +xcb_randr_get_screen_resources.3 \
 +xcb_randr_get_screen_resources_crtcs.3 \
 +xcb_randr_get_screen_resources_crtcs_end.3 \
 +xcb_randr_get_screen_resources_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current.3 \
 +xcb_randr_get_screen_resources_current_crtcs.3 \
 +xcb_randr_get_screen_resources_current_crtcs_end.3 \
 +xcb_randr_get_screen_resources_current_crtcs_length.3 \
 +xcb_randr_get_screen_resources_current_modes.3 \
 +xcb_randr_get_screen_resources_current_modes_iterator.3 \
 +xcb_randr_get_screen_resources_current_modes_length.3 \
 +xcb_randr_get_screen_resources_current_names.3 \
 +xcb_randr_get_screen_resources_current_names_end.3 \
 +xcb_randr_get_screen_resources_current_names_length.3 \
 +xcb_randr_get_screen_resources_current_outputs.3 \
 +xcb_randr_get_screen_resources_current_outputs_end.3 \
 +xcb_randr_get_screen_resources_current_outputs_length.3 \
 +xcb_randr_get_screen_resources_current_reply.3 \
 +xcb_randr_get_screen_resources_current_unchecked.3 \
 +xcb_randr_get_screen_resources_modes.3 \
 +xcb_randr_get_screen_resources_modes_iterator.3 \
 +xcb_randr_get_screen_resources_modes_length.3 \
 +xcb_randr_get_screen_resources_names.3 \
 +xcb_randr_get_screen_resources_names_end.3 \
 +xcb_randr_get_screen_resources_names_length.3 \
 +xcb_randr_get_screen_resources_outputs.3 \
 +xcb_randr_get_screen_resources_outputs_end.3 \
 +xcb_randr_get_screen_resources_outputs_length.3 \
 +xcb_randr_get_screen_resources_reply.3 \
 +xcb_randr_get_screen_resources_unchecked.3 \
 +xcb_randr_get_screen_size_range.3 \
 +xcb_randr_get_screen_size_range_reply.3 \
 +xcb_randr_get_screen_size_range_unchecked.3 \
 +xcb_randr_list_output_properties.3 \
 +xcb_randr_list_output_properties_atoms.3 \
 +xcb_randr_list_output_properties_atoms_end.3 \
 +xcb_randr_list_output_properties_atoms_length.3 \
 +xcb_randr_list_output_properties_reply.3 \
 +xcb_randr_list_output_properties_unchecked.3 \
 +xcb_randr_notify_event_t.3 \
 +xcb_randr_query_output_property.3 \
 +xcb_randr_query_output_property_reply.3 \
 +xcb_randr_query_output_property_unchecked.3 \
 +xcb_randr_query_output_property_valid_values.3 \
 +xcb_randr_query_output_property_valid_values_end.3 \
 +xcb_randr_query_output_property_valid_values_length.3 \
 +xcb_randr_query_version.3 \
 +xcb_randr_query_version_reply.3 \
 +xcb_randr_query_version_unchecked.3 \
 +xcb_randr_screen_change_notify_event_t.3 \
 +xcb_randr_select_input.3 \
 +xcb_randr_select_input_checked.3 \
 +xcb_randr_set_crtc_config.3 \
 +xcb_randr_set_crtc_config_reply.3 \
 +xcb_randr_set_crtc_config_unchecked.3 \
 +xcb_randr_set_crtc_gamma.3 \
 +xcb_randr_set_crtc_gamma_checked.3 \
 +xcb_randr_set_crtc_transform.3 \
 +xcb_randr_set_crtc_transform_checked.3 \
 +xcb_randr_set_output_primary.3 \
 +xcb_randr_set_output_primary_checked.3 \
 +xcb_randr_set_panning.3 \
 +xcb_randr_set_panning_reply.3 \
 +xcb_randr_set_panning_unchecked.3 \
 +xcb_randr_set_screen_config.3 \
 +xcb_randr_set_screen_config_reply.3 \
 +xcb_randr_set_screen_config_unchecked.3 \
 +xcb_randr_set_screen_size.3 \
 +xcb_randr_set_screen_size_checked.3 \
 +xcb_recolor_cursor.3 \
 +xcb_recolor_cursor_checked.3 \
 +xcb_record_create_context.3 \
 +xcb_record_create_context_checked.3 \
 +xcb_record_disable_context.3 \
 +xcb_record_disable_context_checked.3 \
 +xcb_record_enable_context.3 \
 +xcb_record_enable_context_data.3 \
 +xcb_record_enable_context_data_end.3 \
 +xcb_record_enable_context_data_length.3 \
 +xcb_record_enable_context_reply.3 \
 +xcb_record_enable_context_unchecked.3 \
 +xcb_record_free_context.3 \
 +xcb_record_free_context_checked.3 \
 +xcb_record_get_context.3 \
 +xcb_record_get_context_intercepted_clients_iterator.3 \
 +xcb_record_get_context_intercepted_clients_length.3 \
 +xcb_record_get_context_reply.3 \
 +xcb_record_get_context_unchecked.3 \
 +xcb_record_query_version.3 \
 +xcb_record_query_version_reply.3 \
 +xcb_record_query_version_unchecked.3 \
 +xcb_record_register_clients.3 \
 +xcb_record_register_clients_checked.3 \
 +xcb_record_unregister_clients.3 \
 +xcb_record_unregister_clients_checked.3 \
 +xcb_render_add_glyphs.3 \
 +xcb_render_add_glyphs_checked.3 \
 +xcb_render_add_traps.3 \
 +xcb_render_add_traps_checked.3 \
 +xcb_render_change_picture.3 \
 +xcb_render_change_picture_checked.3 \
 +xcb_render_composite.3 \
 +xcb_render_composite_checked.3 \
 +xcb_render_composite_glyphs_16.3 \
 +xcb_render_composite_glyphs_16_checked.3 \
 +xcb_render_composite_glyphs_32.3 \
 +xcb_render_composite_glyphs_32_checked.3 \
 +xcb_render_composite_glyphs_8.3 \
 +xcb_render_composite_glyphs_8_checked.3 \
 +xcb_render_create_anim_cursor.3 \
 +xcb_render_create_anim_cursor_checked.3 \
 +xcb_render_create_conical_gradient.3 \
 +xcb_render_create_conical_gradient_checked.3 \
 +xcb_render_create_cursor.3 \
 +xcb_render_create_cursor_checked.3 \
 +xcb_render_create_glyph_set.3 \
 +xcb_render_create_glyph_set_checked.3 \
 +xcb_render_create_linear_gradient.3 \
 +xcb_render_create_linear_gradient_checked.3 \
 +xcb_render_create_picture.3 \
 +xcb_render_create_picture_checked.3 \
 +xcb_render_create_radial_gradient.3 \
 +xcb_render_create_radial_gradient_checked.3 \
 +xcb_render_create_solid_fill.3 \
 +xcb_render_create_solid_fill_checked.3 \
 +xcb_render_fill_rectangles.3 \
 +xcb_render_fill_rectangles_checked.3 \
 +xcb_render_free_glyph_set.3 \
 +xcb_render_free_glyph_set_checked.3 \
 +xcb_render_free_glyphs.3 \
 +xcb_render_free_glyphs_checked.3 \
 +xcb_render_free_picture.3 \
 +xcb_render_free_picture_checked.3 \
 +xcb_render_query_filters.3 \
 +xcb_render_query_filters_aliases.3 \
 +xcb_render_query_filters_aliases_end.3 \
 +xcb_render_query_filters_aliases_length.3 \
 +xcb_render_query_filters_filters_iterator.3 \
 +xcb_render_query_filters_filters_length.3 \
 +xcb_render_query_filters_reply.3 \
 +xcb_render_query_filters_unchecked.3 \
 +xcb_render_query_pict_formats.3 \
 +xcb_render_query_pict_formats_formats.3 \
 +xcb_render_query_pict_formats_formats_iterator.3 \
 +xcb_render_query_pict_formats_formats_length.3 \
 +xcb_render_query_pict_formats_reply.3 \
 +xcb_render_query_pict_formats_screens_iterator.3 \
 +xcb_render_query_pict_formats_screens_length.3 \
 +xcb_render_query_pict_formats_subpixels.3 \
 +xcb_render_query_pict_formats_subpixels_end.3 \
 +xcb_render_query_pict_formats_subpixels_length.3 \
 +xcb_render_query_pict_formats_unchecked.3 \
 +xcb_render_query_pict_index_values.3 \
 +xcb_render_query_pict_index_values_reply.3 \
 +xcb_render_query_pict_index_values_unchecked.3 \
 +xcb_render_query_pict_index_values_values.3 \
 +xcb_render_query_pict_index_values_values_iterator.3 \
 +xcb_render_query_pict_index_values_values_length.3 \
 +xcb_render_query_version.3 \
 +xcb_render_query_version_reply.3 \
 +xcb_render_query_version_unchecked.3 \
 +xcb_render_reference_glyph_set.3 \
 +xcb_render_reference_glyph_set_checked.3 \
 +xcb_render_set_picture_clip_rectangles.3 \
 +xcb_render_set_picture_clip_rectangles_checked.3 \
 +xcb_render_set_picture_filter.3 \
 +xcb_render_set_picture_filter_checked.3 \
 +xcb_render_set_picture_transform.3 \
 +xcb_render_set_picture_transform_checked.3 \
 +xcb_render_trapezoids.3 \
 +xcb_render_trapezoids_checked.3 \
 +xcb_render_tri_fan.3 \
 +xcb_render_tri_fan_checked.3 \
 +xcb_render_tri_strip.3 \
 +xcb_render_tri_strip_checked.3 \
 +xcb_render_triangles.3 \
 +xcb_render_triangles_checked.3 \
 +xcb_reparent_notify_event_t.3 \
 +xcb_reparent_window.3 \
 +xcb_reparent_window_checked.3 \
 +xcb_res_query_client_pixmap_bytes.3 \
 +xcb_res_query_client_pixmap_bytes_reply.3 \
 +xcb_res_query_client_pixmap_bytes_unchecked.3 \
 +xcb_res_query_client_resources.3 \
 +xcb_res_query_client_resources_reply.3 \
 +xcb_res_query_client_resources_types.3 \
 +xcb_res_query_client_resources_types_iterator.3 \
 +xcb_res_query_client_resources_types_length.3 \
 +xcb_res_query_client_resources_unchecked.3 \
 +xcb_res_query_clients.3 \
 +xcb_res_query_clients_clients.3 \
 +xcb_res_query_clients_clients_iterator.3 \
 +xcb_res_query_clients_clients_length.3 \
 +xcb_res_query_clients_reply.3 \
 +xcb_res_query_clients_unchecked.3 \
 +xcb_res_query_version.3 \
 +xcb_res_query_version_reply.3 \
 +xcb_res_query_version_unchecked.3 \
 +xcb_resize_request_event_t.3 \
 +xcb_rotate_properties.3 \
 +xcb_rotate_properties_checked.3 \
 +xcb_screensaver_notify_event_t.3 \
 +xcb_screensaver_query_info.3 \
 +xcb_screensaver_query_info_reply.3 \
 +xcb_screensaver_query_info_unchecked.3 \
 +xcb_screensaver_query_version.3 \
 +xcb_screensaver_query_version_reply.3 \
 +xcb_screensaver_query_version_unchecked.3 \
 +xcb_screensaver_select_input.3 \
 +xcb_screensaver_select_input_checked.3 \
 +xcb_screensaver_set_attributes.3 \
 +xcb_screensaver_set_attributes_checked.3 \
 +xcb_screensaver_suspend.3 \
 +xcb_screensaver_suspend_checked.3 \
 +xcb_screensaver_unset_attributes.3 \
 +xcb_screensaver_unset_attributes_checked.3 \
 +xcb_selection_clear_event_t.3 \
 +xcb_selection_notify_event_t.3 \
 +xcb_selection_request_event_t.3 \
 +xcb_selinux_get_client_context.3 \
 +xcb_selinux_get_client_context_context.3 \
 +xcb_selinux_get_client_context_context_end.3 \
 +xcb_selinux_get_client_context_context_length.3 \
 +xcb_selinux_get_client_context_reply.3 \
 +xcb_selinux_get_client_context_unchecked.3 \
 +xcb_selinux_get_device_context.3 \
 +xcb_selinux_get_device_context_context.3 \
 +xcb_selinux_get_device_context_context_end.3 \
 +xcb_selinux_get_device_context_context_length.3 \
 +xcb_selinux_get_device_context_reply.3 \
 +xcb_selinux_get_device_context_unchecked.3 \
 +xcb_selinux_get_device_create_context.3 \
 +xcb_selinux_get_device_create_context_context.3 \
 +xcb_selinux_get_device_create_context_context_end.3 \
 +xcb_selinux_get_device_create_context_context_length.3 \
 +xcb_selinux_get_device_create_context_reply.3 \
 +xcb_selinux_get_device_create_context_unchecked.3 \
 +xcb_selinux_get_property_context.3 \
 +xcb_selinux_get_property_context_context.3 \
 +xcb_selinux_get_property_context_context_end.3 \
 +xcb_selinux_get_property_context_context_length.3 \
 +xcb_selinux_get_property_context_reply.3 \
 +xcb_selinux_get_property_context_unchecked.3 \
 +xcb_selinux_get_property_create_context.3 \
 +xcb_selinux_get_property_create_context_context.3 \
 +xcb_selinux_get_property_create_context_context_end.3 \
 +xcb_selinux_get_property_create_context_context_length.3 \
 +xcb_selinux_get_property_create_context_reply.3 \
 +xcb_selinux_get_property_create_context_unchecked.3 \
 +xcb_selinux_get_property_data_context.3 \
 +xcb_selinux_get_property_data_context_context.3 \
 +xcb_selinux_get_property_data_context_context_end.3 \
 +xcb_selinux_get_property_data_context_context_length.3 \
 +xcb_selinux_get_property_data_context_reply.3 \
 +xcb_selinux_get_property_data_context_unchecked.3 \
 +xcb_selinux_get_property_use_context.3 \
 +xcb_selinux_get_property_use_context_context.3 \
 +xcb_selinux_get_property_use_context_context_end.3 \
 +xcb_selinux_get_property_use_context_context_length.3 \
 +xcb_selinux_get_property_use_context_reply.3 \
 +xcb_selinux_get_property_use_context_unchecked.3 \
 +xcb_selinux_get_selection_context.3 \
 +xcb_selinux_get_selection_context_context.3 \
 +xcb_selinux_get_selection_context_context_end.3 \
 +xcb_selinux_get_selection_context_context_length.3 \
 +xcb_selinux_get_selection_context_reply.3 \
 +xcb_selinux_get_selection_context_unchecked.3 \
 +xcb_selinux_get_selection_create_context.3 \
 +xcb_selinux_get_selection_create_context_context.3 \
 +xcb_selinux_get_selection_create_context_context_end.3 \
 +xcb_selinux_get_selection_create_context_context_length.3 \
 +xcb_selinux_get_selection_create_context_reply.3 \
 +xcb_selinux_get_selection_create_context_unchecked.3 \
 +xcb_selinux_get_selection_data_context.3 \
 +xcb_selinux_get_selection_data_context_context.3 \
 +xcb_selinux_get_selection_data_context_context_end.3 \
 +xcb_selinux_get_selection_data_context_context_length.3 \
 +xcb_selinux_get_selection_data_context_reply.3 \
 +xcb_selinux_get_selection_data_context_unchecked.3 \
 +xcb_selinux_get_selection_use_context.3 \
 +xcb_selinux_get_selection_use_context_context.3 \
 +xcb_selinux_get_selection_use_context_context_end.3 \
 +xcb_selinux_get_selection_use_context_context_length.3 \
 +xcb_selinux_get_selection_use_context_reply.3 \
 +xcb_selinux_get_selection_use_context_unchecked.3 \
 +xcb_selinux_get_window_context.3 \
 +xcb_selinux_get_window_context_context.3 \
 +xcb_selinux_get_window_context_context_end.3 \
 +xcb_selinux_get_window_context_context_length.3 \
 +xcb_selinux_get_window_context_reply.3 \
 +xcb_selinux_get_window_context_unchecked.3 \
 +xcb_selinux_get_window_create_context.3 \
 +xcb_selinux_get_window_create_context_context.3 \
 +xcb_selinux_get_window_create_context_context_end.3 \
 +xcb_selinux_get_window_create_context_context_length.3 \
 +xcb_selinux_get_window_create_context_reply.3 \
 +xcb_selinux_get_window_create_context_unchecked.3 \
 +xcb_selinux_list_properties.3 \
 +xcb_selinux_list_properties_properties_iterator.3 \
 +xcb_selinux_list_properties_properties_length.3 \
 +xcb_selinux_list_properties_reply.3 \
 +xcb_selinux_list_properties_unchecked.3 \
 +xcb_selinux_list_selections.3 \
 +xcb_selinux_list_selections_reply.3 \
 +xcb_selinux_list_selections_selections_iterator.3 \
 +xcb_selinux_list_selections_selections_length.3 \
 +xcb_selinux_list_selections_unchecked.3 \
 +xcb_selinux_query_version.3 \
 +xcb_selinux_query_version_reply.3 \
 +xcb_selinux_query_version_unchecked.3 \
 +xcb_selinux_set_device_context.3 \
 +xcb_selinux_set_device_context_checked.3 \
 +xcb_selinux_set_device_create_context.3 \
 +xcb_selinux_set_device_create_context_checked.3 \
 +xcb_selinux_set_property_create_context.3 \
 +xcb_selinux_set_property_create_context_checked.3 \
 +xcb_selinux_set_property_use_context.3 \
 +xcb_selinux_set_property_use_context_checked.3 \
 +xcb_selinux_set_selection_create_context.3 \
 +xcb_selinux_set_selection_create_context_checked.3 \
 +xcb_selinux_set_selection_use_context.3 \
 +xcb_selinux_set_selection_use_context_checked.3 \
 +xcb_selinux_set_window_create_context.3 \
 +xcb_selinux_set_window_create_context_checked.3 \
 +xcb_send_event.3 \
 +xcb_send_event_checked.3 \
 +xcb_set_access_control.3 \
 +xcb_set_access_control_checked.3 \
 +xcb_set_clip_rectangles.3 \
 +xcb_set_clip_rectangles_checked.3 \
 +xcb_set_close_down_mode.3 \
 +xcb_set_close_down_mode_checked.3 \
 +xcb_set_dashes.3 \
 +xcb_set_dashes_checked.3 \
 +xcb_set_font_path.3 \
 +xcb_set_font_path_checked.3 \
 +xcb_set_input_focus.3 \
 +xcb_set_input_focus_checked.3 \
 +xcb_set_modifier_mapping.3 \
 +xcb_set_modifier_mapping_reply.3 \
 +xcb_set_modifier_mapping_unchecked.3 \
 +xcb_set_pointer_mapping.3 \
 +xcb_set_pointer_mapping_reply.3 \
 +xcb_set_pointer_mapping_unchecked.3 \
 +xcb_set_screen_saver.3 \
 +xcb_set_screen_saver_checked.3 \
 +xcb_set_selection_owner.3 \
 +xcb_set_selection_owner_checked.3 \
 +xcb_shape_combine.3 \
 +xcb_shape_combine_checked.3 \
 +xcb_shape_get_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles.3 \
 +xcb_shape_get_rectangles_rectangles_iterator.3 \
 +xcb_shape_get_rectangles_rectangles_length.3 \
 +xcb_shape_get_rectangles_reply.3 \
 +xcb_shape_get_rectangles_unchecked.3 \
 +xcb_shape_input_selected.3 \
 +xcb_shape_input_selected_reply.3 \
 +xcb_shape_input_selected_unchecked.3 \
 +xcb_shape_mask.3 \
 +xcb_shape_mask_checked.3 \
 +xcb_shape_notify_event_t.3 \
 +xcb_shape_offset.3 \
 +xcb_shape_offset_checked.3 \
 +xcb_shape_query_extents.3 \
 +xcb_shape_query_extents_reply.3 \
 +xcb_shape_query_extents_unchecked.3 \
 +xcb_shape_query_version.3 \
 +xcb_shape_query_version_reply.3 \
 +xcb_shape_query_version_unchecked.3 \
 +xcb_shape_rectangles.3 \
 +xcb_shape_rectangles_checked.3 \
 +xcb_shape_select_input.3 \
 +xcb_shape_select_input_checked.3 \
 +xcb_shm_attach.3 \
 +xcb_shm_attach_checked.3 \
 +xcb_shm_completion_event_t.3 \
 +xcb_shm_create_pixmap.3 \
 +xcb_shm_create_pixmap_checked.3 \
 +xcb_shm_detach.3 \
 +xcb_shm_detach_checked.3 \
 +xcb_shm_get_image.3 \
 +xcb_shm_get_image_reply.3 \
 +xcb_shm_get_image_unchecked.3 \
 +xcb_shm_put_image.3 \
 +xcb_shm_put_image_checked.3 \
 +xcb_shm_query_version.3 \
 +xcb_shm_query_version_reply.3 \
 +xcb_shm_query_version_unchecked.3 \
 +xcb_store_colors.3 \
 +xcb_store_colors_checked.3 \
 +xcb_store_named_color.3 \
 +xcb_store_named_color_checked.3 \
 +xcb_sync_alarm_notify_event_t.3 \
 +xcb_sync_await.3 \
 +xcb_sync_await_checked.3 \
 +xcb_sync_await_fence.3 \
 +xcb_sync_await_fence_checked.3 \
 +xcb_sync_change_alarm.3 \
 +xcb_sync_change_alarm_checked.3 \
 +xcb_sync_change_counter.3 \
 +xcb_sync_change_counter_checked.3 \
 +xcb_sync_counter_notify_event_t.3 \
 +xcb_sync_create_alarm.3 \
 +xcb_sync_create_alarm_checked.3 \
 +xcb_sync_create_counter.3 \
 +xcb_sync_create_counter_checked.3 \
 +xcb_sync_create_fence.3 \
 +xcb_sync_create_fence_checked.3 \
 +xcb_sync_destroy_alarm.3 \
 +xcb_sync_destroy_alarm_checked.3 \
 +xcb_sync_destroy_counter.3 \
 +xcb_sync_destroy_counter_checked.3 \
 +xcb_sync_destroy_fence.3 \
 +xcb_sync_destroy_fence_checked.3 \
 +xcb_sync_get_priority.3 \
 +xcb_sync_get_priority_reply.3 \
 +xcb_sync_get_priority_unchecked.3 \
 +xcb_sync_initialize.3 \
 +xcb_sync_initialize_reply.3 \
 +xcb_sync_initialize_unchecked.3 \
 +xcb_sync_list_system_counters.3 \
 +xcb_sync_list_system_counters_counters_iterator.3 \
 +xcb_sync_list_system_counters_counters_length.3 \
 +xcb_sync_list_system_counters_reply.3 \
 +xcb_sync_list_system_counters_unchecked.3 \
 +xcb_sync_query_alarm.3 \
 +xcb_sync_query_alarm_reply.3 \
 +xcb_sync_query_alarm_unchecked.3 \
 +xcb_sync_query_counter.3 \
 +xcb_sync_query_counter_reply.3 \
 +xcb_sync_query_counter_unchecked.3 \
 +xcb_sync_query_fence.3 \
 +xcb_sync_query_fence_reply.3 \
 +xcb_sync_query_fence_unchecked.3 \
 +xcb_sync_reset_fence.3 \
 +xcb_sync_reset_fence_checked.3 \
 +xcb_sync_set_counter.3 \
 +xcb_sync_set_counter_checked.3 \
 +xcb_sync_set_priority.3 \
 +xcb_sync_set_priority_checked.3 \
 +xcb_sync_trigger_fence.3 \
 +xcb_sync_trigger_fence_checked.3 \
 +xcb_test_compare_cursor.3 \
 +xcb_test_compare_cursor_reply.3 \
 +xcb_test_compare_cursor_unchecked.3 \
 +xcb_test_fake_input.3 \
 +xcb_test_fake_input_checked.3 \
 +xcb_test_get_version.3 \
 +xcb_test_get_version_reply.3 \
 +xcb_test_get_version_unchecked.3 \
 +xcb_test_grab_control.3 \
 +xcb_test_grab_control_checked.3 \
 +xcb_translate_coordinates.3 \
 +xcb_translate_coordinates_reply.3 \
 +xcb_translate_coordinates_unchecked.3 \
 +xcb_ungrab_button.3 \
 +xcb_ungrab_button_checked.3 \
 +xcb_ungrab_key.3 \
 +xcb_ungrab_key_checked.3 \
 +xcb_ungrab_keyboard.3 \
 +xcb_ungrab_keyboard_checked.3 \
 +xcb_ungrab_pointer.3 \
 +xcb_ungrab_pointer_checked.3 \
 +xcb_ungrab_server.3 \
 +xcb_ungrab_server_checked.3 \
 +xcb_uninstall_colormap.3 \
 +xcb_uninstall_colormap_checked.3 \
 +xcb_unmap_notify_event_t.3 \
 +xcb_unmap_subwindows.3 \
 +xcb_unmap_subwindows_checked.3 \
 +xcb_unmap_window.3 \
 +xcb_unmap_window_checked.3 \
 +xcb_visibility_notify_event_t.3 \
 +xcb_warp_pointer.3 \
 +xcb_warp_pointer_checked.3 \
 +xcb_x_print_attribut_notify_event_t.3 \
 +xcb_x_print_create_context.3 \
 +xcb_x_print_create_context_checked.3 \
 +xcb_x_print_notify_event_t.3 \
 +xcb_x_print_print_destroy_context.3 \
 +xcb_x_print_print_destroy_context_checked.3 \
 +xcb_x_print_print_end_doc.3 \
 +xcb_x_print_print_end_doc_checked.3 \
 +xcb_x_print_print_end_job.3 \
 +xcb_x_print_print_end_job_checked.3 \
 +xcb_x_print_print_end_page.3 \
 +xcb_x_print_print_end_page_checked.3 \
 +xcb_x_print_print_get_attributes.3 \
 +xcb_x_print_print_get_attributes_reply.3 \
 +xcb_x_print_print_get_attributes_unchecked.3 \
 +xcb_x_print_print_get_context.3 \
 +xcb_x_print_print_get_context_reply.3 \
 +xcb_x_print_print_get_context_unchecked.3 \
 +xcb_x_print_print_get_document_data.3 \
 +xcb_x_print_print_get_document_data_data.3 \
 +xcb_x_print_print_get_document_data_data_end.3 \
 +xcb_x_print_print_get_document_data_data_length.3 \
 +xcb_x_print_print_get_document_data_reply.3 \
 +xcb_x_print_print_get_document_data_unchecked.3 \
 +xcb_x_print_print_get_image_resolution.3 \
 +xcb_x_print_print_get_image_resolution_reply.3 \
 +xcb_x_print_print_get_image_resolution_unchecked.3 \
 +xcb_x_print_print_get_one_attributes.3 \
 +xcb_x_print_print_get_one_attributes_reply.3 \
 +xcb_x_print_print_get_one_attributes_unchecked.3 \
 +xcb_x_print_print_get_one_attributes_value.3 \
 +xcb_x_print_print_get_one_attributes_value_end.3 \
 +xcb_x_print_print_get_one_attributes_value_length.3 \
 +xcb_x_print_print_get_page_dimensions.3 \
 +xcb_x_print_print_get_page_dimensions_reply.3 \
 +xcb_x_print_print_get_page_dimensions_unchecked.3 \
 +xcb_x_print_print_get_printer_list.3 \
 +xcb_x_print_print_get_printer_list_printers_iterator.3 \
 +xcb_x_print_print_get_printer_list_printers_length.3 \
 +xcb_x_print_print_get_printer_list_reply.3 \
 +xcb_x_print_print_get_printer_list_unchecked.3 \
 +xcb_x_print_print_get_screen_of_context.3 \
 +xcb_x_print_print_get_screen_of_context_reply.3 \
 +xcb_x_print_print_get_screen_of_context_unchecked.3 \
 +xcb_x_print_print_input_selected.3 \
 +xcb_x_print_print_input_selected_all_events_list.3 \
 +xcb_x_print_print_input_selected_all_events_list_end.3 \
 +xcb_x_print_print_input_selected_all_events_list_length.3 \
 +xcb_x_print_print_input_selected_event_list.3 \
 +xcb_x_print_print_input_selected_event_list_end.3 \
 +xcb_x_print_print_input_selected_event_list_length.3 \
 +xcb_x_print_print_input_selected_reply.3 \
 +xcb_x_print_print_input_selected_unchecked.3 \
 +xcb_x_print_print_put_document_data.3 \
 +xcb_x_print_print_put_document_data_checked.3 \
 +xcb_x_print_print_query_screens.3 \
 +xcb_x_print_print_query_screens_reply.3 \
 +xcb_x_print_print_query_screens_roots.3 \
 +xcb_x_print_print_query_screens_roots_end.3 \
 +xcb_x_print_print_query_screens_roots_length.3 \
 +xcb_x_print_print_query_screens_unchecked.3 \
 +xcb_x_print_print_query_version.3 \
 +xcb_x_print_print_query_version_reply.3 \
 +xcb_x_print_print_query_version_unchecked.3 \
 +xcb_x_print_print_rehash_printer_list.3 \
 +xcb_x_print_print_rehash_printer_list_checked.3 \
 +xcb_x_print_print_select_input.3 \
 +xcb_x_print_print_select_input_checked.3 \
 +xcb_x_print_print_set_attributes.3 \
 +xcb_x_print_print_set_attributes_checked.3 \
 +xcb_x_print_print_set_context.3 \
 +xcb_x_print_print_set_context_checked.3 \
 +xcb_x_print_print_set_image_resolution.3 \
 +xcb_x_print_print_set_image_resolution_reply.3 \
 +xcb_x_print_print_set_image_resolution_unchecked.3 \
 +xcb_x_print_print_start_doc.3 \
 +xcb_x_print_print_start_doc_checked.3 \
 +xcb_x_print_print_start_job.3 \
 +xcb_x_print_print_start_job_checked.3 \
 +xcb_x_print_print_start_page.3 \
 +xcb_x_print_print_start_page_checked.3 \
 +xcb_xc_misc_get_version.3 \
 +xcb_xc_misc_get_version_reply.3 \
 +xcb_xc_misc_get_version_unchecked.3 \
 +xcb_xc_misc_get_xid_list.3 \
 +xcb_xc_misc_get_xid_list_ids.3 \
 +xcb_xc_misc_get_xid_list_ids_end.3 \
 +xcb_xc_misc_get_xid_list_ids_length.3 \
 +xcb_xc_misc_get_xid_list_reply.3 \
 +xcb_xc_misc_get_xid_list_unchecked.3 \
 +xcb_xc_misc_get_xid_range.3 \
 +xcb_xc_misc_get_xid_range_reply.3 \
 +xcb_xc_misc_get_xid_range_unchecked.3 \
 +xcb_xevie_end.3 \
 +xcb_xevie_end_reply.3 \
 +xcb_xevie_end_unchecked.3 \
 +xcb_xevie_query_version.3 \
 +xcb_xevie_query_version_reply.3 \
 +xcb_xevie_query_version_unchecked.3 \
 +xcb_xevie_select_input.3 \
 +xcb_xevie_select_input_reply.3 \
 +xcb_xevie_select_input_unchecked.3 \
 +xcb_xevie_send.3 \
 +xcb_xevie_send_reply.3 \
 +xcb_xevie_send_unchecked.3 \
 +xcb_xevie_start.3 \
 +xcb_xevie_start_reply.3 \
 +xcb_xevie_start_unchecked.3 \
 +xcb_xf86dri_auth_connection.3 \
 +xcb_xf86dri_auth_connection_reply.3 \
 +xcb_xf86dri_auth_connection_unchecked.3 \
 +xcb_xf86dri_close_connection.3 \
 +xcb_xf86dri_close_connection_checked.3 \
 +xcb_xf86dri_create_context.3 \
 +xcb_xf86dri_create_context_reply.3 \
 +xcb_xf86dri_create_context_unchecked.3 \
 +xcb_xf86dri_create_drawable.3 \
 +xcb_xf86dri_create_drawable_reply.3 \
 +xcb_xf86dri_create_drawable_unchecked.3 \
 +xcb_xf86dri_destroy_context.3 \
 +xcb_xf86dri_destroy_context_checked.3 \
 +xcb_xf86dri_destroy_drawable.3 \
 +xcb_xf86dri_destroy_drawable_checked.3 \
 +xcb_xf86dri_get_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
 +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
 +xcb_xf86dri_get_client_driver_name_reply.3 \
 +xcb_xf86dri_get_client_driver_name_unchecked.3 \
 +xcb_xf86dri_get_device_info.3 \
 +xcb_xf86dri_get_device_info_device_private.3 \
 +xcb_xf86dri_get_device_info_device_private_end.3 \
 +xcb_xf86dri_get_device_info_device_private_length.3 \
 +xcb_xf86dri_get_device_info_reply.3 \
 +xcb_xf86dri_get_device_info_unchecked.3 \
 +xcb_xf86dri_get_drawable_info.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
 +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
 +xcb_xf86dri_get_drawable_info_reply.3 \
 +xcb_xf86dri_get_drawable_info_unchecked.3 \
 +xcb_xf86dri_open_connection.3 \
 +xcb_xf86dri_open_connection_bus_id.3 \
 +xcb_xf86dri_open_connection_bus_id_end.3 \
 +xcb_xf86dri_open_connection_bus_id_length.3 \
 +xcb_xf86dri_open_connection_reply.3 \
 +xcb_xf86dri_open_connection_unchecked.3 \
 +xcb_xf86dri_query_direct_rendering_capable.3 \
 +xcb_xf86dri_query_direct_rendering_capable_reply.3 \
 +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
 +xcb_xf86dri_query_version.3 \
 +xcb_xf86dri_query_version_reply.3 \
 +xcb_xf86dri_query_version_unchecked.3 \
 +xcb_xfixes_change_cursor.3 \
 +xcb_xfixes_change_cursor_by_name.3 \
 +xcb_xfixes_change_cursor_by_name_checked.3 \
 +xcb_xfixes_change_cursor_checked.3 \
 +xcb_xfixes_change_save_set.3 \
 +xcb_xfixes_change_save_set_checked.3 \
 +xcb_xfixes_copy_region.3 \
 +xcb_xfixes_copy_region_checked.3 \
 +xcb_xfixes_create_region.3 \
 +xcb_xfixes_create_region_checked.3 \
 +xcb_xfixes_create_region_from_bitmap.3 \
 +xcb_xfixes_create_region_from_bitmap_checked.3 \
 +xcb_xfixes_create_region_from_gc.3 \
 +xcb_xfixes_create_region_from_gc_checked.3 \
 +xcb_xfixes_create_region_from_picture.3 \
 +xcb_xfixes_create_region_from_picture_checked.3 \
 +xcb_xfixes_create_region_from_window.3 \
 +xcb_xfixes_create_region_from_window_checked.3 \
 +xcb_xfixes_cursor_notify_event_t.3 \
 +xcb_xfixes_destroy_region.3 \
 +xcb_xfixes_destroy_region_checked.3 \
 +xcb_xfixes_expand_region.3 \
 +xcb_xfixes_expand_region_checked.3 \
 +xcb_xfixes_fetch_region.3 \
 +xcb_xfixes_fetch_region_rectangles.3 \
 +xcb_xfixes_fetch_region_rectangles_iterator.3 \
 +xcb_xfixes_fetch_region_rectangles_length.3 \
 +xcb_xfixes_fetch_region_reply.3 \
 +xcb_xfixes_fetch_region_unchecked.3 \
 +xcb_xfixes_get_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_name.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_end.3 \
 +xcb_xfixes_get_cursor_image_and_name_name_length.3 \
 +xcb_xfixes_get_cursor_image_and_name_reply.3 \
 +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
 +xcb_xfixes_get_cursor_image_cursor_image.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_end.3 \
 +xcb_xfixes_get_cursor_image_cursor_image_length.3 \
 +xcb_xfixes_get_cursor_image_reply.3 \
 +xcb_xfixes_get_cursor_image_unchecked.3 \
 +xcb_xfixes_get_cursor_name.3 \
 +xcb_xfixes_get_cursor_name_name.3 \
 +xcb_xfixes_get_cursor_name_name_end.3 \
 +xcb_xfixes_get_cursor_name_name_length.3 \
 +xcb_xfixes_get_cursor_name_reply.3 \
 +xcb_xfixes_get_cursor_name_unchecked.3 \
 +xcb_xfixes_hide_cursor.3 \
 +xcb_xfixes_hide_cursor_checked.3 \
 +xcb_xfixes_intersect_region.3 \
 +xcb_xfixes_intersect_region_checked.3 \
 +xcb_xfixes_invert_region.3 \
 +xcb_xfixes_invert_region_checked.3 \
 +xcb_xfixes_query_version.3 \
 +xcb_xfixes_query_version_reply.3 \
 +xcb_xfixes_query_version_unchecked.3 \
 +xcb_xfixes_region_extents.3 \
 +xcb_xfixes_region_extents_checked.3 \
 +xcb_xfixes_select_cursor_input.3 \
 +xcb_xfixes_select_cursor_input_checked.3 \
 +xcb_xfixes_select_selection_input.3 \
 +xcb_xfixes_select_selection_input_checked.3 \
 +xcb_xfixes_selection_notify_event_t.3 \
 +xcb_xfixes_set_cursor_name.3 \
 +xcb_xfixes_set_cursor_name_checked.3 \
 +xcb_xfixes_set_gc_clip_region.3 \
 +xcb_xfixes_set_gc_clip_region_checked.3 \
 +xcb_xfixes_set_picture_clip_region.3 \
 +xcb_xfixes_set_picture_clip_region_checked.3 \
 +xcb_xfixes_set_region.3 \
 +xcb_xfixes_set_region_checked.3 \
 +xcb_xfixes_set_window_shape_region.3 \
 +xcb_xfixes_set_window_shape_region_checked.3 \
 +xcb_xfixes_show_cursor.3 \
 +xcb_xfixes_show_cursor_checked.3 \
 +xcb_xfixes_subtract_region.3 \
 +xcb_xfixes_subtract_region_checked.3 \
 +xcb_xfixes_translate_region.3 \
 +xcb_xfixes_translate_region_checked.3 \
 +xcb_xfixes_union_region.3 \
 +xcb_xfixes_union_region_checked.3 \
 +xcb_xinerama_get_screen_count.3 \
 +xcb_xinerama_get_screen_count_reply.3 \
 +xcb_xinerama_get_screen_count_unchecked.3 \
 +xcb_xinerama_get_screen_size.3 \
 +xcb_xinerama_get_screen_size_reply.3 \
 +xcb_xinerama_get_screen_size_unchecked.3 \
 +xcb_xinerama_get_state.3 \
 +xcb_xinerama_get_state_reply.3 \
 +xcb_xinerama_get_state_unchecked.3 \
 +xcb_xinerama_is_active.3 \
 +xcb_xinerama_is_active_reply.3 \
 +xcb_xinerama_is_active_unchecked.3 \
 +xcb_xinerama_query_screens.3 \
 +xcb_xinerama_query_screens_reply.3 \
 +xcb_xinerama_query_screens_screen_info.3 \
 +xcb_xinerama_query_screens_screen_info_iterator.3 \
 +xcb_xinerama_query_screens_screen_info_length.3 \
 +xcb_xinerama_query_screens_unchecked.3 \
 +xcb_xinerama_query_version.3 \
 +xcb_xinerama_query_version_reply.3 \
 +xcb_xinerama_query_version_unchecked.3 \
 +xcb_xkb_access_x_notify_event_t.3 \
 +xcb_xkb_action_message_event_t.3 \
 +xcb_xkb_bell.3 \
 +xcb_xkb_bell_checked.3 \
 +xcb_xkb_bell_notify_event_t.3 \
 +xcb_xkb_compat_map_notify_event_t.3 \
 +xcb_xkb_controls_notify_event_t.3 \
 +xcb_xkb_extension_device_notify_event_t.3 \
 +xcb_xkb_get_compat_map.3 \
 +xcb_xkb_get_compat_map_group_rtrn.3 \
 +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
 +xcb_xkb_get_compat_map_group_rtrn_length.3 \
 +xcb_xkb_get_compat_map_reply.3 \
 +xcb_xkb_get_compat_map_si_rtrn.3 \
 +xcb_xkb_get_compat_map_si_rtrn_end.3 \
 +xcb_xkb_get_compat_map_si_rtrn_length.3 \
 +xcb_xkb_get_compat_map_unchecked.3 \
 +xcb_xkb_get_controls.3 \
 +xcb_xkb_get_controls_reply.3 \
 +xcb_xkb_get_controls_unchecked.3 \
 +xcb_xkb_get_device_info.3 \
 +xcb_xkb_get_device_info_btn_actions.3 \
 +xcb_xkb_get_device_info_btn_actions_iterator.3 \
 +xcb_xkb_get_device_info_btn_actions_length.3 \
 +xcb_xkb_get_device_info_leds_iterator.3 \
 +xcb_xkb_get_device_info_leds_length.3 \
 +xcb_xkb_get_device_info_name.3 \
 +xcb_xkb_get_device_info_name_end.3 \
 +xcb_xkb_get_device_info_name_length.3 \
 +xcb_xkb_get_device_info_reply.3 \
 +xcb_xkb_get_device_info_unchecked.3 \
 +xcb_xkb_get_geometry.3 \
 +xcb_xkb_get_geometry_colors_iterator.3 \
 +xcb_xkb_get_geometry_colors_length.3 \
 +xcb_xkb_get_geometry_doodads_iterator.3 \
 +xcb_xkb_get_geometry_doodads_length.3 \
 +xcb_xkb_get_geometry_key_aliases.3 \
 +xcb_xkb_get_geometry_key_aliases_iterator.3 \
 +xcb_xkb_get_geometry_key_aliases_length.3 \
 +xcb_xkb_get_geometry_label_font.3 \
 +xcb_xkb_get_geometry_properties_iterator.3 \
 +xcb_xkb_get_geometry_properties_length.3 \
 +xcb_xkb_get_geometry_reply.3 \
 +xcb_xkb_get_geometry_sections_iterator.3 \
 +xcb_xkb_get_geometry_sections_length.3 \
 +xcb_xkb_get_geometry_shapes_iterator.3 \
 +xcb_xkb_get_geometry_shapes_length.3 \
 +xcb_xkb_get_geometry_unchecked.3 \
 +xcb_xkb_get_indicator_map.3 \
 +xcb_xkb_get_indicator_map_maps.3 \
 +xcb_xkb_get_indicator_map_maps_iterator.3 \
 +xcb_xkb_get_indicator_map_maps_length.3 \
 +xcb_xkb_get_indicator_map_reply.3 \
 +xcb_xkb_get_indicator_map_unchecked.3 \
 +xcb_xkb_get_indicator_state.3 \
 +xcb_xkb_get_indicator_state_reply.3 \
 +xcb_xkb_get_indicator_state_unchecked.3 \
 +xcb_xkb_get_kbd_by_name.3 \
 +xcb_xkb_get_kbd_by_name_replies.3 \
 +xcb_xkb_get_kbd_by_name_reply.3 \
 +xcb_xkb_get_kbd_by_name_unchecked.3 \
 +xcb_xkb_get_map.3 \
 +xcb_xkb_get_map_map.3 \
 +xcb_xkb_get_map_reply.3 \
 +xcb_xkb_get_map_unchecked.3 \
 +xcb_xkb_get_named_indicator.3 \
 +xcb_xkb_get_named_indicator_reply.3 \
 +xcb_xkb_get_named_indicator_unchecked.3 \
 +xcb_xkb_get_names.3 \
 +xcb_xkb_get_names_reply.3 \
 +xcb_xkb_get_names_unchecked.3 \
 +xcb_xkb_get_names_value_list.3 \
 +xcb_xkb_get_state.3 \
 +xcb_xkb_get_state_reply.3 \
 +xcb_xkb_get_state_unchecked.3 \
 +xcb_xkb_indicator_map_notify_event_t.3 \
 +xcb_xkb_indicator_state_notify_event_t.3 \
 +xcb_xkb_latch_lock_state.3 \
 +xcb_xkb_latch_lock_state_checked.3 \
 +xcb_xkb_list_components.3 \
 +xcb_xkb_list_components_compat_maps_iterator.3 \
 +xcb_xkb_list_components_compat_maps_length.3 \
 +xcb_xkb_list_components_geometries_iterator.3 \
 +xcb_xkb_list_components_geometries_length.3 \
 +xcb_xkb_list_components_keycodes_iterator.3 \
 +xcb_xkb_list_components_keycodes_length.3 \
 +xcb_xkb_list_components_keymaps_iterator.3 \
 +xcb_xkb_list_components_keymaps_length.3 \
 +xcb_xkb_list_components_reply.3 \
 +xcb_xkb_list_components_symbols_iterator.3 \
 +xcb_xkb_list_components_symbols_length.3 \
 +xcb_xkb_list_components_types_iterator.3 \
 +xcb_xkb_list_components_types_length.3 \
 +xcb_xkb_list_components_unchecked.3 \
 +xcb_xkb_map_notify_event_t.3 \
 +xcb_xkb_names_notify_event_t.3 \
 +xcb_xkb_new_keyboard_notify_event_t.3 \
 +xcb_xkb_per_client_flags.3 \
 +xcb_xkb_per_client_flags_reply.3 \
 +xcb_xkb_per_client_flags_unchecked.3 \
 +xcb_xkb_select_events.3 \
 +xcb_xkb_select_events_checked.3 \
 +xcb_xkb_set_compat_map.3 \
 +xcb_xkb_set_compat_map_checked.3 \
 +xcb_xkb_set_controls.3 \
 +xcb_xkb_set_controls_checked.3 \
 +xcb_xkb_set_debugging_flags.3 \
 +xcb_xkb_set_debugging_flags_reply.3 \
 +xcb_xkb_set_debugging_flags_unchecked.3 \
 +xcb_xkb_set_device_info.3 \
 +xcb_xkb_set_device_info_checked.3 \
 +xcb_xkb_set_geometry.3 \
 +xcb_xkb_set_geometry_checked.3 \
 +xcb_xkb_set_indicator_map.3 \
 +xcb_xkb_set_indicator_map_checked.3 \
 +xcb_xkb_set_map.3 \
 +xcb_xkb_set_map_checked.3 \
 +xcb_xkb_set_named_indicator.3 \
 +xcb_xkb_set_named_indicator_checked.3 \
 +xcb_xkb_set_names.3 \
 +xcb_xkb_set_names_checked.3 \
 +xcb_xkb_state_notify_event_t.3 \
 +xcb_xkb_use_extension.3 \
 +xcb_xkb_use_extension_reply.3 \
 +xcb_xkb_use_extension_unchecked.3 \
 +xcb_xv_get_port_attribute.3 \
 +xcb_xv_get_port_attribute_reply.3 \
 +xcb_xv_get_port_attribute_unchecked.3 \
 +xcb_xv_get_still.3 \
 +xcb_xv_get_still_checked.3 \
 +xcb_xv_get_video.3 \
 +xcb_xv_get_video_checked.3 \
 +xcb_xv_grab_port.3 \
 +xcb_xv_grab_port_reply.3 \
 +xcb_xv_grab_port_unchecked.3 \
 +xcb_xv_list_image_formats.3 \
 +xcb_xv_list_image_formats_format.3 \
 +xcb_xv_list_image_formats_format_iterator.3 \
 +xcb_xv_list_image_formats_format_length.3 \
 +xcb_xv_list_image_formats_reply.3 \
 +xcb_xv_list_image_formats_unchecked.3 \
 +xcb_xv_port_notify_event_t.3 \
 +xcb_xv_put_image.3 \
 +xcb_xv_put_image_checked.3 \
 +xcb_xv_put_still.3 \
 +xcb_xv_put_still_checked.3 \
 +xcb_xv_put_video.3 \
 +xcb_xv_put_video_checked.3 \
 +xcb_xv_query_adaptors.3 \
 +xcb_xv_query_adaptors_info_iterator.3 \
 +xcb_xv_query_adaptors_info_length.3 \
 +xcb_xv_query_adaptors_reply.3 \
 +xcb_xv_query_adaptors_unchecked.3 \
 +xcb_xv_query_best_size.3 \
 +xcb_xv_query_best_size_reply.3 \
 +xcb_xv_query_best_size_unchecked.3 \
 +xcb_xv_query_encodings.3 \
 +xcb_xv_query_encodings_info_iterator.3 \
 +xcb_xv_query_encodings_info_length.3 \
 +xcb_xv_query_encodings_reply.3 \
 +xcb_xv_query_encodings_unchecked.3 \
 +xcb_xv_query_extension.3 \
 +xcb_xv_query_extension_reply.3 \
 +xcb_xv_query_extension_unchecked.3 \
 +xcb_xv_query_image_attributes.3 \
 +xcb_xv_query_image_attributes_offsets.3 \
 +xcb_xv_query_image_attributes_offsets_end.3 \
 +xcb_xv_query_image_attributes_offsets_length.3 \
 +xcb_xv_query_image_attributes_pitches.3 \
 +xcb_xv_query_image_attributes_pitches_end.3 \
 +xcb_xv_query_image_attributes_pitches_length.3 \
 +xcb_xv_query_image_attributes_reply.3 \
 +xcb_xv_query_image_attributes_unchecked.3 \
 +xcb_xv_query_port_attributes.3 \
 +xcb_xv_query_port_attributes_attributes_iterator.3 \
 +xcb_xv_query_port_attributes_attributes_length.3 \
 +xcb_xv_query_port_attributes_reply.3 \
 +xcb_xv_query_port_attributes_unchecked.3 \
 +xcb_xv_select_port_notify.3 \
 +xcb_xv_select_port_notify_checked.3 \
 +xcb_xv_select_video_notify.3 \
 +xcb_xv_select_video_notify_checked.3 \
 +xcb_xv_set_port_attribute.3 \
 +xcb_xv_set_port_attribute_checked.3 \
 +xcb_xv_shm_put_image.3 \
 +xcb_xv_shm_put_image_checked.3 \
 +xcb_xv_stop_video.3 \
 +xcb_xv_stop_video_checked.3 \
 +xcb_xv_ungrab_port.3 \
 +xcb_xv_ungrab_port_checked.3 \
 +xcb_xv_video_notify_event_t.3 \
 +xcb_xvmc_create_context.3 \
 +xcb_xvmc_create_context_priv_data.3 \
 +xcb_xvmc_create_context_priv_data_end.3 \
 +xcb_xvmc_create_context_priv_data_length.3 \
 +xcb_xvmc_create_context_reply.3 \
 +xcb_xvmc_create_context_unchecked.3 \
 +xcb_xvmc_create_subpicture.3 \
 +xcb_xvmc_create_subpicture_priv_data.3 \
 +xcb_xvmc_create_subpicture_priv_data_end.3 \
 +xcb_xvmc_create_subpicture_priv_data_length.3 \
 +xcb_xvmc_create_subpicture_reply.3 \
 +xcb_xvmc_create_subpicture_unchecked.3 \
 +xcb_xvmc_create_surface.3 \
 +xcb_xvmc_create_surface_priv_data.3 \
 +xcb_xvmc_create_surface_priv_data_end.3 \
 +xcb_xvmc_create_surface_priv_data_length.3 \
 +xcb_xvmc_create_surface_reply.3 \
 +xcb_xvmc_create_surface_unchecked.3 \
 +xcb_xvmc_destroy_context.3 \
 +xcb_xvmc_destroy_context_checked.3 \
 +xcb_xvmc_destroy_subpicture.3 \
 +xcb_xvmc_destroy_subpicture_checked.3 \
 +xcb_xvmc_destroy_surface.3 \
 +xcb_xvmc_destroy_surface_checked.3 \
 +xcb_xvmc_list_subpicture_types.3 \
 +xcb_xvmc_list_subpicture_types_reply.3 \
 +xcb_xvmc_list_subpicture_types_types.3 \
 +xcb_xvmc_list_subpicture_types_types_iterator.3 \
 +xcb_xvmc_list_subpicture_types_types_length.3 \
 +xcb_xvmc_list_subpicture_types_unchecked.3 \
 +xcb_xvmc_list_surface_types.3 \
 +xcb_xvmc_list_surface_types_reply.3 \
 +xcb_xvmc_list_surface_types_surfaces.3 \
 +xcb_xvmc_list_surface_types_surfaces_iterator.3 \
 +xcb_xvmc_list_surface_types_surfaces_length.3 \
 +xcb_xvmc_list_surface_types_unchecked.3 \
 +xcb_xvmc_query_version.3 \
 +xcb_xvmc_query_version_reply.3 \
 +xcb_xvmc_query_version_unchecked.3 \
 
 Property changes on: x11/libxcb/manpages
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11/libxcb/pkg-plist
 ===================================================================
 --- x11/libxcb/pkg-plist	(revision 318748)
 +++ x11/libxcb/pkg-plist	(working copy)
 @@ -18,6 +18,7 @@
  include/xcb/xevie.h
  include/xcb/xf86dri.h
  include/xcb/xfixes.h
 +include/xcb/xkb.h
  include/xcb/xinerama.h
  include/xcb/xinput.h
  include/xcb/xprint.h
 Index: x11/libxkbfile/Makefile
 ===================================================================
 --- x11/libxkbfile/Makefile	(revision 318748)
 +++ x11/libxkbfile/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libxkbfile
 -# Date Created:			7 May 2004
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbfile
 -PORTVERSION=	1.0.7
 +PORTVERSION=	1.0.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/libxkbfile/distinfo
 ===================================================================
 --- x11/libxkbfile/distinfo	(revision 318748)
 +++ x11/libxkbfile/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
 +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
 Index: x11/libxkbui/Makefile
 ===================================================================
 --- x11/libxkbui/Makefile	(revision 318748)
 +++ x11/libxkbui/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:   libxkbui
 -# Date Created:			8 Feb 2006
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libxkbui
  PORTVERSION=	1.0.2
 Index: x11/listres/Makefile
 ===================================================================
 --- x11/listres/Makefile	(revision 318748)
 +++ x11/listres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List resources in widgets
  
  XORG_CAT=	app
 -USE_XORG=	xproto xt xmu xaw xorg-macros
 +USE_XORG=	xproto xt xmu xaw
  
  PLIST_FILES=	bin/listres
  
 Index: x11/luit/Makefile
 ===================================================================
 --- x11/luit/Makefile	(revision 318748)
 +++ x11/luit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	luit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	luit
  PORTVERSION=	1.1.0
 Index: x11/mkcomposecache/Makefile
 ===================================================================
 --- x11/mkcomposecache/Makefile	(revision 318748)
 +++ x11/mkcomposecache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	mkcomposecache
 -# Date Created:				30 Jan 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	mkcomposecache
  PORTVERSION=	1.2.1
 Index: x11/ooxcb/Makefile
 ===================================================================
 --- x11/ooxcb/Makefile	(revision 318748)
 +++ x11/ooxcb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection Makefile for:	ooxcb
 -# Date created:				26 June 2009
 -# Whom:					gahr
 -#
 +# Created by: gahr
  # $FreeBSD$
 -#
  
  PORTNAME=	ooxcb
  PORTVERSION=	1.1
 @@ -13,9 +9,8 @@
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Python binding to the X server using xcb
  
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 -
  USE_PYTHON=	yes
 +USE_XORG=	xcb
  USE_PYDISTUTILS=easy_install
  PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
  
 Index: x11/pixman/Makefile
 ===================================================================
 --- x11/pixman/Makefile	(revision 318748)
 +++ x11/pixman/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	pixman
 -PORTVERSION=	0.24.2
 +PORTVERSION=	0.28.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,7 +17,7 @@
  
  .include <bsd.port.options.mk>
  
 -.if !${PORT_OPTIONS:MSIMD}
 +.if ! {PORT_OPTIONS:MSIMD}
  CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
  . if ! ${MACHINE_CPU:Mmmx}
  CONFIGURE_ARGS+=	--disable-mmx
 Index: x11/pixman/distinfo
 ===================================================================
 --- x11/pixman/distinfo	(revision 318748)
 +++ x11/pixman/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
 Index: x11/printproto/Makefile
 ===================================================================
 --- x11/printproto/Makefile	(revision 318748)
 +++ x11/printproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	printproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	printproto
  PORTVERSION=	1.0.5
 Index: x11/randrproto/Makefile
 ===================================================================
 --- x11/randrproto/Makefile	(revision 318748)
 +++ x11/randrproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	randrproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	randrproto
 -PORTVERSION=	1.3.2
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/randrproto/distinfo
 ===================================================================
 --- x11/randrproto/distinfo	(revision 318748)
 +++ x11/randrproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
 Index: x11/recordproto/Makefile
 ===================================================================
 --- x11/recordproto/Makefile	(revision 318748)
 +++ x11/recordproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	recordproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	recordproto
 -PORTVERSION=	1.14.1
 +PORTVERSION=	1.14.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/recordproto/distinfo
 ===================================================================
 --- x11/recordproto/distinfo	(revision 318748)
 +++ x11/recordproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
 -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
 Index: x11/renderproto/Makefile
 ===================================================================
 --- x11/renderproto/Makefile	(revision 318748)
 +++ x11/renderproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	renderproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	renderproto
  PORTVERSION=	0.11.1
 Index: x11/resourceproto/Makefile
 ===================================================================
 --- x11/resourceproto/Makefile	(revision 318748)
 +++ x11/resourceproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	resourceproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	resourceproto
  PORTVERSION=	1.2.0
 Index: x11/rstart/Makefile
 ===================================================================
 --- x11/rstart/Makefile	(revision 318748)
 +++ x11/rstart/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Sample implementation of a Remote Start client
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  MAN1=		rstart.1 rstartd.1
  
 Index: x11/scripts/Makefile
 ===================================================================
 --- x11/scripts/Makefile	(revision 318748)
 +++ x11/scripts/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	scripts
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scripts
  PORTVERSION=	1.0.1
 Index: x11/scrnsaverproto/Makefile
 ===================================================================
 --- x11/scrnsaverproto/Makefile	(revision 318748)
 +++ x11/scrnsaverproto/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	scrnsaverproto
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	scrnsaverproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/scrnsaverproto/distinfo
 ===================================================================
 --- x11/scrnsaverproto/distinfo	(revision 318748)
 +++ x11/scrnsaverproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
 Index: x11/sessreg/Makefile
 ===================================================================
 --- x11/sessreg/Makefile	(revision 318748)
 +++ x11/sessreg/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Manage utmp/wtmp entries for non-init X clients
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/sessreg
  
 Index: x11/slim/Makefile
 ===================================================================
 --- x11/slim/Makefile	(revision 318748)
 +++ x11/slim/Makefile	(working copy)
 @@ -19,11 +19,10 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		ck-connector:${PORTSDIR}/sysutils/consolekit \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		cmake pkgconfig
 -USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
 +USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
  USE_RC_SUBR=	slim
  SUB_FILES=	pkg-message
  
 Index: x11/smproxy/Makefile
 ===================================================================
 --- x11/smproxy/Makefile	(revision 318748)
 +++ x11/smproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	smproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	smproxy
  PORTVERSION=	1.0.5
 Index: x11/trapproto/Makefile
 ===================================================================
 --- x11/trapproto/Makefile	(revision 318748)
 +++ x11/trapproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	trapproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	trapproto
  PORTVERSION=	3.4.3
 Index: x11/videoproto/Makefile
 ===================================================================
 --- x11/videoproto/Makefile	(revision 318748)
 +++ x11/videoproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	videoproto
 -# Date Created:				09 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	videoproto
  PORTVERSION=	2.3.1
 Index: x11/viewres/Makefile
 ===================================================================
 --- x11/viewres/Makefile	(revision 318748)
 +++ x11/viewres/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Graphical class browser for Xt
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		viewres.1
  
 Index: x11/x11perf/Makefile
 ===================================================================
 --- x11/x11perf/Makefile	(revision 318748)
 +++ x11/x11perf/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	x11perf
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	x11perf
  PORTVERSION=	1.5.4
 Index: x11/xbacklight/Makefile
 ===================================================================
 --- x11/xbacklight/Makefile	(revision 318748)
 +++ x11/xbacklight/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbacklight
 -# Date Created:				11 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbacklight
  PORTVERSION=	1.1.2
 Index: x11/xbiff/Makefile
 ===================================================================
 --- x11/xbiff/Makefile	(revision 318748)
 +++ x11/xbiff/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xbiff
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xbiff
  PORTVERSION=	1.0.3
 Index: x11/xbitmaps/Makefile
 ===================================================================
 --- x11/xbitmaps/Makefile	(revision 318748)
 +++ x11/xbitmaps/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xbitmaps
 -# Date Created:				17 Feb 2006
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xbitmaps
  PORTVERSION=	1.1.1
 Index: x11/xcb-proto/Makefile
 ===================================================================
 --- x11/xcb-proto/Makefile	(revision 318748)
 +++ x11/xcb-proto/Makefile	(working copy)
 @@ -1,25 +1,18 @@
 -# New ports collection makefile for:	xcb-proto
 -# Date Created:				2006-08-23
 -# Whom:					Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcb-proto
 -PORTVERSION=	1.7.1
 +PORTVERSION=	1.8
  CATEGORIES=	x11 python
 -MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
 -		http://distfiles.pirateparty.in/%SUBDIR%/ \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	ashish
 +MASTER_SITES=	http://xcb.freedesktop.org/dist/
  
 -MAINTAINER=	ashish@FreeBSD.org
 +MAINTAINER=	x11@FreeBSD.org
  COMMENT=	The X protocol C-language Binding (XCB) protocol
  
  BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
  
  USE_BZIP2=	yes
 -USES=	pathfix
 +USES=		pathfix
  USE_PYTHON=	2.5+
  GNU_CONFIGURE=	yes
  
 Index: x11/xcb-proto/distinfo
 ===================================================================
 --- x11/xcb-proto/distinfo	(revision 318748)
 +++ x11/xcb-proto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
 +SIZE (xcb-proto-1.8.tar.bz2) = 125072
 Index: x11/xcb-util/Makefile
 ===================================================================
 --- x11/xcb-util/Makefile	(revision 318748)
 +++ x11/xcb-util/Makefile	(working copy)
 @@ -11,12 +11,10 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A module with libxcb/libX11 extension/replacement libraries
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 -USE_XORG=	xau xdmcp
 +USE_XORG=	xau xcb xdmcp xorg-macros
  USE_AUTOTOOLS=	libtool
  
  GNU_CONFIGURE=	yes
 Index: x11/xcb-util-image/Makefile
 ===================================================================
 --- x11/xcb-util-image/Makefile	(revision 318748)
 +++ x11/xcb-util-image/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	A port of Xlib's XImage and XShmImage functions
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-keysyms/Makefile
 ===================================================================
 --- x11/xcb-util-keysyms/Makefile	(revision 318748)
 +++ x11/xcb-util-keysyms/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Standard X key constants and conversion to/from keycodes
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xcb-util-renderutil/Makefile
 ===================================================================
 --- x11/xcb-util-renderutil/Makefile	(revision 318748)
 +++ x11/xcb-util-renderutil/Makefile	(working copy)
 @@ -8,12 +8,12 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Convenience functions for the Render extension
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 +USE_XORG=	xcb xorg-macros
  USE_LDCONFIG=	yes
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
 Index: x11/xcb-util-wm/Makefile
 ===================================================================
 --- x11/xcb-util-wm/Makefile	(revision 318748)
 +++ x11/xcb-util-wm/Makefile	(working copy)
 @@ -8,13 +8,13 @@
  MAINTAINER=	garga@FreeBSD.org
  COMMENT=	Framework for window manager implementation
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util
 +LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
  #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	yes
 +USE_XORG=	xcb xorg-macros
  #USE_XORG=	xau xdmcp
  #USE_AUTOTOOLS=	libtool
  
 Index: x11/xclipboard/Makefile
 ===================================================================
 --- x11/xclipboard/Makefile	(revision 318748)
 +++ x11/xclipboard/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xclipboard.1 xcutsel.1
  
 Index: x11/xcmiscproto/Makefile
 ===================================================================
 --- x11/xcmiscproto/Makefile	(revision 318748)
 +++ x11/xcmiscproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xcmiscproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xcmiscproto
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xcmiscproto/distinfo
 ===================================================================
 --- x11/xcmiscproto/distinfo	(revision 318748)
 +++ x11/xcmiscproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
 +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
 Index: x11/xdbedizzy/Makefile
 ===================================================================
 --- x11/xdbedizzy/Makefile	(revision 318748)
 +++ x11/xdbedizzy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdbedizzy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdbedizzy
  PORTVERSION=	1.1.0
 Index: x11/xditview/Makefile
 ===================================================================
 --- x11/xditview/Makefile	(revision 318748)
 +++ x11/xditview/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xditview.1
  
 Index: x11/xdpyinfo/Makefile
 ===================================================================
 --- x11/xdpyinfo/Makefile	(revision 318748)
 +++ x11/xdpyinfo/Makefile	(working copy)
 @@ -10,8 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
 -USE_XORG=	dmx x11 xcomposite xext xinerama xorg-macros xproto xrender \
 +USE_XORG=	dmx x11 xcb xcomposite xext xinerama xproto xrender \
  		xtst xxf86dga xxf86misc xxf86vm
  
  PLIST_FILES=	bin/xdpyinfo
 Index: x11/xdriinfo/Makefile
 ===================================================================
 --- x11/xdriinfo/Makefile	(revision 318748)
 +++ x11/xdriinfo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xdriinfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xdriinfo
  PORTVERSION=	1.0.4
 Index: x11/xedit/Makefile
 ===================================================================
 --- x11/xedit/Makefile	(revision 318748)
 +++ x11/xedit/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Simple text editor for X
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw7 xorg-macros
 +USE_XORG=	xt xaw7
  
  MAN1=		xedit.1
  
 Index: x11/xextproto/Makefile
 ===================================================================
 --- x11/xextproto/Makefile	(revision 318748)
 +++ x11/xextproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xextproto
 -# Date Created:				07 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xextproto
 -PORTVERSION=	7.2.0
 +PORTVERSION=	7.2.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xextproto/distinfo
 ===================================================================
 --- x11/xextproto/distinfo	(revision 318748)
 +++ x11/xextproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
 +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
 Index: x11/xeyes/Makefile
 ===================================================================
 --- x11/xeyes/Makefile	(revision 318748)
 +++ x11/xeyes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xeyes
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xeyes
  PORTVERSION=	1.1.1
 Index: x11/xf86dga/Makefile
 ===================================================================
 --- x11/xf86dga/Makefile	(revision 318748)
 +++ x11/xf86dga/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86dga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dga
  PORTVERSION=	1.0.3
 Index: x11/xf86dgaproto/Makefile
 ===================================================================
 --- x11/xf86dgaproto/Makefile	(revision 318748)
 +++ x11/xf86dgaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86dgaproto
  PORTVERSION=	2.1
 Index: x11/xf86driproto/Makefile
 ===================================================================
 --- x11/xf86driproto/Makefile	(revision 318748)
 +++ x11/xf86driproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86driproto
  PORTVERSION=	2.1.1
 Index: x11/xf86miscproto/Makefile
 ===================================================================
 --- x11/xf86miscproto/Makefile	(revision 318748)
 +++ x11/xf86miscproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86miscproto
  PORTVERSION=	0.9.3
 Index: x11/xf86rushproto/Makefile
 ===================================================================
 --- x11/xf86rushproto/Makefile	(revision 318748)
 +++ x11/xf86rushproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86rushproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86rushproto
  PORTVERSION=	1.1.2
 Index: x11/xf86vidmodeproto/Makefile
 ===================================================================
 --- x11/xf86vidmodeproto/Makefile	(revision 318748)
 +++ x11/xf86vidmodeproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86vidmodeproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86vidmodeproto
  PORTVERSION=	2.3.1
 Index: x11/xfd/Makefile
 ===================================================================
 --- x11/xfd/Makefile	(revision 318748)
 +++ x11/xfd/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfd
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfd
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xfd/distinfo
 ===================================================================
 --- x11/xfd/distinfo	(revision 318748)
 +++ x11/xfd/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
 -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
 Index: x11/xfindproxy/Makefile
 ===================================================================
 --- x11/xfindproxy/Makefile	(revision 318748)
 +++ x11/xfindproxy/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfindproxy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfindproxy
  PORTVERSION=	1.0.2
 Index: x11/xfwp/Makefile
 ===================================================================
 --- x11/xfwp/Makefile	(revision 318748)
 +++ x11/xfwp/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xfwp
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfwp
  PORTVERSION=	1.0.2
 Index: x11/xineramaproto/Makefile
 ===================================================================
 --- x11/xineramaproto/Makefile	(revision 318748)
 +++ x11/xineramaproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xineramaproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xineramaproto
  PORTVERSION=	1.2.1
 Index: x11/xinit/Makefile
 ===================================================================
 --- x11/xinit/Makefile	(revision 318748)
 +++ x11/xinit/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xinit
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xinit
  PORTVERSION=	1.3.2
 Index: x11/xinput/Makefile
 ===================================================================
 --- x11/xinput/Makefile	(revision 318748)
 +++ x11/xinput/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xinput
 -# Date created:			05 July 2003
 -# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
 -#
 +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xinput
 -PORTVERSION=	1.5.4
 +PORTVERSION=	1.6.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Very useful utility for configuring and testing XInput devices
  
  XORG_CAT=	app
 -USE_XORG=	inputproto x11 xi xext
 +USE_XORG=	inputproto x11 xi xext xrandr xinerama
  
  PLIST_FILES=	bin/xinput
  
 Index: x11/xinput/distinfo
 ===================================================================
 --- x11/xinput/distinfo	(revision 318748)
 +++ x11/xinput/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
 Index: x11/xkbcomp/Makefile
 ===================================================================
 --- x11/xkbcomp/Makefile	(revision 318748)
 +++ x11/xkbcomp/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xkbfile xorg-macros
 +USE_XORG=	x11 xkbfile
  USES=		pathfix
  
  PLIST_FILES=	bin/xkbcomp \
 Index: x11/xkbprint/Makefile
 ===================================================================
 --- x11/xkbprint/Makefile	(revision 318748)
 +++ x11/xkbprint/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkbprint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkbprint
  PORTVERSION=	1.0.3
 Index: x11/xkbutils/Makefile
 ===================================================================
 --- x11/xkbutils/Makefile	(revision 318748)
 +++ x11/xkbutils/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 +USE_XORG=	xkbfile x11 xaw inputproto
  
  MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
  
 Index: x11/xkeyboard-config/Makefile
 ===================================================================
 --- x11/xkeyboard-config/Makefile	(revision 318748)
 +++ x11/xkeyboard-config/Makefile	(working copy)
 @@ -1,12 +1,12 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xkeyboard-config
 -PORTVERSION=	2.5.1
 +PORTVERSION=	2.8
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X Keyboard Configuration Database
 +MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
  
  LICENSE=	MIT
  
 @@ -14,12 +14,14 @@
  		xsltproc:${PORTSDIR}/textproc/libxslt
  XORG_CAT=	data
  
 -USES=		pathfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GNOME=	intlhack
 +USES=		pathfix
  USE_PERL5_BUILD=yes
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=yes
 +
  CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
  		--with-xkb-rules-symlink=xorg
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -33,10 +35,7 @@
  USES+=		gettext iconv
  PLIST_SUB+=	NLS=""
  .else
 -CONFIGURE_ARGS+=	--disable-nls
 -CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 -		XGETTEXT="/bin/echo '(GNU '" \
 -		MSGMERGE="/bin/echo '(GNU '"
 +CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 Index: x11/xkeyboard-config/distinfo
 ===================================================================
 --- x11/xkeyboard-config/distinfo	(revision 318748)
 +++ x11/xkeyboard-config/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
 +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
 Index: x11/xkeyboard-config/pkg-plist
 ===================================================================
 --- x11/xkeyboard-config/pkg-plist	(revision 318748)
 +++ x11/xkeyboard-config/pkg-plist	(working copy)
 @@ -1,28 +1,23 @@
  libdata/pkgconfig/xkeyboard-config.pc
 -share/X11/xkb/compat.dir
  share/X11/xkb/compat/README
  share/X11/xkb/compat/accessx
  share/X11/xkb/compat/basic
  share/X11/xkb/compat/caps
  share/X11/xkb/compat/complete
 -share/X11/xkb/compat/default
  share/X11/xkb/compat/iso9995
  share/X11/xkb/compat/japan
 -share/X11/xkb/compat/keypad
  share/X11/xkb/compat/ledcaps
  share/X11/xkb/compat/lednum
  share/X11/xkb/compat/ledscroll
  share/X11/xkb/compat/level5
  share/X11/xkb/compat/misc
  share/X11/xkb/compat/mousekeys
 -share/X11/xkb/compat/norepeat
  share/X11/xkb/compat/olpc
  share/X11/xkb/compat/pc
  share/X11/xkb/compat/pc98
  share/X11/xkb/compat/xfree86
  share/X11/xkb/compat/xtest
  share/X11/xkb/compiled
 -share/X11/xkb/geometry.dir
  share/X11/xkb/geometry/README
  share/X11/xkb/geometry/amiga
  share/X11/xkb/geometry/ataritt
 @@ -52,7 +47,6 @@
  share/X11/xkb/geometry/thinkpad
  share/X11/xkb/geometry/typematrix
  share/X11/xkb/geometry/winbook
 -share/X11/xkb/keycodes.dir
  share/X11/xkb/keycodes/README
  share/X11/xkb/keycodes/aliases
  share/X11/xkb/keycodes/amiga
 @@ -72,49 +66,6 @@
  share/X11/xkb/keycodes/sun
  share/X11/xkb/keycodes/xfree86
  share/X11/xkb/keycodes/xfree98
 -share/X11/xkb/keymap.dir
 -share/X11/xkb/keymap/README
 -share/X11/xkb/keymap/amiga
 -share/X11/xkb/keymap/ataritt
 -share/X11/xkb/keymap/digital_vndr/us
 -share/X11/xkb/keymap/macintosh
 -share/X11/xkb/keymap/sgi_vndr/be
 -share/X11/xkb/keymap/sgi_vndr/bg
 -share/X11/xkb/keymap/sgi_vndr/ca
 -share/X11/xkb/keymap/sgi_vndr/ch
 -share/X11/xkb/keymap/sgi_vndr/cz
 -share/X11/xkb/keymap/sgi_vndr/de
 -share/X11/xkb/keymap/sgi_vndr/dk
 -share/X11/xkb/keymap/sgi_vndr/dvorak
 -share/X11/xkb/keymap/sgi_vndr/es
 -share/X11/xkb/keymap/sgi_vndr/fi
 -share/X11/xkb/keymap/sgi_vndr/fr
 -share/X11/xkb/keymap/sgi_vndr/gb
 -share/X11/xkb/keymap/sgi_vndr/hu
 -share/X11/xkb/keymap/sgi_vndr/it
 -share/X11/xkb/keymap/sgi_vndr/jp
 -share/X11/xkb/keymap/sgi_vndr/no
 -share/X11/xkb/keymap/sgi_vndr/pl
 -share/X11/xkb/keymap/sgi_vndr/pt
 -share/X11/xkb/keymap/sgi_vndr/ru
 -share/X11/xkb/keymap/sgi_vndr/se
 -share/X11/xkb/keymap/sgi_vndr/sk
 -share/X11/xkb/keymap/sgi_vndr/th
 -share/X11/xkb/keymap/sgi_vndr/us
 -share/X11/xkb/keymap/sony
 -share/X11/xkb/keymap/sun_vndr/all
 -share/X11/xkb/keymap/sun_vndr/de
 -share/X11/xkb/keymap/sun_vndr/es
 -share/X11/xkb/keymap/sun_vndr/fi
 -share/X11/xkb/keymap/sun_vndr/fr
 -share/X11/xkb/keymap/sun_vndr/no
 -share/X11/xkb/keymap/sun_vndr/pl
 -share/X11/xkb/keymap/sun_vndr/ru
 -share/X11/xkb/keymap/sun_vndr/se
 -share/X11/xkb/keymap/sun_vndr/uk
 -share/X11/xkb/keymap/sun_vndr/us
 -share/X11/xkb/keymap/xfree86
 -share/X11/xkb/keymap/xfree98
  share/X11/xkb/rules/README
  share/X11/xkb/rules/base
  share/X11/xkb/rules/base.extras.xml
 @@ -129,13 +80,6 @@
  share/X11/xkb/rules/xorg
  share/X11/xkb/rules/xorg.lst
  share/X11/xkb/rules/xorg.xml
 -share/X11/xkb/semantics.dir
 -share/X11/xkb/semantics/basic
 -share/X11/xkb/semantics/complete
 -share/X11/xkb/semantics/default
 -share/X11/xkb/semantics/xtest
 -share/X11/xkb/symbols.dir
 -share/X11/xkb/symbols/ad
  share/X11/xkb/symbols/af
  share/X11/xkb/symbols/al
  share/X11/xkb/symbols/altwin
 @@ -230,6 +174,7 @@
  share/X11/xkb/symbols/macintosh_vndr/se
  share/X11/xkb/symbols/macintosh_vndr/us
  share/X11/xkb/symbols/mao
 +share/X11/xkb/symbols/md
  share/X11/xkb/symbols/me
  share/X11/xkb/symbols/mk
  share/X11/xkb/symbols/ml
 @@ -258,6 +203,11 @@
  share/X11/xkb/symbols/rupeesign
  share/X11/xkb/symbols/se
  share/X11/xkb/symbols/sgi_vndr/jp
 +share/X11/xkb/symbols/sharp_vndr/sl-c3x00
 +share/X11/xkb/symbols/sharp_vndr/ws003sh
 +share/X11/xkb/symbols/sharp_vndr/ws007sh
 +share/X11/xkb/symbols/sharp_vndr/ws011sh
 +share/X11/xkb/symbols/sharp_vndr/ws020sh
  share/X11/xkb/symbols/shift
  share/X11/xkb/symbols/si
  share/X11/xkb/symbols/sk
 @@ -293,7 +243,6 @@
  share/X11/xkb/symbols/sun_vndr/sk
  share/X11/xkb/symbols/sun_vndr/solaris
  share/X11/xkb/symbols/sun_vndr/tr
 -share/X11/xkb/symbols/sun_vndr/tuv
  share/X11/xkb/symbols/sun_vndr/tw
  share/X11/xkb/symbols/sun_vndr/ua
  share/X11/xkb/symbols/sun_vndr/us
 @@ -313,7 +262,6 @@
  share/X11/xkb/symbols/xfree68_vndr/amiga
  share/X11/xkb/symbols/xfree68_vndr/ataritt
  share/X11/xkb/symbols/za
 -share/X11/xkb/types.dir
  share/X11/xkb/types/README
  share/X11/xkb/types/basic
  share/X11/xkb/types/cancel
 @@ -343,6 +291,7 @@
  %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 @@ -366,17 +315,18 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 -@dirrmtry share/locale/rw/LC_MESSAGES
 -@dirrmtry share/locale/rw
 -@dirrmtry share/locale/ky/LC_MESSAGES
 -@dirrmtry share/locale/ky
 -@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/rw
 +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ky
 +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/crh
  @exec mkdir -p /var/lib/xkb
 -@dirrmtry share/locale/crh
  @dirrm share/X11/xkb/types
  @dirrm share/X11/xkb/symbols/xfree68_vndr
  @dirrm share/X11/xkb/symbols/sun_vndr
  @dirrm share/X11/xkb/symbols/sony_vndr
 +@dirrm share/X11/xkb/symbols/sharp_vndr
  @dirrm share/X11/xkb/symbols/sgi_vndr
  @dirrm share/X11/xkb/symbols/nokia_vndr
  @dirrm share/X11/xkb/symbols/nec_vndr
 @@ -385,12 +335,7 @@
  @dirrm share/X11/xkb/symbols/fujitsu_vndr
  @dirrm share/X11/xkb/symbols/digital_vndr
  @dirrm share/X11/xkb/symbols
 -@dirrm share/X11/xkb/semantics
  @dirrm share/X11/xkb/rules
 -@dirrm share/X11/xkb/keymap/sun_vndr
 -@dirrm share/X11/xkb/keymap/sgi_vndr
 -@dirrm share/X11/xkb/keymap/digital_vndr
 -@dirrm share/X11/xkb/keymap
  @dirrm share/X11/xkb/keycodes/sgi_vndr
  @dirrm share/X11/xkb/keycodes/digital_vndr
  @dirrm share/X11/xkb/keycodes
 Index: x11/xkill/Makefile
 ===================================================================
 --- x11/xkill/Makefile	(revision 318748)
 +++ x11/xkill/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xkill
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xkill
  PORTVERSION=	1.0.3
 Index: x11/xload/Makefile
 ===================================================================
 --- x11/xload/Makefile	(revision 318748)
 +++ x11/xload/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xload.1
  
 Index: x11/xlogo/Makefile
 ===================================================================
 --- x11/xlogo/Makefile	(revision 318748)
 +++ x11/xlogo/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 +USE_XORG=	xrender xft xext xt xaw xp xprintutil
  
  MAN1=		xlogo.1
  
 Index: x11/xlsclients/Makefile
 ===================================================================
 --- x11/xlsclients/Makefile	(revision 318748)
 +++ x11/xlsclients/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xlsclients
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xlsclients
  PORTVERSION=	1.1.2
 Index: x11/xmag/Makefile
 ===================================================================
 --- x11/xmag/Makefile	(revision 318748)
 +++ x11/xmag/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xmag.1
  
 Index: x11/xman/Makefile
 ===================================================================
 --- x11/xman/Makefile	(revision 318748)
 +++ x11/xman/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xman
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xman
  PORTVERSION=	1.1.2
 Index: x11/xmh/Makefile
 ===================================================================
 --- x11/xmh/Makefile	(revision 318748)
 +++ x11/xmh/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmh
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmh
  PORTVERSION=	1.0.2
 Index: x11/xmore/Makefile
 ===================================================================
 --- x11/xmore/Makefile	(revision 318748)
 +++ x11/xmore/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xmore
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xmore
  PORTVERSION=	1.0.2
 Index: x11/xnee/Makefile
 ===================================================================
 --- x11/xnee/Makefile	(revision 318748)
 +++ x11/xnee/Makefile	(working copy)
 @@ -10,14 +10,13 @@
  MAINTAINER=	pawel@FreeBSD.org
  COMMENT=	X events recorder and player
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  LICENSE=	GPLv3
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -USE_XORG=	x11 xau xdmcp xext xi xtst
 +USE_XORG=	x11 xau xcb xdmcp xext xi xtst
  USE_GNOME=	gnomehack
  MAKE_JOBS_SAFE=	yes
  
 Index: x11/xorg/Makefile
 ===================================================================
 --- x11/xorg/Makefile	(revision 318748)
 +++ x11/xorg/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg
 -# Date created:		18 Jun 2004
 -# Whom:			anholt
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -23,8 +19,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
  		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
  
 +.include <bsd.port.options.mk>
 +
  # doc
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
  .endif
  
 @@ -57,8 +55,4 @@
  .endif
  .endif
  
 -.if ${ARCH} != "alpha"
 -RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 -.endif
 -
  .include <bsd.port.post.mk>
 Index: x11/xorg-apps/Makefile
 ===================================================================
 --- x11/xorg-apps/Makefile	(revision 318748)
 +++ x11/xorg-apps/Makefile	(working copy)
 @@ -1,8 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-apps
 -PORTVERSION=	7.5.2
 -PORTREVISION=	1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xorg-cf-files/Makefile
 ===================================================================
 --- x11/xorg-cf-files/Makefile	(revision 318748)
 +++ x11/xorg-cf-files/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xorg-cf-files
 -# Date created:				Nov 18 2006
 -# Whom:					Dave Grochowski
 -#
 +# Created by: Dave Grochowski
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-cf-files
  PORTVERSION=	1.0.4
 Index: x11/xorg-docs/Makefile
 ===================================================================
 --- x11/xorg-docs/Makefile	(revision 318748)
 +++ x11/xorg-docs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xorg-docs
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-docs
 -PORTVERSION=	1.6
 +PORTVERSION=	1.7
  PORTEPOCH=	1
  CATEGORIES=	x11
  
 Index: x11/xorg-docs/distinfo
 ===================================================================
 --- x11/xorg-docs/distinfo	(revision 318748)
 +++ x11/xorg-docs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
 Index: x11/xorg-libraries/Makefile
 ===================================================================
 --- x11/xorg-libraries/Makefile	(revision 318748)
 +++ x11/xorg-libraries/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-libraries
 -# Date created:		29 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-libraries
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11/xplsprinters/Makefile
 ===================================================================
 --- x11/xplsprinters/Makefile	(revision 318748)
 +++ x11/xplsprinters/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xplsprinters
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xplsprinters
  PORTVERSION=	1.0.1
 Index: x11/xprehashprinterlist/Makefile
 ===================================================================
 --- x11/xprehashprinterlist/Makefile	(revision 318748)
 +++ x11/xprehashprinterlist/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprehashprinterlist
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprehashprinterlist
  PORTVERSION=	1.0.1
 Index: x11/xprop/Makefile
 ===================================================================
 --- x11/xprop/Makefile	(revision 318748)
 +++ x11/xprop/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xprop
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xprop
  PORTVERSION=	1.2.1
 Index: x11/xproto/Makefile
 ===================================================================
 --- x11/xproto/Makefile	(revision 318748)
 +++ x11/xproto/Makefile	(working copy)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:   xproto
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xproto
 -PORTVERSION=	7.0.22
 +PORTVERSION=	7.0.24
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X11 protocol headers
  
  XORG_CAT=	proto
 -USE_GNOME=	pkgconfig
  
 -CONFIGURE_ARGS+=--disable-specs
 +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
  
  .include <bsd.port.mk>
 Index: x11/xproto/distinfo
 ===================================================================
 --- x11/xproto/distinfo	(revision 318748)
 +++ x11/xproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
 +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
 Index: x11/xproxymanagementprotocol/Makefile
 ===================================================================
 --- x11/xproxymanagementprotocol/Makefile	(revision 318748)
 +++ x11/xproxymanagementprotocol/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:   xproxymanagementprotocol
 -# Date Created:			Jun 21 2006
 -# Whom:				Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xproxymanagementprotocol
  PORTVERSION=	1.0.3
 Index: x11/xpyb/Makefile
 ===================================================================
 --- x11/xpyb/Makefile	(revision 318748)
 +++ x11/xpyb/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xpyb
 -# Date created:		2008-08-27
 -# Whom:			Ashish Shukla <wahjava@gmail.com>
 -#
 +# Created by: Ashish Shukla <wahjava@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xpyb
  PORTVERSION=	1.3.1
 @@ -17,10 +13,10 @@
  
  BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
  		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
 -LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
  
  USE_BZIP2=	yes
  USE_PYTHON=	2.5+
 +USE_XORG=	xcb
  USES=	pathfix
  PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
  
 Index: x11/xrandr/Makefile
 ===================================================================
 --- x11/xrandr/Makefile	(revision 318748)
 +++ x11/xrandr/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xrandr
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrandr
 -PORTVERSION=	1.3.5
 +PORTVERSION=	1.4.0
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xrandr/distinfo
 ===================================================================
 --- x11/xrandr/distinfo	(revision 318748)
 +++ x11/xrandr/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
 -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
 Index: x11/xrdb/Makefile
 ===================================================================
 --- x11/xrdb/Makefile	(revision 318748)
 +++ x11/xrdb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrdb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdb
  PORTVERSION=	1.0.9
 Index: x11/xrefresh/Makefile
 ===================================================================
 --- x11/xrefresh/Makefile	(revision 318748)
 +++ x11/xrefresh/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xrefresh
  
 Index: x11/xrx/Makefile
 ===================================================================
 --- x11/xrx/Makefile	(revision 318748)
 +++ x11/xrx/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xrx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xrx
  PORTVERSION=	1.0.4
 Index: x11/xset/Makefile
 ===================================================================
 --- x11/xset/Makefile	(revision 318748)
 +++ x11/xset/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xset
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xset
  PORTVERSION=	1.2.2
 Index: x11/xsetmode/Makefile
 ===================================================================
 --- x11/xsetmode/Makefile	(revision 318748)
 +++ x11/xsetmode/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetmode
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetmode
  PORTVERSION=	1.0.0
 Index: x11/xsetpointer/Makefile
 ===================================================================
 --- x11/xsetpointer/Makefile	(revision 318748)
 +++ x11/xsetpointer/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xsetpointer
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xsetpointer
  PORTVERSION=	1.0.1
 Index: x11/xsm/Makefile
 ===================================================================
 --- x11/xsm/Makefile	(revision 318748)
 +++ x11/xsm/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X Session Manager
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xsm.1
  
 Index: x11/xstdcmap/Makefile
 ===================================================================
 --- x11/xstdcmap/Makefile	(revision 318748)
 +++ x11/xstdcmap/Makefile	(working copy)
 @@ -10,7 +10,7 @@
  LICENSE=	MIT
  
  XORG_CAT=	app
 -USE_XORG=	xmu x11 xorg-macros
 +USE_XORG=	xmu x11
  
  PLIST_FILES=	bin/xstdcmap
  
 Index: x11/xtrans/Makefile
 ===================================================================
 --- x11/xtrans/Makefile	(revision 318748)
 +++ x11/xtrans/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xtrans
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrans
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.7
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xtrans/distinfo
 ===================================================================
 --- x11/xtrans/distinfo	(revision 318748)
 +++ x11/xtrans/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
 Index: x11/xtrans/pkg-plist
 ===================================================================
 --- x11/xtrans/pkg-plist	(revision 318748)
 +++ x11/xtrans/pkg-plist	(working copy)
 @@ -8,5 +8,4 @@
  include/X11/Xtrans/transport.c
  libdata/pkgconfig/xtrans.pc
  share/aclocal/xtrans.m4
 -@dirrmtry %%DOCSDIR%%
  @dirrm include/X11/Xtrans
 Index: x11/xtrap/Makefile
 ===================================================================
 --- x11/xtrap/Makefile	(revision 318748)
 +++ x11/xtrap/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xtrap
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xtrap
  PORTVERSION=	1.0.2
 Index: x11/xvidtune/Makefile
 ===================================================================
 --- x11/xvidtune/Makefile	(revision 318748)
 +++ x11/xvidtune/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xvidtune
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xvidtune
 -PORTVERSION=	1.0.2
 +PORTVERSION=	1.0.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11/xvidtune/distinfo
 ===================================================================
 --- x11/xvidtune/distinfo	(revision 318748)
 +++ x11/xvidtune/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
 Index: x11/xvinfo/Makefile
 ===================================================================
 --- x11/xvinfo/Makefile	(revision 318748)
 +++ x11/xvinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Print out X-Video extension adaptor information
  
  XORG_CAT=	app
 -USE_XORG=	xv x11 xorg-macros
 +USE_XORG=	xv x11
  
  PLIST_FILES=	bin/xvinfo
  
 Index: x11/xvmcinfo/Makefile
 ===================================================================
 --- x11/xvmcinfo/Makefile	(revision 318748)
 +++ x11/xvmcinfo/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xvmcinfo
 -# Date Created:				6 Dec 2008
 -# Whom:					bms
 -#
 +# Created by: Bruce M Simpson <bms@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xvmcinfo
  PORTVERSION=	0.1
 Index: x11/xwininfo/Makefile
 ===================================================================
 --- x11/xwininfo/Makefile	(revision 318748)
 +++ x11/xwininfo/Makefile	(working copy)
 @@ -1,19 +1,15 @@
 -# New ports collection makefile for:	xwininfo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xwininfo
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	x11
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Window information utility for X
  
  XORG_CAT=	app
 -USE_XORG=	xmuu xext x11
 +USES=		iconv
 +USE_XORG=	x11 xcb xproto xorg-macros
  
  PLIST_FILES=	bin/xwininfo
  
 Index: x11/xwininfo/distinfo
 ===================================================================
 --- x11/xwininfo/distinfo	(revision 318748)
 +++ x11/xwininfo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xwininfo-1.1.2.tar.bz2) = 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a
 -SIZE (xorg/app/xwininfo-1.1.2.tar.bz2) = 135415
 +SHA256 (xorg/app/xwininfo-1.1.3.tar.bz2) = 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8
 +SIZE (xorg/app/xwininfo-1.1.3.tar.bz2) = 157512
 Index: x11-clocks/oclock/Makefile
 ===================================================================
 --- x11-clocks/oclock/Makefile	(revision 318748)
 +++ x11-clocks/oclock/Makefile	(working copy)
 @@ -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
 Index: x11-clocks/xclock/Makefile
 ===================================================================
 --- x11-clocks/xclock/Makefile	(revision 318748)
 +++ x11-clocks/xclock/Makefile	(working copy)
 @@ -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
 Index: x11-drivers/xf86-input-acecad/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-acecad/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org acecad input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		acecad.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-egalax/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-egalax/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
 @@ -25,7 +25,7 @@
  .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>
 Index: x11-drivers/xf86-input-elographics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-elographics/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
 @@ -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 @@
  COMMENT=	X.Org elographics input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		elographics.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-fpit/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
 +++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
 @@ -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>
 
 Property changes on: x11-drivers/xf86-input-fpit/Makefile
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-fpit/distinfo	(revision 0)
 +++ x11-drivers/xf86-input-fpit/distinfo	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/distinfo
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-descr
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-descr	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-descr	(working copy)
 @@ -0,0 +1,3 @@
 +This package contains the X.Org xf86-input-fpit driver.
 +
 +WWW: http://www.x.org
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-descr
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-fpit/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-fpit/pkg-plist	(revision 0)
 +++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
 @@ -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
 
 Property changes on: x11-drivers/xf86-input-fpit/pkg-plist
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-hyperpen/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-hyperpen/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-hyperpen
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-hyperpen
  PORTVERSION=	${HYPERVER}
 @@ -14,13 +9,10 @@
  COMMENT=	X.Org hyperpen input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .if defined(WITH_NEW_XORG)
  HYPERVER=	1.4.1
  HYPERREVISION=	0
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 -
  .else
  HYPERVER=	1.3.0
  HYPERREVISION=	6
 Index: x11-drivers/xf86-input-joystick/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-joystick/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-joystick
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-joystick
  PORTVERSION=	${JOYVER}
 @@ -14,11 +9,10 @@
  COMMENT=	X.Org joystick input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		joystick.4x
  
  .if defined(WITH_NEW_XORG)
 -JOYVER=		1.6.0
 +JOYVER=		1.6.2
  JOYREVISION=	0
  .else
  JOYVER=		1.5.0
 Index: x11-drivers/xf86-input-joystick/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-joystick/distinfo	(revision 318748)
 +++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
  SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
 Index: x11-drivers/xf86-input-keyboard/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
 @@ -1,19 +1,14 @@
 -# New ports collection makefile for:	xf86-input-keyboard
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-keyboard
 -PORTVERSION=	1.6.1
 +PORTVERSION=	1.7.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org keyboard input driver
  
  XORG_CAT=	driver
 -USE_XORG=	kbproto xextproto videoproto
 +USE_XORG=	kbproto
  MAN4=		kbd.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-keyboard/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-keyboard/distinfo	(revision 318748)
 +++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
 +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
 Index: x11-drivers/xf86-input-magictouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-magictouch/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-magictouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-magictouch
  PORTVERSION=	1.0.0.5
 Index: x11-drivers/xf86-input-mouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mouse/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
 @@ -1,18 +1,14 @@
 -# Created by: Florent Thoumie <flz@FreeBSD.org>
  # $FreeBSD$
  
  PORTNAME=	xf86-input-mouse
 -PORTVERSION=	1.7.1
 -PORTREVISION=	1
 +PORTVERSION=	1.9.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org mouse input driver
  
 -CONFIGURE_ARGS+=--disable-silent-rules
 -
  XORG_CAT=	driver
 -USE_XORG=       xextproto videoproto
 +USES=		pathfix
  MAN4=		mousedrv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-mouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-mouse/distinfo	(revision 318748)
 +++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
 Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 318748)
 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working copy)
 @@ -1,64 +1,57 @@
 ---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
 -+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
 -@@ -1,4 +1,3 @@
 --
 - /*
 -  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
 -  *
 -@@ -71,15 +70,20 @@
 +--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
 +@@ -71,15 +71,20 @@
   static const char *FindDevice(InputInfoPtr, const char *, int);
   
   #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
 ++#if !defined(XPS2_SUPPORT)
  +#define XPS2_SUPPORT
  +#endif
   /* These are for FreeBSD and DragonFly */
 - #define DEFAULT_MOUSE_DEV		"/dev/mouse"
 - #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
 - #define DEFAULT_PS2_DEV			"/dev/psm0"
 -+#define DEFAULT_USB_DEV			"/dev/ums0"
 + #define DEFAULT_MOUSE_DEV               "/dev/mouse"
 + #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
 + #define DEFAULT_PS2_DEV                 "/dev/psm0"
 ++#define DEFAULT_USB_DEV                 "/dev/ums0"
   
   static const char *mouseDevs[] = {
 - 	DEFAULT_MOUSE_DEV,
 - 	DEFAULT_SYSMOUSE_DEV,
 - 	DEFAULT_PS2_DEV,
 -+	DEFAULT_USB_DEV,
 - 	NULL
 +         DEFAULT_MOUSE_DEV,
 +         DEFAULT_SYSMOUSE_DEV,
 +         DEFAULT_PS2_DEV,
 ++        DEFAULT_USB_DEV,
 +         NULL
   };
   #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
 -@@ -100,7 +104,11 @@
 +@@ -100,7 +105,11 @@
   #if defined(__NetBSD__)
       return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
   #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
  +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
  +#ifdef XPS2_SUPPORT
 -+	MSE_XPS2 |
 ++        MSE_XPS2 |
  +#endif
 -+	MSE_AUTO | MSE_MISC;
 ++        MSE_AUTO | MSE_MISC;
   #else
 -     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
 +     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
   #endif
 -@@ -179,10 +187,31 @@
 - 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
 - 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
 +@@ -180,9 +189,30 @@
 +         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
   };
 --	
 -+
 + 
  +#ifdef XPS2_SUPPORT
  +static struct {
 -+	int dmodel;
 -+	char *name;
 ++        int dmodel;
 ++        char *name;
  +} ps2proto[] = {
 -+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
 -+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
 -+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
 -+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
 -+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
 -+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
 -+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
 -+	{ MOUSE_MODEL_4D,		"IMPS/2" },
 -+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
 ++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
 ++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
 ++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
 ++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
 ++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
 ++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
 ++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
 ++        { MOUSE_MODEL_4D,               "IMPS/2" },
 ++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
  +};
  +#endif
  +
 @@ -72,56 +65,52 @@
       int i;
       mousehw_t hw;
       mousemode_t mode;
 -@@ -190,10 +219,16 @@
 +@@ -190,7 +220,13 @@
       if (pInfo->fd == -1)
 - 	return NULL;
 +         return NULL;
   
  +#ifdef XPS2_SUPPORT
       /* set the driver operation level, if applicable */
  +    dev = xf86FindOptionValue(pInfo->options, "Device");
  +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
 -+	i = 2;
 ++        i = 2;
  +    else
  +#endif
       i = 1;
       ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 --    
 -+
 -     /* interrogate the driver and get some intelligence on the device. */
 -     hw.iftype = MOUSE_IF_UNKNOWN;
 -     hw.model = MOUSE_MODEL_GENERIC;
 -@@ -209,9 +244,18 @@
 - 		    protoPara[0] = mode.syncmask[0];
 - 		    protoPara[1] = mode.syncmask[1];
 - 		}
 -+		proto = devproto[i].name;
 + 
 +@@ -209,9 +245,18 @@
 +                     protoPara[0] = mode.syncmask[0];
 +                     protoPara[1] = mode.syncmask[1];
 +                 }
 ++                proto = devproto[i].name;
  +#ifdef XPS2_SUPPORT
 -+		if (mode.protocol == MOUSE_PROTO_PS2)
 -+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 -+			if (hw.model == ps2proto[i].dmodel) {
 -+			    proto = ps2proto[i].name;
 -+			    break;
 -+			}
 ++                if (mode.protocol == MOUSE_PROTO_PS2)
 ++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
 ++                        if (hw.model == ps2proto[i].dmodel) {
 ++                           proto = ps2proto[i].name;
 ++                           break;
 ++                }
  +#endif
 - 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 --			    pInfo->name, devproto[i].name);
 --		return devproto[i].name;
 -+			    pInfo->name, proto);
 -+		return proto;
 - 	    }
 - 	}
 +                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
 +-                            pInfo->name, devproto[i].name);
 +-                return devproto[i].name;
 ++                            pInfo->name, proto);
 ++                return proto;
 +             }
 +         }
       }
 -@@ -234,41 +278,41 @@
 - 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 - 	/*
 - 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
 --	 * everytime it is opened we enforce protocol level 1 again at
 -+	 * everytime it is closed we enforce protocol level 1 again at
 - 	 * this point.
 - 	 */
 - 	mode.level = 1;
 +@@ -234,41 +279,41 @@
 +         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 +         /*
 +          * As the FreeBSD sysmouse driver defaults to protocol level 0
 +-         * everytime it is opened we enforce protocol level 1 again at
 ++         * everytime it is closed we enforce protocol level 1 again at
 +          * this point.
 +          */
 +         mode.level = 1;
       } else
 --	mode.level = -1;
 +-        mode.level = -1;
  -#else
  -    mode.level = -1;
   #endif
 @@ -151,26 +140,26 @@
  +    unsigned int i;
   
  -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
 --	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 --	    if (kill(pid, 0) == 0) {
 --		fclose(f);
 --		return TRUE;
 --	    }
 +-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
 +-            if (kill(pid, 0) == 0) {
 +-                fclose(f);
 +-                return TRUE;
 +-            }
  +    if (dev)
 -+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 ++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
  +    else
 -+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 ++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
  +    if ((f = popen(cmd, "r")) != NULL) {
 -+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
 -+	    pclose(f);
 -+	    return TRUE;
 - 	}
 --	fclose(f);
 -+	pclose(f);
 ++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
 ++            pclose(f);
 ++            return TRUE;
 +         }
 +-        fclose(f);
 ++        pclose(f);
       }
       return FALSE;
   }
 -@@ -276,17 +320,17 @@
 +@@ -276,17 +321,17 @@
   static const char *
   FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
   {
 @@ -182,63 +171,63 @@
       struct stat sb;
   
       for (pdev = mouseDevs; *pdev; pdev++) {
 --	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 --	if (fd == -1) {
 -+	SYSCALL (ret = stat(*pdev, &sb));
 -+	if (ret == -1) {
 +-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
 +-        if (fd == -1) {
 ++        SYSCALL (ret = stat(*pdev, &sb));
 ++        if (ret == -1) {
   #ifdef DEBUG
 --	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 -+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
 +-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
 ++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
   #endif
 - 	} else {
 - 	    /*
 -@@ -295,28 +339,32 @@
 - 	     * the test for whether /dev/sysmouse is usable can be made.
 - 	     */
 - 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 --		if (fstat(fd, &devMouseStat) == 0)
 --		    devMouse = TRUE;
 --		close(fd);
 -+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 -+		devMouse = TRUE;
 - 		continue;
 - 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 - 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
 --		if (devMouse && fstat(fd, &sb) == 0 && 
 --		    devMouseStat.st_dev == sb.st_dev &&
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 - 		    devMouseStat.st_ino == sb.st_ino) {
 - 		    /* If the same, use /dev/sysmouse. */
 - 		    devMouse = FALSE;
 - 		}
 --		close(fd);
 --		if (MousedRunning())
 -+		if (MousedRunning(NULL))
 - 		    break;
 --		else {
 +         } else {
 +             /*
 +@@ -295,28 +340,32 @@
 +              * the test for whether /dev/sysmouse is usable can be made.
 +              */
 +             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
 +-                if (fstat(fd, &devMouseStat) == 0)
 +-                    devMouse = TRUE;
 +-                close(fd);
 ++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
 ++                devMouse = TRUE;
 +                 continue;
 +             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
 +                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
 +-                if (devMouse && fstat(fd, &sb) == 0 &&
 +-                    devMouseStat.st_dev == sb.st_dev &&
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 +                     devMouseStat.st_ino == sb.st_ino) {
 +                     /* If the same, use /dev/sysmouse. */
 +                     devMouse = FALSE;
 +                 }
 +-                close(fd);
 +-                if (MousedRunning())
 ++                if (MousedRunning(NULL))
 +                     break;
 +-                else {
  -#ifdef DEBUG
 --	    	    ErrorF("moused isn't running\n");
 +-                    ErrorF("moused isn't running\n");
  -#endif
 --		}
 - 	    } else {
 --		close(fd);
 -+		/* Check if /dev/mouse is the same as this device. */
 -+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 -+		    devMouseStat.st_ino == sb.st_ino) {
 -+		    /* If the same, use this device. */
 -+		    devMouse = FALSE;
 -+		}
 -+		if (MousedRunning(*pdev))
 -+		    continue;
 -+		/* ums(4) does not support anything but SysMouse protocol. */
 -+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 -+		    xf86NameCmp(protocol, "auto") != 0 &&
 -+		    xf86NameCmp(protocol, "sysmouse") != 0)
 -+		    continue;
 - 		break;
 - 	    }
 - 	}
 -@@ -782,7 +830,9 @@
 +-                }
 +             } else {
 +-                close(fd);
 ++                /* Check if /dev/mouse is the same as this device. */
 ++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
 ++                    devMouseStat.st_ino == sb.st_ino) {
 ++                    /* If the same, use this device. */
 ++                    devMouse = FALSE;
 ++                }
 ++                if (MousedRunning(*pdev))
 ++                    continue;
 ++                /* ums(4) does not support anything but SysMouse protocol. */
 ++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
 ++                    xf86NameCmp(protocol, "auto") != 0 &&
 ++                    xf86NameCmp(protocol, "sysmouse") != 0)
 ++                    continue;
 +                 break;
 +             }
 +         }
 +@@ -764,7 +813,9 @@
       p->CheckProtocol = CheckProtocol;
   #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
       p->SetupAuto = SetupAuto;
 Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- ./src/Makefile.in.orig	2011-07-05 18:09:54.000000000 +0200
 ++++ ./src/Makefile.in	2012-03-02 14:02:43.000000000 +0100
 +@@ -279,7 +279,7 @@
 + # _ladir passes a dummy rpath to libtool so the thing will actually link
 + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
 + @DRIVER_NAME@_drv_ladir = @inputdir@
 + 
 + # We have to list all the mouse drivers here, even if we don't build them, so
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 318748)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(working copy)
 @@ -1,11 +1,182 @@
 ---- src/mouse.c.orig	2012-10-18 11:06:28.000000000 +0400
 -+++ src/mouse.c	2012-10-18 11:06:57.000000000 +0400
 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
 -     pInfo->private_flags = 0;
 -     pInfo->always_core_feedback = NULL;
 +--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
 +@@ -280,13 +280,39 @@
   
 -+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
 +     pMse = pInfo->private;
 + 
 +-    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 ++    if (i != 0)
 ++        pMse->buttons = i;
 +     if (!pMse->buttons) {
 +         pMse->buttons = MSE_DFLTBUTTONS;
 +         buttons_from = X_DEFAULT;
 +     }
 +     origButtons = pMse->buttons;
 + 
 ++    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 ++    if (s) {
 ++        int b, n = 0;
 ++        char *s1 = s;
 ++        /* keep getting numbers which are buttons */
 ++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 ++            /* check sanity for a button */
 ++            if (b < 0 || b > MSE_MAXBUTTONS) {
 ++                xf86Msg(X_WARNING,
 ++                        "ButtonMapping: Invalid button number = %d\n", b);
 ++                break;
 ++           };
 ++           pMse->buttonMap[n++] = 1 << (b-1);
 ++           if (b > pMse->buttons) pMse->buttons = b;
 ++        }
 ++        free(s);
 ++    }
 ++    /* get maximum of mapped buttons */
 ++    for (i = pMse->buttons-1; i >= 0; i--) {
 ++        int f = ffs (pMse->buttonMap[i]);
 ++        if (f > pMse->buttons)
 ++            pMse->buttons = f;
 ++    }
  +
 -     if (NewMousePreInit(drv, pInfo, flags) == Success)
 -     {
 -         /* Check if SendDragEvents has been disabled. */
 +     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
 +                                               "Emulate3Buttons", FALSE);
 +     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
 +@@ -298,6 +324,8 @@
 +                                              "Emulate3Timeout", 50);
 +     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
 +         MessageType from = X_CONFIG;
 ++	if (pMse->buttons < 3)
 ++            pMse->buttons = 3;
 +         if (pMse->emulate3ButtonsSoft)
 +             from = X_DEFAULT;
 +         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 +@@ -305,6 +333,8 @@
 +     }
 + 
 +     pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
 ++    if (pMse->chordMiddle && pMse->buttons < 3)
 ++	    pMse->buttons = 3;
 +     pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
 +     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
 +         pMse->invX = -1;
 +@@ -315,7 +345,7 @@
 +     } else
 +         pMse->invY = 1;
 +     pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
 +-
 ++    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + 
 +     if (pMse->pDragLock)
 +         free(pMse->pDragLock);
 +@@ -425,14 +455,17 @@
 +         free(s);
 +     }
 + 
 +-    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 ++    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
 ++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
 +     if (s) {
 +         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 +         char *msg = NULL;
 + 
 +         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
 +         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
 +-        if (!xf86NameCmp(s, "x")) {
 ++        if (!xf86NameCmp(s, "off")) {
 ++            msg = xstrdup("off");
 ++	} else if (!xf86NameCmp(s, "x")) {
 +             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
 +             msg = xstrdup("X axis");
 +         } else if (!xf86NameCmp(s, "y")) {
 +@@ -568,29 +601,6 @@
 +                 pInfo->name, wheelButton, pMse->wheelInertia,
 +                 pMse->wheelButtonTimeout);
 +     }
 +-    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +-    if (s) {
 +-       int b, n = 0;
 +-       char *s1 = s;
 +-       /* keep getting numbers which are buttons */
 +-       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
 +-           /* check sanity for a button */
 +-           if (b < 0 || b > MSE_MAXBUTTONS) {
 +-               xf86Msg(X_WARNING,
 +-                       "ButtonMapping: Invalid button number = %d\n", b);
 +-               break;
 +-           };
 +-           pMse->buttonMap[n++] = 1 << (b-1);
 +-           if (b > pMse->buttons) pMse->buttons = b;
 +-       }
 +-       free(s);
 +-    }
 +-    /* get maximum of mapped buttons */
 +-    for (i = pMse->buttons-1; i >= 0; i--) {
 +-        int f = ffs (pMse->buttonMap[i]);
 +-        if (f > pMse->buttons)
 +-            pMse->buttons = f;
 +-    }
 +     if (origButtons != pMse->buttons)
 +         buttons_from = X_CONFIG;
 +     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
 +@@ -668,7 +678,6 @@
 +     }
 +     pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
 +     pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
 +-    mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
 + }
 + 
 + static void
 +@@ -959,6 +968,8 @@
 +     /* Default Mapping: 1 2 3 8 9 10 11 ... */
 +     for (i = 0; i < MSE_MAXBUTTONS; i++)
 +         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 ++    pMse->hasZ = 1;
 ++    pMse->hasW = 0;
 + 
 +     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 + 
 +@@ -2137,7 +2148,7 @@
 + 
 +     if (pMse->emulateWheel) {
 +         /* Emulate wheel button handling */
 +-        if(pMse->wheelButton == 0)
 ++        if (pMse->wheelButton == 0)
 +             wheelButtonMask = 0;
 +         else
 +             wheelButtonMask = 1 << (pMse->wheelButton - 1);
 +@@ -2221,6 +2232,9 @@
 +                         }
 +                     }
 +                 }
 ++            } else {
 ++                pMse->wheelXDistance = 0;
 ++                pMse->wheelYDistance = 0;
 +             }
 + 
 +             /* Absorb the mouse movement while the wheel button is pressed. */
 +@@ -2238,7 +2252,7 @@
 +     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
 +         buttonTimer(pInfo);
 + 
 +-    if (dx || dy)
 ++    if ((dx || dy) && !pMse->disableXY)
 +         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 + 
 +     if (change) {
 +@@ -2448,11 +2462,11 @@
 + 
 +     /* Accumulate the scaled dx, dy in the private variables
 +        fracdx,fracdy and return the integer number part */
 +-    if (mousepriv) {
 +-        mousepriv->fracdx += mousepriv->sensitivity*dx;
 +-        mousepriv->fracdy += mousepriv->sensitivity*dy;
 +-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
 +-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 ++    if (pMse->sensitivity != 0) {
 ++        pMse->fracdx += pMse->sensitivity*dx;
 ++        pMse->fracdy += pMse->sensitivity*dy;
 ++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
 ++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
 +     }
 + 
 +     /* If mouse wheel movement has to be mapped on a button, we need to
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	(working copy)
 @@ -0,0 +1,25 @@
 +--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
 +@@ -217,10 +217,13 @@
 +     Bool                emulate3ButtonsSoft;
 +     int                 emulate3Timeout;/* Timeout for 3 button emulation */
 +     Bool                chordMiddle;
 ++    Bool                disableXY;
 +     Bool                flipXY;
 +     int                 invX;
 +     int                 invY;
 +     int                 resolution;
 ++    Bool                hasW;
 ++    Bool                hasZ;
 +     int                 negativeZ;      /* button mask */
 +     int                 positiveZ;      /* button mask */
 +     int                 negativeW;      /* button mask */
 +@@ -259,6 +262,8 @@
 +     int                 doubleClickOldSourceState;
 +     int                 lastMappedButtons;
 +     int                 buttonMap[MSE_MAXBUTTONS];
 ++    float               fracdx,fracdy;
 ++    float               sensitivity;
 + } MouseDevRec, *MouseDevPtr;
 + 
 + #endif /* _XF86OSMOUSE_H_ */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ===================================================================
 --- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)
 +++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
 ++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 +@@ -63,8 +63,6 @@
 +     int         acc;
 +     CARD32      pnpLast;
 +     Bool        disablePnPauto;
 +-    float       fracdx,fracdy;
 +-    float       sensitivity;
 + } mousePrivRec, *mousePrivPtr;
 + 
 + /* mouse proto flags */
 
 Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-drivers/xf86-input-mouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-mouse/pkg-plist	(revision 318748)
 +++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
 @@ -1,5 +1,8 @@
 +include/xorg/xf86-mouse-properties.h
  lib/xorg/modules/input/mouse_drv.la
  lib/xorg/modules/input/mouse_drv.so
 +libdata/pkgconfig/xorg-mouse.pc
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +@dirrmtry include/xorg
 Index: x11-drivers/xf86-input-mutouch/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-mutouch/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-mutouch
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-mutouch
  PORTVERSION=	1.3.0
 @@ -13,7 +8,6 @@
  COMMENT=	X.Org mutouch input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		mutouch.4x
  
  .if !defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-penmount/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-penmount/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-penmount
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-penmount
  PORTVERSION=	${PEN_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org penmount input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		penmount.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-input-synaptics/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xf86-input-synaptics
 -# Date Created:				25 Sep 2008
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-synaptics
 -PORTVERSION=	1.5.0
 +PORTVERSION=	${SYNAPTICS_VERSION}
 +PORTREVISION=	${SYNAPTICS_REVISION}
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,25 +10,47 @@
  
  CONFLICTS=	synaptics-[0-9]*
  
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +OPTIONS_DEFINE=	HAL
 +OPTIONS_DEFAULT=HAL
  
 -USES=	pathfix
 -USE_XORG=	x11 xextproto videoproto
 +.include <bsd.port.options.mk>
 +
 +USES=		pathfix
 +USE_XORG=	x11
  XORG_CAT=	driver
  
 +.if ${PORT_OPTIONS:MHAL}
 +PLIST_SUB+=	HAL=""
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +.else
 +PLIST_SUB+=	HAL="@comment "
 +.endif
 +
  MAN1=		syndaemon.1 \
  		synclient.1
  MAN4=		synaptics.4x
  
 -post-install:
 -	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 -	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 -		${PREFIX}/share/hal/fdi/policy/10osvendor/
 -
  .if defined(WITH_NEW_XORG)
 +SYNAPTICS_VERSION=	1.7.1
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="" OLD="@comment "
  .else
 +SYNAPTICS_VERSION=	1.6.4
 +SYNAPTICS_REVISION=	0
  PLIST_SUB+=	NEW="@comment " OLD=""
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
  .endif
  
 +post-install:
 +.if ${PORT_OPTIONS:MHAL}
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/10osvendor/
 +.if !defined(WITH_NEW_XORG)
 +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
 +	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
 +		${PREFIX}/share/hal/fdi/policy/20thirdparty/
 +.endif
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-synaptics/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/distinfo	(revision 318748)
 +++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
 @@ -1,2 +1,4 @@
 -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
 -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
 +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
 Index: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(revision 0)
 +++ x11-drivers/xf86-input-synaptics/files/extra-Makefile.in	(working copy)
 @@ -0,0 +1,11 @@
 +--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
 ++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
 +@@ -321,7 +321,7 @@
 + 	--with-sdkdir='$${includedir}/xorg' \
 + 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
 + 
 +-SUBDIRS = include src man tools conf test
 ++SUBDIRS = include src man tools test
 + MAINTAINERCLEANFILES = ChangeLog INSTALL
 + pkgconfigdir = $(libdir)/pkgconfig
 + pkgconfig_DATA = xorg-synaptics.pc
 
 Property changes on: x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-input-synaptics/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 318748)
 +++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
 @@ -1,18 +1,18 @@
  bin/synclient
  bin/syndaemon
  include/xorg/synaptics-properties.h
 -include/xorg/synaptics.h
 +%%OLD%%include/xorg/synaptics.h
  lib/xorg/modules/input/synaptics_drv.la
  lib/xorg/modules/input/synaptics_drv.so
  libdata/pkgconfig/xorg-synaptics.pc
  %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
 -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
  @dirrmtry include/xorg
 -@dirrmtry share/hal/fdi/policy/10osvendor
 -@dirrmtry share/hal/fdi/policy
 -@dirrmtry share/hal/fdi
 -@dirrmtry share/hal
 +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
 +%%HAL%%@dirrmtry share/hal/fdi/policy
 +%%HAL%%@dirrmtry share/hal/fdi
 +%%HAL%%@dirrmtry share/hal
 Index: x11-drivers/xf86-input-vmmouse/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
 @@ -1,18 +1,15 @@
 -# New ports collection makefile for:	xf86-input-vmmouse
 -# Date Created:				17 Feb 2006
 -# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
 -#
 +# Created by: NIIMI Satoshi <sa2c@sa2c.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-vmmouse
 -PORTVERSION=	12.6.9
 -PORTREVISION=	2
 +PORTVERSION=	13.0.0
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vmmouse input driver
  
 +LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +
  XORG_CAT=	driver
  CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
  USE_GMAKE=	yes
 @@ -23,4 +20,10 @@
  ONLY_FOR_ARCHS=	i386 amd64
  ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
  
 +.if defined(WITH_NEW_XORG)
 +PLIST_SUB+=	NEW=""
 +.else
 +PLIST_SUB+=	NEW="@comment "
 +.endif
 +
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-input-vmmouse/distinfo
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/distinfo	(revision 318748)
 +++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
 -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
 +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
 Index: x11-drivers/xf86-input-vmmouse/pkg-plist
 ===================================================================
 --- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 318748)
 +++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
 @@ -2,6 +2,7 @@
  libexec/hal/scripts/hal-probe-vmmouse
  lib/xorg/modules/input/vmmouse_drv.la
  lib/xorg/modules/input/vmmouse_drv.so
 +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
  share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
  @dirrmtry lib/xorg/modules/input
  @dirrmtry lib/xorg/modules
 Index: x11-drivers/xf86-input-void/Makefile
 ===================================================================
 --- x11-drivers/xf86-input-void/Makefile	(revision 318748)
 +++ x11-drivers/xf86-input-void/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-input-void
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-input-void
  PORTVERSION=	${VOID_VERSION}
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org void input driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		void.4x
  
  .if defined(WITH_NEW_XORG)
 Index: x11-drivers/xf86-video-apm/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-apm/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-apm/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-apm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-apm
 -PORTVERSION=	1.2.3
 -PORTREVISION=	1
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org apm display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		apm.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-apm/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-apm/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-apm/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
 -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
 +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
 Index: x11-drivers/xf86-video-ark/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ark/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-ark/Makefile	(working copy)
 @@ -1,19 +1,12 @@
 -# New ports collection makefile for:	xf86-video-ark
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ark
 -PORTVERSION=	0.7.3
 -PORTREVISION=	1
 +PORTVERSION=	0.7.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org ark display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-ark/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ark/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-ark/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
 +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
 Index: x11-drivers/xf86-video-ati/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-ati/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-ati/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-ati
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-ati
 -PORTVERSION=	6.14.3
 -PORTREVISION=	1
 +PORTVERSION=	6.14.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +9,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		ati.4x radeon.4x
  
  CONFIGURE_ARGS+=--disable-kms
 Index: x11-drivers/xf86-video-ati/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-ati/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-ati/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
 Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
 ===================================================================
 --- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 318748)
 +++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working copy)
 @@ -1,17 +1,15 @@
 ---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
 -+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
 -@@ -982,10 +982,9 @@
 +--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
 ++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
 +@@ -967,10 +967,9 @@
   
   	    for (; nwords > 0; --nwords, ++d, ++s)
   #ifdef __powerpc__
  -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
  +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
   #else
 --	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 +-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
  -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
  +		*d = (*s >> 8) | (*s << 8);
   #endif
   	    return;
 - 	}
 -
 -
 +         }
 Index: x11-drivers/xf86-video-chips/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-chips/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-chips/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-chips
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-chips
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org chips display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		chips.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-chips/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-chips/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-chips/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	(working copy)
 @@ -0,0 +1,13 @@
 +--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
 ++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
 +@@ -3,7 +3,7 @@
 + noinst_PROGRAMS = dRegs mRegs modClock memClock
 + endif
 + 
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	(working copy)
 @@ -0,0 +1,15 @@
 +--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
 ++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
 +@@ -238,9 +238,9 @@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-dRegs_SOURCES = dRegs.c AsmMacros.h
 +-mRegs_SOURCES = mRegs.c AsmMacros.h
 +-modClock_SOURCES = modClock.c AsmMacros.h
 ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
 ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
 ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
 + memClock_SOURCES = modClock.c AsmMacros.h
 + all: all-am
 + 
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ===================================================================
 --- x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(revision 0)
 +++ x11-drivers/xf86-video-chips/files/patch-util_iopl.h	(working copy)
 @@ -0,0 +1,63 @@
 +--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
 ++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
 +@@ -0,0 +1,60 @@
 ++#ifdef __NetBSD__
 ++#  include <sys/types.h>
 ++#  include <machine/pio.h>
 ++#  include <machine/sysarch.h>
 ++#else
 ++#  if defined(__linux__)
 ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
 ++ * #    include <sys/io.h>
 ++ */
 ++int iopl(int level);
 ++#  endif
 ++#  if defined(SVR4) && defined(i386)
 ++#    include <sys/types.h>
 ++#    ifdef NCR
 ++       /* broken NCR <sys/sysi86.h> */
 ++#      define __STDC
 ++#      include <sys/sysi86.h>
 ++#      undef __STDC
 ++#    else
 ++#      include <sys/sysi86.h>
 ++#    endif
 ++#    ifdef SVR4
 ++#      if !defined(sun)
 ++#        include <sys/seg.h>
 ++#      endif
 ++#    endif
 ++#    include <sys/v86.h>
 ++#    if defined(sun)
 ++#      include <sys/psw.h>
 ++#    endif
 ++#  endif
 ++#  include "AsmMacros.h"
 ++#endif /* NetBSD */
 ++
 ++#include <unistd.h>
 ++#include <stdio.h>
 ++#include <stdlib.h>
 ++
 ++#ifdef __NetBSD__
 ++#  define SET_IOPL() i386_iopl(3)
 ++#  define RESET_IOPL() i386_iopl(0)
 ++#else
 ++#  if defined(SVR4) && defined(i386)
 ++#    ifndef SI86IOPL
 ++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
 ++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
 ++#    else
 ++#      define SET_IOPL() sysi86(SI86IOPL,3)
 ++#      define RESET_IOPL() sysi86(SI86IOPL,0)
 ++#    endif
 ++#  else
 ++#    ifdef linux
 ++#      define SET_IOPL() iopl(3)
 ++#      define RESET_IOPL() iopl(0)
 ++#    else
 ++#      define SET_IOPL() (void)0
 ++#      define RESET_IOPL() (void)0
 ++#    endif
 ++#  endif
 ++#endif
 
 Property changes on: x11-drivers/xf86-video-chips/files/patch-util_iopl.h
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-cirrus/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-cirrus
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cirrus
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.5.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org cirrus display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		cirrus.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-cirrus/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-cirrus/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
 -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
 Index: x11-drivers/xf86-video-cyrix/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-cyrix/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-cyrix
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-cyrix
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-dummy/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-dummy/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
 @@ -1,18 +1,13 @@
 -# New ports collection makefile for:	xf86-video-dummy
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-dummy
 -PORTVERSION=	0.3.5
 +PORTVERSION=	0.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org dummy display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-dummy/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-dummy/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
 Index: x11-drivers/xf86-video-fbdev/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-fbdev
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-fbdev
 -PORTVERSION=	0.4.2
 +PORTVERSION=	0.4.3
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org fbdev display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		fbdev.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-fbdev/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-fbdev/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
 Index: x11-drivers/xf86-video-glint/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-glint/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-glint/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-glint
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-glint
 -PORTVERSION=	1.2.6
 +PORTVERSION=	1.2.8
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
 +USE_XORG=	xf86driproto xf86dgaproto glproto
  MAN4=		glint.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-glint/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-glint/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-glint/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
 Index: x11-drivers/xf86-video-i128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i128/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-i128/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i128
 -PORTVERSION=	1.3.4
 -PORTREVISION=	1
 +PORTVERSION=	1.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i128 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i128/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-i128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
 -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
 +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
 Index: x11-drivers/xf86-video-i740/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-i740/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-i740/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-i740
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-i740
 -PORTVERSION=	1.3.2
 -PORTREVISION=	2
 +PORTVERSION=	1.3.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org i740 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		i740.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-i740/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-i740/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-i740/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
 Index: x11-drivers/xf86-video-imstt/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-imstt/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-imstt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-imstt
  PORTVERSION=	1.1.0
 Index: x11-drivers/xf86-video-intel/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-intel/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-intel/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-intel
 -# Date Created:				28 May 2007
 -# Whom:					lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-intel
  PORTVERSION=	${INTEL_VERSION}
 @@ -18,15 +14,29 @@
  
  USE_LDCONFIG=	yes
  XORG_CAT=	driver
 -USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 +USE_XORG=	glproto \
 +		pixman \
 +		x11 \
 +		xext \
 +		xf86driproto \
 +		xineramaproto \
 +		xrender \
 +		xvmc
 +
  MAN4=		intel.4x
  
  .if defined(WITH_NEW_XORG)
 -INTEL_VERSION=	2.17.0
 -INTEL_REVISION=	1
 +INTEL_VERSION=	2.21.6
 +INTEL_REVISION=	0
 +CONFIGURE_ARGS+=	--enable-sna
  MAKE_JOBS_UNSAFE=yes
  PLIST_SUB+=	OLD="@comment "
 -EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
 +EXTRA_PATCHES+=	${PATCHDIR}/extra-clang \
 +		${PATCHDIR}/extra-src_sna_compiler.h \
 +		${PATCHDIR}/extra-src_sna_kgem.c \
 +		${PATCHDIR}/extra-src__sna__sna_threads.c \
 +		${PATCHDIR}/extra-i915kms
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
  .else
  INTEL_VERSION=	2.7.1
  INTEL_REVISION=	4
 Index: x11-drivers/xf86-video-intel/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-intel/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-intel/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
  SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
 Index: x11-drivers/xf86-video-intel/files/extra-clang
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-clang	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-clang	(working copy)
 @@ -0,0 +1,53 @@
 +--- src/intel_display.c.orig	2012-12-11 20:33:06.000000000 +0100
 ++++ src/intel_display.c	2012-12-11 20:33:45.000000000 +0100
 +@@ -1691,7 +1691,7 @@
 + static drmModeEncoderPtr
 + intel_get_kencoder(struct intel_mode *mode, int num)
 + {
 +-	struct intel_output *iterator;
 ++	struct intel_output *iterator = NULL;
 + 	int id = mode->mode_res->encoders[num];
 + 
 + 	list_for_each_entry(iterator, &mode->outputs, link)
 +--- src/intel_batchbuffer.c.orig	2012-12-11 20:34:55.000000000 +0100
 ++++ src/intel_batchbuffer.c	2012-12-11 20:35:19.000000000 +0100
 +@@ -119,7 +119,7 @@
 + static void intel_batch_do_flush(ScrnInfoPtr scrn)
 + {
 + 	intel_screen_private *intel = intel_get_screen_private(scrn);
 +-	struct intel_pixmap *priv;
 ++	struct intel_pixmap *priv = NULL;
 + 
 + 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 + 		priv->dirty = 0;
 +--- src/sna/sna_damage.c.orig	2012-12-11 20:41:38.000000000 +0100
 ++++ src/sna/sna_damage.c	2012-12-11 20:42:23.000000000 +0100
 +@@ -410,7 +410,7 @@
 + 	int n, nboxes;
 + 	BoxPtr boxes, free_boxes = NULL;
 + 	pixman_region16_t *region = &damage->region;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	assert(damage->mode != DAMAGE_ALL);
 + 	assert(damage->dirty);
 +@@ -1671,7 +1671,7 @@
 + {
 + 	int n, nboxes;
 + 	BoxPtr boxes;
 +-	struct sna_damage_box *iter;
 ++	struct sna_damage_box *iter = NULL;
 + 
 + 	RegionCopy(r, &damage->region);
 + 	if (!damage->dirty)
 +--- uxa/uxa-accel.c.orig	2012-12-11 20:50:56.000000000 +0100
 ++++ uxa/uxa-accel.c	2012-12-11 20:51:14.000000000 +0100
 +@@ -944,7 +944,7 @@
 + 
 + 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
 + 		int ok = 0;
 +-		RegionPtr region;
 ++		RegionPtr region = NULL;
 + 
 + 		if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
 + 			if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-clang
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-i915kms
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 318748)
 +++ x11-drivers/xf86-video-intel/files/extra-i915kms	(working copy)
 @@ -1,11 +1,13 @@
 ---- src/intel_driver.c.orig	2012-05-17 16:13:46.000000000 +0200
 -+++ src/intel_driver.c	2012-05-17 16:14:46.000000000 +0200
 -@@ -334,7 +334,7 @@
 - 	snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
 +--- src/intel_module.c.orig	2012-09-27 23:31:20.000000000 +0300
 ++++ src/intel_module.c	2012-11-02 17:32:00.819723398 +0200
 +@@ -393,8 +393,8 @@
   		 dev->domain, dev->bus, dev->dev, dev->func);
   
 --	intel->drmSubFD = drmOpen("i915", busid);
 -+	intel->drmSubFD = drmOpen("i915kms", busid);
 - 	if (intel->drmSubFD == -1) {
 - 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 - 			   "[drm] Failed to open DRM device for %s: %s\n",
 + 	ret = drmCheckModesettingSupported(id);
 +-	if (ret) {
 +-		if (xf86LoadKernelModule("i915"))
 ++	if (ret || 1) {
 ++		if (xf86LoadKernelModule("i915kms"))
 + 			ret = drmCheckModesettingSupported(id);
 + 		if (ret)
 + 			return FALSE;
 Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(working copy)
 @@ -0,0 +1,14 @@
 +--- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
 ++++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
 +@@ -94,7 +94,11 @@
 + 		size_t len = 0;
 + 		char *line = NULL;
 + 		uint32_t processors = 0, cores = 0;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int id;
 + 			if (sscanf(line, "physical id : %d", &id) == 1) {
 + 				if (id >= 32)
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h	(working copy)
 @@ -0,0 +1,18 @@
 +--- src/sna/compiler.h.orig	2013-03-12 12:48:29.745101779 +0100
 ++++ src/sna/compiler.h	2013-03-12 12:48:52.857102997 +0100
 +@@ -37,7 +37,6 @@
 + #define must_check __attribute__((warn_unused_result))
 + #define constant __attribute__((const))
 + #define pure __attribute__((pure))
 +-#define __packed__ __attribute__((__packed__))
 + #define flatten __attribute__((flatten))
 + #else
 + #define likely(expr) (expr)
 +@@ -48,7 +47,6 @@
 + #define must_check
 + #define constant
 + #define pure
 +-#define __packed__
 + #define flatten
 + #endif
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ===================================================================
 --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(revision 0)
 +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c	(working copy)
 @@ -0,0 +1,91 @@
 +--- src/sna/kgem.c.orig	2013-03-11 11:19:02.000000000 +0100
 ++++ src/sna/kgem.c	2013-03-12 12:56:49.452065668 +0100
 +@@ -658,7 +658,11 @@
 + 	if (file) {
 + 		size_t len = 0;
 + 		char *line = NULL;
 ++#ifdef __GLIBC__
 + 		while (getline(&line, &len, file) != -1) {
 ++#else
 ++		while ((line = fgetln(file, &len)) != (char *) NULL) {
 ++#endif
 + 			int mb;
 + 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 + 				/* Paranoid check against gargantuan caches */
 +@@ -1666,7 +1670,8 @@
 + static struct kgem_bo *
 + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 
 + 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 + 
 +@@ -1868,7 +1873,8 @@
 + 
 + static bool kgem_retire__flushing(struct kgem *kgem)
 + {
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 	bool retired = false;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
 +@@ -2073,7 +2079,8 @@
 + static void kgem_commit(struct kgem *kgem)
 + {
 + 	struct kgem_request *rq = kgem->next_request;
 +-	struct kgem_bo *bo, *next;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 + 		assert(next->request.prev == &bo->request);
 +@@ -2154,7 +2161,8 @@
 + 
 + static void kgem_finish_buffers(struct kgem *kgem)
 + {
 +-	struct kgem_buffer *bo, *next;
 ++	struct kgem_buffer *bo = NULL;
 ++	struct kgem_buffer *next;
 + 
 + 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 + 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
 +@@ -2963,7 +2971,8 @@
 + static struct kgem_bo *
 + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 + {
 +-	struct kgem_bo *bo, *first = NULL;
 ++	struct kgem_bo *bo = NULL;
 ++	struct kgem_bo *first = NULL;
 + 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 + 	struct list *cache;
 + 
 +@@ -3521,7 +3530,7 @@
 + 			       uint32_t flags)
 + {
 + 	struct list *cache;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 	uint32_t pitch, tiled_height, size;
 + 	uint32_t handle;
 + 	int i, bucket, retry;
 +@@ -4834,7 +4843,7 @@
 + void kgem_clear_dirty(struct kgem *kgem)
 + {
 + 	struct list * const buffers = &kgem->next_request->buffers;
 +-	struct kgem_bo *bo;
 ++	struct kgem_bo *bo = NULL;
 + 
 + 	list_for_each_entry(bo, buffers, request) {
 + 		if (!bo->dirty)
 +@@ -5072,7 +5081,7 @@
 + 				   uint32_t size, uint32_t flags,
 + 				   void **ret)
 + {
 +-	struct kgem_buffer *bo;
 ++	struct kgem_buffer *bo = NULL;
 + 	unsigned offset, alloc;
 + 	struct kgem_bo *old;
 + 
 
 Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-drivers/xf86-video-mach64/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mach64/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-mach64
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mach64
 -PORTVERSION=	6.9.0
 +PORTVERSION=	6.9.3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -15,6 +10,6 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto
 +USE_XORG=	glproto xf86driproto xf86miscproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-mach64/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mach64/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
 -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
 Index: x11-drivers/xf86-video-mga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-mga/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-mga/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	xf86-video-mga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-mga
 -PORTVERSION=	1.4.13
 -PORTEPOCH=	2
 +PORTVERSION=	1.6.1
 +PORTEPOCH=	3
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		mga.4x
  
  pre-patch:
 Index: x11-drivers/xf86-video-mga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-mga/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-mga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
 Index: x11-drivers/xf86-video-neomagic/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-neomagic
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-neomagic
 -PORTVERSION=	1.2.5
 +PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org neomagic display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		neomagic.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-neomagic/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-neomagic/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
 Index: x11-drivers/xf86-video-newport/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-newport/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-newport/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-newport
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-newport
 -PORTVERSION=	0.2.3
 -PORTREVISION=	2
 +PORTVERSION=	0.2.4
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org newport display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto
  MAN4=		newport.4x
  
  post-patch:
 Index: x11-drivers/xf86-video-newport/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-newport/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-newport/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
 Index: x11-drivers/xf86-video-nouveau/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nouveau/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-nouveau
 -# Date Created:				29 Jan 2009
 -# Whom:					Anonymous <swell.k@gmail.com>
 -#
 +# Created by: Anonymous <swell.k@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nouveau
  PORTVERSION=	0.0.10.${SNAPDATE}
 @@ -16,7 +12,7 @@
  COMMENT=	Free nouveau display driver for nvidia-based cards
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86driproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		nouveau.4x
  
  MAKE_JOBS_SAFE=	yes
 Index: x11-drivers/xf86-video-nv/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-nv/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-nv/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-nv
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-nv
 -PORTVERSION=	2.1.18
 +PORTVERSION=	2.1.20
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org nv display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		nv.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-nv/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-nv/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-nv/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
 +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
 Index: x11-drivers/xf86-video-openchrome/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
 @@ -1,15 +1,8 @@
 -# New ports collection makefile for:	xf86-video-openchrome
 -# Date Created:				17 Sep 2007
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-openchrome
 -PORTVERSION=	0.2.904
 -PORTREVISION=	3
 +PORTVERSION=	0.3.2
  CATEGORIES=	x11-drivers
 -MASTER_SITES=	http://www.openchrome.org/releases/
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org openChrome display driver
 @@ -17,7 +10,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
 +USE_XORG=	xf86driproto xvmc glproto
  MAN4=		openchrome.4x
  
  MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 Index: x11-drivers/xf86-video-openchrome/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
 -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 159ccd5f3e0bbedd1f10d406b384790f6c73ed626390cf73b15db68e1344f586
 +SIZE (xorg/driver/xf86-video-openchrome-0.3.2.tar.bz2) = 517434
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revision 318748)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(working copy)
 @@ -1,32 +0,0 @@
 ---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
 -+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
 -@@ -36,6 +36,11 @@
 - #include "via_driver.h" /* for HAVE_DEBUG */
 - #include "via_vgahw.h"
 - 
 -+#if ABI_VIDEODRV_VERSION < 12
 -+#define PIOOFFSET hwp->PIOOffset
 -+#else
 -+#define PIOOFFSET 0
 -+#endif
 - 
 - static CARD8
 - ViaVgahwIn(vgaHWPtr hwp, int address)
 -@@ -43,7 +48,7 @@
 -     if (hwp->MMIOBase)
 -         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
 -     else
 --        return inb(hwp->PIOOffset + address);
 -+        return inb(PIOOFFSET + address);
 - }
 - 
 - static void
 -@@ -52,7 +57,7 @@
 -     if (hwp->MMIOBase)
 -         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
 -     else
 --        outb(hwp->PIOOffset + address, value);
 -+        outb(PIOOFFSET + address, value);
 - }
 - 
 - /*
 Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
 ===================================================================
 --- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revision 318748)
 +++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(working copy)
 @@ -1,83 +0,0 @@
 -Fix Xvideo crash in X.org server 1.10
 -
 -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
 -
 ---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
 -+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
 -@@ -763,67 +763,6 @@
 -     return 0;
 - }
 - 
 --
 --/*
 -- * This one gets called, for example, on panning.
 -- */
 --
 --static int
 --viaReputImage(ScrnInfoPtr pScrn,
 --        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
 --        DrawablePtr pDraw)
 --{
 --
 --    DDUPDATEOVERLAY UpdateOverlay_Video;
 --    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
 --    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
 --    VIAPtr pVia = VIAPTR(pScrn);
 --
 --    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 --        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 --        if (pPriv->autoPaint) {
 --            if (pDraw->type == DRAWABLE_WINDOW) {
 --                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
 --            } else {
 --                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
 --                    clipBoxes);
 --            }
 --        }
 --    }
 --
 --    if (drw_x == pPriv->old_drw_x &&
 --        drw_y == pPriv->old_drw_y &&
 --        pVia->swov.oldPanningX == pVia->swov.panning_x &&
 --        pVia->swov.oldPanningY == pVia->swov.panning_y) {
 --        viaXvError(pScrn, pPriv, xve_none);
 --        return Success;
 --    }
 --
 --    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
 --    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
 --    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
 --    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
 --
 --    lpUpdateOverlay->DstLeft = drw_x;
 --    lpUpdateOverlay->DstTop = drw_y;
 --    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
 --    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
 --    pPriv->old_drw_x = drw_x;
 --    pPriv->old_drw_y = drw_y;
 --
 --    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
 --
 --    if (pScrn->bitsPerPixel == 8)
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
 --    else
 --        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
 --
 --    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
 --
 --    viaXvError(pScrn, pPriv, xve_none);
 --    return Success;
 --}
 --
 - static unsigned
 - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
 - {
 -@@ -884,7 +823,7 @@
 -         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
 -         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
 -         viaAdaptPtr[i]->PutImage = viaPutImage;
 --        viaAdaptPtr[i]->ReputImage = viaReputImage;
 -+        viaAdaptPtr[i]->ReputImage = NULL;
 -         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
 -         for (j = 0; j < numPorts; ++j) {
 -             viaPortPriv[j].dmaBounceBuffer = NULL;
 Index: x11-drivers/xf86-video-r128/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-r128/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-r128/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-r128
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-r128
 -PORTVERSION=	6.8.1
 +PORTVERSION=	6.8.4
  PORTREVISION=	3
  CATEGORIES=	x11-drivers
  
 @@ -15,7 +10,7 @@
  
  USE_GL=		gl
  XORG_CAT=	driver
 -USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
 +USE_XORG=	glproto xf86driproto xf86miscproto xineramaproto
  MAN4=		r128.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-r128/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-r128/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-r128/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
 -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
 Index: x11-drivers/xf86-video-rdc/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rdc/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-rdc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86-video-rdc
 -# Date created:				14 April 2010
 -# Whom:					stas
 -#
 +# Created by: stas
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rdc
  PORTVERSION=	0.9
 @@ -17,6 +13,10 @@
  XORG_CAT=	driver
  USE_XORG=	xvmc xf86driproto xextproto x11 glproto
  
 +.if defined(WITH_NEW_XORG)
 +IGNORE=         does not build with X server 1.12
 +.endif
 +
  do-install:
  	${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
  	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
 Index: x11-drivers/xf86-video-rendition/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-rendition/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-rendition
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-rendition
 -PORTVERSION=	4.2.4
 +PORTVERSION=	4.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org rendition display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		rendition.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-rendition/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-rendition/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
 +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
 Index: x11-drivers/xf86-video-s3/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-s3/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3
 -PORTVERSION=	0.6.3
 -PORTREVISION=	3
 +PORTVERSION=	0.6.5
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3 display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-s3/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
 Index: x11-drivers/xf86-video-s3virge/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-s3virge
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-s3virge
 -PORTVERSION=	1.10.4
 -PORTREVISION=	2
 +PORTVERSION=	1.10.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org s3virge display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		s3virge.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-s3virge/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-s3virge/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
 +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
 Index: x11-drivers/xf86-video-savage/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-savage/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-savage/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-savage
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-savage
 -PORTVERSION=	2.3.3
 +PORTVERSION=	2.3.6
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -14,9 +9,8 @@
  
  USE_GL=		gl
  
 -WITH_FBSD10_FIX=yes
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		savage.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-savage/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-savage/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-savage/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
 Index: x11-drivers/xf86-video-siliconmotion/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
 @@ -1,19 +1,13 @@
 -# New ports collection makefile for:	xf86-video-siliconmotion
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-siliconmotion
 -PORTVERSION=	1.7.5
 +PORTVERSION=	1.7.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org siliconmotion display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		siliconmotion.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-siliconmotion/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
 Index: x11-drivers/xf86-video-sis/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sis/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-sis/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-sis
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sis
 -PORTVERSION=	0.10.3
 +PORTVERSION=	0.10.7
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 @@ -17,11 +12,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 +USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
  MAN4=		sis.4x
  
 -post-patch:
 -	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 -		${WRKSRC}/configure
 -	
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-sis/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-sis/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-sis/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
 Index: x11-drivers/xf86-video-sunffb/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-sunffb/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-sunffb
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-sunffb
  PORTVERSION=	1.2.1
 Index: x11-drivers/xf86-video-tdfx/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tdfx
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tdfx
 -PORTVERSION=	1.4.3
 +PORTVERSION=	1.4.5
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -16,7 +11,7 @@
  USE_GL=		gl
  
  XORG_CAT=	driver
 -USE_XORG=	xf86driproto videoproto xextproto glproto
 +USE_XORG=	xf86driproto glproto
  MAN4=		tdfx.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tdfx/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tdfx/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
 Index: x11-drivers/xf86-video-tga/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tga/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-tga/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tga
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tga
 -PORTVERSION=	1.2.1
 +PORTVERSION=	1.2.2
  PORTREVISION=	2
  CATEGORIES=	x11-drivers
  
 @@ -14,6 +9,6 @@
  COMMENT=	X.Org tga display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tga/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tga/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-tga/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
 Index: x11-drivers/xf86-video-trident/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-trident/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-trident/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-trident
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-trident
 -PORTVERSION=	1.3.4
 +PORTVERSION=	1.3.6
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org trident display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto xf86dgaproto
 +USE_XORG=	xf86dgaproto
  MAN4=		trident.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-trident/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-trident/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-trident/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
 Index: x11-drivers/xf86-video-tseng/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-tseng/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-tseng
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-tseng
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,6 @@
  COMMENT=	X.Org tseng display driver
  
  XORG_CAT=	driver
 -USE_XORG=	videoproto xextproto
  MAN4=		tseng.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-tseng/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-tseng/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
 -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
 Index: x11-drivers/xf86-video-vesa/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vesa/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
 @@ -1,20 +1,13 @@
 -# New ports collection makefile for:	xf86-video-vesa
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vesa
 -PORTVERSION=	2.3.0
 -PORTREVISION=	2
 +PORTVERSION=	2.3.2
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	X.Org vesa display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xextproto videoproto
  MAN4=		vesa.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-vesa/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vesa/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
 -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
 Index: x11-drivers/xf86-video-via/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-via/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-via/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xf86-video-via
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-via
  PORTVERSION=	0.2.2
 Index: x11-drivers/xf86-video-vmware/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-vmware/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
 @@ -1,13 +1,7 @@
 -# New ports collection makefile for:	xf86-video-vmware
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-vmware
 -PORTVERSION=	12.0.2
 -PORTREVISION=	1
 +PORTVERSION=	13.0.1
  CATEGORIES=	x11-drivers
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-drivers/xf86-video-vmware/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-vmware/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
 +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
 Index: x11-drivers/xf86-video-voodoo/Makefile
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/Makefile	(revision 318748)
 +++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xf86-video-voodoo
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86-video-voodoo
 -PORTVERSION=	1.2.4
 +PORTVERSION=	1.2.5
  PORTREVISION=	1
  CATEGORIES=	x11-drivers
  
 @@ -14,7 +9,7 @@
  COMMENT=	X.Org voodoo display driver
  
  XORG_CAT=	driver
 -USE_XORG=	xf86dgaproto xextproto videoproto
 +USE_XORG=	xf86dgaproto
  MAN4=		voodoo.4x
  
  .include <bsd.port.mk>
 Index: x11-drivers/xf86-video-voodoo/distinfo
 ===================================================================
 --- x11-drivers/xf86-video-voodoo/distinfo	(revision 318748)
 +++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
 Index: x11-drivers/xorg-drivers/Makefile
 ===================================================================
 --- x11-drivers/xorg-drivers/Makefile	(revision 318748)
 +++ x11-drivers/xorg-drivers/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	xorg-drivers
 -PORTVERSION=	7.5.2
 +PORTVERSION=	7.7
  CATEGORIES=	x11-drivers
  MASTER_SITES=	# none
  DISTFILES=	# none
 @@ -92,10 +92,9 @@
  OPENCHROME_DESC=	Install openchrome video driver
  SUNFFB_DESC=		Install sunffb video driver
  
 -# these drivers module name are different then the plugin they install
 +# these drivers have a different module name compared to the plugin they install
  QUIRKS=		keyboard:kbd
  
 -
  .include <bsd.port.options.mk>
  
  # Manual add arch specific drivers so they be added to depend lines.
 Index: x11-fonts/bdftopcf/Makefile
 ===================================================================
 --- x11-fonts/bdftopcf/Makefile	(revision 318748)
 +++ x11-fonts/bdftopcf/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	Convert X font from BDF to PCF
  
  XORG_CAT=	app
 -USE_XORG=	xfont xorg-macros
 +USE_XORG=	xfont
  
  PLIST_FILES=	bin/bdftopcf
  MAN1=		bdftopcf.1
 Index: x11-fonts/encodings/Makefile
 ===================================================================
 --- x11-fonts/encodings/Makefile	(revision 318748)
 +++ x11-fonts/encodings/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    encodings
 -# Date created:				Oct 29 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	encodings
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-100dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-75dpi
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-adobe-utopia-type1/Makefile
 ===================================================================
 --- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 318748)
 +++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-adobe-utopia-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-adobe-utopia-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-alias/Makefile
 ===================================================================
 --- x11-fonts/font-alias/Makefile	(revision 318748)
 +++ x11-fonts/font-alias/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-alias
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-alias
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-arabic-misc/Makefile
 ===================================================================
 --- x11-fonts/font-arabic-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-arabic-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-arabic-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-arabic-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-lucidatypewriter-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-ttf/Makefile
 ===================================================================
 --- x11-fonts/font-bh-ttf/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-ttf/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-ttf
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-ttf
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bh-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bh-type1/Makefile	(revision 318748)
 +++ x11-fonts/font-bh-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bh-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bh-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-100dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-100dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-100dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-75dpi/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-75dpi
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-75dpi
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-bitstream-speedo/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-speedo/Makefile	(revision 318748)
 +++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-bitstream-speedo
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-speedo
  PORTVERSION=	1.0.2
 Index: x11-fonts/font-bitstream-type1/Makefile
 ===================================================================
 --- x11-fonts/font-bitstream-type1/Makefile	(revision 318748)
 +++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-bitstream-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-bitstream-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cronyx-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 318748)
 +++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cronyx-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cronyx-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-cursor-misc/Makefile
 ===================================================================
 --- x11-fonts/font-cursor-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-cursor-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-cursor-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-cursor-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-daewoo-misc/Makefile
 ===================================================================
 --- x11-fonts/font-daewoo-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-daewoo-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-daewoo-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-dec-misc/Makefile
 ===================================================================
 --- x11-fonts/font-dec-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-dec-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-dec-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-dec-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-ibm-type1/Makefile
 ===================================================================
 --- x11-fonts/font-ibm-type1/Makefile	(revision 318748)
 +++ x11-fonts/font-ibm-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-ibm-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-ibm-type1
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-isas-misc/Makefile
 ===================================================================
 --- x11-fonts/font-isas-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-isas-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-isas-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-isas-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-jis-misc/Makefile
 ===================================================================
 --- x11-fonts/font-jis-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-jis-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-jis-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-jis-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-micro-misc/Makefile
 ===================================================================
 --- x11-fonts/font-micro-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-micro-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-micro-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-micro-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-cyrillic/Makefile	(revision 318748)
 +++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-ethiopic/Makefile
 ===================================================================
 --- x11-fonts/font-misc-ethiopic/Makefile	(revision 318748)
 +++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-ethiopic
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-ethiopic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-meltho/Makefile
 ===================================================================
 --- x11-fonts/font-misc-meltho/Makefile	(revision 318748)
 +++ x11-fonts/font-misc-meltho/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:    font-misc-meltho
 -# Date created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-meltho
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-misc-misc/Makefile
 ===================================================================
 --- x11-fonts/font-misc-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-misc-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-misc-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-misc-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-mutt-misc/Makefile
 ===================================================================
 --- x11-fonts/font-mutt-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-mutt-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-mutt-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-mutt-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-schumacher-misc/Makefile
 ===================================================================
 --- x11-fonts/font-schumacher-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-schumacher-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-schumacher-misc
  PORTVERSION=	1.1.2
 Index: x11-fonts/font-screen-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-screen-cyrillic/Makefile	(revision 318748)
 +++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-screen-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-screen-cyrillic
  PORTVERSION=	1.0.4
 Index: x11-fonts/font-sony-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sony-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-sony-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sony-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sony-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-sun-misc/Makefile
 ===================================================================
 --- x11-fonts/font-sun-misc/Makefile	(revision 318748)
 +++ x11-fonts/font-sun-misc/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-sun-misc
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-sun-misc
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-util/Makefile
 ===================================================================
 --- x11-fonts/font-util/Makefile	(revision 318748)
 +++ x11-fonts/font-util/Makefile	(working copy)
 @@ -10,9 +10,6 @@
  
  XORG_CAT=	font
  
 -USES=		pkgconfig
 -USE_XORG=	xorg-macros
 -
  MAN1=		bdftruncate.1 ucs2any.1
  
  .include <bsd.port.mk>
 Index: x11-fonts/font-winitzki-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 318748)
 +++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-winitzki-cyrillic
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-winitzki-cyrillic
  PORTVERSION=	1.0.3
 Index: x11-fonts/font-xfree86-type1/Makefile
 ===================================================================
 --- x11-fonts/font-xfree86-type1/Makefile	(revision 318748)
 +++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    font-xfree86-type1
 -# Date created:		28 Aug 2005
 -# Whom:			Pawel Worach
 -#
 +# Created by: Pawel Worach
  # $FreeBSD$
 -#
  
  PORTNAME=	font-xfree86-type1
  PORTVERSION=	1.0.4
 Index: x11-fonts/fontcacheproto/Makefile
 ===================================================================
 --- x11-fonts/fontcacheproto/Makefile	(revision 318748)
 +++ x11-fonts/fontcacheproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	fontcacheproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontcacheproto
  PORTVERSION=	0.1.3
 Index: x11-fonts/fontsproto/Makefile
 ===================================================================
 --- x11-fonts/fontsproto/Makefile	(revision 318748)
 +++ x11-fonts/fontsproto/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	fontsproto
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	fontsproto
 -PORTVERSION=	2.1.1
 +PORTVERSION=	2.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/fontsproto/distinfo
 ===================================================================
 --- x11-fonts/fontsproto/distinfo	(revision 318748)
 +++ x11-fonts/fontsproto/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
 -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
 Index: x11-fonts/fonttosfnt/Makefile
 ===================================================================
 --- x11-fonts/fonttosfnt/Makefile	(revision 318748)
 +++ x11-fonts/fonttosfnt/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	fonttosfnt
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	fonttosfnt
  PORTVERSION=	1.0.4
 Index: x11-fonts/fslsfonts/Makefile
 ===================================================================
 --- x11-fonts/fslsfonts/Makefile	(revision 318748)
 +++ x11-fonts/fslsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	List fonts served by the X font server
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/fslsfonts
  
 Index: x11-fonts/libFS/Makefile
 ===================================================================
 --- x11-fonts/libFS/Makefile	(revision 318748)
 +++ x11-fonts/libFS/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	libFS
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libFS
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libFS/distinfo
 ===================================================================
 --- x11-fonts/libFS/distinfo	(revision 318748)
 +++ x11-fonts/libFS/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
 Index: x11-fonts/libXfont/Makefile
 ===================================================================
 --- x11-fonts/libXfont/Makefile	(revision 318748)
 +++ x11-fonts/libXfont/Makefile	(working copy)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:   libXfont
 -# Date Created:			29 Oct, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfont
 -PORTVERSION=	1.4.4
 -PORTREVISION=	1
 +PORTVERSION=	1.4.5
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 Index: x11-fonts/libXfont/distinfo
 ===================================================================
 --- x11-fonts/libXfont/distinfo	(revision 318748)
 +++ x11-fonts/libXfont/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
 Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
 ===================================================================
 --- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 318748)
 +++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working copy)
 @@ -1,101 +0,0 @@
 -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
 -From: Joerg Sonnenberger <joerg@britannica.bec.de>
 -Date: Sun, 21 Aug 2011 16:51:53 +0000
 -Subject: Do proper input validation to fix for CVE-2011-2895.
 -
 -It ensures that all valid input can be decompressed, checks that the
 -overflow conditions doesn't happen and generally tightens the
 -validation of the LZW stream and doesn't pessimize the inner loop for
 -no good reason. It's derived from a change in libarchive from 2004.
 -
 -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 -Reviewed-by: Tomas Hoger <thoger@redhat.com>
 -
 ---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
 -+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
 - #define FIRST	257	/* first free entry */
 - #define	CLEAR	256	/* table clear output code */
 - 
 --#define STACK_SIZE  8192
 -+#define STACK_SIZE  65300
 - 
 - typedef struct _compressedFILE {
 -     BufFilePtr	    file;
 -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
 - 	file->tab_suffix[code] = (char_type) code;
 -     }
 -     file->free_ent = ((file->block_compress) ? FIRST : 256 );
 -+    file->oldcode = -1;
 -     file->clear_flg = 0;
 -     file->offset = 0;
 -     file->size = 0;
 -     file->stackp = file->de_stack;
 -     bzero(file->buf, BITS);
 --    file->finchar = file->oldcode = getcode (file);
 --    if (file->oldcode != -1)
 --	*file->stackp++ = file->finchar;
 -     return BufFileCreate ((char *) file,
 - 			  BufCompressedFill,
 - 			  0,
 -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
 - 	if (buf == bufend)
 - 	    break;
 - 
 --	if (oldcode == -1)
 --	    break;
 --
 - 	code = getcode (file);
 - 	if (code == -1)
 - 	    break;
 -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
 - 	    for ( code = 255; code >= 0; code-- )
 - 	    	file->tab_prefix[code] = 0;
 - 	    file->clear_flg = 1;
 --	    file->free_ent = FIRST - 1;
 --	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
 --	    	break;
 -+	    file->free_ent = FIRST;
 -+	    oldcode = -1;
 -+	    continue;
 -     	}
 -     	incode = code;
 -     	/*
 -      	 * Special case for KwKwK string.
 -      	 */
 -     	if ( code >= file->free_ent ) {
 -+	    if ( code > file->free_ent || oldcode == -1 ) {
 -+		/* Bad stream. */
 -+		return BUFFILEEOF;
 -+	    }
 - 	    *stackp++ = finchar;
 - 	    code = oldcode;
 -     	}
 --    
 -+
 -+	/*
 -+	 * The above condition ensures that code < free_ent.
 -+	 * The construction of tab_prefixof in turn guarantees that
 -+	 * each iteration decreases code and therefore stack usage is
 -+	 * bound by 1 << BITS - 256.
 -+	 */
 -+
 -     	/*
 -      	 * Generate output characters in reverse order
 -      	 */
 -     	while ( code >= 256 )
 -     	{
 --	    if (stackp - de_stack >= STACK_SIZE - 1)
 --		return BUFFILEEOF;
 - 	    *stackp++ = file->tab_suffix[code];
 - 	    code = file->tab_prefix[code];
 -     	}
 -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
 -     	/*
 -      	 * Generate the new entry.
 -      	 */
 --    	if ( (code=file->free_ent) < file->maxmaxcode ) {
 -+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
 - 	    file->tab_prefix[code] = (unsigned short)oldcode;
 - 	    file->tab_suffix[code] = finchar;
 - 	    file->free_ent = code+1;
 Index: x11-fonts/libXfontcache/Makefile
 ===================================================================
 --- x11-fonts/libXfontcache/Makefile	(revision 318748)
 +++ x11-fonts/libXfontcache/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	libXfontcache
 -# Date Created:				21 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	libXfontcache
  PORTVERSION=	1.0.5
 Index: x11-fonts/libfontenc/Makefile
 ===================================================================
 --- x11-fonts/libfontenc/Makefile	(revision 318748)
 +++ x11-fonts/libfontenc/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	libfontenc
 -# Date Created:				08 Aug 2005
 -# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
 -#
 +# Created by: Dejan Lesjak <lesi@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libfontenc
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.2
  CATEGORIES=	x11-fonts
  
  MAINTAINER=	x11@FreeBSD.org
 Index: x11-fonts/libfontenc/distinfo
 ===================================================================
 --- x11-fonts/libfontenc/distinfo	(revision 318748)
 +++ x11-fonts/libfontenc/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
 -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
 Index: x11-fonts/mkfontdir/Makefile
 ===================================================================
 --- x11-fonts/mkfontdir/Makefile	(revision 318748)
 +++ x11-fonts/mkfontdir/Makefile	(working copy)
 @@ -8,7 +8,6 @@
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	Create an index of X font files in a directory
  
 -USE_XORG=	xorg-macros
  RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
  
  XORG_CAT=	app
 Index: x11-fonts/mkfontscale/Makefile
 ===================================================================
 --- x11-fonts/mkfontscale/Makefile	(revision 318748)
 +++ x11-fonts/mkfontscale/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
  
  XORG_CAT=	app
 -USE_XORG=	xproto fontenc xorg-macros
 +USE_XORG=	xproto fontenc
  
  PLIST_FILES=	bin/mkfontscale
  MAN1=		mkfontscale.1
 Index: x11-fonts/showfont/Makefile
 ===================================================================
 --- x11-fonts/showfont/Makefile	(revision 318748)
 +++ x11-fonts/showfont/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Font dumper for the X font server
  
  XORG_CAT=	app
 -USE_XORG=	libfs xorg-macros
 +USE_XORG=	libfs
  
  PLIST_FILES=	bin/showfont
  
 Index: x11-fonts/xf86bigfontproto/Makefile
 ===================================================================
 --- x11-fonts/xf86bigfontproto/Makefile	(revision 318748)
 +++ x11-fonts/xf86bigfontproto/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xf86bigfontproto
 -# Date Created:				06 Feb 2006
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xf86bigfontproto
  PORTVERSION=	1.2.0
 Index: x11-fonts/xfontsel/Makefile
 ===================================================================
 --- x11-fonts/xfontsel/Makefile	(revision 318748)
 +++ x11-fonts/xfontsel/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Point and click selection of X11 font names
  
  XORG_CAT=	app
 -USE_XORG=	xt xaw xorg-macros
 +USE_XORG=	xt xaw
  
  MAN1=		xfontsel.1
  
 Index: x11-fonts/xfs/Makefile
 ===================================================================
 --- x11-fonts/xfs/Makefile	(revision 318748)
 +++ x11-fonts/xfs/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:	xfs
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xfs
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-fonts
  
 @@ -17,7 +12,7 @@
  USE_GMAKE=	yes
  USE_XORG=	libfs xfont xtrans
  USE_RC_SUBR=	xfs
 -CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
 +CONFIGURE_ARGS=	--without-xmlto --without-fop
  
  MAN1=		xfs.1
  
 Index: x11-fonts/xfs/distinfo
 ===================================================================
 --- x11-fonts/xfs/distinfo	(revision 318748)
 +++ x11-fonts/xfs/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
 -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
 Index: x11-fonts/xfsinfo/Makefile
 ===================================================================
 --- x11-fonts/xfsinfo/Makefile	(revision 318748)
 +++ x11-fonts/xfsinfo/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	X font server information utility
  
  XORG_CAT=	app
 -USE_XORG=	x11 libfs xorg-macros
 +USE_XORG=	x11 libfs
  
  PLIST_FILES=	bin/xfsinfo
  
 Index: x11-fonts/xlsfonts/Makefile
 ===================================================================
 --- x11-fonts/xlsfonts/Makefile	(revision 318748)
 +++ x11-fonts/xlsfonts/Makefile	(working copy)
 @@ -8,7 +8,7 @@
  COMMENT=	Server font list displayer for X
  
  XORG_CAT=	app
 -USE_XORG=	x11 xorg-macros
 +USE_XORG=	x11
  
  PLIST_FILES=	bin/xlsfonts
  
 Index: x11-fonts/xorg-fonts/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-fonts
 -# Date created:				Jun 22 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-100dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-100dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-100dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-75dpi/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-75dpi
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-75dpi
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-cyrillic/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-cyrillic
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-cyrillic
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-miscbitmaps
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-miscbitmaps
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-truetype/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-truetype/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-truetype
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-truetype
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-fonts/xorg-fonts-type1/Makefile
 ===================================================================
 --- x11-fonts/xorg-fonts-type1/Makefile	(revision 318748)
 +++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:    xorg-fonts-type1
 -# Date created:		30 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-fonts-type1
 -PORTVERSION=	7.5.1
 +PORTVERSION=	7.7
  CATEGORIES=	x11-fonts
  MASTER_SITES=	# none
  DISTFILES=	# none
 Index: x11-servers/mga_hal/Makefile
 ===================================================================
 --- x11-servers/mga_hal/Makefile	(revision 318748)
 +++ x11-servers/mga_hal/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	mga_hal
 -# Date created:				12 Jan 2005
 -# Whom:					anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	mga_hal
  PORTVERSION=	4.4.0
 Index: x11-servers/xephyr/Makefile
 ===================================================================
 --- x11-servers/xephyr/Makefile	(revision 318748)
 +++ x11-servers/xephyr/Makefile	(working copy)
 @@ -1,14 +1,9 @@
 -# New ports collection makefile for:	xephyr
 -# Date created:				2008-05-18
 -# Whom:					Max Brazhnikov <makc@issp.ac.ru>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xephyr
  PORTREVISION=	0
  
 -COMMENT=	A kdrive based X server from X.Org
 +COMMENT=	X server from X.Org based on kdrive
  
  MASTERDIR=	${.CURDIR}/../xorg-server
  DESCR=		${.CURDIR}/pkg-descr
 @@ -22,8 +17,7 @@
  
  CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
 -		--disable-xorg --disable-xnest \
 -		--localstatedir=/var --without-dtrace
 +		--disable-xnest --localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
  PLIST_FILES=	bin/Xephyr
 Index: x11-servers/xorg-dmx/Makefile
 ===================================================================
 --- x11-servers/xorg-dmx/Makefile	(revision 318748)
 +++ x11-servers/xorg-dmx/Makefile	(working copy)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    xorg-dmx
 -# Date created:		13 Mar 2005
 -# Whom:			lesi@FreeBSD.org
 -#
 +# Created by: lesi@FreeBSD.org
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-dmx
  PORTREVISION=	0
 @@ -21,7 +17,7 @@
  		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
  		xau dmx xtst xres pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
 +CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
  		--without-xmlto	--disable-docs --disable-devel-docs \
  		--enable-dmx --localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-dmx/pkg-plist
 ===================================================================
 --- x11-servers/xorg-dmx/pkg-plist	(revision 318748)
 +++ x11-servers/xorg-dmx/pkg-plist	(working copy)
 @@ -11,5 +11,3 @@
  bin/dmxwininfo
  bin/vdltodmx
  bin/xdmxconfig
 -%%NEW%%@dirrmtry share/X11/xorg.conf.d
 -%%NEW%%@dirrmtry share/X11
 Index: x11-servers/xorg-nestserver/Makefile
 ===================================================================
 --- x11-servers/xorg-nestserver/Makefile	(revision 318748)
 +++ x11-servers/xorg-nestserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-nestserver
 -# Date created:		21 July 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-nestserver
 -PORTREVISION=	1
  
  COMMENT=	Nesting X server from X.Org
  
 @@ -20,7 +15,7 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
  		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
  		--without-xmlto --disable-docs --disable-devel-docs \
  		--localstatedir=/var --without-dtrace
  
 Index: x11-servers/xorg-server/Makefile
 ===================================================================
 --- x11-servers/xorg-server/Makefile	(revision 318748)
 +++ x11-servers/xorg-server/Makefile	(working copy)
 @@ -1,45 +1,42 @@
 -# New ports collection makefile for:    xorg-server
 -# Date created:		7 May 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME?=	xorg-server
  PORTVERSION=	${XORG_VERSION}
  PORTREVISION?=	${XORG_REVISION}
  PORTEPOCH?=	1
  CATEGORIES=	x11-servers
 -MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 -DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 +MASTER_SITES=	XORG
 +MASTER_SITE_SUBDIR=	individual/xserver
 +DISTNAME=	xorg-server-${PORTVERSION}
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT?=	X.Org X server and related programs
  
  LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 -
 -RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
 +RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
  		xkbcomp:${PORTSDIR}/x11/xkbcomp
  
  XORG_CAT=	xserver
  SLAVE_PORT?=	no
  
  .if defined(WITH_NEW_XORG)
 -XORG_VERSION=	1.10.6
 -XORG_REVISION=	2
 +XORG_VERSION=	1.12.4
 +XORG_REVISION=	0
  PLIST_SUB+=	OLD="@comment " NEW=""
 -EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
 -		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
 -		${FILESDIR}/extra-clang
 +EXTRA_PATCHES+=	${FILESDIR}/extra-clang
  .else
  XORG_VERSION=	1.7.7
  XORG_REVISION=	6
  PLIST_SUB+=	OLD="" NEW="@comment "
 -EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
 -EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
 -EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
 +EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
 +		${FILESDIR}/extra-os-utils.c \
 +		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
 +		${FILESDIR}/extra-Xserver-os-xprintf.c \
 +		${FILESDIR}/extra-servermd.h
  .endif
  
 +USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_GL=		gl
  USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 @@ -48,8 +45,7 @@
  		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
  		resourceproto fontsproto inputproto xf86dgaproto \
  		videoproto compositeproto trapproto recordproto xineramaproto \
 -		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
 -		xorg-macros
 +		xinerama evieproto xfont fontenc xkbui pixman pciaccess
  
  MAKE_JOBS_UNSAFE=	yes
  USE_OPENSSL=	yes
 @@ -96,7 +92,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MHAL}
 -LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 +LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=	--enable-config-hal=yes
  .else
  CONFIGURE_ARGS+=	--enable-config-hal=no
 @@ -115,8 +111,12 @@
  .endif
  
  .if ${ARCH} == i386
 -EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 +.if defined(WITH_NEW_XORG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
 +.else
 +EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
  .endif
 +.endif
  
  .if ${ARCH} == ia64
  PLIST_SUB+=	IA64_NA="@comment "
 @@ -166,6 +166,8 @@
  
  .if ${SLAVE_PORT} == "no"
  pre-su-install:
 +# The .xorg dir because else the xorg-server might not load the correct 
 +# libglx module.
  	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
  	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
  		${PREFIX}/lib/xorg/modules/extensions/.xorg/
 Index: x11-servers/xorg-server/distinfo
 ===================================================================
 --- x11-servers/xorg-server/distinfo	(revision 318748)
 +++ x11-servers/xorg-server/distinfo	(working copy)
 @@ -1,4 +1,4 @@
  SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
  SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
 Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -0,0 +1,13 @@
 +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 ++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 +@@ -52,6 +52,10 @@
 + 	pVidMem->mapMem = sparc64MapVidMem;
 + 	pVidMem->unmapMem = sparc64UnmapVidMem;
 + 	pVidMem->initialised = TRUE;
 ++
 ++#if defined(__FreeBSD__)
 ++	pci_system_init_dev_mem(xf86Info.screenFd);
 ++#endif
 + }
 + 
 + static pointer
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working copy)
 @@ -0,0 +1,12 @@
 +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 +--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 ++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 +@@ -39,7 +39,7 @@
 + # ifdef __va_copy
 + #  define va_copy __va_copy
 + # else
 +-#  error "no working va_copy was found"
 ++#  define va_copy(dest, src) ((dest) = (src))
 + # endif
 + #endif
 +     
 
 Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-arch-i386	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-arch-i386	(working copy)
 @@ -1,11 +0,0 @@
 ---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 -+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 -@@ -1021,7 +1021,7 @@
 - 
 - #    if !defined(__SUNPRO_C)
 - #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 --#     ifdef GCCUSESGAS
 -+#     if defined(GCCUSESGAS) || defined(__clang__)
 - 
 - /*
 -  * If gcc uses gas rather than the native assembler, the syntax of these
 Index: x11-servers/xorg-server/files/extra-clang
 ===================================================================
 --- x11-servers/xorg-server/files/extra-clang	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-clang	(working copy)
 @@ -1,53 +1,75 @@
 ---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
 -+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
 -@@ -479,7 +479,7 @@
 - MatchAttrToken(const char *attr, struct list *patterns,
 -                int (*compare)(const char *attr, const char *pattern))
 +--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -5189,7 +5189,8 @@
 + InitEvents(void)
   {
 +     int i;
 +-    QdEventPtr qe, tmp;
 ++    QdEventPtr qe = NULL;
 ++    QdEventPtr tmp;
 + 
 +     inputInfo.numDevices = 0;
 +     inputInfo.devices = (DeviceIntPtr) NULL;
 +--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
 ++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -524,7 +524,7 @@
 + MatchAttrToken(const char *attr, struct xorg_list *patterns,
 +                int (*compare) (const char *attr, const char *pattern))
 + {
  -    const xf86MatchGroup *group;
  +    const xf86MatchGroup *group = NULL;
   
       /* If there are no patterns, accept the match */
 -     if (list_is_empty(patterns))
 ---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
 -+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
 -@@ -338,7 +338,8 @@
 -     XF86ConfInputClassPtr prev;
 - 
 -     while (ptr) {
 --        xf86MatchGroup *group, *next;
 -+        xf86MatchGroup *group = NULL;
 -+        xf86MatchGroup *next;
 -         char **list;
 - 
 -         TestFree(ptr->identifier);
 ---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
 -+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
 -@@ -201,7 +201,7 @@
 +     if (xorg_list_is_empty(patterns))
 +--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
 ++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
 +@@ -239,7 +239,7 @@
   static DRI2DrawableRefPtr
   DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
   {
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     list_for_each_entry(ref, &pPriv->reference_list, link) {
 - 	if (ref->id == id)
 -@@ -267,7 +267,8 @@
 +     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
 +         if (ref->id == id)
 +@@ -306,7 +306,8 @@
   {
       DRI2DrawablePtr pPriv = p;
 -     DRI2ScreenPtr   ds = pPriv->dri2_screen;
 +     DRI2ScreenPtr ds = pPriv->dri2_screen;
  -    DRI2DrawableRefPtr ref, next;
  +    DRI2DrawableRefPtr ref = NULL;
 -+    DRI2DrawableRefPtr  next;
 ++    DRI2DrawableRefPtr next;
       WindowPtr pWin;
       PixmapPtr pPixmap;
       DrawablePtr pDraw;
 -@@ -534,7 +535,7 @@
 +@@ -587,7 +588,7 @@
   DRI2InvalidateDrawable(DrawablePtr pDraw)
   {
       DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
  -    DRI2DrawableRefPtr ref;
  +    DRI2DrawableRefPtr ref = NULL;
   
 -     if (!pPriv)
 +     if (!pPriv || !pPriv->needInvalidate)
           return;
 +--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
 ++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -187,7 +187,7 @@
 + {
 +     struct parent parent = { 0 };
 +     struct child child[3];
 +-    struct child *c;
 ++    struct child *c = NULL;
 +     int i = 0;
 + 
 +     xorg_list_init(&parent.children);
 +--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
 ++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
 +@@ -1143,7 +1143,7 @@
 + barrier_find_nearest(CursorScreenPtr cs, int dir,
 +                      int x1, int y1, int x2, int y2)
 + {
 +-    struct PointerBarrierClient *c;
 ++    struct PointerBarrierClient *c = NULL;
 +     struct PointerBarrier *nearest = NULL;
 +     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
 + 
 Index: x11-servers/xorg-server/files/extra-dix_events.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-dix_events.c	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-dix_events.c	(working copy)
 @@ -1,89 +0,0 @@
 ---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
 -+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
 -     {
 - 	DeviceIntPtr	gdev;
 - 	XkbSrvInfoPtr	xkbi = NULL;
 --	Mask		mask = 0;
 - 
 - 	gdev= grab->modifierDevice;
 -         if (grab->grabtype == GRABTYPE_CORE)
 -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
 -                 }
 -                 xE = &core;
 -                 count = 1;
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents)
 --                    mask |= pWin->eventMask;
 -             } else if (match & XI2_MATCH)
 -             {
 -                 rc = EventToXI2((InternalEvent*)event, &xE);
 -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
 -                     continue;
 -                 }
 -                 count = 1;
 --
 --                /* FIXME: EventToXI2 returns NULL for enter events, so
 --                 * dereferencing the event is bad. Internal event types are
 --                 * aligned with core events, so the else clause is valid.
 --                 * long-term we should use internal events for enter/focus
 --                 * as well */
 --                if (xE)
 --                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
 --                else if (event->type == XI_Enter || event->type == XI_FocusIn)
 --                    mask = grab->xi2mask[device->id][event->type/8];
 --
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
 --                            mask |= icp->xi2mask[device->id][evtype/8];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             } else
 -             {
 -                 rc = EventToXI((InternalEvent*)event, &xE, &count);
 -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
 -                                 "(%d, %d).\n", device->name, event->type, rc);
 -                     continue;
 -                 }
 --                mask = grab->eventMask;
 --                if (grab->ownerEvents && wOtherInputMasks(grab->window))
 --                {
 --                    InputClientsPtr icp =
 --                        wOtherInputMasks(grab->window)->inputClients;
 --
 --                    while(icp)
 --                    {
 --                        if (rClient(icp) == rClient(grab))
 --                        {
 --                            mask |= icp->mask[device->id];
 --                            break;
 --                        }
 --
 --                        icp = icp->next;
 --                    }
 --                }
 -             }
 - 
 - 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
 -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
 -             {
 -                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
 - 
 --                TryClientEvents(rClient(grab), device, xE, count, mask,
 -+                TryClientEvents(rClient(grab), device, xE, count,
 -+                                       GetEventFilter(device, xE),
 -                                        GetEventFilter(device, xE), grab);
 -             }
 - 
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(working copy)
 @@ -1,54 +0,0 @@
 ---- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
 -+++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
 -@@ -0,0 +1,51 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __compsize_h__
 -+#define __compsize_h__
 -+
 -+extern GLint __glColorTableParameterfv_size(GLenum pname);
 -+extern GLint __glColorTableParameteriv_size(GLenum pname);
 -+extern GLint __glConvolutionParameterfv_size(GLenum pname);
 -+extern GLint __glConvolutionParameteriv_size(GLenum pname);
 -+extern GLint __glFogfv_size(GLenum pname);
 -+extern GLint __glFogiv_size(GLenum pname);
 -+extern GLint __glLightModelfv_size(GLenum pname);
 -+extern GLint __glLightModeliv_size(GLenum pname);
 -+extern GLint __glLightfv_size(GLenum pname);
 -+extern GLint __glLightiv_size(GLenum pname);
 -+extern GLint __glMaterialfv_size(GLenum pname);
 -+extern GLint __glMaterialiv_size(GLenum pname);
 -+extern GLint __glTexEnvfv_size(GLenum e);
 -+extern GLint __glTexEnviv_size(GLenum e);
 -+extern GLint __glTexGendv_size(GLenum e);
 -+extern GLint __glTexGenfv_size(GLenum e);
 -+extern GLint __glTexGeniv_size(GLenum e);
 -+extern GLint __glTexParameterfv_size(GLenum e);
 -+extern GLint __glTexParameteriv_size(GLenum e);
 -+
 -+#endif /* !__compsize_h__ */
 Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(working copy)
 @@ -1,40 +0,0 @@
 ---- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
 -+++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
 -@@ -0,0 +1,37 @@
 -+/*
 -+ * Copyright 2011 Apple Inc.
 -+ *
 -+ * All Rights Reserved.
 -+ *
 -+ * Permission is hereby granted, free of charge, to any person obtaining
 -+ * a copy of this software and associated documentation files (the
 -+ * "Software"), to deal in the Software without restriction, including
 -+ * without limitation on the rights to use, copy, modify, merge,
 -+ * publish, distribute, sublicense, and/or sell copies of the Software,
 -+ * and to permit persons to whom the Software is furnished to do so,
 -+ * subject to the following conditions:
 -+ *
 -+ * The above copyright notice and this permission notice (including the
 -+ * next paragraph) shall be included in all copies or substantial
 -+ * portions of the Software.
 -+ *
 -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 -+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
 -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 -+ * SOFTWARE.
 -+ */
 -+
 -+#ifndef __GLX_cmds_h__
 -+#define __GLX_cmds_h__
 -+
 -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
 -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
 -+
 -+#endif /* !__GLX_cmds_h__ */
 Index: x11-servers/xorg-server/files/extra-new-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-new-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-new-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
 +@@ -1335,7 +1335,7 @@
 + 
 + #if !defined(__SUNPRO_C)
 + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#ifdef GCCUSESGAS
 ++#if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-new-arch-i386
 ___________________________________________________________________
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-old-arch-i386
 ===================================================================
 --- x11-servers/xorg-server/files/extra-old-arch-i386	(revision 0)
 +++ x11-servers/xorg-server/files/extra-old-arch-i386	(working copy)
 @@ -0,0 +1,11 @@
 +--- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
 ++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
 +@@ -1021,7 +1021,7 @@
 + 
 + #    if !defined(__SUNPRO_C)
 + #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
 +-#     ifdef GCCUSESGAS
 ++#     if defined(GCCUSESGAS) || defined(__clang__)
 + 
 + /*
 +  * If gcc uses gas rather than the native assembler, the syntax of these
 
 Property changes on: x11-servers/xorg-server/files/extra-old-arch-i386
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-os-utils.c	(revision 0)
 +++ x11-servers/xorg-server/files/extra-os-utils.c	(working copy)
 @@ -0,0 +1,20 @@
 +--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 ++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 +@@ -315,7 +315,7 @@
 +     FatalError("Could not create lock file in %s\n", tmp);
 +   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 +   (void) write(lfd, pid_str, 11);
 +-  (void) chmod(tmp, 0444);
 ++  (void) fchmod(tmp, 0444);
 +   (void) close(lfd);
 + 
 +   /*
 +@@ -336,7 +336,7 @@
 +       /*
 +        * Read the pid from the existing file
 +        */
 +-      lfd = open(LockFile, O_RDONLY);
 ++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 +       if (lfd < 0) {
 +         unlink(tmp);
 +         FatalError("Can't read lock file %s\n", LockFile); 
 
 Property changes on: x11-servers/xorg-server/files/extra-os-utils.c
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/extra-patch-os-utils.c
 ===================================================================
 --- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 318748)
 +++ x11-servers/xorg-server/files/extra-patch-os-utils.c	(working copy)
 @@ -1,20 +0,0 @@
 ---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
 -+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
 -@@ -315,7 +315,7 @@
 -     FatalError("Could not create lock file in %s\n", tmp);
 -   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
 -   (void) write(lfd, pid_str, 11);
 --  (void) chmod(tmp, 0444);
 -+  (void) fchmod(tmp, 0444);
 -   (void) close(lfd);
 - 
 -   /*
 -@@ -336,7 +336,7 @@
 -       /*
 -        * Read the pid from the existing file
 -        */
 --      lfd = open(LockFile, O_RDONLY);
 -+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
 -       if (lfd < 0) {
 -         unlink(tmp);
 -         FatalError("Can't read lock file %s\n", LockFile); 
 Index: x11-servers/xorg-server/files/extra-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/extra-servermd.h	(revision 0)
 +++ x11-servers/xorg-server/files/extra-servermd.h	(working copy)
 @@ -0,0 +1,11 @@
 +--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 ++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 +@@ -216,7 +216,7 @@
 +     defined(__sparc__) || defined(__mc68000__)
 + 
 + #if defined(__sparc) || defined(__sparc__)
 +-# if !defined(sparc)
 ++# if !defined(sparc) && !defined(__FreeBSD__)
 + #  define sparc 1
 + # endif
 + #endif
 
 Property changes on: x11-servers/xorg-server/files/extra-servermd.h
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:eolstyle
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(revision 318748)
 +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c	(working copy)
 @@ -1,13 +0,0 @@
 ---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
 -+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
 -@@ -52,6 +52,10 @@
 - 	pVidMem->mapMem = sparc64MapVidMem;
 - 	pVidMem->unmapMem = sparc64UnmapVidMem;
 - 	pVidMem->initialised = TRUE;
 -+
 -+#if defined(__FreeBSD__)
 -+	pci_system_init_dev_mem(xf86Info.screenFd);
 -+#endif
 - }
 - 
 - static pointer
 Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
 ===================================================================
 --- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 318748)
 +++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working copy)
 @@ -1,12 +0,0 @@
 -diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
 ---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
 -+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 -@@ -39,7 +39,7 @@
 - # ifdef __va_copy
 - #  define va_copy __va_copy
 - # else
 --#  error "no working va_copy was found"
 -+#  define va_copy(dest, src) ((dest) = (src))
 - # endif
 - #endif
 -     
 Index: x11-servers/xorg-server/files/patch-servermd.h
 ===================================================================
 --- x11-servers/xorg-server/files/patch-servermd.h	(revision 318748)
 +++ x11-servers/xorg-server/files/patch-servermd.h	(working copy)
 @@ -1,11 +0,0 @@
 ---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
 -+++ include/servermd.h	Sun Jan  8 14:06:22 2006
 -@@ -216,7 +216,7 @@
 -     defined(__sparc__) || defined(__mc68000__)
 - 
 - #if defined(__sparc) || defined(__sparc__)
 --# if !defined(sparc)
 -+# if !defined(sparc) && !defined(__FreeBSD__)
 - #  define sparc 1
 - # endif
 - #endif
 Index: x11-servers/xorg-server/pkg-plist
 ===================================================================
 --- x11-servers/xorg-server/pkg-plist	(revision 318748)
 +++ x11-servers/xorg-server/pkg-plist	(working copy)
 @@ -12,6 +12,7 @@
  %%OLD%%include/xorg/bstorestr.h
  %%NEW%%include/xorg/callback.h
  %%OLD%%include/xorg/cfb8_16.h
 +%%NEW%%include/xorg/client.h
  include/xorg/closestr.h
  include/xorg/closure.h
  include/xorg/colormap.h
 @@ -83,6 +84,7 @@
  include/xorg/msp3430.h
  include/xorg/opaque.h
  include/xorg/os.h
 +%%NEW%%include/xorg/optionstr.h
  include/xorg/panoramiXsrv.h
  include/xorg/panoramiX.h
  include/xorg/picture.h
 @@ -138,6 +140,7 @@
  include/xorg/xf86Modes.h
  include/xorg/xf86Module.h
  include/xorg/xf86Opt.h
 +%%NEW%%include/xorg/xf86Optionstr.h
  include/xorg/xf86Optrec.h
  include/xorg/xf86Parser.h
  include/xorg/xf86Pci.h
 @@ -225,7 +228,7 @@
  libdata/pkgconfig/xorg-server.pc
  share/aclocal/xorg-server.m4
  %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 -%%NEW%%@dirrm share/doc/xorg-server
 +@comment %%NEW%%@dirrm share/doc/xorg-server
  @dirrm include/xorg
  @dirrm lib/xorg/modules/extensions/.xorg
  @dirrm lib/xorg/modules/extensions
 Index: x11-servers/xorg-vfbserver/Makefile
 ===================================================================
 --- x11-servers/xorg-vfbserver/Makefile	(revision 318748)
 +++ x11-servers/xorg-vfbserver/Makefile	(working copy)
 @@ -1,12 +1,7 @@
 -# New ports collection makefile for:    xorg-vfbserver
 -# Date created:		17 June 2004
 -# Whom:			anholt@FreeBSD.org
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-vfbserver
 -PORTREVISION=	1
  
  COMMENT=	X virtual framebuffer server from X.Org
  
 @@ -20,8 +15,8 @@
  		xineramaproto xinerama evieproto xkbfile xfont fontenc \
  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
  
 -CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
 -		--without-xmlto --disable-docs --disable-devel-docs \
 +CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 +		--without-xmlto --disable-docs --disable-devel1-docs \
  		--localstatedir=/var --without-dtrace
  
  SLAVE_PORT=	yes
 Index: x11-themes/xcursor-themes/Makefile
 ===================================================================
 --- x11-themes/xcursor-themes/Makefile	(revision 318748)
 +++ x11-themes/xcursor-themes/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	xcursor-themes
 -# Date Created:				Nov 2 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	xcursor-themes
  PORTVERSION=	1.0.3
 Index: x11-toolkits/gtkglext/Makefile
 ===================================================================
 --- x11-toolkits/gtkglext/Makefile	(revision 318748)
 +++ x11-toolkits/gtkglext/Makefile	(working copy)
 @@ -20,7 +20,6 @@
  		png15:${PORTSDIR}/graphics/png \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  OPTIONS_DEFINE=	DOCS
 @@ -28,8 +27,8 @@
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_AUTOTOOLS=	libtool
 -USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  USE_GL=		glu
  USES=		pathfix pkgconfig gettext iconv
  USE_GNOME=	gdkpixbuf2 gtk20
 Index: x11-toolkits/libXaw/Makefile
 ===================================================================
 --- x11-toolkits/libXaw/Makefile	(revision 318748)
 +++ x11-toolkits/libXaw/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXaw
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXaw
 -PORTVERSION=	1.0.9
 +PORTVERSION=	1.0.11
  PORTEPOCH=	2
  CATEGORIES=	x11-toolkits
  
 @@ -16,16 +12,8 @@
  XORG_CAT=	lib
  USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
  USE_GMAKE=	yes
 -CONFIGURE_ARGS=	--without-xmlto
 +CONFIGURE_ARGS+=--without-xmlto
  
 -PORTDOCS=	*
 -
 -.if defined(NOPORTDOCS)
 -CONFIGURE_ARGS+=--disable-specs
 -post-configure:
 -	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
 -.endif
 -
  MAN3=		Xaw.3
  
  .include <bsd.port.mk>
 Index: x11-toolkits/libXaw/distinfo
 ===================================================================
 --- x11-toolkits/libXaw/distinfo	(revision 318748)
 +++ x11-toolkits/libXaw/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
 Index: x11-toolkits/libXaw/pkg-plist
 ===================================================================
 --- x11-toolkits/libXaw/pkg-plist	(revision 318748)
 +++ x11-toolkits/libXaw/pkg-plist	(working copy)
 @@ -82,4 +82,51 @@
  lib/libXaw7.so.7
  libdata/pkgconfig/xaw6.pc
  libdata/pkgconfig/xaw7.pc
 +%%DOCSDIR%%/AsciiSink.xml
 +%%DOCSDIR%%/AsciiSource.xml
 +%%DOCSDIR%%/AsciiText.xml
 +%%DOCSDIR%%/Box.xml
 +%%DOCSDIR%%/CH1.xml
 +%%DOCSDIR%%/CH2.xml
 +%%DOCSDIR%%/CH3.xml
 +%%DOCSDIR%%/CH4.xml
 +%%DOCSDIR%%/CH5.xml
 +%%DOCSDIR%%/CH6.xml
 +%%DOCSDIR%%/CH7.xml
 +%%DOCSDIR%%/Command.xml
 +%%DOCSDIR%%/Dialog.xml
 +%%DOCSDIR%%/Form.xml
 +%%DOCSDIR%%/Grip.xml
 +%%DOCSDIR%%/Label.xml
 +%%DOCSDIR%%/List.xml
 +%%DOCSDIR%%/MenuButton.xml
 +%%DOCSDIR%%/Paned.xml
 +%%DOCSDIR%%/Panner.xml
 +%%DOCSDIR%%/Porthole.xml
 +%%DOCSDIR%%/Repeater.xml
 +%%DOCSDIR%%/Scrollbar.xml
 +%%DOCSDIR%%/Simple.xml
 +%%DOCSDIR%%/SimpleMenu.xml
 +%%DOCSDIR%%/Sme.xml
 +%%DOCSDIR%%/SmeBSB.xml
 +%%DOCSDIR%%/SmeLine.xml
 +%%DOCSDIR%%/StripChart.xml
 +%%DOCSDIR%%/TPage_Credits.xml
 +%%DOCSDIR%%/Template.xml
 +%%DOCSDIR%%/Template_private_header_file.xml
 +%%DOCSDIR%%/Template_public_header_file.xml
 +%%DOCSDIR%%/Template_widget_source_file.xml
 +%%DOCSDIR%%/Text.xml
 +%%DOCSDIR%%/TextActions.xml
 +%%DOCSDIR%%/TextActions_default_translation_bindings.xml
 +%%DOCSDIR%%/TextActions_text_widget_actions.xml
 +%%DOCSDIR%%/TextCustom.xml
 +%%DOCSDIR%%/TextFuncs.xml
 +%%DOCSDIR%%/TextSink.xml
 +%%DOCSDIR%%/TextSource.xml
 +%%DOCSDIR%%/Toggle.xml
 +%%DOCSDIR%%/Tree.xml
 +%%DOCSDIR%%/Viewport.xml
 +%%DOCSDIR%%/libXaw.xml
 +@dirrmtry %%DOCSDIR%%
  @dirrmtry include/X11/Xaw
 Index: x11-toolkits/libXmu/Makefile
 ===================================================================
 --- x11-toolkits/libXmu/Makefile	(revision 318748)
 +++ x11-toolkits/libXmu/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXmu
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXmu
 -PORTVERSION=	1.1.0
 +PORTVERSION=	1.1.1
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 Index: x11-toolkits/libXmu/distinfo
 ===================================================================
 --- x11-toolkits/libXmu/distinfo	(revision 318748)
 +++ x11-toolkits/libXmu/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473
 Index: x11-toolkits/libXt/Makefile
 ===================================================================
 --- x11-toolkits/libXt/Makefile	(revision 318748)
 +++ x11-toolkits/libXt/Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:   libXt
 -# Date Created:			25 Jan, 2003
 -# Whom:				Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	libXt
 -PORTVERSION=	1.1.1
 +PORTVERSION=	1.1.3
  PORTEPOCH=	1
  CATEGORIES=	x11-toolkits
  
 @@ -15,6 +11,7 @@
  
  XORG_CAT=	lib
  USE_XORG=	x11 sm xproto:both kbproto
 +CONFIGURE_ARGS=	--disable-specs
  
  MAN3=	MenuPopdown.3 \
  	MenuPopup.3 \
 Index: x11-toolkits/libXt/distinfo
 ===================================================================
 --- x11-toolkits/libXt/distinfo	(revision 318748)
 +++ x11-toolkits/libXt/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
 +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679
 Index: x11-toolkits/termit/Makefile
 ===================================================================
 --- x11-toolkits/termit/Makefile	(revision 318748)
 +++ x11-toolkits/termit/Makefile	(working copy)
 @@ -18,14 +18,13 @@
  		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_BZIP2=	yes
  USES=		cmake pkgconfig iconv
  USE_LUA=	yes
 -USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	gdkpixbuf2 vte
  MAKE_JOBS_SAFE=	yes
  
 Index: x11-wm/awesome/Makefile
 ===================================================================
 --- x11-wm/awesome/Makefile	(revision 318748)
 +++ x11-wm/awesome/Makefile	(working copy)
 @@ -27,7 +27,6 @@
  		freetype:${PORTSDIR}/print/freetype2 \
  		startup-notification-1:${PORTSDIR}/x11/startup-notification \
  		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-image:${PORTSDIR}/x11/xcb-util-image \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 @@ -40,7 +39,8 @@
  USE_EFL=	imlib2
  USE_GNOME=	glib20 pango
  USE_LUA=	5.1+
 -USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 +USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 +		xproto
  
  MAN1=	awesome.1 \
  	awesome-client.1
 Index: x11-wm/dwm/Makefile
 ===================================================================
 --- x11-wm/dwm/Makefile	(revision 318748)
 +++ x11-wm/dwm/Makefile	(working copy)
 @@ -15,13 +15,12 @@
  LICENSE=	MIT
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 -LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
  
  OPTIONS_DEFINE=	XINERAMA XFT DOCS
  OPTIONS_DEFAULT=XINERAMA
  
 -USE_XORG=	x11 xau xdmcp xext
 +USE_XORG=	x11 xau xcb xdmcp xext
  
  MAN1=		dwm.1
  PLIST_FILES=	bin/dwm
 Index: x11-wm/echinus/Makefile
 ===================================================================
 --- x11-wm/echinus/Makefile	(revision 318748)
 +++ x11-wm/echinus/Makefile	(working copy)
 @@ -12,11 +12,10 @@
  LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		xcb:${PORTSDIR}/x11/libxcb \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  USES=		pkgconfig
 -USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 +USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
  
  MAN1=		echinus.1
  MANCOMPRESSED=	no
 Index: x11-wm/i3/Makefile
 ===================================================================
 --- x11-wm/i3/Makefile	(revision 318748)
 +++ x11-wm/i3/Makefile	(working copy)
 @@ -14,8 +14,7 @@
  
  LICENSE=	BSD
  
 -LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
 -		startup-notification:${PORTSDIR}/x11/startup-notification \
 +LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
  		xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 @@ -29,7 +28,7 @@
  		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
  
  USE_PERL5_RUN=	yes
 -USE_XORG=	x11 xcursor
 +USE_XORG=	x11 xcb xcursor
  USES=		pkgconfig iconv
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 Index: x11-wm/spectrwm/Makefile
 ===================================================================
 --- x11-wm/spectrwm/Makefile	(revision 318748)
 +++ x11-wm/spectrwm/Makefile	(working copy)
 @@ -12,13 +12,12 @@
  
  LICENSE=	ISCL
  
 -LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
 -		xcb-util:${PORTSDIR}/x11/xcb-util \
 +LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
  		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
  		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
  RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
  
 -USE_XORG=	x11 xcursor xft xrandr xt
 +USE_XORG=	x11 xcb xcursor xft xrandr xt
  
  MAN1=		spectrwm.1
  USE_LDCONFIG=	yes
 Index: x11-wm/transset/Makefile
 ===================================================================
 --- x11-wm/transset/Makefile	(revision 318748)
 +++ x11-wm/transset/Makefile	(working copy)
 @@ -11,7 +11,7 @@
  COMMENT=	Make your windows transparent
  
  XORG_CAT=	app
 -USE_XORG=	x11 xproto xorg-macros
 +USE_XORG=	x11 xproto
  MAKE_JOBS_SAFE=	yes
  
  MAN1=		transset.1
 Index: x11-wm/twm/Makefile
 ===================================================================
 --- x11-wm/twm/Makefile	(revision 318748)
 +++ x11-wm/twm/Makefile	(working copy)
 @@ -1,9 +1,4 @@
 -# New ports collection makefile for:	twm
 -# Date Created:				17 Feb 2006
 -# Whom:					Florent Thoumie <flz@FreeBSD.org>
 -#
  # $FreeBSD$
 -#
  
  PORTNAME=	twm
  PORTVERSION=	1.0.7
 Index: x11-wm/xcompmgr/Makefile
 ===================================================================
 --- x11-wm/xcompmgr/Makefile	(revision 318748)
 +++ x11-wm/xcompmgr/Makefile	(working copy)
 @@ -9,7 +9,7 @@
  COMMENT=	A sample X compositing manager
  
  XORG_CAT=	app
 -USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 +USE_XORG=	x11 xcomposite xfixes xdamage xrender
  
  PLIST_FILES=	bin/${PORTNAME}
  
 
 --------------070303090004000601080003--
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177942: commit references a PR
Date: Sat, 25 May 2013 14:37:29 +0000 (UTC)

 Author: zeising
 Date: Sat May 25 14:37:02 2013
 New Revision: 319055
 URL: http://svnweb.freebsd.org/changeset/ports/319055
 
 Log:
   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!
 
 Added:
   head/graphics/freeglut/pkg-message   (contents, props changed)
   head/graphics/libdrm/files/extra-configure   (contents, props changed)
   head/graphics/libdrm/files/extra-tests_modetest_Makefile.in   (contents, props changed)
   head/graphics/libdrm/files/extra-tests_modetest_modetest.c   (contents, props changed)
   head/graphics/libdrm/files/extra-tests_modetest_strchrnul.c   (contents, props changed)
   head/x11-drivers/xf86-input-fpit/
   head/x11-drivers/xf86-input-fpit/Makefile   (contents, props changed)
   head/x11-drivers/xf86-input-fpit/distinfo   (contents, props changed)
   head/x11-drivers/xf86-input-fpit/pkg-descr   (contents, props changed)
   head/x11-drivers/xf86-input-fpit/pkg-plist   (contents, props changed)
   head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in   (contents, props changed)
   head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h   (contents, props changed)
   head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h   (contents, props changed)
   head/x11-drivers/xf86-input-synaptics/files/
   head/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in   (contents, props changed)
   head/x11-drivers/xf86-video-chips/files/
   head/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am   (contents, props changed)
   head/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in   (contents, props changed)
   head/x11-drivers/xf86-video-chips/files/patch-util_iopl.h   (contents, props changed)
   head/x11-drivers/xf86-video-intel/files/extra-clang   (contents, props changed)
   head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c   (contents, props changed)
   head/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h   (contents, props changed)
   head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-new-arch-i386   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-old-arch-i386   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-os-utils.c   (contents, props changed)
   head/x11-servers/xorg-server/files/extra-servermd.h   (contents, props changed)
   head/x11-wm/icewm/files/patch-src_base.h   (contents, props changed)
   head/x11/libXfixes/files/
   head/x11/libXi/files/
   head/x11/libXxf86dga/files/
   head/x11/libXxf86dga/files/patch-src_XF86DGA2.c   (contents, props changed)
   head/x11/libxcb/manpages   (contents, props changed)
 Deleted:
   head/devel/libpciaccess/files/patch-src-common_init.c
   head/devel/libpciaccess/files/patch-src-pciaccess_private.h
   head/graphics/dri/distinfo
   head/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c
   head/graphics/libGL/files/extra-mach64_context.h
   head/graphics/libGL/files/extra-sis_context.h
   head/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c
   head/graphics/libGLU/distinfo
   head/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
   head/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
   head/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
   head/x11-servers/xorg-server/files/extra-arch-i386
   head/x11-servers/xorg-server/files/extra-dix_events.c
   head/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
   head/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
   head/x11-servers/xorg-server/files/extra-patch-os-utils.c
   head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
   head/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
   head/x11-servers/xorg-server/files/patch-servermd.h
 Modified:
   head/Mk/bsd.port.mk
   head/Mk/bsd.xorg.mk
   head/UPDATING
   head/astro/boinc-astropulse/Makefile
   head/astro/boinc-setiathome-enhanced/Makefile
   head/astro/viking/Makefile
   head/audio/arts/Makefile
   head/audio/py-karaoke/Makefile
   head/audio/xmms-curses/Makefile
   head/audio/xmms-flac/Makefile
   head/cad/brlcad/Makefile
   head/cad/openvsp/Makefile
   head/cad/pdnmesh/Makefile
   head/cad/repsnapper/Makefile
   head/comms/efax-gtk/Makefile
   head/deskutils/nagaina/Makefile
   head/devel/gccmakedep/Makefile
   head/devel/imake/Makefile
   head/devel/imake/distinfo
   head/devel/imake/files/patch-xmkmf.cpp
   head/devel/libpciaccess/Makefile
   head/devel/libpciaccess/distinfo
   head/devel/libpciaccess/files/patch-src-freebsd_pci.c
   head/devel/lndir/Makefile
   head/devel/makedepend/Makefile
   head/devel/makedepend/distinfo
   head/devel/xorg-macros/Makefile
   head/devel/xorg-macros/distinfo
   head/emulators/catapult/Makefile
   head/emulators/tme/Makefile
   head/finance/homebank/Makefile
   head/games/capitalism/Makefile
   head/games/gnome-games/Makefile
   head/games/klavaro/Makefile
   head/games/spellathon/Makefile
   head/graphics/clutter-box2d/Makefile
   head/graphics/converseen/Makefile
   head/graphics/dri/Makefile
   head/graphics/dri/pkg-plist
   head/graphics/eog-plugins/Makefile
   head/graphics/freeglut/Makefile
   head/graphics/freeglut/distinfo
   head/graphics/glfw/Makefile
   head/graphics/grx/Makefile
   head/graphics/libGL/Makefile
   head/graphics/libGL/bsd.mesalib.mk
   head/graphics/libGL/distinfo
   head/graphics/libGL/files/extra-configure
   head/graphics/libGL/pkg-plist
   head/graphics/libGLU/Makefile
   head/graphics/libGLw/Makefile
   head/graphics/libGLw/distinfo
   head/graphics/libGLw/pkg-plist
   head/graphics/libdrm/Makefile
   head/graphics/libdrm/distinfo
   head/graphics/libdrm/pkg-plist
   head/graphics/libreatlas/Makefile
   head/graphics/mesa-demos/Makefile
   head/graphics/pinpoint/Makefile
   head/graphics/zbar/Makefile
   head/japanese/mozc-server/Makefile
   head/math/xspread/Makefile
   head/misc/nut/Makefile
   head/multimedia/clutter-gst/Makefile
   head/multimedia/freetuxtv/Makefile
   head/multimedia/vdr-plugin-softhddevice/Makefile
   head/multimedia/vlc/Makefile
   head/net-im/empathy/Makefile
   head/net-p2p/retroshare/Makefile
   head/net/tigervnc/Makefile
   head/net/x11vnc/Makefile
   head/polish/kadu/Makefile
   head/polish/qnapi/Makefile
   head/print/photoprint/Makefile
   head/science/massxpert/Makefile
   head/sysutils/gsmartcontrol/Makefile
   head/sysutils/gtk-imonc/Makefile
   head/sysutils/nitrogen/Makefile
   head/x11-clocks/oclock/Makefile
   head/x11-clocks/xclock/Makefile
   head/x11-drivers/xf86-input-acecad/Makefile
   head/x11-drivers/xf86-input-egalax/Makefile
   head/x11-drivers/xf86-input-elographics/Makefile
   head/x11-drivers/xf86-input-hyperpen/Makefile
   head/x11-drivers/xf86-input-joystick/Makefile
   head/x11-drivers/xf86-input-joystick/distinfo
   head/x11-drivers/xf86-input-keyboard/Makefile
   head/x11-drivers/xf86-input-keyboard/distinfo
   head/x11-drivers/xf86-input-magictouch/Makefile
   head/x11-drivers/xf86-input-mouse/Makefile
   head/x11-drivers/xf86-input-mouse/distinfo
   head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
   head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
   head/x11-drivers/xf86-input-mouse/pkg-plist
   head/x11-drivers/xf86-input-mutouch/Makefile
   head/x11-drivers/xf86-input-penmount/Makefile
   head/x11-drivers/xf86-input-synaptics/Makefile
   head/x11-drivers/xf86-input-synaptics/distinfo
   head/x11-drivers/xf86-input-synaptics/pkg-plist
   head/x11-drivers/xf86-input-vmmouse/Makefile
   head/x11-drivers/xf86-input-vmmouse/distinfo
   head/x11-drivers/xf86-input-vmmouse/pkg-plist
   head/x11-drivers/xf86-input-void/Makefile
   head/x11-drivers/xf86-video-apm/Makefile
   head/x11-drivers/xf86-video-apm/distinfo
   head/x11-drivers/xf86-video-ark/Makefile
   head/x11-drivers/xf86-video-ark/distinfo
   head/x11-drivers/xf86-video-ati/Makefile
   head/x11-drivers/xf86-video-ati/distinfo
   head/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
   head/x11-drivers/xf86-video-chips/Makefile
   head/x11-drivers/xf86-video-chips/distinfo
   head/x11-drivers/xf86-video-cirrus/Makefile
   head/x11-drivers/xf86-video-cirrus/distinfo
   head/x11-drivers/xf86-video-cyrix/Makefile
   head/x11-drivers/xf86-video-dummy/Makefile
   head/x11-drivers/xf86-video-dummy/distinfo
   head/x11-drivers/xf86-video-fbdev/Makefile
   head/x11-drivers/xf86-video-fbdev/distinfo
   head/x11-drivers/xf86-video-glint/Makefile
   head/x11-drivers/xf86-video-glint/distinfo
   head/x11-drivers/xf86-video-i128/Makefile
   head/x11-drivers/xf86-video-i128/distinfo
   head/x11-drivers/xf86-video-i740/Makefile
   head/x11-drivers/xf86-video-i740/distinfo
   head/x11-drivers/xf86-video-imstt/Makefile
   head/x11-drivers/xf86-video-intel/Makefile
   head/x11-drivers/xf86-video-intel/distinfo
   head/x11-drivers/xf86-video-intel/files/extra-i915kms
   head/x11-drivers/xf86-video-mach64/Makefile
   head/x11-drivers/xf86-video-mach64/distinfo
   head/x11-drivers/xf86-video-mga/Makefile
   head/x11-drivers/xf86-video-mga/distinfo
   head/x11-drivers/xf86-video-neomagic/Makefile
   head/x11-drivers/xf86-video-neomagic/distinfo
   head/x11-drivers/xf86-video-newport/Makefile
   head/x11-drivers/xf86-video-newport/distinfo
   head/x11-drivers/xf86-video-nouveau/Makefile
   head/x11-drivers/xf86-video-nv/Makefile
   head/x11-drivers/xf86-video-nv/distinfo
   head/x11-drivers/xf86-video-openchrome/Makefile
   head/x11-drivers/xf86-video-openchrome/distinfo
   head/x11-drivers/xf86-video-r128/Makefile
   head/x11-drivers/xf86-video-r128/distinfo
   head/x11-drivers/xf86-video-rdc/Makefile
   head/x11-drivers/xf86-video-rendition/Makefile
   head/x11-drivers/xf86-video-rendition/distinfo
   head/x11-drivers/xf86-video-s3/Makefile
   head/x11-drivers/xf86-video-s3/distinfo
   head/x11-drivers/xf86-video-s3virge/Makefile
   head/x11-drivers/xf86-video-s3virge/distinfo
   head/x11-drivers/xf86-video-savage/Makefile
   head/x11-drivers/xf86-video-savage/distinfo
   head/x11-drivers/xf86-video-siliconmotion/Makefile
   head/x11-drivers/xf86-video-siliconmotion/distinfo
   head/x11-drivers/xf86-video-sis/Makefile
   head/x11-drivers/xf86-video-sis/distinfo
   head/x11-drivers/xf86-video-sunffb/Makefile
   head/x11-drivers/xf86-video-tdfx/Makefile
   head/x11-drivers/xf86-video-tdfx/distinfo
   head/x11-drivers/xf86-video-tga/Makefile
   head/x11-drivers/xf86-video-tga/distinfo
   head/x11-drivers/xf86-video-trident/Makefile
   head/x11-drivers/xf86-video-trident/distinfo
   head/x11-drivers/xf86-video-tseng/Makefile
   head/x11-drivers/xf86-video-tseng/distinfo
   head/x11-drivers/xf86-video-vesa/Makefile
   head/x11-drivers/xf86-video-vesa/distinfo
   head/x11-drivers/xf86-video-via/Makefile
   head/x11-drivers/xf86-video-vmware/Makefile
   head/x11-drivers/xf86-video-vmware/distinfo
   head/x11-drivers/xf86-video-voodoo/Makefile
   head/x11-drivers/xf86-video-voodoo/distinfo
   head/x11-drivers/xorg-drivers/Makefile
   head/x11-fonts/bdftopcf/Makefile
   head/x11-fonts/encodings/Makefile
   head/x11-fonts/font-adobe-100dpi/Makefile
   head/x11-fonts/font-adobe-75dpi/Makefile
   head/x11-fonts/font-adobe-utopia-100dpi/Makefile
   head/x11-fonts/font-adobe-utopia-75dpi/Makefile
   head/x11-fonts/font-adobe-utopia-type1/Makefile
   head/x11-fonts/font-alias/Makefile
   head/x11-fonts/font-arabic-misc/Makefile
   head/x11-fonts/font-bh-100dpi/Makefile
   head/x11-fonts/font-bh-75dpi/Makefile
   head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
   head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
   head/x11-fonts/font-bh-ttf/Makefile
   head/x11-fonts/font-bh-type1/Makefile
   head/x11-fonts/font-bitstream-100dpi/Makefile
   head/x11-fonts/font-bitstream-75dpi/Makefile
   head/x11-fonts/font-bitstream-speedo/Makefile
   head/x11-fonts/font-bitstream-type1/Makefile
   head/x11-fonts/font-cronyx-cyrillic/Makefile
   head/x11-fonts/font-cursor-misc/Makefile
   head/x11-fonts/font-daewoo-misc/Makefile
   head/x11-fonts/font-dec-misc/Makefile
   head/x11-fonts/font-ibm-type1/Makefile
   head/x11-fonts/font-isas-misc/Makefile
   head/x11-fonts/font-jis-misc/Makefile
   head/x11-fonts/font-micro-misc/Makefile
   head/x11-fonts/font-misc-cyrillic/Makefile
   head/x11-fonts/font-misc-ethiopic/Makefile
   head/x11-fonts/font-misc-meltho/Makefile
   head/x11-fonts/font-misc-misc/Makefile
   head/x11-fonts/font-mutt-misc/Makefile
   head/x11-fonts/font-schumacher-misc/Makefile
   head/x11-fonts/font-screen-cyrillic/Makefile
   head/x11-fonts/font-sony-misc/Makefile
   head/x11-fonts/font-sun-misc/Makefile
   head/x11-fonts/font-util/Makefile
   head/x11-fonts/font-winitzki-cyrillic/Makefile
   head/x11-fonts/font-xfree86-type1/Makefile
   head/x11-fonts/fontcacheproto/Makefile
   head/x11-fonts/fontsproto/Makefile
   head/x11-fonts/fontsproto/distinfo
   head/x11-fonts/fonttosfnt/Makefile
   head/x11-fonts/fslsfonts/Makefile
   head/x11-fonts/libFS/Makefile
   head/x11-fonts/libFS/distinfo
   head/x11-fonts/libXfont/Makefile
   head/x11-fonts/libXfont/distinfo
   head/x11-fonts/libXfontcache/Makefile
   head/x11-fonts/libfontenc/Makefile
   head/x11-fonts/libfontenc/distinfo
   head/x11-fonts/mkfontdir/Makefile
   head/x11-fonts/mkfontscale/Makefile
   head/x11-fonts/showfont/Makefile
   head/x11-fonts/xf86bigfontproto/Makefile
   head/x11-fonts/xfontsel/Makefile
   head/x11-fonts/xfs/Makefile
   head/x11-fonts/xfs/distinfo
   head/x11-fonts/xfsinfo/Makefile
   head/x11-fonts/xlsfonts/Makefile
   head/x11-fonts/xorg-fonts-100dpi/Makefile
   head/x11-fonts/xorg-fonts-75dpi/Makefile
   head/x11-fonts/xorg-fonts-cyrillic/Makefile
   head/x11-fonts/xorg-fonts-miscbitmaps/Makefile
   head/x11-fonts/xorg-fonts-truetype/Makefile
   head/x11-fonts/xorg-fonts-type1/Makefile
   head/x11-fonts/xorg-fonts/Makefile
   head/x11-servers/mga_hal/Makefile
   head/x11-servers/xephyr/Makefile
   head/x11-servers/xorg-dmx/Makefile
   head/x11-servers/xorg-dmx/pkg-plist
   head/x11-servers/xorg-nestserver/Makefile
   head/x11-servers/xorg-server/Makefile
   head/x11-servers/xorg-server/distinfo
   head/x11-servers/xorg-server/files/extra-clang
   head/x11-servers/xorg-server/pkg-plist
   head/x11-servers/xorg-vfbserver/Makefile
   head/x11-themes/xcursor-themes/Makefile
   head/x11-toolkits/gtkglext/Makefile
   head/x11-toolkits/libXaw/Makefile
   head/x11-toolkits/libXaw/distinfo
   head/x11-toolkits/libXaw/pkg-plist
   head/x11-toolkits/libXmu/Makefile
   head/x11-toolkits/libXmu/distinfo
   head/x11-toolkits/libXt/Makefile
   head/x11-toolkits/libXt/distinfo
   head/x11-toolkits/termit/Makefile
   head/x11-wm/awesome/Makefile
   head/x11-wm/dwm/Makefile
   head/x11-wm/echinus/Makefile
   head/x11-wm/i3/Makefile
   head/x11-wm/spectrwm/Makefile
   head/x11-wm/transset/Makefile
   head/x11-wm/twm/Makefile
   head/x11-wm/xcompmgr/Makefile
   head/x11/appres/Makefile
   head/x11/beforelight/Makefile
   head/x11/bigreqsproto/Makefile
   head/x11/bigreqsproto/distinfo
   head/x11/bitmap/Makefile
   head/x11/compositeproto/Makefile
   head/x11/damageproto/Makefile
   head/x11/dmxproto/Makefile
   head/x11/dri2proto/Makefile
   head/x11/dri2proto/distinfo
   head/x11/editres/Makefile
   head/x11/evieext/Makefile
   head/x11/fixesproto/Makefile
   head/x11/fstobdf/Makefile
   head/x11/fstobdf/distinfo
   head/x11/glproto/Makefile
   head/x11/glproto/distinfo
   head/x11/i3lock/Makefile
   head/x11/iceauth/Makefile
   head/x11/ico/Makefile
   head/x11/inputproto/Makefile
   head/x11/inputproto/distinfo
   head/x11/inputproto/pkg-plist
   head/x11/kbproto/Makefile
   head/x11/kbproto/distinfo
   head/x11/kbproto/pkg-plist
   head/x11/libICE/Makefile
   head/x11/libICE/distinfo
   head/x11/libSM/Makefile
   head/x11/libSM/distinfo
   head/x11/libX11/Makefile
   head/x11/libX11/distinfo
   head/x11/libXScrnSaver/Makefile
   head/x11/libXScrnSaver/distinfo
   head/x11/libXTrap/Makefile
   head/x11/libXTrap/distinfo
   head/x11/libXau/Makefile
   head/x11/libXau/distinfo
   head/x11/libXcomposite/Makefile
   head/x11/libXcomposite/distinfo
   head/x11/libXcomposite/pkg-plist
   head/x11/libXcursor/Makefile
   head/x11/libXcursor/distinfo
   head/x11/libXdamage/Makefile
   head/x11/libXdamage/distinfo
   head/x11/libXdamage/pkg-plist
   head/x11/libXdmcp/Makefile
   head/x11/libXdmcp/distinfo
   head/x11/libXevie/Makefile
   head/x11/libXext/Makefile
   head/x11/libXext/distinfo
   head/x11/libXfixes/Makefile
   head/x11/libXi/Makefile
   head/x11/libXi/distinfo
   head/x11/libXinerama/Makefile
   head/x11/libXinerama/distinfo
   head/x11/libXp/Makefile
   head/x11/libXpm/Makefile
   head/x11/libXpm/distinfo
   head/x11/libXprintAppUtil/Makefile
   head/x11/libXprintUtil/Makefile
   head/x11/libXrandr/Makefile
   head/x11/libXrandr/distinfo
   head/x11/libXrender/Makefile
   head/x11/libXrender/distinfo
   head/x11/libXres/Makefile
   head/x11/libXres/distinfo
   head/x11/libXtrans/Makefile
   head/x11/libXtst/Makefile
   head/x11/libXtst/distinfo
   head/x11/libXv/Makefile
   head/x11/libXv/distinfo
   head/x11/libXvMC/Makefile
   head/x11/libXvMC/distinfo
   head/x11/libXxf86dga/Makefile
   head/x11/libXxf86dga/distinfo
   head/x11/libXxf86misc/Makefile
   head/x11/libXxf86vm/Makefile
   head/x11/libXxf86vm/distinfo
   head/x11/libdmx/Makefile
   head/x11/libdmx/distinfo
   head/x11/liboldX/Makefile
   head/x11/libxcb/Makefile
   head/x11/libxcb/distinfo
   head/x11/libxcb/pkg-plist
   head/x11/libxkbfile/Makefile
   head/x11/libxkbfile/distinfo
   head/x11/libxkbui/Makefile
   head/x11/listres/Makefile
   head/x11/luit/Makefile
   head/x11/mkcomposecache/Makefile
   head/x11/ooxcb/Makefile
   head/x11/pixman/Makefile
   head/x11/pixman/distinfo
   head/x11/printproto/Makefile
   head/x11/randrproto/Makefile
   head/x11/randrproto/distinfo
   head/x11/recordproto/Makefile
   head/x11/recordproto/distinfo
   head/x11/renderproto/Makefile
   head/x11/resourceproto/Makefile
   head/x11/rstart/Makefile
   head/x11/scripts/Makefile
   head/x11/scrnsaverproto/Makefile
   head/x11/scrnsaverproto/distinfo
   head/x11/sessreg/Makefile
   head/x11/slim/Makefile
   head/x11/smproxy/Makefile
   head/x11/trapproto/Makefile
   head/x11/videoproto/Makefile
   head/x11/viewres/Makefile
   head/x11/x11perf/Makefile
   head/x11/xbacklight/Makefile
   head/x11/xbiff/Makefile
   head/x11/xbitmaps/Makefile
   head/x11/xcb-proto/Makefile
   head/x11/xcb-proto/distinfo
   head/x11/xcb-util-image/Makefile
   head/x11/xcb-util-keysyms/Makefile
   head/x11/xcb-util-renderutil/Makefile
   head/x11/xcb-util-wm/Makefile
   head/x11/xcb-util/Makefile
   head/x11/xclipboard/Makefile
   head/x11/xcmiscproto/Makefile
   head/x11/xcmiscproto/distinfo
   head/x11/xdbedizzy/Makefile
   head/x11/xditview/Makefile
   head/x11/xdpyinfo/Makefile
   head/x11/xdriinfo/Makefile
   head/x11/xedit/Makefile
   head/x11/xextproto/Makefile
   head/x11/xextproto/distinfo
   head/x11/xeyes/Makefile
   head/x11/xf86dga/Makefile
   head/x11/xf86dgaproto/Makefile
   head/x11/xf86driproto/Makefile
   head/x11/xf86miscproto/Makefile
   head/x11/xf86rushproto/Makefile
   head/x11/xf86vidmodeproto/Makefile
   head/x11/xfd/Makefile
   head/x11/xfd/distinfo
   head/x11/xfindproxy/Makefile
   head/x11/xfwp/Makefile
   head/x11/xineramaproto/Makefile
   head/x11/xinit/Makefile
   head/x11/xinput/Makefile
   head/x11/xinput/distinfo
   head/x11/xkbcomp/Makefile
   head/x11/xkbprint/Makefile
   head/x11/xkbutils/Makefile
   head/x11/xkeyboard-config/Makefile
   head/x11/xkeyboard-config/distinfo
   head/x11/xkeyboard-config/pkg-plist
   head/x11/xkill/Makefile
   head/x11/xload/Makefile
   head/x11/xlogo/Makefile
   head/x11/xlsclients/Makefile
   head/x11/xmag/Makefile
   head/x11/xman/Makefile
   head/x11/xmh/Makefile
   head/x11/xmore/Makefile
   head/x11/xnee/Makefile
   head/x11/xorg-apps/Makefile
   head/x11/xorg-cf-files/Makefile
   head/x11/xorg-docs/Makefile
   head/x11/xorg-docs/distinfo
   head/x11/xorg-libraries/Makefile
   head/x11/xorg/Makefile
   head/x11/xplsprinters/Makefile
   head/x11/xprehashprinterlist/Makefile
   head/x11/xprop/Makefile
   head/x11/xproto/Makefile
   head/x11/xproto/distinfo
   head/x11/xproxymanagementprotocol/Makefile
   head/x11/xpyb/Makefile
   head/x11/xrandr/Makefile
   head/x11/xrandr/distinfo
   head/x11/xrdb/Makefile
   head/x11/xrefresh/Makefile
   head/x11/xrx/Makefile
   head/x11/xset/Makefile
   head/x11/xsetmode/Makefile
   head/x11/xsetpointer/Makefile
   head/x11/xsm/Makefile
   head/x11/xstdcmap/Makefile
   head/x11/xtrans/Makefile
   head/x11/xtrans/distinfo
   head/x11/xtrans/pkg-plist
   head/x11/xtrap/Makefile
   head/x11/xvidtune/Makefile
   head/x11/xvidtune/distinfo
   head/x11/xvinfo/Makefile
   head/x11/xvmcinfo/Makefile
   head/x11/xwininfo/Makefile
   head/x11/xwininfo/distinfo
 
 Modified: head/Mk/bsd.port.mk
 ==============================================================================
 --- head/Mk/bsd.port.mk	Sat May 25 14:00:33 2013	(r319054)
 +++ head/Mk/bsd.port.mk	Sat May 25 14:37:02 2013	(r319055)
 @@ -1903,8 +1903,14 @@ X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-font
  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
 
 Modified: head/Mk/bsd.xorg.mk
 ==============================================================================
 --- head/Mk/bsd.xorg.mk	Sat May 25 14:00:33 2013	(r319054)
 +++ head/Mk/bsd.xorg.mk	Sat May 25 14:37:02 2013	(r319055)
 @@ -17,14 +17,14 @@ Xorg_Pre_Include=		bsd.xorg.mk
  
  # Some notes:
  #
 -# app - requires pkgconfig, don't install shared libraries (I guess)
 -# data - nothing I could factorize
 +# app - Installs applications, no shared libraries.
 +# 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
 -# proto - install .pc file, no dependencies, needed only at build time for most of them
 +# lib - various dependencies, install .pc file, needs pathfix
 +# 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_DEPEN
  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
 
 Modified: head/UPDATING
 ==============================================================================
 --- head/UPDATING	Sat May 25 14:00:33 2013	(r319054)
 +++ head/UPDATING	Sat May 25 14:37:02 2013	(r319055)
 @@ -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
 
 Modified: head/astro/boinc-astropulse/Makefile
 ==============================================================================
 --- head/astro/boinc-astropulse/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/astro/boinc-astropulse/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -43,10 +43,9 @@ X11_DESC=	Build screensaver (requires ne
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 
 Modified: head/astro/boinc-setiathome-enhanced/Makefile
 ==============================================================================
 --- head/astro/boinc-setiathome-enhanced/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/astro/boinc-setiathome-enhanced/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -43,10 +43,9 @@ X11_DESC=	Build screensaver (requires ne
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MX11}
 -LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 -		xcb:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  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
 
 Modified: head/astro/viking/Makefile
 ==============================================================================
 --- head/astro/viking/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/astro/viking/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -19,14 +19,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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
  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
 
 Modified: head/audio/arts/Makefile
 ==============================================================================
 --- head/audio/arts/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/audio/arts/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -27,8 +27,7 @@ LIB_DEPENDS+=	asound:${PORTSDIR}/audio/a
  		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
  
  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
 
 Modified: head/audio/py-karaoke/Makefile
 ==============================================================================
 --- head/audio/py-karaoke/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/audio/py-karaoke/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		aa:${PORTSDIR}/graphics/aalib
  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
  
 
 Modified: head/audio/xmms-curses/Makefile
 ==============================================================================
 --- head/audio/xmms-curses/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/audio/xmms-curses/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	xmms-curses
 -# Date created:				2007-07-20
 -# Whom:				Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 -#
 +# Created by: 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) 
  
  BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
  RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 -LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
  
  USES=		gettext iconv
  USE_GNOME=	gtk12
 -USE_XORG=	x11 xau xdmcp xext xi
 +USE_XORG=	x11 xau xcb xdmcp xext xi
  
  MAN1=	${PORTNAME}.1
  
 
 Modified: head/audio/xmms-flac/Makefile
 ==============================================================================
 --- head/audio/xmms-flac/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/audio/xmms-flac/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -13,13 +13,12 @@ COMMENT=	XMMS input plugin for playing F
  LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
  		FLAC.10:${PORTSDIR}/audio/flac \
  		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 -		ogg:${PORTSDIR}/audio/libogg \
 -		xcb.2:${PORTSDIR}/x11/libxcb
 +		ogg:${PORTSDIR}/audio/libogg
  
  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}"
 
 Modified: head/cad/brlcad/Makefile
 ==============================================================================
 --- head/cad/brlcad/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/cad/brlcad/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -18,12 +18,11 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		rle:${PORTSDIR}/graphics/urt \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
  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
 
 Modified: head/cad/openvsp/Makefile
 ==============================================================================
 --- head/cad/openvsp/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/cad/openvsp/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -16,8 +16,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		fltk:${PORTSDIR}/x11-toolkits/fltk \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fltk:${PORTSDIR}/x11-toolkits/fltk
  
  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
 
 Modified: head/cad/pdnmesh/Makefile
 ==============================================================================
 --- head/cad/pdnmesh/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/cad/pdnmesh/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -20,8 +20,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
  
  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 \
 -		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
 +		xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
  
 
 Modified: head/cad/repsnapper/Makefile
 ==============================================================================
 --- head/cad/repsnapper/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/cad/repsnapper/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -32,8 +32,7 @@ LIB_DEPENDS=	gtkglext:${PORTSDIR}/x11-to
  		expat:${PORTSDIR}/textproc/expat2 \
  		xml++-2.6:${PORTSDIR}/textproc/libxml++26 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
  
  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 \
 -		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 +USE_XORG=	ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \
 +		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
  
  .include <bsd.port.options.mk>
  
 
 Modified: head/comms/efax-gtk/Makefile
 ==============================================================================
 --- head/comms/efax-gtk/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/comms/efax-gtk/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -23,8 +23,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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 \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils
  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
  
 
 Modified: head/deskutils/nagaina/Makefile
 ==============================================================================
 --- head/deskutils/nagaina/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/deskutils/nagaina/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -18,8 +18,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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
  
  OPTIONS_DEFINE=	DOCS
  
 @@ -28,7 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
  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
 
 Modified: head/devel/gccmakedep/Makefile
 ==============================================================================
 --- head/devel/gccmakedep/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/gccmakedep/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -16,16 +16,13 @@ PLIST_FILES=	bin/gccmakedep
  
  .include <bsd.port.pre.mk>
  
 -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
 -		-e 's|^RM= *|RM=|' \
 -		-e 's|^LN= *|LN=|' \
 -		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +    ${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 +
  .include <bsd.port.post.mk>
 
 Modified: head/devel/imake/Makefile
 ==============================================================================
 --- head/devel/imake/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/imake/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -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 
  
  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
 -BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 -CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
 -
 -post-build:
 -	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
 +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
 +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
 +	${OSVERSION} >= 1000010
 +CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
  .endif
  
  .include <bsd.port.post.mk>
 
 Modified: head/devel/imake/distinfo
 ==============================================================================
 --- head/devel/imake/distinfo	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/imake/distinfo	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
 -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
 
 Modified: head/devel/imake/files/patch-xmkmf.cpp
 ==============================================================================
 --- head/devel/imake/files/patch-xmkmf.cpp	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/imake/files/patch-xmkmf.cpp	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,17 +1,6 @@
 ---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
 -+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
 -@@ -53,6 +53,10 @@
 -     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 @@
 +--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
 ++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
 +@@ -64,3 +64,12 @@
       imake $imake_defines $args
       ;;
   esac
 
 Modified: head/devel/libpciaccess/Makefile
 ==============================================================================
 --- head/devel/libpciaccess/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/libpciaccess/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -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
 
 Modified: head/devel/libpciaccess/distinfo
 ==============================================================================
 --- head/devel/libpciaccess/distinfo	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/libpciaccess/distinfo	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
 
 Modified: head/devel/libpciaccess/files/patch-src-freebsd_pci.c
 ==============================================================================
 --- head/devel/libpciaccess/files/patch-src-freebsd_pci.c	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/libpciaccess/files/patch-src-freebsd_pci.c	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,113 +1,169 @@
 ---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
 -+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
 -@@ -72,6 +72,10 @@
 - #define PCIM_BAR_MEM_SPACE      0
 - #define PCIM_BAR_IO_SPACE       1
 +--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
 ++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
 +@@ -1,6 +1,8 @@
 + /*
 +  * (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__)
 -+static int screenfd;
 ++#if defined(__i386__) || defined(__amd64__)
 ++#include <machine/cpufunc.h>
  +#endif
  +
 - /**
 -  * FreeBSD private pci_system structure that extends the base pci_system
 -  * structure.
 -@@ -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;
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__)
 ++	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
 -     fd = open("/dev/mem", O_RDWR);
 ++	return NULL;
  +#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);
 ++}
 ++
 ++#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
 - 
 -     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");
 - 	}
 -     }
 ++
 ++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
 - 
 -     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;
 ++}
 ++
 ++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
 -     memfd = open( "/dev/mem", O_RDONLY );
 ++	return *(uint16_t *)((uintptr_t)handle->memory + reg);
  +#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 );
 ++}
 ++
 ++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
 - 	return errno;
 -     }
 - 
 -     memcpy( buffer, bios, dev->rom_size );
 - 
 -     munmap( bios, dev->rom_size );
 -+#if !defined(__sparc64__)
 -     close( memfd );
 ++}
 ++
 ++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
 - 
 -     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;
 - }
 ++}
 ++
 ++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
 ++}
  +
 -+void
 -+pci_system_freebsd_init_dev_mem(int fd)
 ++static void
 ++pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg,
 ++    uint8_t data)
  +{
 -+#if defined(__sparc64__)
 -+    screenfd = fd;
 ++#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,
 + };
 + 
 + /**
 
 Modified: head/devel/lndir/Makefile
 ==============================================================================
 --- head/devel/lndir/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/lndir/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -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
  
 
 Modified: head/devel/makedepend/Makefile
 ==============================================================================
 --- head/devel/makedepend/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/makedepend/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,20 +1,15 @@
 -# New ports collection makefile for:	makedepend
 -# Date created:				August 15th 1997
 -# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 -#
 +# Created by: 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
 
 Modified: head/devel/makedepend/distinfo
 ==============================================================================
 --- head/devel/makedepend/distinfo	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/makedepend/distinfo	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
 +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
 
 Modified: head/devel/xorg-macros/Makefile
 ==============================================================================
 --- head/devel/xorg-macros/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/xorg-macros/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	xorg-macros
 -# Date Created:				24 Mar 2007
 -# Whom:					Eric Anholt <anholt@FreeBSD.org>
 -#
 +# Created by: Eric Anholt <anholt@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	xorg-macros
 -PORTVERSION=	1.16.1
 +PORTVERSION=	1.17
  CATEGORIES=	devel x11
  DISTNAME=	util-macros-$(PORTVERSION)
  
 
 Modified: head/devel/xorg-macros/distinfo
 ==============================================================================
 --- head/devel/xorg-macros/distinfo	Sat May 25 14:00:33 2013	(r319054)
 +++ head/devel/xorg-macros/distinfo	Sat May 25 14:37:02 2013	(r319055)
 @@ -1,2 +1,2 @@
 -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
 +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029
 
 Modified: head/emulators/catapult/Makefile
 ==============================================================================
 --- head/emulators/catapult/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/emulators/catapult/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -24,8 +24,7 @@ LIB_DEPENDS=	mspack:${PORTSDIR}/archiver
  		tiff:${PORTSDIR}/graphics/tiff \
  		freetype:${PORTSDIR}/print/freetype2 \
  		expat:${PORTSDIR}/textproc/expat2 \
 -		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 -		xcb:${PORTSDIR}/x11/libxcb
 +		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  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}" \
 
 Modified: head/emulators/tme/Makefile
 ==============================================================================
 --- head/emulators/tme/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/emulators/tme/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -19,8 +19,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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
  
  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
 
 Modified: head/finance/homebank/Makefile
 ==============================================================================
 --- head/finance/homebank/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/finance/homebank/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -17,14 +17,13 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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 \
 -		xi xinerama xrandr xrender
 +USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 +		xfixes xi xinerama xrandr xrender
  USE_GNOME=	desktopfileutils gnomehier gtk20
  INSTALLS_ICONS=	yes
  
 
 Modified: head/games/capitalism/Makefile
 ==============================================================================
 --- head/games/capitalism/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/games/capitalism/Makefile	Sat May 25 14:37:02 2013	(r319055)
 @@ -18,13 +18,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
  		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
  
  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
 
 Modified: head/games/gnome-games/Makefile
 ==============================================================================
 --- head/games/gnome-games/Makefile	Sat May 25 14:00:33 2013	(r319054)
 +++ head/games/gnome-games/Makefile	Sat May 25 14:37:02 2013	(r319055)
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri May 31 16:14:31 UTC 2013 
State-Changed-Why:  
got already committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177942 
>Unformatted:
