Site Navigation

Date:      Mon, 11 Mar 2013 22:50:15 +0100
From:      Niclas Zeising <zeising@freebsd.org>
To:        ports@freebsd.org, x11@freebsd.org
Subject:   [CFT] xorg 7.7
Message-ID:  <513E5197.70509@freebsd.org>

---

next in thread | raw e-mail | index | archive | help

---

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2JXQIDPXNBISVTIPHUMWL
Content-Type: multipart/mixed;
 boundary="------------050908080507080502050508"

This is a multi-part message in MIME format.
--------------050908080507080502050508
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

The FreeBSD xorg team (x11@) presents this update of the FreeBSD xorg
port to version 7.7.
This CFT is intended to weed out as many bugs and regressions as
possible before merging xorg 7.7 into ports, please test it as much as
possible, to make it as good as can be.
We need testers of both new and old xorg, on as many architectures and
hardware combinations as possible.
Please report both successes and failures, and remember to include which
architecture, graphics card, version of FreeBSD and compiler you are
using, as well as relevant logs if any.

This CFT and any updates can either be obtained using SVN from
https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7 .
Once this ports overlay is obtained, it is necessary to run the
xorgmerge script, obtainable here:
http://people.freebsd.org/~miwi/xorg/xorgmerge .
Please don't forget to update directories before running this script.

A patch against the ports tree is also available, and can be obtained
from http://people.freebsd.org/~zeising/xorg-7.7.diff .
Apply this using either
svn patch /path/to/xorg-7.7.diff
if your ports tree is managed by svn or
patch -p0 -E < /path/to/xorg-7.7.diff
if your ports tree is managed by portsnap
Remember -E, so that empty files are removed.
This patch will be kept as up to date as possible, but might lag a
little behind the SVN repository.

Once the patch is in your ports tree, to build the old xorg, just cd to
/usr/ports/x11/xorg and run make install.
To get the new xorg, first set WITH_NEW_XORG in /etc/make.conf then
proceed as above.

Hopefully we will also be able to make packages and test images
available for use, however, this is not done yet.  A link for these
packages and images will be posted in a follow-up mail.

In this CFT:
* xorg-server 1.12.4 (WITH_NEW_XORG)
* Mesa 8.0.5 (WITH_NEW_XORG)
* Updated dri
* libX11 1.5
* libxcb 1.8
* updates for drivers
* Updates for all other utilities and libraries

Known issues:
The issues with imake and makedepend requiring a gnu compatible cpp is
not yet resolved.
Hardware acceleration for certain ATI radeon cards might no longer work,
if compiled with WITH_NEW_XORG.  This is expected to be resolved once
the work of porting TTM/KMS for radeon is completed.

For more information see https://wiki.freebsd.org/Xorg or come visit us
on IRC, #freebsd-xorg @ EFNet
Best Regards
--=20
Niclas Zeising
on behalf of the FreeBSD x11@ team


--------------050908080507080502050508
Content-Type: text/x-patch;
 name="xorg-7.7.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="xorg-7.7.diff"

Index: Mk/bsd.port.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.port.mk	(revision 313938)
+++ Mk/bsd.port.mk	(working copy)
@@ -1978,6 +1978,7 @@
=20
 PKG_IGNORE_DEPENDS?=3D		'this_port_does_not_exist'
=20
+_GL_gl_USE_XORG=3D		glproto dri2proto
 _GL_gl_LIB_DEPENDS=3D		GL.1:${PORTSDIR}/graphics/libGL
 _GL_glew_LIB_DEPENDS=3D		GLEW.1:${PORTSDIR}/graphics/glew
 _GL_glu_LIB_DEPENDS=3D		GLU.1:${PORTSDIR}/graphics/libGLU
@@ -1994,6 +1995,8 @@
 		!defined(_GL_${_component}_RUN_DEPENDS)
 IGNORE=3D		uses unknown GL component
 .  else
+USE_XORG+=3D	${_GL_${_component}_USE_XORG}
+BUILD_DEPENDS+=3D	${_GL_${_component}_BUILD_DEPENDS}
 LIB_DEPENDS+=3D	${_GL_${_component}_LIB_DEPENDS}
 RUN_DEPENDS+=3D	${_GL_${_component}_RUN_DEPENDS}
 .  endif
Index: Mk/bsd.xorg.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.xorg.mk	(revision 313938)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -20,7 +20,7 @@
 # app - requires pkgconfig, don't install shared libraries (I guess)
 # data - nothing I could factorize
 # 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
@@ -39,7 +39,7 @@
 MASTER_SITE_SUBDIR?=3D	individual/${XORG_CAT}
=20
 . if ${XORG_CAT} =3D=3D "app"
-USE_GNOME+=3D	pkgconfig
+USE_PKGCONFIG=3D	build
 . endif
=20
 . if ${XORG_CAT} =3D=3D "data"
@@ -47,7 +47,7 @@
 . endif
=20
 . if ${XORG_CAT} =3D=3D "driver"
-USE_GNOME+=3D	pkgconfig
+USE_PKGCONFIG=3D	build
 USE_XORG+=3D	xorg-server xproto randrproto xi
 # work around a llvm bug on i386, llvm bug #15806=20
 # reproduced with clang 3.2 (current release) and 3.1
@@ -56,11 +56,12 @@
 .  endif
 CONFIGURE_ENV+=3D	DRIVER_MAN_SUFFIX=3D4x DRIVER_MAN_DIR=3D'$$(mandir)/ma=
n4'
 .  if ${PORTNAME:M*input*}x !=3D x
-USE_XORG+=3D	inputproto renderproto
+USE_XORG+=3D	inputproto videoproto fontsproto renderproto xextproto \
+		dri2proto
 .  elif ${PORTNAME:M*video*}x !=3D x
-USE_XORG+=3D	fontsproto renderproto
+USE_XORG+=3D	videoproto fontsproto renderproto xextproto dri2proto
 .  else
-IGNORE=3D		doesn't contain either "driver" or "input"
+IGNORE=3D		doesn't contain either "video" or "input"
 .  endif
 . endif
=20
@@ -84,10 +85,10 @@
 .  endif
=20
 .  if ${PORTNAME:M*font-util*}x !=3D x
-USE_GNOME+=3D	gnomehack
+USES+=3D	pathfix
 NEED_MKFONTFOO=3D	no
 .  elif ${INSTALLS_TTF} =3D=3D "yes"
-USE_GNOME+=3D	pkgconfig
+USE_PKGCONFIG=3D	build
 BUILD_DEPENDS+=3D	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDI=
R}/x11-fonts/fontconfig
 RUN_DEPENDS+=3D	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}=
/x11-fonts/fontconfig
 .  else
@@ -123,23 +124,24 @@
 . endif
=20
 . if ${XORG_CAT} =3D=3D "lib"
-USE_GNOME+=3D	gnomehack pkgconfig
+USE_PKGCONFIG=3D	build
+USES+=3D	pathfix
 USE_LDCONFIG=3D	yes
 CONFIGURE_ARGS+=3D--enable-malloc0returnsnull
 . endif
=20
 . if ${XORG_CAT} =3D=3D "proto"
-USE_GNOME+=3D	gnomehack
+USES+=3D	pathfix
 . endif
=20
 . if ${XORG_CAT} =3D=3D "xserver"
 DISTFILES?=3D	xorg-server-${PORTVERSION}.tar.bz2
 WRKSRC=3D		${WRKDIR}/xorg-server-${PORTVERSION}
-USE_GNOME+=3D	gnomehack
+USES+=3D	pathfix
 CONFIGURE_ARGS+=3D	--with-xkb-path=3D${LOCALBASE}/share/X11/xkb
=20
 LIB_PC_DEPENDS+=3D	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/gra=
phics/dri
-USE_XORG+=3D	pciaccess
+USE_XORG+=3D	pciaccess xextproto videoproto fontsproto dri2proto
 . endif
=20
 .endif
Index: devel/imake/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/imake/Makefile	(revision 313938)
+++ devel/imake/Makefile	(working copy)
@@ -1,8 +1,8 @@
-# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
+# Created by: anholt
 # $FreeBSD$
=20
 PORTNAME=3D	imake
-PORTVERSION=3D	1.0.4
+PORTVERSION=3D	1.0.5
 PORTEPOCH=3D	1
 CATEGORIES=3D	devel
=20
@@ -11,7 +11,7 @@
=20
 RUN_DEPENDS=3D	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
=20
 USE_PERL5=3D	yes
=20
@@ -37,6 +37,8 @@
=20
 .include <bsd.port.pre.mk>
=20
+# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
+# which is fatal for imake.
 .if defined(CC) && ${CC:T:M*clang*} =3D=3D "clang" || ${OSVERSION} >=3D =
1000024
 BUILD_DEPENDS+=3D	ucpp:${PORTSDIR}/devel/ucpp
 RUN_DEPENDS+=3D	ucpp:${PORTSDIR}/devel/ucpp
Index: devel/imake/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/imake/distinfo	(revision 313938)
+++ devel/imake/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/imake-1.0.4.tar.bz2) =3D acb27ff09e3083000441a8d555fbe=
dbf35ecb4ad52d2bd5b8680dce853f146fe
-SIZE (xorg/util/imake-1.0.4.tar.bz2) =3D 140773
+SHA256 (xorg/util/imake-1.0.5.tar.bz2) =3D 99ce77ce73892d262522ee621032c=
ef2fad2d30a36088b1305a156af4ee21cc1
+SIZE (xorg/util/imake-1.0.5.tar.bz2) =3D 148503
Index: devel/libpciaccess/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/libpciaccess/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libpciaccess
-PORTVERSION=3D	0.12.1
+PORTVERSION=3D	0.13.1
+PORTREVISION=3D	1
 CATEGORIES=3D	devel
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	Generic PCI access library
=20
 BUILD_DEPENDS=3D	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pcii=
ds
-# XXX - Is it a runtime dep too?
 RUN_DEPENDS=3D	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids=

=20
 CONFIGURE_ARGS+=3D	--with-pciids-path=3D${LOCALBASE}/share/pciids
Index: devel/libpciaccess/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/libpciaccess/distinfo	(revision 313938)
+++ devel/libpciaccess/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) =3D cc47d7f0e48cf4eed97291=
6b536fdc97788d7521915e3ae1cc92d540776d7344
-SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) =3D 326217
+SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) =3D 27ab68f645691a4ca258dc=
c9d131040586e134f9233ce079794496f6264da084
+SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) =3D 352351
Index: devel/libpciaccess/files/patch-src-common_init.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/libpciaccess/files/patch-src-common_init.c	(revision 313938)
+++ 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(__Dr=
agonFly__)
-+    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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/libpciaccess/files/patch-src-freebsd_pci.c	(revision 313938)
+++ devel/libpciaccess/files/patch-src-freebsd_pci.c	(working copy)
@@ -1,113 +1,177 @@
---- 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 19:02:57.000000000 +0200
++++ src/freebsd_pci.c	2012-11-16 17:58:08.000000000 +0100
+@@ -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 obtainin=
g a
+@@ -561,6 +563,146 @@
+     freebsd_pci_sys =3D NULL;
+ }
 =20
-+#if defined(__sparc64__)
-+static int screenfd;
++#if defined(__i386__) || defined(__amd64__)
++#include <machine/bus.h>
++/* check this OSVERSION */
++# if __FreeBSD_version < 900000
++#  if defined(__i386__)
++#define X86_BUS_SPACE_IO I386_BUS_SPACE_IO
++#  else
++#define X86_BUS_SPACE_IO AMD64_BUS_SPACE_IO
++#  endif
++# endif
 +#endif
 +
- /**
-  * FreeBSD private pci_system structure that extends the base pci_syste=
m
-  * structure.
-@@ -103,12 +107,18 @@
- {
-     const int prot =3D ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) !=3D 0=
)=20
-         ? (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 =3D open("/dev/io", O_RDWR | O_CLOEXEC);
++
++	if (ret->fd < 0)
++		return NULL;
++
++	ret->base =3D base;
++	ret->size =3D size;
++	return ret;
++#elif defined(PCI_MAGIC_IO_RANGE)
++	ret->memory =3D mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
++	    aperturefd, PCI_MAGIC_IO_RANGE + base);
++	if (ret->memory =3D=3D MAP_FAILED)
++		return NULL;
++
++	ret->base =3D base;
++	ret->size =3D size;
++	return ret;
++#else
++	return NULL;
 +#endif
-=20
-     int fd, err =3D 0;
-=20
-+#if defined(__sparc64__)
-+    fd =3D screenfd;
++}
++
++#if defined(__i386__) || defined(__amd64__)
++static void
++pci_device_freebsd_close_io(struct pci_device *dev, struct pci_io_handl=
e *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 bus_space_read_4(X86_BUS_SPACE_IO, handle->base, reg);
 +#else
-     fd =3D open("/dev/mem", O_RDWR);
++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
 +#endif
-     if (fd =3D=3D -1)
- 	return errno;
-=20
-@@ -118,6 +128,7 @@
- 	err =3D errno;
-     }
-=20
-+#if !defined(__sparc64__)
-     mrd.mr_base =3D map->base;
-     mrd.mr_len =3D map->size;
-     strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner));
-@@ -138,6 +149,7 @@
-     }
-=20
-     close(fd);
++}
++
++static uint16_t
++pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg)
++{
++#if defined(__i386__) || defined(__amd64__)
++	return bus_space_read_2(X86_BUS_SPACE_IO, handle->base, reg);
++#else
++	return *(uint16_t *)((uintptr_t)handle->memory + reg);
 +#endif
-=20
-     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 bus_space_read_1(X86_BUS_SPACE_IO, handle->base, reg);
++#else
++	return *(uint8_t *)((uintptr_t)handle->memory + reg);
 +#endif
-=20
-     return pci_device_generic_unmap_range(dev, map);
- }
-@@ -293,20 +307,28 @@
-     }
-=20
-     printf("Using rom_base =3D 0x%lx\n", (long)rom_base);
-+#if defined(__sparc64__)
-+    memfd =3D screenfd;
++}
++
++static void
++pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg,
++    uint32_t data)
++{
++#if defined(__i386__) || defined(__amd64__)
++	bus_space_write_4(X86_BUS_SPACE_IO, handle->base, reg, data);
 +#else
-     memfd =3D open( "/dev/mem", O_RDONLY );
++	*(uint16_t *)((uintptr_t)handle->memory + reg) =3D data;
 +#endif
-     if ( memfd =3D=3D -1 )
- 	return errno;
-=20
-     bios =3D mmap( NULL, dev->rom_size, PROT_READ, 0, memfd, rom_base )=
;
-     if ( bios =3D=3D 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__)
++	bus_space_write_2(X86_BUS_SPACE_IO, handle->base, reg, data);
++#else
++	*(uint8_t *)((uintptr_t)handle->memory + reg) =3D data;
 +#endif
- 	return errno;
-     }
-=20
-     memcpy( buffer, bios, dev->rom_size );
-=20
-     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__)
++	bus_space_write_1(X86_BUS_SPACE_IO, handle->base, reg, data);
++#else
++	*(uint32_t *)((uintptr_t)handle->memory + reg) =3D data;
 +#endif
-=20
-     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 =3D (struct pci_device_private *) d=
ev;
-     struct pci_bar_io bar;
-     uint8_t irq;
-     int err, i;
-@@ -644,3 +665,11 @@
-=20
-     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 =3D fd;
++	struct pci_device_mapping map;
++	int err;
++
++	map.base =3D base;
++	map.size =3D size;
++	map.flags =3D map_flags;
++	map.memory =3D NULL;
++	err =3D pci_device_freebsd_map_range(dev, &map);
++	*addr =3D 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 =3D addr;
++	map.size =3D size;
++	map.flags =3D 0;
++	return pci_device_freebsd_unmap_range(dev, &map);
++}
++
+ static const struct pci_system_methods freebsd_pci_methods =3D {
+     .destroy =3D pci_system_freebsd_destroy,
+     .destroy_device =3D NULL, /* nothing to do for this */
+@@ -571,6 +713,18 @@
+     .read =3D pci_device_freebsd_read,
+     .write =3D pci_device_freebsd_write,
+     .fill_capabilities =3D pci_fill_capabilities_generic,
++    .open_legacy_io =3D pci_device_freebsd_open_legacy_io,
++#if defined(__i386__) || defined(__amd64__)
++    .close_io =3D pci_device_freebsd_close_io,
 +#endif
-+}
++    .read32 =3D pci_device_freebsd_read32,
++    .read16 =3D pci_device_freebsd_read16,
++    .read8 =3D pci_device_freebsd_read8,
++    .write32 =3D pci_device_freebsd_write32,
++    .write16 =3D pci_device_freebsd_write16,
++    .write8 =3D pci_device_freebsd_write8,
++    .map_legacy =3D pci_device_freebsd_map_legacy,
++    .unmap_legacy =3D pci_device_freebsd_unmap_legacy,
+ };
+=20
+ /**
Index: devel/libpciaccess/files/patch-src-pciaccess_private.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/libpciaccess/files/patch-src-pciaccess_private.h	(revision 3139=
38)
+++ 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 @@
-=20
- 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/makedepend/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/makedepend/Makefile	(revision 313938)
+++ devel/makedepend/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# 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$
-#
=20
 PORTNAME=3D	makedepend
-PORTVERSION=3D	1.0.3
+PORTVERSION=3D	1.0.4
 PORTEPOCH=3D	1
 CATEGORIES=3D	devel
=20
Index: devel/makedepend/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/makedepend/distinfo	(revision 313938)
+++ devel/makedepend/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) =3D 3a251d30e567e4eab109be48=
6918887635e08963195b80d193f0ee65cef8b737
-SIZE (xorg/util/makedepend-1.0.3.tar.bz2) =3D 123703
+SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) =3D ab56b8aeee00ed78d93c57d1=
02e33ef4e6828ef5edd7108574966ed7d212f7fe
+SIZE (xorg/util/makedepend-1.0.4.tar.bz2) =3D 131683
Index: devel/makedepend/pkg-descr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/makedepend/pkg-descr	(revision 313938)
+++ devel/makedepend/pkg-descr	(working copy)
@@ -13,4 +13,4 @@
 makefile in such a way that make will know which object files must be=20
 recompiled when a dependency has changed.
=20
-WWW: http://www.x.org/archive/X11R7.5/doc/man/man1/makedepend.1.html
+WWW: http://www.x.org/archive/X11R7.5/doc/man/man1/makedepend.1.html
\ No newline at end of file
Index: devel/xorg-macros/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/xorg-macros/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-macros
-PORTVERSION=3D	1.16.1
+PORTVERSION=3D	1.17
 CATEGORIES=3D	devel x11
 DISTNAME=3D	util-macros-$(PORTVERSION)
=20
Index: devel/xorg-macros/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- devel/xorg-macros/distinfo	(revision 313938)
+++ devel/xorg-macros/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) =3D cd21cb32592644065b70a7=
d2ceeedad49ab231651599c74b3fd2c7343f6be933
-SIZE (xorg/util/util-macros-1.16.1.tar.bz2) =3D 75404
+SHA256 (xorg/util/util-macros-1.17.tar.bz2) =3D 7d79edde72fc17dcdc56cfbe=
2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
+SIZE (xorg/util/util-macros-1.17.tar.bz2) =3D 77029
Index: graphics/dri/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/dri/Makefile	(revision 313938)
+++ graphics/dri/Makefile	(working copy)
@@ -15,60 +15,103 @@
 USE_PKGCONFIG=3D	build
 USE_XORG=3D	glproto x11 xext xxf86vm xdamage xfixes dri2proto
=20
-ALL_DRI_DRIVERS=3DI810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \=

-		SAVAGE SIS SWRAST TDFX UNICHROME
+do-install:
+	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
=20
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
=20
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} =3D=3D "ia64"
-BROKEN=3D		does not install on ia64
+BROKEN=3D		Does not install on ia64
 .endif
=20
-.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386"
-OPTIONS_DEFINE=3D	${ALL_DRI_DRIVERS}
-.elif ${ARCH} =3D=3D "powerpc"
-OPTIONS_DEFINE=3D	MACH64 RADEON SWRAST TDFX
-.elif ${ARCH} =3D=3D "sparc64"
-OPTIONS_DEFINE=3D	MACH64 RADEON SWRAST
+.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386")
+CONFIGURE_ARGS+=3D--disable-gallium-intel
 .endif
-OPTIONS_DEFAULT=3D${OPTIONS_DEFINE}
=20
-I810_DESC=3D	Include DRI support for Intel i810
-I915_DESC=3D	Include DRI support for Intel i915
-I965_DESC=3D	Include DRI support for Intel i965
-MACH64_DESC=3D	Include DRI support for AMD/ATI Mach64
-MGA_DESC=3D	Include DRI support for Matrox
-R128_DESC=3D	Include DRI support for AMD/ATI R128
-R200_DESC=3D	Include DRI support for AMD/ATI R200
-R300_DESC=3D	Include DRI support for AMD/ATI R300
-R600_DESC=3D	Include DRI support for AMD/ATI R600
-RADEON_DESC=3D	Include DRI support for AMD/ATI R100
-SAVAGE_DESC=3D	Include DRI support for S3/Via Savage
-SIS_DESC=3D	Include DRI support for SiS 300 and 6326
-SWRAST_DESC=3D	Include generic software DRI support
-TDFX_DESC=3D	Include DRI support for 3dfx Voodoo
-UNICHROME_DESC=3D	Include DRI support for S3/Via Unichrome
+.if ${ARCH} =3D=3D "amd64"
+PLIST_SUB+=3D	I810_DRIVER=3D"@comment "
+PLIST_SUB+=3D	I9X5_DRIVER=3D""
+PLIST_SUB+=3D	MACH64_DRIVER=3D""
+PLIST_SUB+=3D	MGA_DRIVER=3D""
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D""
+PLIST_SUB+=3D	RADEON_DRIVERS=3D""
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D""
+PLIST_SUB+=3D	SIS_DRIVER=3D""
+PLIST_SUB+=3D	SWRAST_DRIVER=3D""
+PLIST_SUB+=3D	TDFX_DRIVER=3D""
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D""
+.endif
=20
-.include <bsd.port.options.mk>
+.if ${ARCH} =3D=3D "arm"
+PLIST_SUB+=3D	I810_DRIVER=3D"@comment "
+PLIST_SUB+=3D	I9X5_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MACH64_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MGA_DRIVER=3D"@comment "
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D"@comment "
+PLIST_SUB+=3D	RADEON_DRIVERS=3D"@comment "
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SIS_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SWRAST_DRIVER=3D"@comment "
+PLIST_SUB+=3D	TDFX_DRIVER=3D"@comment "
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D"@comment "
+.endif
=20
-DRI_DRIVERS=3D
-.for _d in ${ALL_DRI_DRIVERS}
-.if ${PORT_OPTIONS:M${_d}}
-DRI_DRIVERS+=3D	${_d}
-PLIST_SUB+=3D	${_d}_DRIVER=3D""
-.else
-PLIST_SUB+=3D	${_d}_DRIVER=3D"@comment "
+.if ${ARCH} =3D=3D "i386"
+PLIST_SUB+=3D	I810_DRIVER=3D""
+PLIST_SUB+=3D	I9X5_DRIVER=3D""
+PLIST_SUB+=3D	MACH64_DRIVER=3D""
+PLIST_SUB+=3D	MGA_DRIVER=3D""
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D""
+PLIST_SUB+=3D	RADEON_DRIVERS=3D""
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D""
+PLIST_SUB+=3D	SIS_DRIVER=3D""
+PLIST_SUB+=3D	SWRAST_DRIVER=3D""
+PLIST_SUB+=3D	TDFX_DRIVER=3D""
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D""
 .endif
-.endfor
=20
-.include <bsd.port.pre.mk>
+.if ${ARCH} =3D=3D "mips"
+PLIST_SUB+=3D	I810_DRIVER=3D"@comment "
+PLIST_SUB+=3D	I9X5_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MACH64_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MGA_DRIVER=3D"@comment "
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D"@comment "
+PLIST_SUB+=3D	RADEON_DRIVERS=3D"@comment "
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SIS_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SWRAST_DRIVER=3D"@comment "
+PLIST_SUB+=3D	TDFX_DRIVER=3D"@comment "
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D"@comment "
+.endif
=20
-.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386")
-CONFIGURE_ARGS+=3D--disable-gallium-intel
+.if ${ARCH} =3D=3D "powerpc"
+PLIST_SUB+=3D	I810_DRIVER=3D"@comment "
+PLIST_SUB+=3D	I9X5_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MACH64_DRIVER=3D""
+PLIST_SUB+=3D	MGA_DRIVER=3D"@comment "
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D"@comment "
+PLIST_SUB+=3D	RADEON_DRIVERS=3D""
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SIS_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SWRAST_DRIVER=3D""
+PLIST_SUB+=3D	TDFX_DRIVER=3D""
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D"@comment "
 .endif
-CONFIGURE_ARGS+=3D--with-dri-drivers=3D"${DRI_DRIVERS:L}"
=20
-do-install:
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
+.if ${ARCH} =3D=3D "sparc64"
+PLIST_SUB+=3D	I810_DRIVER=3D"@comment "
+PLIST_SUB+=3D	I9X5_DRIVER=3D"@comment "
+PLIST_SUB+=3D	MACH64_DRIVER=3D""
+PLIST_SUB+=3D	MGA_DRIVER=3D"@comment "
+PLIST_SUB+=3D	NOUVEAU_DRIVER=3D"@comment "
+PLIST_SUB+=3D	RADEON_DRIVERS=3D""
+PLIST_SUB+=3D	SAVAGE_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SIS_DRIVER=3D"@comment "
+PLIST_SUB+=3D	SWRAST_DRIVER=3D""
+PLIST_SUB+=3D	TDFX_DRIVER=3D"@comment "
+PLIST_SUB+=3D	UNICHROME_DRIVER=3D"@comment "
+.endif
=20
 .include <bsd.port.post.mk>
Index: graphics/dri/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/dri/distinfo	(revision 313938)
+++ graphics/dri/distinfo	(working copy)
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad=
d02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) =3D 57746aa8c60bc6f5596ec6c6c7274de40fa1=
2edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) =3D 6257280
Index: graphics/dri/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/dri/pkg-plist	(revision 313938)
+++ graphics/dri/pkg-plist	(working copy)
@@ -1,19 +1,19 @@
 include/GL/internal/dri_interface.h
-%%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
-%%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_DRIVER%%lib/dri/r300_dri.so
-%%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%%%%I810_DRIVER%%lib/dri/i810_dri.so
+%%I9X5_DRIVER%%lib/dri/i915_dri.so
+%%I9X5_DRIVER%%lib/dri/i965_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%RADEON_DRIVERS%%lib/dri/r128_dri.so
+%%RADEON_DRIVERS%%lib/dri/r200_dri.so
+%%OLD%%%%RADEON_DRIVERS%%lib/dri/r300_dri.so
+%%OLD%%%%RADEON_DRIVERS%%lib/dri/r600_dri.so
+%%RADEON_DRIVERS%%lib/dri/radeon_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/libGL/bsd.mesalib.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/bsd.mesalib.mk	(revision 313938)
+++ graphics/libGL/bsd.mesalib.mk	(working copy)
@@ -11,17 +11,15 @@
 #
 #    - graphics/libGL
 #    - graphics/libGLU
-#    - graphics/libGLw
 #    - graphics/dri
 #
 # $FreeBSD$
-#
=20
 MESAVERSION=3D	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=3D${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
=20
 .if defined(WITH_NEW_XORG)
-MESABASEVERSION=3D	7.11.2
+MESABASEVERSION=3D	8.0.5
 # if there is a subversion, include the '-' between 7.11-rc2 for example=
=2E
 MESASUBVERSION=3D	=09
 PLIST_SUB+=3D	OLD=3D"@comment " NEW=3D""
@@ -31,8 +29,8 @@
 PLIST_SUB+=3D	OLD=3D"" NEW=3D"@comment "
 .endif
=20
-MASTER_SITES=3D	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:m=
esa,glut
-DISTFILES=3D	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MASTER_SITES=3D	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+DISTFILES=3D	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
 MAINTAINER?=3D	x11@FreeBSD.org
=20
 BUILD_DEPENDS+=3D	makedepend:${PORTSDIR}/devel/makedepend \
@@ -44,22 +42,19 @@
 USE_GMAKE=3D	yes
 USE_LDCONFIG=3D	yes
 GNU_CONFIGURE=3D	yes
-MAKE_JOBS_UNSAFE=3D	yes
+MAKE_JOBS_SAFE=3D	yes
=20
 CPPFLAGS+=3D	-I${LOCALBASE}/include
 LDFLAGS+=3D	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers \=

-		--disable-egl --disable-glut
+		--disable-egl
=20
 .if defined(WITH_NEW_XORG)
 EXTRA_PATCHES+=3D	${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+=3D	${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+=3D--disable-glut --disable-glw
 .endif
=20
 ALL_TARGET=3D		default
=20
-PATCHDIR=3D		${.CURDIR}/../../graphics/libGL/files
-WRKSRC=3D			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
+MASTERDIR=3D		${.CURDIR}/../../graphics/libGL
+PATCHDIR=3D		${MASTERDIR}/files
+DESCR=3D			${.CURDIR}/pkg-descr
+PLIST=3D			${.CURDIR}/pkg-plist
+WRKSRC=3D			${WRKDIR}/Mesa-${MESADISTVERSION}
=20
 .if !defined(ARCH)
 ARCH!=3D			uname -p
@@ -84,38 +83,25 @@
 CONFIGURE_ARGS+=3D	--disable-glu
 .endif
=20
-.if ${COMPONENT:Mglw} =3D=3D ""
-CONFIGURE_ARGS+=3D	--disable-glw
-.else
-CONFIGURE_ARGS+=3D	--enable-motif
-.endif
-
 .if ${COMPONENT:Mdri} =3D=3D ""
 CONFIGURE_ARGS+=3D	--with-dri-drivers=3Dno
+.else
+CONFIGURE_ARGS+=3D	--with-dri-drivers=3D"i915,i965,r200,radeon,swrast"
 .endif
=20
+.if !defined(WITH_NEW_XORG)
 .if defined(WITHOUT_XCB)
 CONFIGURE_ARGS+=3D	--disable-xcb
 .else
 CONFIGURE_ARGS+=3D	--enable-xcb
 .endif
+.endif
=20
 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}/libda=
ta/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} !=3D ""
-	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libda=
ta/pkgconfig|' \
-		${WRKSRC}/src/glut/glx/Makefile
-.endif
+
Index: graphics/libGL/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/distinfo	(revision 313938)
+++ graphics/libGL/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad=
d02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) =3D 57746aa8c60bc6f5596ec6c6c7274de40fa1=
2edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) =3D 6257280
+SHA256 (MesaLib-8.0.5.tar.bz2) =3D 511b8da34f8e69ed24caf422964fb7ae747f3=
b1d8093f6b8aa2602164a475a5e
+SIZE (MesaLib-8.0.5.tar.bz2) =3D 5734571
Index: graphics/libGL/files/extra-configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/files/extra-configure	(revision 313938)
+++ 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=3D"$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=3D"$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=3D1"
+         DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
 =20
 -        if test "x$DRI_DIRS" =3D "xyes"; then
--            DRI_DIRS=3D"i810 i915 i965 mach64 mga nouveau r128 r200 r30=
0 r600 \
--                radeon tdfx unichrome savage sis swrast"
+-            DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast"
 -        fi
 +        case "$host_cpu" in
 +        x86_64)
 +            # i810 is missing because there is no x86-64 system where i=
t
 +            # could *ever* be used.
 +            if test "x$DRI_DIRS" =3D "xyes"; then
-+                DRI_DIRS=3D"i915 i965 mach64 mga nouveau r128 r200 r300=
 r600 \
-+                    radeon savage tdfx unichrome sis swrast"
++                DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast"
 +            fi
 +            ;;
 +        i*86)
 +            if test "x$DRI_DIRS" =3D "xyes"; then
-+                DRI_DIRS=3D"i810 i915 i965 mach64 mga nouveau r128 r200=
 r300 \
-+                    r600 radeon savage tdfx unichrome sis swrast"
++                DRI_DIRS=3D"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" =3D "xyes"; then
-+                DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra=
st"
++                DRI_DIRS=3D"r200 radeon swrast"
 +            fi
 +            ;;
 +        sparc*)
 +            # Build only the drivers for cards that exist on SPARC.
 +            if test "x$DRI_DIRS" =3D "xyes"; then
-+                DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast"
++                DRI_DIRS=3D"r200 radeon swrast"
 +            fi
 +            ;;
 +        esac
++
          ;;
      gnu*)
          DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER=
"
Index: graphics/libGL/files/extra-mach64_context.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/files/extra-mach64_context.h	(revision 313938)
+++ 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:1=
8.000000000 +0200
-+++ src/mesa/drivers/dri/mach64/mach64_context.h	2011-07-27 09:59:53.000=
000000 +0200
-@@ -289,7 +289,7 @@
- /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-  * Byte ordering
-  */
--#if MESA_LITTLE_ENDIAN =3D=3D 1
-+#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN =3D=3D 1
- #define LE32_IN( x )		( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
- #define LE32_OUT( x, y )	do { *(GLuint *)(x) =3D (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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/files/extra-sis_context.h	(revision 313938)
+++ 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.0000=
00000 +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))
-=20
--#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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_sp=
an.c	(revision 313938)
+++ graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_sp=
an.c	(working copy)
@@ -1,15 +0,0 @@
---- src/mesa/drivers/dri/radeon/radeon_span.c.orig	2011-07-09 03:37:10.0=
00000000 +0200
-+++ src/mesa/drivers/dri/radeon/radeon_span.c	2012-06-28 21:44:07.000000=
000 +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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGL/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGLU/Makefile	(revision 313938)
+++ graphics/libGLU/Makefile	(working copy)
@@ -2,7 +2,6 @@
 # $FreeBSD$
=20
 PORTNAME=3D	libGLU
-PORTREVISION=3D	2
 PORTVERSION=3D	${MESAVERSION}
 CATEGORIES=3D	graphics
=20
@@ -13,16 +12,8 @@
=20
 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
=20
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
-.include <bsd.port.pre.mk>
-
-.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386")
-CONFIGURE_ARGS+=3D--disable-gallium-intel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/libGLU/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGLU/distinfo	(revision 313938)
+++ graphics/libGLU/distinfo	(working copy)
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad=
d02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) =3D 57746aa8c60bc6f5596ec6c6c7274de40fa1=
2edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) =3D 6257280
Index: graphics/libGLw/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGLw/Makefile	(revision 313938)
+++ graphics/libGLw/Makefile	(working copy)
@@ -2,25 +2,24 @@
 # $FreeBSD$
=20
 PORTNAME=3D	libGLw
-PORTVERSION=3D	${MESAVERSION}
-PORTREVISION=3D	2
+PORTVERSION=3D	8.0.0
 CATEGORIES=3D	graphics
+MASTER_SITES=3D	ftp://ftp.freedesktop.org/pub/mesa/glw/
+DISTNAME=3D	glw-${PORTVERSION}
+DIST_SUBDIR=3D	GL
=20
+MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	OpenGL widgets library
=20
+USE_BZIP2=3D	yes
+USE_GNOME=3D	gnomehack pkgconfig
+USE_LDCONFIG=3D	yes
 USE_GL=3D		gl
 USE_MOTIF=3D	yes
-USE_XORG=3D	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
+USE_XORG=3D	x11 xt xext
+GNU_CONFIGURE=3D	yes
+CONFIGURE_ARGS=3D	--disable-static --enable-motif
+CPPFLAGS+=3D	-I${LOCALBASE}/include
+LDFLAGS+=3D	-L${LOCALBASE}/lib
=20
-do-install:
-	cd ${WRKSRC}/src/glw; ${GMAKE} install
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
-.include <bsd.port.pre.mk>
-
-.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386")
-CONFIGURE_ARGS+=3D--disable-gallium-intel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/libGLw/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGLw/distinfo	(revision 313938)
+++ graphics/libGLw/distinfo	(working copy)
@@ -1,4 +1,2 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad=
d02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) =3D 57746aa8c60bc6f5596ec6c6c7274de40fa1=
2edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) =3D 6257280
+SHA256 (GL/glw-8.0.0.tar.bz2) =3D 2da1d06e825f073dcbad264aec7b45c649100e=
5bcde688ac3035b34c8dbc8597
+SIZE (GL/glw-8.0.0.tar.bz2) =3D 221136
Index: graphics/libGLw/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libGLw/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libdrm/Makefile	(revision 313938)
+++ graphics/libdrm/Makefile	(working copy)
@@ -10,24 +10,27 @@
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	Userspace interface to kernel Direct Rendering Module service=
s
=20
-BUILD_DEPENDS+=3D	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORT=
SDIR}/devel/libpthread-stubs
 LIB_DEPENDS=3D	pciaccess:${PORTSDIR}/devel/libpciaccess \
 		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS+=3D	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSD=
IR}/devel/libpthread-stubs
=20
 USE_BZIP2=3D	yes
 GNU_CONFIGURE=3D	yes
 USE_LDCONFIG=3D	yes
=20
-CONFIGURE_ARGS=3D	--enable-nouveau-experimental-api
-
 MAKE_JOBS_SAFE=3D	yes
=20
 .if defined(WITH_NEW_XORG)
=20
-OPTIONS_DEFINE=3D	KMS
-KMS_DESC=3D	Enable experimental KMS support
+USE_GMAKE=3D	yes
=20
+OPTIONS_DEFINE=3D	KMS MANPAGES
+OPTIONS_DEFAULT=3DKMS
+KMS_DESC=3D	Enable KMS support
+
+.if defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT+=3D	MANPAGES
+.endif
+
 .include <bsd.port.options.mk>
=20
 .if ${PORT_OPTIONS:MKMS}
@@ -38,12 +41,34 @@
 PLIST_SUB+=3D	KMS=3D"@comment "
 .endif
=20
-LIBDRM_VERSION=3D	2.4.31
+.if ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+=3D	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${=
PORTSDIR}/textproc/docbook-xsl \
+		xsltproc:${PORTSDIR}/textproc/libxslt
+MAN3=3D		drmAvailable.3 \
+		drmHandleEvent.3 \
+		drmModeGetResources.3
+MAN7=3D		drm-gem.7 \
+		drm-kms.7 \
+		drm-memory.7 \
+		drm-mm.7 \
+		drm-ttm.7 \
+		drm.7
+.else
+CONFIGURE_ARGS+=3D--disable-manpages
+.endif
+
+LIBDRM_VERSION=3D	2.4.42
 LIBDRM_REVISION=3D1
 PLIST_SUB+=3D	OLD=3D"@comment " NEW=3D""
+EXTRA_PATCHES+=3D ${FILESDIR}/extra-configure \
+		${FILESDIR}/extra-tests_modetest_Makefile.in \
+		${FILESDIR}/extra-tests_modetest_modetest.c \
+		${FILESDIR}/extra-tests_modetest_strchrnul.c
+CONFIGURE_ARGS+=3D--disable-vmwgfx
 .else
+CONFIGURE_ARGS=3D	--enable-nouveau-experimental-api
 LIBDRM_VERSION=3D	2.4.17
-LIBDRM_REVISION=3D1
+LIBDRM_REVISION=3D0
 PLIST_SUB+=3D	OLD=3D"" NEW=3D"@comment "
 .endif
=20
@@ -59,7 +84,7 @@
=20
 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
=20
 .include <bsd.port.post.mk>
Index: graphics/libdrm/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libdrm/distinfo	(revision 313938)
+++ graphics/libdrm/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (libdrm-2.4.17.tar.bz2) =3D b8a4e7c610b0e970546d791c06e28882857a4=
9d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) =3D 408882
-SHA256 (libdrm-2.4.31.tar.bz2) =3D 8fc7e0e5b2f9bf493447a4ef7adc49174a700=
824457774cb53c1b8f2da866af4
-SIZE (libdrm-2.4.31.tar.bz2) =3D 475677
+SHA256 (libdrm-2.4.42.tar.bz2) =3D e0671082a77871c8474d3c0f09dbf5ff82d24=
29cd248088a691f7b484cbc76e1
+SIZE (libdrm-2.4.42.tar.bz2) =3D 500327
Index: graphics/libdrm/files/extra-configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
+=20
+=20
++for ac_func in strchrnul
++do :
++  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
++if test "x$ac_cv_func_strchrnul" =3D xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_STRCHRNUL 1
++_ACEOF
++ HAVE_STRCHRNUL=3Dyes
++fi
++done
++
++
++ if test "x$ac_cv_func_strchrnul" =3D xyes; then
++  HAVE_STRCHRNUL_TRUE=3D
++  HAVE_STRCHRNUL_FALSE=3D'#'
++else
++  HAVE_STRCHRNUL_TRUE=3D'#'
++  HAVE_STRCHRNUL_FALSE=3D
++fi
++
++
+=20
+=20
+ MAYBE_WARN=3D"-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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 0)
+++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)=

@@ -0,0 +1,56 @@
+--- tests/modetest/Makefile.in.orig	2013-02-22 00:34:49.022808571 +0100
++++ tests/modetest/Makefile.in	2013-02-22 00:34:56.998705101 +0100
+@@ -35,10 +51,14 @@
+ build_triplet =3D @build@
+ host_triplet =3D @host@
+ noinst_PROGRAMS =3D modetest$(EXEEXT)
+-@HAVE_CAIRO_TRUE@am__append_1 =3D $(CAIRO_CFLAGS)
+-@HAVE_CAIRO_TRUE@am__append_2 =3D $(CAIRO_LIBS)
++@HAVE_STRCHRNUL_FALSE@am__append_1 =3D \
++@HAVE_STRCHRNUL_FALSE@	strchrnul.c
++
++@HAVE_CAIRO_TRUE@am__append_2 =3D $(CAIRO_CFLAGS)
++@HAVE_CAIRO_TRUE@am__append_3 =3D $(CAIRO_LIBS)
+ subdir =3D tests/modetest
+-DIST_COMMON =3D $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++DIST_COMMON =3D $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	$(top_srcdir)/build-aux/depcomp
+ ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps =3D $(top_srcdir)/m4/libtool.m4 \
+ 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+@@ -51,7 +71,10 @@
+ CONFIG_CLEAN_FILES =3D
+ CONFIG_CLEAN_VPATH_FILES =3D
+ PROGRAMS =3D $(noinst_PROGRAMS)
+-am_modetest_OBJECTS =3D buffers.$(OBJEXT) modetest.$(OBJEXT)
++am__modetest_SOURCES_DIST =3D buffers.c modetest.c buffers.h strchrnul.=
c
++@HAVE_STRCHRNUL_FALSE@am__objects_1 =3D strchrnul.$(OBJEXT)
++am_modetest_OBJECTS =3D buffers.$(OBJEXT) modetest.$(OBJEXT) \
++	$(am__objects_1)
+ modetest_OBJECTS =3D $(am_modetest_OBJECTS)
+ am__DEPENDENCIES_1 =3D
+ @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 =3D $(am__DEPENDENCIES_1)
+@@ -227,12 +264,10 @@
+ top_builddir =3D @top_builddir@
+ top_srcdir =3D @top_srcdir@
+ AM_CFLAGS =3D -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
+-	-I$(top_srcdir) $(am__append_1)
+-modetest_SOURCES =3D \
+-	buffers.c modetest.c buffers.h
+-
++	-I$(top_srcdir) $(am__append_2)
++modetest_SOURCES =3D buffers.c modetest.c buffers.h $(am__append_1)
+ modetest_LDADD =3D $(top_builddir)/libdrm.la \
+-	$(top_builddir)/libkms/libkms.la $(am__append_2)
++	$(top_builddir)/libkms/libkms.la $(am__append_3)
+ all: all-am
+=20
+ .SUFFIXES:
+@@ -288,6 +323,7 @@
+=20
+ @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=
@
+=20
+ .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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
+=20
+ #include "buffers.h"
+=20
++#ifndef HAVE_STRCHRNUL
++char *strchrnul(const char *, int);
++#endif
++
+ drmModeRes *resources;
+ int fd, modes;
+=20

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 t=
he
++ *    documentation and/or other materials provided with the distributi=
on.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' A=
ND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, TH=
E
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR P=
URPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIA=
BLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQU=
ENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GO=
ODS
++ * 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 AN=
Y 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 2=
013-02-13 15:46:33Z zeising
++ */
++
++char *
++strchrnul(const char *p, int ch)
++{
++	char c;
++
++	c =3D ch;
++	for (;; ++p) {
++		if (*p =3D=3D c || *p =3D=3D '\0')
++			return ((char *)p);
++	}
++	/* NOTREACHED */
++}
++

Property changes on: graphics/libdrm/files/extra-tests_modetest_strchrnul=
=2Ec
___________________________________________________________________
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- graphics/libdrm/pkg-plist	(revision 313938)
+++ 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: x11/bigreqsproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/bigreqsproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	bigreqsproto
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/bigreqsproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/bigreqsproto/distinfo	(revision 313938)
+++ x11/bigreqsproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) =3D 1c3b85872b58d215e8fbf=
dc7c36bb397d10053324a5df8722227d35254fff09a
-SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) =3D 102069
+SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) =3D 462116ab44e41d8121bfd=
e947321950370b285a5316612b8fce8334d50751b1e
+SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) =3D 113218
Index: x11/dri2proto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/dri2proto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	dri2proto
-PORTVERSION=3D	2.6
+PORTVERSION=3D	2.8
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/dri2proto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/dri2proto/distinfo	(revision 313938)
+++ x11/dri2proto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) =3D ad82c0b28c19fcd3f91ea1f939=
56cb666526b41b91f239773b5854b9b1a3b909
-SIZE (xorg/proto/dri2proto-2.6.tar.bz2) =3D 102188
+SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) =3D f9b55476def44fc7c459b2537d=
17dbc731e36ed5d416af7ca0b1e2e676f8aa04
+SIZE (xorg/proto/dri2proto-2.8.tar.bz2) =3D 108746
Index: x11/fstobdf/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/fstobdf/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	fstobdf
-PORTVERSION=3D	1.0.4
+PORTVERSION=3D	1.0.5
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/fstobdf/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/fstobdf/distinfo	(revision 313938)
+++ x11/fstobdf/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) =3D f1ca8af634656d727d09cc7527f0=
2ba2655eb7a8c217bde36cd44701665ee06b
-SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) =3D 108528
+SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) =3D 9c44ef069174ec501fa848fe0dfa=
41c06c2367df84721e94b3bca670608f15a8
+SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) =3D 119822
Index: x11/glproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/glproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	glproto
-PORTVERSION=3D	1.4.15
+PORTVERSION=3D	1.4.16
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/glproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/glproto/distinfo	(revision 313938)
+++ x11/glproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) =3D 990356ebe2e8966aa643287c9=
a485777957a49299dfb211654df5ff212dec171
-SIZE (xorg/proto/glproto-1.4.15.tar.bz2) =3D 113671
+SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) =3D 54dd663a7f5ed702f2ff035b7=
9edf770c2f850867ac0d55742f696bfc8b2598d
+SIZE (xorg/proto/glproto-1.4.16.tar.bz2) =3D 119584
Index: x11/inputproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/inputproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	inputproto
-PORTVERSION=3D	2.0.2
+PORTVERSION=3D	2.3
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	Input extension headers
=20
+USE_XORG=3D	xorg-macros
+USE_PKGCONFIG=3D	build
 XORG_CAT=3D	proto
=20
+CONFIGURE_ARGS=3D	--without-asciidoc
+
 .include <bsd.port.mk>
Index: x11/inputproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/inputproto/distinfo	(revision 313938)
+++ x11/inputproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) =3D 64222a590ad4a62a3c8d578=
05379451769e3329cc5c8c5c1f1fc0d1529ebf005
-SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) =3D 155535
+SHA256 (xorg/proto/inputproto-2.3.tar.bz2) =3D 7d26b193f6699f8e9c1e28bf0=
26844b7ecea33dd644402523471be109152c32f
+SIZE (xorg/proto/inputproto-2.3.tar.bz2) =3D 195642
Index: x11/inputproto/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/inputproto/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/kbproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	kbproto
-PORTVERSION=3D	1.0.5
+PORTVERSION=3D	1.0.6
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/kbproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/kbproto/distinfo	(revision 313938)
+++ x11/kbproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) =3D 0eba4f525e1700798cc0585fe2=
9556e4369fba6517c670866273ad104cf5f49d
-SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) =3D 111270
+SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) =3D 037cac0aeb80c4fccf44bf736d=
791fccb2ff7fd34c558ef8f03ac60b61085479
+SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) =3D 256988
Index: x11/kbproto/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/kbproto/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libICE/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libICE
-PORTVERSION=3D	1.0.7
+PORTVERSION=3D	1.0.8
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libICE/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libICE/distinfo	(revision 313938)
+++ x11/libICE/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) =3D a8b1692f151a473cee8733df9aefe=
98f7e5f64dfe6d4213cb6231d7bf855b901
-SIZE (xorg/lib/libICE-1.0.7.tar.bz2) =3D 323808
+SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) =3D 24a991284d02ff0c789bc8d11ad2e=
4dffe144cb70f24e28f9ce3e8b1ee08b71e
+SIZE (xorg/lib/libICE-1.0.8.tar.bz2) =3D 365762
Index: x11/libSM/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libSM/Makefile	(revision 313938)
+++ x11/libSM/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
=20
 PORTNAME=3D	libSM
-PORTVERSION=3D	1.2.0
+PORTVERSION=3D	1.2.1
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libSM/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libSM/distinfo	(revision 313938)
+++ x11/libSM/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) =3D 0cd8df1b7067bfda10b05d38279777=
770677c6fecb5a14e804a28597da7a57cb
-SIZE (xorg/lib/libSM-1.2.0.tar.bz2) =3D 284287
+SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) =3D 93c11d569c64f40723b93b44af1efb=
474a0cfe92573b0c8c330343cabb897f1d
+SIZE (xorg/lib/libSM-1.2.1.tar.bz2) =3D 334696
Index: x11/libX11/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libX11/Makefile	(revision 313938)
+++ x11/libX11/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
=20
 PORTNAME=3D	libX11
-PORTVERSION=3D	1.4.4
+PORTVERSION=3D	1.5.0
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
@@ -18,6 +18,7 @@
 USE_XORG=3D	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 		kbproto:both inputproto xf86bigfontproto xproto:both \
 		xorg-macros
+USE_PERL5_BUILD=3Dyes
=20
 CONFIGURE_ARGS+=3D	--datadir=3D${PREFIX}/lib \
 			--without-xmlto \
Index: x11/libX11/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libX11/distinfo	(revision 313938)
+++ x11/libX11/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) =3D 7fe62180f08ef5f0a0062fb444591=
e349cae2ab5af6ad834599f5c654e6c840d
-SIZE (xorg/lib/libX11-1.4.4.tar.bz2) =3D 2323404
+SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) =3D c382efd7e92bfc3cef39a4b7f1ecf=
2744ba4414a705e3bc1e697f75502bd4d86
+SIZE (xorg/lib/libX11-1.5.0.tar.bz2) =3D 2322265
Index: x11/libXScrnSaver/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXScrnSaver/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXScrnSaver
-PORTVERSION=3D	1.2.1
+PORTVERSION=3D	1.2.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXScrnSaver/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXScrnSaver/distinfo	(revision 313938)
+++ x11/libXScrnSaver/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) =3D ce3a66e2f6fa85b22280ab=
9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
-SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) =3D 268322
+SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) =3D 8ff1efa7341c7f34bcf9b1=
7c89648d6325ddaae22e3904e091794e0b4426ce1d
+SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) =3D 290437
Index: x11/libXTrap/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXTrap/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXTrap
-PORTVERSION=3D	1.0.0
+PORTVERSION=3D	1.0.1
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXTrap/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXTrap/distinfo	(revision 313938)
+++ x11/libXTrap/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) =3D cfd12ce675bd5cdeac372058274=
1fe81a99343bef475d440cb34a7f2cdfe34ba
-SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) =3D 220148
+SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) =3D 8f373d55985676b893d61bd5a25=
5ec9f214be4682ec1167d30356e6564e7252e
+SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) =3D 269484
Index: x11/libXau/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXau/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXau
-PORTVERSION=3D	1.0.6
+PORTVERSION=3D	1.0.7
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXau/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXau/distinfo	(revision 313938)
+++ x11/libXau/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) =3D ee84415ffedcc1c0d39b3a39c35d0=
596c89907bba93d22bf85e24d21f90170fc
-SIZE (xorg/lib/libXau-1.0.6.tar.bz2) =3D 261501
+SHA256 (xorg/lib/libXau-1.0.7.tar.bz2) =3D 7153ba503e2362d552612d9dc2e7d=
7ad3106d5055e310a26ecf28addf471a489
+SIZE (xorg/lib/libXau-1.0.7.tar.bz2) =3D 274681
Index: x11/libXcomposite/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXcomposite/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXcomposite
-PORTVERSION=3D	0.4.3
+PORTVERSION=3D	0.4.4
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libXcomposite/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXcomposite/distinfo	(revision 313938)
+++ x11/libXcomposite/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) =3D 32294d28f4ee46db310c34=
4546d98484728b7d52158c6d7c25bba02563b41aad
-SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) =3D 246715
+SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) =3D ede250cd207d8bee4a3382=
65c3007d7a68d5aca791b6ac41af18e9a2aeb34178
+SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) =3D 283746
Index: x11/libXcomposite/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXcomposite/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXcursor/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXcursor
-PORTVERSION=3D	1.1.12
+PORTVERSION=3D	1.1.13
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXcursor/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXcursor/distinfo	(revision 313938)
+++ x11/libXcursor/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) =3D 0c4de165e07ac66b091af50a=
4db1f07e3c14d1bcf80830013693a21ef03e7ba4
-SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) =3D 297332
+SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) =3D f78827de4a1b7ce8cceca24a=
9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
+SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) =3D 302525
Index: x11/libXdamage/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXdamage/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXdamage
-PORTVERSION=3D	1.1.3
+PORTVERSION=3D	1.1.4
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXdamage/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXdamage/distinfo	(revision 313938)
+++ x11/libXdamage/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) =3D bc6169c826d3cb17435ca84e1=
b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
-SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) =3D 249029
+SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) =3D 7c3fe7c657e83547f4822bfde=
30a90d84524efb56365448768409b77f05355ad
+SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) =3D 278937
Index: x11/libXdamage/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXdamage/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXdmcp/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXdmcp
-PORTVERSION=3D	1.1.0
+PORTVERSION=3D	1.1.1
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXdmcp/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXdmcp/distinfo	(revision 313938)
+++ x11/libXdmcp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) =3D b8a0e9a3192a3afddb56eb1d7ad=
f933e423b401b2a492975d776dc0423c10072
-SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) =3D 288256
+SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) =3D 9ace6d4230f9dce4ed090692f82=
f613253ada8f887b23b3d8ff3dd4e3a7c118e
+SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) =3D 310878
Index: x11/libXext/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXext/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXext
-PORTVERSION=3D	1.3.0
-PORTREVISION=3D	1
+PORTVERSION=3D	1.3.1
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libXext/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXext/distinfo	(revision 313938)
+++ x11/libXext/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) =3D e9daeb400855b9836e328500cec3=
56b2769033174fc1b2be0df4a80f031debc0
-SIZE (xorg/lib/libXext-1.3.0.tar.bz2) =3D 341172
+SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) =3D 56229c617eb7bfd6dec40d2805bc=
4dfb883dfe80f130d99b9a2beb632165e859
+SIZE (xorg/lib/libXext-1.3.1.tar.bz2) =3D 372728
Index: x11/libXi/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXi/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXi
-PORTVERSION=3D	1.4.5
+PORTVERSION=3D	1.7
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
@@ -16,9 +12,14 @@
 LICENSE=3D	MIT
=20
 XORG_CAT=3D	lib
-USE_XORG=3D	xproto x11 xext xextproto inputproto:both
+USE_XORG=3D	xorg-macros xproto x11 xext xextproto inputproto:both
=20
-CONFIGURE_ARGS+=3D--disable-specs --without-xmlto
+CONFIGURE_ARGS+=3D--disable-docs \
+		--disable-specs \
+	       	--without-xmlto \
+		--without-fop \
+		--without-asciidoc \
+		--without-xsltproc
=20
 MAN3=3D		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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXi/distinfo	(revision 313938)
+++ x11/libXi/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) =3D 22a99123229d22e6e1567c4cda0224=
a744475f427625d61b23d965157a86f1b5
-SIZE (xorg/lib/libXi-1.4.5.tar.bz2) =3D 416807
+SHA256 (xorg/lib/libXi-1.7.tar.bz2) =3D 4ebcf2b02c16ff51e41e9d045de01416=
d6430b6a4af6a82b17b6bfa4d6f9cbfc
+SIZE (xorg/lib/libXi-1.7.tar.bz2) =3D 433745
Index: x11/libXinerama/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXinerama/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXinerama
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.2
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libXinerama/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXinerama/distinfo	(revision 313938)
+++ x11/libXinerama/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) =3D bbe2b4a0e8ccf01a40f02c42=
9c8418bd1fe652fd2c6f05d487e1319599d6779f
-SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) =3D 266086
+SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) =3D a4e77c2fd88372e4ae365f3c=
a0434a23613da96c5b359b1a64bf43614ec06aac
+SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) =3D 279682
Index: x11/libXpm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXpm/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXpm
-PORTVERSION=3D	3.5.9
+PORTVERSION=3D	3.5.10
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXpm/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXpm/distinfo	(revision 313938)
+++ x11/libXpm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) =3D 8add01029cab0598ca86e01a2f778=
1a636f74b757abe6b50ba61b2a6e2fd621e
-SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) =3D 383818
+SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) =3D a6db7e234750e7d60330017972e3=
1d8e1f29f0a8c1391e4ac82f6102d919a735
+SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) =3D 431310
Index: x11/libXrandr/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXrandr/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXrandr
-PORTVERSION=3D	1.3.2
+PORTVERSION=3D	1.4.0
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXrandr/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXrandr/distinfo	(revision 313938)
+++ x11/libXrandr/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) =3D 7eaca216ab5233d7396119eb87=
c1989d350a3efead104d54b55f22cdd1d99b81
-SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) =3D 274401
+SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) =3D 033ad0ac2f012afb05268660f6=
d78705c85f84689f92fa7b47ce12959b15f5c3
+SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) =3D 306649
Index: x11/libXrender/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXrender/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXrender
-PORTVERSION=3D	0.9.6
+PORTVERSION=3D	0.9.7
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXrender/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXrender/distinfo	(revision 313938)
+++ x11/libXrender/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) =3D 7f58b1e263109e0a873eef842=
3aa14733a5499befbe645053aa622ed1f3ea668
-SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) =3D 258249
+SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) =3D f9b46b93c9bc15d5745d19383=
5ac9ba2a2b411878fad60c504bbb8f98492bbe6
+SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) =3D 281098
Index: x11/libXres/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXres/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXres
-PORTVERSION=3D	1.0.5
+PORTVERSION=3D	1.0.6
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXres/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXres/distinfo	(revision 313938)
+++ x11/libXres/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) =3D a00b0f464bc0c038db5614513b0e=
33475db22a7b3cd41e4e56a6c661a518a059
-SIZE (xorg/lib/libXres-1.0.5.tar.bz2) =3D 240062
+SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) =3D ff8661c925e8b182f98ae98f02bb=
d93c55259ef7f34a92c1a126b6074ebde890
+SIZE (xorg/lib/libXres-1.0.6.tar.bz2) =3D 282035
Index: x11/libXtst/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXtst/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXtst
-PORTVERSION=3D	1.2.0
+PORTVERSION=3D	1.2.1
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXtst/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXtst/distinfo	(revision 313938)
+++ x11/libXtst/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) =3D 7a2e0912b521f6bd8c392189874b=
a4a3b8168b0bba4c2143e073de53d8e85408
-SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) =3D 281922
+SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) =3D 7eea3e66e392aca3f9dad6238198=
753c28e1c32fa4903cbb7739607a2504e5e0
+SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) =3D 313147
Index: x11/libXv/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXv/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXv
-PORTVERSION=3D	1.0.6
+PORTVERSION=3D	1.0.7
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/libXv/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXv/distinfo	(revision 313938)
+++ x11/libXv/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) =3D e20f8e594bb0f44f3fbd2599694573=
0391d72acbe5eaac760429fd6579caf5ee
-SIZE (xorg/lib/libXv-1.0.6.tar.bz2) =3D 271504
+SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) =3D 5d664aeb641f8c867331a0c6b4574a=
5e7e420f00bf5fcefd874e8d003ea59010
+SIZE (xorg/lib/libXv-1.0.7.tar.bz2) =3D 285379
Index: x11/libXvMC/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXvMC/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXvMC
-PORTVERSION=3D	1.0.6
+PORTVERSION=3D	1.0.7
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXvMC/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXvMC/distinfo	(revision 313938)
+++ x11/libXvMC/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) =3D 3dda80e9c71fd14a14f93279c6f6=
61703c5c1c43d104a5db0842377bdf0c3392
-SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) =3D 270013
+SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) =3D 28f085fc8518a3dadfe355360705=
d50153051f09898093e69af806c0b437cea3
+SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) =3D 299745
Index: x11/libXxf86dga/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXxf86dga/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXxf86dga
-PORTVERSION=3D	1.1.2
+PORTVERSION=3D	1.1.3
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXxf86dga/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXxf86dga/distinfo	(revision 313938)
+++ x11/libXxf86dga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) =3D 1ba652f562ce3fb3fef092ce=
5485eb7ef15b521124c901977b56d6f324605a06
-SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) =3D 270013
+SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) =3D 551fa374dbef0f977de1f35d=
005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
+SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) =3D 290347
Index: x11/libXxf86vm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXxf86vm/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXxf86vm
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libXxf86vm/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libXxf86vm/distinfo	(revision 313938)
+++ x11/libXxf86vm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) =3D 21cae9239aefd59353a4ddb0d=
6ed890402b681570ccd4bc977d80a75a020239e
-SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) =3D 252404
+SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) =3D a564172fb866b1b587bbccb7d=
041088931029845245e0d15c32ca7f1bb48fc84
+SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) =3D 284717
Index: x11/libdmx/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libdmx/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libdmx
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libdmx/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libdmx/distinfo	(revision 313938)
+++ x11/libdmx/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) =3D a6de6e87470bc749de02056fa3875=
8d0e633303789830fdafc56600e75b3de18
-SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) =3D 265460
+SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) =3D a7870b648a8768d65432af76dd115=
81ff69f3955118540d5967eb1eef43838ba
+SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) =3D 290694
Index: x11/libxcb/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxcb/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libxcb
-PORTVERSION=3D	1.7
+PORTVERSION=3D	1.9
 CATEGORIES=3D	x11 python
 MASTER_SITES=3D	http://xcb.freedesktop.org/dist/
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	The X protocol C-language Binding (XCB) library
=20
+LICENSE=3D	MIT
+LICENSE_FILE=3D	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=3D	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck =
\
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		xcb-proto>=3D1.7:${PORTSDIR}/x11/xcb-proto \
@@ -21,15 +20,12 @@
=20
 CONFIGURE_ARGS+=3D	--disable-build-docs --without-doxygen --enable-xinpu=
t
=20
-LICENSE=3D	MIT
-LICENSE_FILE=3D	${WRKSRC}/COPYING
-
 USE_BZIP2=3D	yes
 USE_GNOME=3D	gnomehack
 USE_GMAKE=3D	yes
 USE_LDCONFIG=3D	yes
 USE_XORG=3D	xau xdmcp
-USE_PYTHON_BUILD=3D	2.5-2.7
+USE_PYTHON_BUILD=3D	2.5+
=20
 GNU_CONFIGURE=3D	yes
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAG=
S NEEDED_LIBS
@@ -46,6 +42,8 @@
 XPROTO_CFLAGS=3D	-I${LOCALBASE}/include
 XPROTO_LIBS=3D	-L${LOCALBASE}/lib
=20
+.include "${.CURDIR}/manpages"
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
Index: x11/libxcb/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxcb/distinfo	(revision 313938)
+++ x11/libxcb/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libxcb-1.7.tar.bz2) =3D e776dc35e2a66094e7308ce2e045fb4e27cf3ca3=
0ab1813a8fc08538140724df
-SIZE (libxcb-1.7.tar.bz2) =3D 318619
+SHA256 (libxcb-1.9.tar.bz2) =3D 8857e62b3aae2976c7e10043643e45a85964fd1d=
cb4469dfde0d04d3d1b12c96
+SIZE (libxcb-1.9.tar.bz2) =3D 387612
Index: x11/libxcb/manpages
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxcb/manpages	(revision 0)
+++ x11/libxcb/manpages	(working copy)
@@ -0,0 +1,2041 @@
+MAN3 =3D \
+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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxcb/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxkbfile/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libxkbfile
-PORTVERSION=3D	1.0.7
+PORTVERSION=3D	1.0.8
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/libxkbfile/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/libxkbfile/distinfo	(revision 313938)
+++ x11/libxkbfile/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) =3D 667e370a733b96b647a402114=
30cfc41dd2160c9a2aa701d0c839c626d0f2ae5
-SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) =3D 317847
+SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) =3D 8aa94e19c537c43558f309066=
50cea6e15fa012591445d9f927658c3b32a8f3a
+SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) =3D 335788
Index: x11/pixman/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/pixman/Makefile	(revision 313938)
+++ x11/pixman/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
=20
 PORTNAME=3D	pixman
-PORTVERSION=3D	0.24.2
+PORTVERSION=3D	0.28.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -15,9 +15,9 @@
=20
 OPTIONS_DEFINE=3D	SIMD
=20
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
=20
-.if !${PORT_OPTIONS:MSIMD}
+.if empty(PORT_OPTIONS:MSIMD)
 CONFIGURE_ARGS=3D	--disable-vmx --disable-arm-simd
 . if ! ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=3D	--disable-mmx
@@ -27,4 +27,4 @@
 . endif
 .endif
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11/pixman/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/pixman/distinfo	(revision 313938)
+++ x11/pixman/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) =3D 32f74f3e3c1feea33e6ad3e2fd66=
cb3eb816805c384b346ea1636a87c9057dbf
-SIZE (xorg/lib/pixman-0.24.2.tar.bz2) =3D 467979
+SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) =3D 583686afbfa5a1dfc40a21e888a3=
eacf31fe0e02469d20b821b5d8f719165a51
+SIZE (xorg/lib/pixman-0.28.2.tar.bz2) =3D 625655
Index: x11/randrproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/randrproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	randrproto
-PORTVERSION=3D	1.3.2
+PORTVERSION=3D	1.4.0
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/randrproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/randrproto/distinfo	(revision 313938)
+++ x11/randrproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) =3D d90d00612cc49292bd8d9dc=
19efb1c9187385fbe87590d7279a02e5e1066dc71
-SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) =3D 122915
+SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) =3D 85c42e8c66a55318ddaf2ce=
5727beacb25cb1f8555229f778cd1da86478209cf
+SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) =3D 133300
Index: x11/recordproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/recordproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	recordproto
-PORTVERSION=3D	1.14.1
+PORTVERSION=3D	1.14.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/recordproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/recordproto/distinfo	(revision 313938)
+++ x11/recordproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) =3D b27eb043d3e618bc1f8b7=
04a64f8ae218ea00e7f36f9107ac41d41940773098d
-SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) =3D 112238
+SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) =3D a777548d2e92aa259f152=
8de3c4a36d15e07a4650d0976573a8e2ff5437e7370
+SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) =3D 123033
Index: x11/scrnsaverproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/scrnsaverproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	scrnsaverproto
-PORTVERSION=3D	1.2.1
+PORTVERSION=3D	1.2.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/scrnsaverproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/scrnsaverproto/distinfo	(revision 313938)
+++ x11/scrnsaverproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) =3D fad2f73cac136fcddd3=
11d27a14ac7e519a9bec6ab272490d9c9b363556024f1
-SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) =3D 107997
+SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) =3D 8bb70a8da164930ccea=
eb4c74180291660533ad3cc45377b30a795d1b85bcd65
+SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) =3D 118820
Index: x11/xcb-proto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xcb-proto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xcb-proto
-PORTVERSION=3D	1.7.1
+PORTVERSION=3D	1.8
 CATEGORIES=3D	x11 python
-MASTER_SITES=3D	http://xcb.freedesktop.org/dist/ \
-		http://distfiles.pirateparty.in/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=3D	ashish
+MASTER_SITES=3D	http://xcb.freedesktop.org/dist/
=20
 MAINTAINER=3D	ashish@FreeBSD.org
 COMMENT=3D	The X protocol C-language Binding (XCB) protocol
Index: x11/xcb-proto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xcb-proto/distinfo	(revision 313938)
+++ x11/xcb-proto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.7.1.tar.bz2) =3D ad5d99887d811c9817f1916d7b3f5dc6c21=
414c093256cbeffb945aacdc34437
-SIZE (xcb-proto-1.7.1.tar.bz2) =3D 106040
+SHA256 (xcb-proto-1.8.tar.bz2) =3D 233d16c7a019235b3092111e7c11429119357=
eb13754a607b75eea04453121b0
+SIZE (xcb-proto-1.8.tar.bz2) =3D 125072
Index: x11/xcmiscproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xcmiscproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xcmiscproto
-PORTVERSION=3D	1.2.1
+PORTVERSION=3D	1.2.2
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xcmiscproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xcmiscproto/distinfo	(revision 313938)
+++ x11/xcmiscproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) =3D 730e27e22bfb99409bc364=
233f3f766f5163de0cbf2edad33738cfdf55f04c15
-SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) =3D 101926
+SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) =3D b13236869372256c36db79=
ae39d54214172677fb79e9cdc555dceec80bd9d2df
+SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) =3D 112486
Index: x11/xextproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xextproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xextproto
-PORTVERSION=3D	7.2.0
+PORTVERSION=3D	7.2.1
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xextproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xextproto/distinfo	(revision 313938)
+++ x11/xextproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) =3D d2bc4208c6b1883ebe00bc5c=
0048e5d825038cda56775f74bb4aa89afdc576d5
-SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) =3D 207724
+SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) =3D 7c53b105407ef3b2eb180a36=
1bd672c1814524a600166a0a7dbbe76b97556d1a
+SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) =3D 229282
Index: x11/xfd/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xfd/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xfd
-PORTVERSION=3D	1.1.0
+PORTVERSION=3D	1.1.1
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xfd/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xfd/distinfo	(revision 313938)
+++ x11/xfd/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfd-1.1.0.tar.bz2) =3D e76db409ac46bd81c80348bea816d720=
65f36c2ef3d78a0da37ada7ffbeaea1a
-SIZE (xorg/app/xfd-1.1.0.tar.bz2) =3D 121204
+SHA256 (xorg/app/xfd-1.1.1.tar.bz2) =3D 3fbef0d5ed6dc088017df156e748d187=
b2d1aaedc3de7ea96e505ea6d1af7b73
+SIZE (xorg/app/xfd-1.1.1.tar.bz2) =3D 130547
Index: x11/xinput/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xinput/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xinput
-PORTVERSION=3D	1.5.4
+PORTVERSION=3D	1.6.0
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	Very useful utility for configuring and testing XInput device=
s
=20
 XORG_CAT=3D	app
-USE_XORG=3D	inputproto x11 xi xext
+USE_XORG=3D	inputproto x11 xi xext xrandr xinerama
=20
 PLIST_FILES=3D	bin/xinput
=20
Index: x11/xinput/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xinput/distinfo	(revision 313938)
+++ x11/xinput/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinput-1.5.4.tar.bz2) =3D a8da86f0d7c8ac0c4434e3140ae7f=
208fc2b35869e5adf10971eef7cb77f4360
-SIZE (xorg/app/xinput-1.5.4.tar.bz2) =3D 134702
+SHA256 (xorg/app/xinput-1.6.0.tar.bz2) =3D 4ab007d952c76665603bcb82ceb15=
fd3929d10faf0580fc4873ac16f5f63847e
+SIZE (xorg/app/xinput-1.6.0.tar.bz2) =3D 146209
Index: x11/xkeyboard-config/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xkeyboard-config/Makefile	(revision 313938)
+++ x11/xkeyboard-config/Makefile	(working copy)
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	xkeyboard-config
-# Date Created:				Dec 20 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
=20
 PORTNAME=3D	xkeyboard-config
-PORTVERSION=3D	2.5.1
+PORTVERSION=3D	2.8
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X Keyboard Configuration Database
+MASTER_SITE_SUBDIR=3D	individual/${XORG_CAT}/${PORTNAME}
=20
 LICENSE=3D	MIT
=20
Index: x11/xkeyboard-config/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xkeyboard-config/distinfo	(revision 313938)
+++ x11/xkeyboard-config/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) =3D eb80e8dc38c389728b=
fca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
-SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) =3D 833871
+SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) =3D 4e1cf5468d488aaf320d=
dfd439e03cbda0b213550fd734026d23138e4b2078ae
+SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) =3D 862678
Index: x11/xkeyboard-config/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xkeyboard-config/pkg-plist	(revision 313938)
+++ 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
@@ -371,12 +320,13 @@
 %%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
@@ -400,5 +345,3 @@
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb
 @dirrmtry share/X11
-@cwd /
-@dirrmtry var/lib/xkb
Index: x11/xorg/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xorg/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg
-PORTVERSION=3D	7.5.2
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11/xorg-apps/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xorg-apps/Makefile	(revision 313938)
+++ x11/xorg-apps/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
=20
 PORTNAME=3D	xorg-apps
-PORTVERSION=3D	7.5.2
-PORTREVISION=3D	1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
@@ -39,7 +38,7 @@
 .include <bsd.port.options.mk>
=20
 .for comp in ${COMPONENTS}
-. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
+. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
 .  if ${comp:M:}=3D=3D""
 port=3D${comp}
 check=3D${comp:C/.*\///} # doesn't work
Index: x11/xorg-docs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xorg-docs/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-docs
-PORTVERSION=3D	1.6
+PORTVERSION=3D	1.7
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11
=20
Index: x11/xorg-docs/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xorg-docs/distinfo	(revision 313938)
+++ x11/xorg-docs/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) =3D f6b21bc486ab10fdf2bf1dfdf08f=
0aba22a4b87542165eeb395d0a6202f19d32
-SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) =3D 345028
+SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) =3D b9b1918bd365e9eb29c325e76bb8=
c4d774d37be707e433fb0af94da35683375f
+SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) =3D 370482
Index: x11/xorg-libraries/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xorg-libraries/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-libraries
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11/xproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xproto/Makefile	(revision 313938)
+++ x11/xproto/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# 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$
-#
=20
 PORTNAME=3D	xproto
-PORTVERSION=3D	7.0.22
+PORTVERSION=3D	7.0.23
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xproto/distinfo	(revision 313938)
+++ x11/xproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) =3D ad8397dd2a3de7249d2f3fb3a4=
9444fef71483d43681285936c11911663817a8
-SIZE (xorg/proto/xproto-7.0.22.tar.bz2) =3D 281763
+SHA256 (xorg/proto/xproto-7.0.23.tar.bz2) =3D ade04a0949ebe4e3ef34bb2183=
b1ae8e08f6f9c7571729c9db38212742ac939e
+SIZE (xorg/proto/xproto-7.0.23.tar.bz2) =3D 290114
Index: x11/xrandr/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xrandr/Makefile	(revision 313938)
+++ x11/xrandr/Makefile	(working copy)
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	xrandr
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
=20
 PORTNAME=3D	xrandr
-PORTVERSION=3D	1.3.5
+PORTVERSION=3D	1.4.0
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	Primitive command line interface to the RandR extension
=20
 XORG_CAT=3D	app
-USE_XORG=3D	xrandr xrender x11
+USE_XORG=3D	xrandr xrender x11 xorg-macros
=20
 PLIST_FILES=3D	bin/xrandr \
 		bin/xkeystone
Index: x11/xrandr/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xrandr/distinfo	(revision 313938)
+++ x11/xrandr/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) =3D 1059ff7a9ad0df8e00a765ffa4e08=
a505304c02663112da370ac7082030b980e
-SIZE (xorg/app/xrandr-1.3.5.tar.bz2) =3D 152891
+SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) =3D a76b004abe6fd7606eba9ad161ac6=
391fe5c665708cc5fb7c7ea7d36459d9693
+SIZE (xorg/app/xrandr-1.4.0.tar.bz2) =3D 165459
Index: x11/xtrans/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xtrans/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xtrans
-PORTVERSION=3D	1.2.6
+PORTVERSION=3D	1.2.7
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xtrans/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xtrans/distinfo	(revision 313938)
+++ x11/xtrans/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) =3D c5f9a73705ddbb8c9b8f16c4fac33=
b4b9ba7661b8305474b4c1549e48d9ca5c6
-SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) =3D 156600
+SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) =3D 7f811191ba70a34a9994d165ea11a=
239e52c527f039b6e7f5011588f075fe1a6
+SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) =3D 173025
Index: x11/xtrans/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xtrans/pkg-plist	(revision 313938)
+++ 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/xvidtune/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xvidtune/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xvidtune
-PORTVERSION=3D	1.0.2
+PORTVERSION=3D	1.0.3
 CATEGORIES=3D	x11
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11/xvidtune/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11/xvidtune/distinfo	(revision 313938)
+++ x11/xvidtune/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) =3D 73ca41bd5e73560663bea0d9814=
9b099cfef5743a2282ca67547e97732618a53
-SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) =3D 113117
+SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) =3D 24e5e103933a04bfb2e1d185626=
19ed74031ab515e7343eb546bacdbcbeecf01
+SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) =3D 128492
Index: x11-drivers/xf86-input-acecad/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-acecad/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-acecad
 PORTVERSION=3D	1.5.0
@@ -13,7 +8,6 @@
 COMMENT=3D	X.Org acecad input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		acecad.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-elographics/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-elographics/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-elographics
 PORTVERSION=3D	${ELO_VERSION}
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org elographics input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		elographics.4x
=20
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-fpit
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-fpit	(revision 313938)
+++ x11-drivers/xf86-input-fpit	(working copy)

Property changes on: x11-drivers/xf86-input-fpit
___________________________________________________________________
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-input-fpit/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-fpit/Makefile	(revision 0)
+++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=3D	xf86-input-fpit
+PORTVERSION=3D	1.4.0
+CATEGORIES=3D	x11-drivers
+
+MAINTAINER=3D	x11@FreeBSD.org
+COMMENT=3D	X.Org fpit input driver
+
+XORG_CAT=3D	driver
+USE_XORG=3D	xrandr
+
+MAN4=3D		fpit.4x
+
+.if !defined(WITH_NEW_XORG)
+IGNORE=3D		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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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) =3D 38a80ad6e9b367e06=
8390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a
+SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) =3D 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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: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-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-hyperpen/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-hyperpen
 PORTVERSION=3D	${HYPERVER}
@@ -14,17 +9,13 @@
 COMMENT=3D	X.Org hyperpen input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
=20
 .if defined(WITH_NEW_XORG)
 HYPERVER=3D	1.4.1
 HYPERREVISION=3D	0
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-patch-src_xf86HyperPen.c
-
 .else
 HYPERVER=3D	1.3.0
-HYPERREVISION=3D	6
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-patch-src_xf86HyperPen.c
+HYPERREVISION=3D	5
 .endif
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen=
=2Ec
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c	=
(revision 313938)
+++ 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 =3D (LocalDevicePtr)pHyp->public.devicePrivate=
;
-     HyperPenDevicePtr	priv =3D (HyperPenDevicePtr)PRIVATE(pHyp);
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 7
-+    Atom axis_labels[3] =3D { 0 };
-+#endif
-=20
-     if (xf86HypOpen(local) !=3D Success) {
- 	if (local->fd >=3D 0) {
-@@ -730,6 +733,9 @@
- /* Set the real values */
-     InitValuatorAxisStruct(pHyp,
- 			   0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 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) >=3D 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) >=3D 7
-+			   axis_labels[2],
-+#endif
- 			   0, /* min val */
- 			   511, /* max val */
- 			   512, /* resolution */
-@@ -765,8 +777,10 @@
-     int			loop;
-     LocalDevicePtr	local =3D (LocalDevicePtr)pHyp->public.devicePrivate=
;
-     HyperPenDevicePtr	priv =3D (HyperPenDevicePtr)PRIVATE(pHyp);
--
--
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 7
-+    Atom btn_labels[4] =3D { 0 };
-+    Atom axis_labels[3] =3D { 0 };
-+#endif
-=20
-     switch (what) {
- 	case DEVICE_INIT:
-@@ -779,6 +793,9 @@
-=20
- 	    if (InitButtonClassDeviceStruct(pHyp,
- 					    nbbuttons,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 7
-+					    btn_labels,
-+#endif
- 					    map) =3D=3D FALSE) {
- 		ErrorF("unable to allocate Button class device\n");
- 		return !Success;
-@@ -802,6 +819,9 @@
-=20
- 	    if (InitValuatorClassDeviceStruct(pHyp,
- 		   nbaxes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 7
-+		   axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- 		   xf86GetMotionEvents,
- #endif
Index: x11-drivers/xf86-input-joystick/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-joystick/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-joystick
 PORTVERSION=3D	${JOYVER}
@@ -14,11 +9,10 @@
 COMMENT=3D	X.Org joystick input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		joystick.4x
=20
 .if defined(WITH_NEW_XORG)
-JOYVER=3D		1.6.0
+JOYVER=3D		1.6.2
 JOYREVISION=3D	0
 .else
 JOYVER=3D		1.5.0
Index: x11-drivers/xf86-input-joystick/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-joystick/distinfo	(revision 313938)
+++ x11-drivers/xf86-input-joystick/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) =3D 718118c5d7695=
29f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
 SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) =3D 283763
-SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) =3D 4f1c15ec7372d=
d340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
-SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) =3D 310552
+SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) =3D ee3b86ed72f3b=
5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
+SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) =3D 327539
Index: x11-drivers/xf86-input-keyboard/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-keyboard/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-keyboard
-PORTVERSION=3D	1.6.1
+PORTVERSION=3D	1.6.2
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org keyboard input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	kbproto xextproto videoproto
+USE_XORG=3D	kbproto
 MAN4=3D		kbd.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-keyboard/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-keyboard/distinfo	(revision 313938)
+++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) =3D aa9ec96e7f7f8=
7bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
-SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) =3D 304166
+SHA256 (xorg/driver/xf86-input-keyboard-1.6.2.tar.bz2) =3D 76651a84f5031=
f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a
+SIZE (xorg/driver/xf86-input-keyboard-1.6.2.tar.bz2) =3D 322733
Index: x11-drivers/xf86-input-mouse/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/Makefile	(revision 313938)
+++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
@@ -1,18 +1,14 @@
-# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
=20
 PORTNAME=3D	xf86-input-mouse
-PORTVERSION=3D	1.7.1
-PORTREVISION=3D	1
+PORTVERSION=3D	1.8.1
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org mouse input driver
=20
-CONFIGURE_ARGS+=3D--disable-silent-rules
-
 XORG_CAT=3D	driver
-USE_XORG=3D       xextproto videoproto
+USE_GNOME=3D	gnomehack
 MAN4=3D		mousedrv.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-mouse/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/distinfo	(revision 313938)
+++ x11-drivers/xf86-input-mouse/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) =3D d2c5b4b9bf03f8f7=
ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
-SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) =3D 319429
+SHA256 (xorg/driver/xf86-input-mouse-1.8.1.tar.bz2) =3D f5b97aac9aab8fa8=
b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8
+SIZE (xorg/driver/xf86-input-mouse-1.8.1.tar.bz2) =3D 352034
Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(revision 31=
3938)
+++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	(working cop=
y)
@@ -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);
 =20
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr=
agonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >=3D 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"
 =20
  static const char *mouseDevs[] =3D {
- 	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_S=
UPPORT)
-@@ -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_M=
ISC;
  #endif
-@@ -179,10 +187,31 @@
- 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
- 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
+@@ -180,9 +189,30 @@
+         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
  };
--=09
-+
+=20
 +#ifdef XPS2_SUPPORT
 +static struct {
-+	int dmodel;
-+	char *name;
++        int dmodel;
++        char *name;
 +} ps2proto[] =3D {
-+	{ 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 =3D=3D -1)
- 	return NULL;
+         return NULL;
 =20
 +#ifdef XPS2_SUPPORT
      /* set the driver operation level, if applicable */
 +    dev =3D xf86FindOptionValue(pInfo->options, "Device");
 +    if (dev !=3D NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
-+	i =3D 2;
++        i =3D 2;
 +    else
 +#endif
      i =3D 1;
      ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
--   =20
-+
-     /* interrogate the driver and get some intelligence on the device. =
*/
-     hw.iftype =3D MOUSE_IF_UNKNOWN;
-     hw.model =3D MOUSE_MODEL_GENERIC;
-@@ -209,9 +244,18 @@
- 		    protoPara[0] =3D mode.syncmask[0];
- 		    protoPara[1] =3D mode.syncmask[1];
- 		}
-+		proto =3D devproto[i].name;
+=20
+@@ -209,9 +245,18 @@
+                     protoPara[0] =3D mode.syncmask[0];
+                     protoPara[1] =3D mode.syncmask[1];
+                 }
++                proto =3D devproto[i].name;
 +#ifdef XPS2_SUPPORT
-+		if (mode.protocol =3D=3D MOUSE_PROTO_PS2)
-+		    for (i =3D 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
-+			if (hw.model =3D=3D ps2proto[i].dmodel) {
-+			    proto =3D ps2proto[i].name;
-+			    break;
-+			}
++                if (mode.protocol =3D=3D MOUSE_PROTO_PS2)
++                    for (i =3D 0; i < sizeof(ps2proto)/sizeof(ps2proto[=
0]); ++i)
++                        if (hw.model =3D=3D ps2proto[i].dmodel) {
++                           proto =3D 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") =3D=3D 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 =3D 1;
+@@ -234,41 +279,41 @@
+         (protocol && xf86NameCmp(protocol, "SysMouse") =3D=3D 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 =3D 1;
      } else
--	mode.level =3D -1;
+-        mode.level =3D -1;
 -#else
 -    mode.level =3D -1;
  #endif
@@ -151,26 +140,26 @@
 +    unsigned int i;
 =20
 -    if ((f =3D fopen(MOUSED_PID_FILE, "r")) !=3D NULL) {
--	if (fscanf(f, "%u", &pid) =3D=3D 1 && pid > 0) {
--	    if (kill(pid, 0) =3D=3D 0) {
--		fclose(f);
--		return TRUE;
--	    }
+-        if (fscanf(f, "%u", &pid) =3D=3D 1 && pid > 0) {
+-            if (kill(pid, 0) =3D=3D 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", d=
ev);
 +    else
-+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 +    if ((f =3D popen(cmd, "r")) !=3D NULL) {
-+	if (fscanf(f, "%u", &i) =3D=3D 1 && i > 0) {
-+	    pclose(f);
-+	    return TRUE;
- 	}
--	fclose(f);
-+	pclose(f);
++        if (fscanf(f, "%u", &i) =3D=3D 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;
 =20
      for (pdev =3D mouseDevs; *pdev; pdev++) {
--	SYSCALL (fd =3D open(*pdev, O_RDWR | O_NONBLOCK));
--	if (fd =3D=3D -1) {
-+	SYSCALL (ret =3D stat(*pdev, &sb));
-+	if (ret =3D=3D -1) {
+-        SYSCALL (fd =3D open(*pdev, O_RDWR | O_NONBLOCK));
+-        if (fd =3D=3D -1) {
++        SYSCALL (ret =3D stat(*pdev, &sb));
++        if (ret =3D=3D -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) =3D=3D 0)
--		    devMouse =3D TRUE;
--		close(fd);
-+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
-+		devMouse =3D TRUE;
- 		continue;
- 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
- 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
--		if (devMouse && fstat(fd, &sb) =3D=3D 0 &&=20
--		    devMouseStat.st_dev =3D=3D sb.st_dev &&
-+		if (devMouse && devMouseStat.st_dev =3D=3D sb.st_dev &&
- 		    devMouseStat.st_ino =3D=3D sb.st_ino) {
- 		    /* If the same, use /dev/sysmouse. */
- 		    devMouse =3D 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=
=2E
+              */
+             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+-                if (fstat(fd, &devMouseStat) =3D=3D 0)
+-                    devMouse =3D TRUE;
+-                close(fd);
++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++                devMouse =3D TRUE;
+                 continue;
+             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+                 /* Check if /dev/mouse is the same as /dev/sysmouse. */=

+-                if (devMouse && fstat(fd, &sb) =3D=3D 0 &&
+-                    devMouseStat.st_dev =3D=3D sb.st_dev &&
++                if (devMouse && devMouseStat.st_dev =3D=3D sb.st_dev &&=

+                     devMouseStat.st_ino =3D=3D sb.st_ino) {
+                     /* If the same, use /dev/sysmouse. */
+                     devMouse =3D 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 =3D=3D sb.st_dev &&
-+		    devMouseStat.st_ino =3D=3D sb.st_ino) {
-+		    /* If the same, use this device. */
-+		    devMouse =3D 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") !=3D 0 &&
-+		    xf86NameCmp(protocol, "sysmouse") !=3D 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 =3D=3D sb.st_dev &&=

++                    devMouseStat.st_ino =3D=3D sb.st_ino) {
++                    /* If the same, use this device. */
++                    devMouse =3D FALSE;
++                }
++                if (MousedRunning(*pdev))
++                    continue;
++                /* ums(4) does not support anything but SysMouse protoc=
ol. */
++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++                    xf86NameCmp(protocol, "auto") !=3D 0 &&
++                    xf86NameCmp(protocol, "sysmouse") !=3D 0)
++                    continue;
+                 break;
+             }
+         }
+@@ -764,7 +813,9 @@
      p->CheckProtocol =3D CheckProtocol;
  #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__D=
ragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
      p->SetupAuto =3D SetupAuto;
Index: x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(revision 0)=

+++ x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	(working cop=
y)
@@ -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 lin=
k
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a,=
 etc.
+ @DRIVER_NAME@_drv_la_LTLIBRARIES =3D @DRIVER_NAME@_drv.la
+-@DRIVER_NAME@_drv_la_LDFLAGS =3D -module -avoid-version
++@DRIVER_NAME@_drv_la_LDFLAGS =3D -module -avoid-version -lusbhid
+ @DRIVER_NAME@_drv_ladir =3D @inputdir@
+=20
+ # We have to list all the mouse drivers here, even if we don't build th=
em, so

Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_Makefil=
e.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	(revision 313938=
)
+++ 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 =3D 0;
-     pInfo->always_core_feedback =3D 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 @@
 =20
-+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
+     pMse =3D pInfo->private;
+=20
+-    pMse->buttons =3D xf86SetIntOption(pInfo->options, "Buttons", 0);
++    i =3D xf86SetIntOption(pInfo->options, "Buttons", 0);
++    if (i !=3D 0)
++        pMse->buttons =3D i;
+     if (!pMse->buttons) {
+         pMse->buttons =3D MSE_DFLTBUTTONS;
+         buttons_from =3D X_DEFAULT;
+     }
+     origButtons =3D pMse->buttons;
+=20
++    s =3D xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
++    if (s) {
++        int b, n =3D 0;
++        char *s1 =3D s;
++        /* keep getting numbers which are buttons */
++        while (s1 && n < MSE_MAXBUTTONS && (b =3D strtol(s1, &s1, 10)) =
!=3D 0) {
++            /* check sanity for a button */
++            if (b < 0 || b > MSE_MAXBUTTONS) {
++                xf86Msg(X_WARNING,
++                        "ButtonMapping: Invalid button number =3D %d\n"=
, b);
++                break;
++           };
++           pMse->buttonMap[n++] =3D 1 << (b-1);
++           if (b > pMse->buttons) pMse->buttons =3D b;
++        }
++        free(s);
++    }
++    /* get maximum of mapped buttons */
++    for (i =3D pMse->buttons-1; i >=3D 0; i--) {
++        int f =3D ffs (pMse->buttonMap[i]);
++        if (f > pMse->buttons)
++            pMse->buttons =3D f;
++    }
 +
-     if (NewMousePreInit(drv, pInfo, flags) =3D=3D Success)
-     {
-         /* Check if SendDragEvents has been disabled. */
+     pMse->emulate3Buttons =3D xf86SetBoolOption(pInfo->options,
+                                               "Emulate3Buttons", FALSE)=
;
+     if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
+@@ -298,6 +324,8 @@
+                                              "Emulate3Timeout", 50);
+     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
+         MessageType from =3D X_CONFIG;
++	if (pMse->buttons < 3)
++            pMse->buttons =3D 3;
+         if (pMse->emulate3ButtonsSoft)
+             from =3D X_DEFAULT;
+         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+@@ -305,6 +333,8 @@
+     }
+=20
+     pMse->chordMiddle =3D xf86SetBoolOption(pInfo->options, "ChordMiddl=
e", FALSE);
++    if (pMse->chordMiddle && pMse->buttons < 3)
++	    pMse->buttons =3D 3;
+     pMse->flipXY =3D xf86SetBoolOption(pInfo->options, "FlipXY", FALSE)=
;
+     if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
+         pMse->invX =3D -1;
+@@ -315,7 +345,7 @@
+     } else
+         pMse->invY =3D 1;
+     pMse->angleOffset =3D xf86SetIntOption(pInfo->options, "AngleOffset=
", 0);
+-
++    pMse->sensitivity =3D xf86SetRealOption(pInfo->options, "Sensitivit=
y", 1.0);
+=20
+     if (pMse->pDragLock)
+         free(pMse->pDragLock);
+@@ -425,14 +455,17 @@
+         free(s);
+     }
+=20
+-    s =3D xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
++    s =3D xf86SetStrOption(pInfo->options, "ZAxisMapping",
++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
+     if (s) {
+         int b1 =3D 0, b2 =3D 0, b3 =3D 0, b4 =3D 0;
+         char *msg =3D NULL;
+=20
+         pMse->negativeZ =3D pMse->positiveZ =3D MSE_NOAXISMAP;
+         pMse->negativeW =3D pMse->positiveW =3D MSE_NOAXISMAP;
+-        if (!xf86NameCmp(s, "x")) {
++        if (!xf86NameCmp(s, "off")) {
++            msg =3D xstrdup("off");
++	} else if (!xf86NameCmp(s, "x")) {
+             pMse->negativeZ =3D pMse->positiveZ =3D MSE_MAPTOX;
+             msg =3D xstrdup("X axis");
+         } else if (!xf86NameCmp(s, "y")) {
+@@ -568,29 +601,6 @@
+                 pInfo->name, wheelButton, pMse->wheelInertia,
+                 pMse->wheelButtonTimeout);
+     }
+-    s =3D xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
+-    if (s) {
+-       int b, n =3D 0;
+-       char *s1 =3D s;
+-       /* keep getting numbers which are buttons */
+-       while (s1 && n < MSE_MAXBUTTONS && (b =3D strtol(s1, &s1, 10)) !=
=3D 0) {
+-           /* check sanity for a button */
+-           if (b < 0 || b > MSE_MAXBUTTONS) {
+-               xf86Msg(X_WARNING,
+-                       "ButtonMapping: Invalid button number =3D %d\n",=
 b);
+-               break;
+-           };
+-           pMse->buttonMap[n++] =3D 1 << (b-1);
+-           if (b > pMse->buttons) pMse->buttons =3D b;
+-       }
+-       free(s);
+-    }
+-    /* get maximum of mapped buttons */
+-    for (i =3D pMse->buttons-1; i >=3D 0; i--) {
+-        int f =3D ffs (pMse->buttonMap[i]);
+-        if (f > pMse->buttons)
+-            pMse->buttons =3D f;
+-    }
+     if (origButtons !=3D pMse->buttons)
+         buttons_from =3D X_CONFIG;
+     xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->butto=
ns);
+@@ -668,7 +678,6 @@
+     }
+     pMse->sampleRate =3D xf86SetIntOption(pInfo->options, "SampleRate",=
 0);
+     pMse->resolution =3D xf86SetIntOption(pInfo->options, "Resolution",=
 0);
+-    mPriv->sensitivity =3D xf86SetRealOption(pInfo->options, "Sensitivi=
ty", 1.0);
+ }
+=20
+ static void
+@@ -959,6 +968,8 @@
+     /* Default Mapping: 1 2 3 8 9 10 11 ... */
+     for (i =3D 0; i < MSE_MAXBUTTONS; i++)
+         pMse->buttonMap[i] =3D 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+=
4 : i);
++    pMse->hasZ =3D 1;
++    pMse->hasW =3D 0;
+=20
+     protocol =3D MousePickProtocol(pInfo, device, protocol, &protocolID=
);
+=20
+@@ -2137,7 +2148,7 @@
+=20
+     if (pMse->emulateWheel) {
+         /* Emulate wheel button handling */
+-        if(pMse->wheelButton =3D=3D 0)
++        if (pMse->wheelButton =3D=3D 0)
+             wheelButtonMask =3D 0;
+         else
+             wheelButtonMask =3D 1 << (pMse->wheelButton - 1);
+@@ -2221,6 +2232,9 @@
+                         }
+                     }
+                 }
++            } else {
++                pMse->wheelXDistance =3D 0;
++                pMse->wheelYDistance =3D 0;
+             }
+=20
+             /* Absorb the mouse movement while the wheel button is pres=
sed. */
+@@ -2238,7 +2252,7 @@
+     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy=
))
+         buttonTimer(pInfo);
+=20
+-    if (dx || dy)
++    if ((dx || dy) && !pMse->disableXY)
+         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+=20
+     if (change) {
+@@ -2448,11 +2462,11 @@
+=20
+     /* Accumulate the scaled dx, dy in the private variables
+        fracdx,fracdy and return the integer number part */
+-    if (mousepriv) {
+-        mousepriv->fracdx +=3D mousepriv->sensitivity*dx;
+-        mousepriv->fracdy +=3D mousepriv->sensitivity*dy;
+-        mousepriv->fracdx -=3D ( dx=3D(int)(mousepriv->fracdx) );
+-        mousepriv->fracdy -=3D ( dy=3D(int)(mousepriv->fracdy) );
++    if (pMse->sensitivity !=3D 0) {
++        pMse->fracdx +=3D pMse->sensitivity*dx;
++        pMse->fracdy +=3D pMse->sensitivity*dy;
++        pMse->fracdx -=3D ( dx=3D(int)(pMse->fracdx) );
++        pMse->fracdy -=3D ( dy=3D(int)(pMse->fracdy) );
+     }
+=20
+     /* 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 emulati=
on */
+     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;
+=20
+ #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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(revision 0)=

+++ x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	(working cop=
y)
@@ -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;
+=20
+ /* mouse proto flags */

Property changes on: x11-drivers/xf86-input-mouse/files/patch-src_mousePr=
iv.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mouse/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-mutouch/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-mutouch
 PORTVERSION=3D	1.3.0
@@ -13,7 +8,6 @@
 COMMENT=3D	X.Org mutouch input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		mutouch.4x
=20
 .if !defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-penmount/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-penmount/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-penmount
 PORTVERSION=3D	${PEN_VERSION}
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org penmount input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		penmount.4x
=20
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-input-synaptics/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-synaptics/Makefile	(revision 313938)
+++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xf86-input-synaptics
-# Date Created:				25 Sep 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
=20
 PORTNAME=3D	xf86-input-synaptics
-PORTVERSION=3D	1.5.0
+PORTVERSION=3D	1.6.2
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -17,7 +12,7 @@
 LIB_DEPENDS+=3D	hal.1:${PORTSDIR}/sysutils/hal
=20
 USE_GNOME=3D	gnomehack
-USE_XORG=3D	x11 xextproto videoproto
+USE_XORG=3D	x11
 XORG_CAT=3D	driver
=20
 MAN1=3D		syndaemon.1 \
Index: x11-drivers/xf86-input-synaptics/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-synaptics/distinfo	(revision 313938)
+++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) =3D 95cc5399fc49=
c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
-SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) =3D 431123
+SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) =3D c3f7d6a085d4=
80c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
+SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) =3D 439313
Index: x11-drivers/xf86-input-vmmouse/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-vmmouse/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-vmmouse
-PORTVERSION=3D	12.6.9
-PORTREVISION=3D	2
+PORTVERSION=3D	13.0.0
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org vmmouse input driver
=20
+LIB_DEPENDS+=3D	hal.1:${PORTSDIR}/sysutils/hal
+
 XORG_CAT=3D	driver
 CONFIGURE_ARGS=3D	--with-hal-callouts-dir=3D${PREFIX}/libexec/hal/script=
s
 USE_GMAKE=3D	yes
@@ -23,4 +20,10 @@
 ONLY_FOR_ARCHS=3D	i386 amd64
 ONLY_FOR_ARCHS_REASON=3D	The vmmouse protocol is only supported on x86-c=
ompatible architectures.
=20
+.if defined(WITH_NEW_XORG)
+PLIST_SUB+=3D	NEW=3D""
+.else
+PLIST_SUB+=3D	NEW=3D"@comment "
+.endif
+
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-vmmouse/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-vmmouse/distinfo	(revision 313938)
+++ x11-drivers/xf86-input-vmmouse/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) =3D a5e2069fc080d=
e9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) =3D 273002
+SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) =3D 04cfb60366008=
d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
+SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) =3D 314269
Index: x11-drivers/xf86-input-vmmouse/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-input-void/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-input-void
 PORTVERSION=3D	${VOID_VERSION}
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org void input driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		void.4x
=20
 .if defined(WITH_NEW_XORG)
Index: x11-drivers/xf86-video-apm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-apm/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-apm
-PORTVERSION=3D	1.2.3
-PORTREVISION=3D	1
+PORTVERSION=3D	1.2.5
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org apm display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		apm.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-apm/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-apm/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-apm/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) =3D 4046ea18dbd76a9df5=
f68695025c2c411c20564af9198974506a041ebd4a30da
-SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) =3D 295470
+SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) =3D 953b04320117b14c5b=
7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
+SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) =3D 325277
Index: x11-drivers/xf86-video-ark/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ark/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-ark
-PORTVERSION=3D	0.7.3
-PORTREVISION=3D	1
+PORTVERSION=3D	0.7.5
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org ark display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-ark/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ark/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-ark/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) =3D 39149a565c64ae0139=
62022c45e561a0e92c5ab413688f3b5055cad694f28f98
-SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) =3D 238946
+SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) =3D c690e046f34a393aac=
1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
+SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) =3D 290423
Index: x11-drivers/xf86-video-ati/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-ati
-PORTVERSION=3D	6.14.3
-PORTREVISION=3D	1
+PORTVERSION=3D	6.14.6
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -15,7 +9,7 @@
=20
 USE_GL=3D		gl
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86driproto xineramaproto videoproto xf86miscproto xextprot=
o glproto
+USE_XORG=3D	xf86driproto xineramaproto xf86miscproto glproto
 MAN4=3D		ati.4x radeon.4x
=20
 CONFIGURE_ARGS+=3D--disable-kms
Index: x11-drivers/xf86-video-ati/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-ati/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) =3D 844a2649eff6a3e92=
aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
-SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) =3D 1113119
+SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D aa5286b3e4f0187d7=
df14785c06dd800255d9405205dbf061da5d77df86bec36
+SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D 1139495
Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(revision 3=
13938)
+++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	(working co=
py)
@@ -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 @@
 =20
  	    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 =3D ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+-		*d =3D ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
 +		*d =3D (*s >> 8) | (*s << 8);
  #endif
  	    return;
- 	}
-
-
+         }
Index: x11-drivers/xf86-video-ati-kms
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms	(revision 313938)
+++ x11-drivers/xf86-video-ati-kms	(working copy)

Property changes on: x11-drivers/xf86-video-ati-kms
___________________________________________________________________
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-ati-kms/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/Makefile	(revision 0)
+++ x11-drivers/xf86-video-ati-kms/Makefile	(working copy)
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME=3D	xf86-video-ati
+PORTVERSION=3D	7.1.0
+CATEGORIES=3D	x11-drivers
+
+MAINTAINER=3D	x11@FreeBSD.org
+COMMENT=3D	X.Org ati display driver
+
+USE_GL=3D		gl
+XORG_CAT=3D	driver
+USE_XORG=3D	xf86driproto xineramaproto xf86miscproto glproto
+MAN4=3D		ati.4x radeon.4x
+
+CONFIGURE_ARGS+=3D--disable-udev
+
+EXTRA_PATCHES+=3D	${FILESDIR}/extra-src__radeon_kms.c
+
+pre-everything::
+	@${ECHO_CMD}
+	@${ECHO_CMD} "This port is KMS/TTM only, and only for testing the upcom=
ing"
+	@${ECHO_CMD} "radeon KMS/TTM kernel support. When that kernel supports =
lands"
+	@${ECHO_CMD} "this port will be merged into the regular ati driver port=
=2E
+	@${ECHO_CMD}
+	@/bin/sleep 7
+
+.include <bsd.port.mk>

Property changes on: x11-drivers/xf86-video-ati-kms/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+%H
\ 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-ati-kms/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/distinfo	(revision 0)
+++ x11-drivers/xf86-video-ati-kms/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-ati-7.1.0.tar.bz2) =3D c8ae44051fcb331625=
217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd
+SIZE (xorg/driver/xf86-video-ati-7.1.0.tar.bz2) =3D 804531

Property changes on: x11-drivers/xf86-video-ati-kms/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-video-ati-kms/files
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/files	(revision 313938)
+++ x11-drivers/xf86-video-ati-kms/files	(working copy)

Property changes on: x11-drivers/xf86-video-ati-kms/files
___________________________________________________________________
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-ati-kms/files/extra-src__radeon_kms.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/files/extra-src__radeon_kms.c	(revisio=
n 0)
+++ x11-drivers/xf86-video-ati-kms/files/extra-src__radeon_kms.c	(working=
 copy)
@@ -0,0 +1,11 @@
+--- src/radeon_kms.c.orig	2013-03-02 12:22:34.000000000 +0100
++++ src/radeon_kms.c	2013-03-02 12:26:26.000000000 +0100
+@@ -564,7 +564,7 @@
+ 		      dev->domain, dev->bus, dev->dev, dev->func);
+ #endif
+=20
+-    info->dri2.drm_fd =3D drmOpen("radeon", busid);
++    info->dri2.drm_fd =3D drmOpen("radeonkms", busid);
+     if (info->dri2.drm_fd =3D=3D -1) {
+=20
+ 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,

Property changes on: x11-drivers/xf86-video-ati-kms/files/extra-src__rade=
on_kms.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-ati-kms/files/patch-src__radeon_dri2.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/files/patch-src__radeon_dri2.c	(revisi=
on 0)
+++ x11-drivers/xf86-video-ati-kms/files/patch-src__radeon_dri2.c	(workin=
g copy)
@@ -0,0 +1,11 @@
+--- src/radeon_dri2.c.orig	2013-02-22 19:31:34.000000000 +0000
++++ src/radeon_dri2.c	2013-02-22 19:31:47.000000000 +0000
+@@ -578,7 +578,7 @@
+ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, =
pointer data, pointer calldata)
+ {
+     DRI2ClientEventsPtr pClientEventsPriv;
+-    DRI2FrameEventPtr ref;
++    DRI2FrameEventPtr ref =3D NULL;
+     NewClientInfoRec *clientinfo =3D calldata;
+     ClientPtr pClient =3D clientinfo->client;
+     pClientEventsPriv =3D GetDRI2ClientEvents(pClient);

Property changes on: x11-drivers/xf86-video-ati-kms/files/patch-src__rade=
on_dri2.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-ati-kms/files/patch-src_radeon_accel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/files/patch-src_radeon_accel.c	(revisi=
on 0)
+++ x11-drivers/xf86-video-ati-kms/files/patch-src_radeon_accel.c	(workin=
g copy)
@@ -0,0 +1,15 @@
+--- 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 @@
+=20
+ 	    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 =3D ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+-			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
++		*d =3D (*s >> 8) | (*s << 8);
+ #endif
+ 	    return;
+         }

Property changes on: x11-drivers/xf86-video-ati-kms/files/patch-src_radeo=
n_accel.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-ati-kms/pkg-descr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/pkg-descr	(revision 0)
+++ x11-drivers/xf86-video-ati-kms/pkg-descr	(working copy)
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-ati driver.

Property changes on: x11-drivers/xf86-video-ati-kms/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-video-ati-kms/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-ati-kms/pkg-plist	(revision 0)
+++ x11-drivers/xf86-video-ati-kms/pkg-plist	(working copy)
@@ -0,0 +1,7 @@
+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
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg

Property changes on: x11-drivers/xf86-video-ati-kms/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-video-chips/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-chips/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-chips
-PORTVERSION=3D	1.2.4
+PORTVERSION=3D	1.2.5
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org chips display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		chips.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-chips/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-chips/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-chips/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) =3D fb6dc34a8d7db82d=
c6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
-SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) =3D 365618
+SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) =3D 8d3c744d035b3d76=
9049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
+SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) =3D 398804
Index: x11-drivers/xf86-video-cirrus/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-cirrus/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-cirrus
-PORTVERSION=3D	1.3.2
-PORTREVISION=3D	2
+PORTVERSION=3D	1.5.2
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org cirrus display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		cirrus.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-cirrus/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-cirrus/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-cirrus/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) =3D 529a98a42c94ba5=
e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
-SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) =3D 286949
+SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) =3D 3361e1a65d9b84c=
464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
+SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) =3D 327547
Index: x11-drivers/xf86-video-dummy/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-dummy/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-dummy
-PORTVERSION=3D	0.3.5
+PORTVERSION=3D	0.3.6
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org dummy display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xf86dgaproto
+USE_XORG=3D	xf86dgaproto
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-dummy/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-dummy/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-dummy/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) =3D d5adc63543bb93b6=
d88008ea746303a2ab3e8b570974704926e81d882728d95f
-SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) =3D 274761
+SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) =3D 44335b640126d339=
700256dae731bd5af79afd027da172bad8a991a33a1de798
+SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) =3D 285892
Index: x11-drivers/xf86-video-fbdev/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-fbdev/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-fbdev
-PORTVERSION=3D	0.4.2
+PORTVERSION=3D	0.4.3
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org fbdev display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto
 MAN4=3D		fbdev.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-fbdev/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-fbdev/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-fbdev/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) =3D 93b271b4b41d7e5c=
a108849a583b9523e96c51813d046282285355b7001f82d5
-SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) =3D 263094
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) =3D ff7b037ad110040a=
4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
+SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) =3D 289056
Index: x11-drivers/xf86-video-glint/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-glint/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-glint
-PORTVERSION=3D	1.2.6
+PORTVERSION=3D	1.2.8
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -15,7 +10,7 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86driproto videoproto xextproto xf86dgaproto glproto
+USE_XORG=3D	xf86driproto xf86dgaproto glproto
 MAN4=3D		glint.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-glint/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-glint/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-glint/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) =3D d43350ed3c149576=
db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
-SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) =3D 393872
+SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) =3D 657f883bb3a4e427=
8399eba73840862c3642706ae8b0a4798ec97a31b3524221
+SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) =3D 395371
Index: x11-drivers/xf86-video-i128/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-i128/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-i128
-PORTVERSION=3D	1.3.4
-PORTREVISION=3D	1
+PORTVERSION=3D	1.3.6
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org i128 display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		i128.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i128/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-i128/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-i128/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) =3D b69b13a7fd69f5ad3=
5119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
-SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) =3D 292046
+SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) =3D f8827e4c988f90cf5=
a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
+SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) =3D 324894
Index: x11-drivers/xf86-video-i740/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-i740/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-i740
-PORTVERSION=3D	1.3.2
-PORTREVISION=3D	2
+PORTVERSION=3D	1.3.4
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org i740 display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		i740.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i740/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-i740/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-i740/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) =3D 48549c6a3d8c0a0d4=
17fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
-SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) =3D 273853
+SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) =3D 1a24009bb2223b722=
fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
+SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) =3D 316654
Index: x11-drivers/xf86-video-intel/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-intel/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-intel
 PORTVERSION=3D	${INTEL_VERSION}
@@ -18,15 +14,22 @@
=20
 USE_LDCONFIG=3D	yes
 XORG_CAT=3D	driver
-USE_XORG=3D	xvmc xineramaproto xextproto x11 xf86driproto glproto
+USE_XORG=3D	xvmc xineramaproto x11 xf86driproto glproto
 MAN4=3D		intel.4x
=20
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=3D	2.17.0
-INTEL_REVISION=3D	1
+INTEL_VERSION=3D	2.21.2
+INTEL_REVISION=3D	0
+CONFIGURE_ARGS+=3D	--enable-sna
 MAKE_JOBS_UNSAFE=3Dyes
 PLIST_SUB+=3D	OLD=3D"@comment "
-EXTRA_PATCHES+=3D	${PATCHDIR}/extra-i915kms
+EXTRA_PATCHES+=3D	${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 \
+		${PATCHDIR}/extra-configure-sna
+LIB_DEPENDS+=3D	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=3D	2.7.1
 INTEL_REVISION=3D	4
Index: x11-drivers/xf86-video-intel/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-intel/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-intel/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 255c0d54249cc013=
2f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 780625
-SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) =3D 8b8450f2a2cc52e=
f31a83414e2f290e748a956690e11b41759d5650aaedc4387
-SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) =3D 1339717
+SHA256 (xorg/driver/xf86-video-intel-2.21.2.tar.bz2) =3D 2e6890ecacc715c=
aa5459581b00b63152e08646ea1b76330bf79b996a139d850
+SIZE (xorg/driver/xf86-video-intel-2.21.2.tar.bz2) =3D 1696958
Index: x11-drivers/xf86-video-intel/files/extra-clang
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D NULL;
+ 	int id =3D mode->mode_res->encoders[num];
+=20
+ 	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 =3D intel_get_screen_private(scrn);
+-	struct intel_pixmap *priv;
++	struct intel_pixmap *priv =3D NULL;
+=20
+ 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
+ 		priv->dirty =3D 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 =3D NULL;
+ 	pixman_region16_t *region =3D &damage->region;
+-	struct sna_damage_box *iter;
++	struct sna_damage_box *iter =3D NULL;
+=20
+ 	assert(damage->mode !=3D DAMAGE_ALL);
+ 	assert(damage->dirty);
+@@ -1671,7 +1671,7 @@
+ {
+ 	int n, nboxes;
+ 	BoxPtr boxes;
+-	struct sna_damage_box *iter;
++	struct sna_damage_box *iter =3D NULL;
+=20
+ 	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 @@
+=20
+ 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
+ 		int ok =3D 0;
+-		RegionPtr region;
++		RegionPtr region =3D NULL;
+=20
+ 		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-configure-sna
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-intel/files/extra-configure-sna	(revision 0)
+++ x11-drivers/xf86-video-intel/files/extra-configure-sna	(working copy)=

@@ -0,0 +1,11 @@
+--- configure.orig	2012-10-26 13:05:01.098919480 +0300
++++ configure	2012-10-26 13:05:05.145919575 +0300
+@@ -18498,7 +18498,7 @@
+ _ACEOF
+=20
+ else
+-  SNA=3Dno
++#  SNA=3Dno
+ fi
+=20
+ done

Property changes on: x11-drivers/xf86-video-intel/files/extra-configure-s=
na
___________________________________________________________________
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-intel/files/extra-i915kms	(revision 313938)
+++ 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);
 =20
--	intel->drmSubFD =3D drmOpen("i915", busid);
-+	intel->drmSubFD =3D drmOpen("i915kms", busid);
- 	if (intel->drmSubFD =3D=3D -1) {
- 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- 			   "[drm] Failed to open DRM device for %s: %s\n",
+ 	ret =3D drmCheckModesettingSupported(id);
+-	if (ret) {
+-		if (xf86LoadKernelModule("i915"))
++	if (ret || 1) {
++		if (xf86LoadKernelModule("i915kms"))
+ 			ret =3D drmCheckModesettingSupported(id);
+ 		if (ret)
+ 			return FALSE;
Index: x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(rev=
ision 0)
+++ x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c	(wor=
king 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 =3D 0;
+ 		char *line =3D NULL;
+ 		uint32_t processors =3D 0, cores =3D 0;
++#ifdef __GLIBC__
+ 		while (getline(&line, &len, file) !=3D -1) {
++#else
++		while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) {
++#endif
+ 			int id;
+ 			if (sscanf(line, "physical id : %d", &id) =3D=3D 1) {
+ 				if (id >=3D 32)

Property changes on: x11-drivers/xf86-video-intel/files/extra-src__sna__s=
na_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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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-02-02 00:01:23.000000000 +0000
++++ src/sna/compiler.h	2013-02-02 00:01:33.000000000 +0000
+@@ -36,7 +36,6 @@
+ #define fastcall __attribute__((regparm(3)))
+ #define must_check __attribute__((warn_unused_result))
+ #define constant __attribute__((const))
+-#define __packed__ __attribute__((__packed__))
+ #else
+ #define likely(expr) (expr)
+ #define unlikely(expr) (expr)
+@@ -45,7 +44,6 @@
+ #define fastcall
+ #define must_check
+ #define constant
+-#define __packed__
+ #endif
+=20
+ #ifdef HAVE_VALGRIND

Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_com=
piler.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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	2012-12-03 11:37:46.000000000 +0100
++++ src/sna/kgem.c	2012-12-11 20:48:26.000000000 +0100
+@@ -624,7 +624,11 @@
+ 	if (file) {
+ 		size_t len =3D 0;
+ 		char *line =3D NULL;
++#ifdef __GLIBC__
+ 		while (getline(&line, &len, file) !=3D -1) {
++#else
++		while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) {
++#endif
+ 			int mb;
+ 			if (sscanf(line, "cache size : %d KB", &mb) =3D=3D 1) {
+ 				/* Paranoid check against gargantuan caches */
+@@ -1474,7 +1478,8 @@
+ static struct kgem_bo *
+ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned =
flags)
+ {
+-	struct kgem_bo *bo, *first =3D NULL;
++	struct kgem_bo *bo =3D NULL;
++	struct kgem_bo *first =3D NULL;
+=20
+ 	DBG(("%s: num_pages=3D%d, flags=3D%x\n", __FUNCTION__, num_pages, flag=
s));
+=20
+@@ -1699,7 +1704,8 @@
+=20
+ static bool kgem_retire__flushing(struct kgem *kgem)
+ {
+-	struct kgem_bo *bo, *next;
++	struct kgem_bo *bo =3D NULL;
++	struct kgem_bo *next;
+ 	bool retired =3D false;
+=20
+ 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
+@@ -1916,7 +1922,8 @@
+ static void kgem_commit(struct kgem *kgem)
+ {
+ 	struct kgem_request *rq =3D kgem->next_request;
+-	struct kgem_bo *bo, *next;
++	struct kgem_bo *bo =3D NULL;
++	struct kgem_bo *next;
+=20
+ 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
+ 		assert(next->request.prev =3D=3D &bo->request);
+@@ -1995,7 +2002,8 @@
+=20
+ static void kgem_finish_buffers(struct kgem *kgem)
+ {
+-	struct kgem_buffer *bo, *next;
++	struct kgem_buffer *bo =3D NULL;
++	struct kgem_buffer *next;
+=20
+ 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
+ 		DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap=
ped=3D%d\n",
+@@ -2678,7 +2686,8 @@
+ static struct kgem_bo *
+ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned=
 flags)
+ {
+-	struct kgem_bo *bo, *first =3D NULL;
++	struct kgem_bo *bo =3D NULL;
++	struct kgem_bo *first =3D NULL;
+ 	bool use_active =3D (flags & CREATE_INACTIVE) =3D=3D 0;
+ 	struct list *cache;
+=20
+@@ -3167,7 +3176,7 @@
+ 			       uint32_t flags)
+ {
+ 	struct list *cache;
+-	struct kgem_bo *bo;
++	struct kgem_bo *bo =3D NULL;
+ 	uint32_t pitch, untiled_pitch, tiled_height, size;
+ 	uint32_t handle;
+ 	int i, bucket, retry;
+@@ -4360,7 +4369,7 @@
+ void kgem_clear_dirty(struct kgem *kgem)
+ {
+ 	struct list * const buffers =3D &kgem->next_request->buffers;
+-	struct kgem_bo *bo;
++	struct kgem_bo *bo =3D NULL;
+=20
+ 	list_for_each_entry(bo, buffers, request) {
+ 		if (!bo->dirty)
+@@ -4599,7 +4608,7 @@
+ 				   uint32_t size, uint32_t flags,
+ 				   void **ret)
+ {
+-	struct kgem_buffer *bo;
++	struct kgem_buffer *bo =3D NULL;
+ 	unsigned offset, alloc;
+ 	struct kgem_bo *old;
+=20

Property changes on: x11-drivers/xf86-video-intel/files/extra-src_sna_kge=
m.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-mach64/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-mach64
-PORTVERSION=3D	6.9.0
+PORTVERSION=3D	6.9.3
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -15,6 +10,6 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	glproto videoproto xextproto xf86driproto xf86miscproto
+USE_XORG=3D	glproto xf86driproto xf86miscproto
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-mach64/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-mach64/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-mach64/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) =3D a214f066c1cc997=
cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
-SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) =3D 505200
+SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) =3D 5473d0e7dfd7bcf=
f3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
+SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) =3D 525988
Index: x11-drivers/xf86-video-mga/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-mga/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-mga
-PORTVERSION=3D	1.4.13
-PORTEPOCH=3D	2
+PORTVERSION=3D	1.6.1
+PORTEPOCH=3D	3
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -16,7 +11,7 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86driproto videoproto xextproto glproto
+USE_XORG=3D	xf86driproto glproto
 MAN4=3D		mga.4x
=20
 pre-patch:
Index: x11-drivers/xf86-video-mga/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-mga/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-mga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) =3D b657bd5fec4aade63=
96c683886739b7c8ce57924278bee0e36f13a966eeddff6
-SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) =3D 423134
+SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) =3D 6a70f5015f822eef82=
a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
+SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) =3D 446495
Index: x11-drivers/xf86-video-neomagic/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-neomagic/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-neomagic
-PORTVERSION=3D	1.2.5
+PORTVERSION=3D	1.2.7
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,7 @@
 COMMENT=3D	X.Org neomagic display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto xf86dgaproto
+USE_XORG=3D	xf86dgaproto
 MAN4=3D		neomagic.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-neomagic/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-neomagic/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-neomagic/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) =3D c0b69e83a4bd6=
c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
-SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) =3D 294723
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) =3D 9f06e89ea68af=
b65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
+SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) =3D 328716
Index: x11-drivers/xf86-video-newport/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-newport/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-newport
-PORTVERSION=3D	0.2.3
-PORTREVISION=3D	2
+PORTVERSION=3D	0.2.4
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org newport display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto
 MAN4=3D		newport.4x
=20
 post-patch:
Index: x11-drivers/xf86-video-newport/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-newport/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-newport/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) =3D e6caeb4f95adfd=
9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
-SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) =3D 266377
+SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) =3D 91cc41c6b17b06=
8ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
+SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) =3D 308541
Index: x11-drivers/xf86-video-nouveau/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-nouveau/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-nouveau
 PORTVERSION=3D	0.0.10.${SNAPDATE}
@@ -16,7 +12,7 @@
 COMMENT=3D	Free nouveau display driver for nvidia-based cards
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto xf86driproto glproto
+USE_XORG=3D	xf86driproto glproto
 MAN4=3D		nouveau.4x
=20
 MAKE_JOBS_SAFE=3D	yes
Index: x11-drivers/xf86-video-nv/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-nv/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-nv
-PORTVERSION=3D	2.1.18
+PORTVERSION=3D	2.1.20
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org nv display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		nv.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-nv/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-nv/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-nv/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) =3D 6cf726cc8377cd823e=
a6038938ea8a88e883fea01b13a749b5491e26535cf415
-SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) =3D 354719
+SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) =3D 8395f65501f16f9cba=
ae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
+SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) =3D 396982
Index: x11-drivers/xf86-video-openchrome/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-openchrome/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-openchrome
-PORTVERSION=3D	0.2.904
-PORTREVISION=3D	3
+PORTVERSION=3D	0.3.1
 CATEGORIES=3D	x11-drivers
-MASTER_SITES=3D	http://www.openchrome.org/releases/
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org openChrome display driver
@@ -17,7 +10,7 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xf86driproto xextproto xvmc glproto
+USE_XORG=3D	xf86driproto xvmc glproto xorg-macros
 MAN4=3D		openchrome.4x
=20
 MAKE_ARGS+=3D	drivermandir=3D${LOCALBASE}/man/man4
Index: x11-drivers/xf86-video-openchrome/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-openchrome/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-openchrome/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) =3D c7bdf7c48=
365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) =3D 460051
+SHA256 (xorg/driver/xf86-video-openchrome-0.3.1.tar.bz2) =3D eb459a86e20=
fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7
+SIZE (xorg/driver/xf86-video-openchrome-0.3.1.tar.bz2) =3D 517335
Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(revis=
ion 313938)
+++ x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	(worki=
ng 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"
-=20
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+#define PIOOFFSET 0
-+#endif
-=20
- 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);
- }
-=20
- 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);
- }
-=20
- /*
Index: x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(revis=
ion 313938)
+++ x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	(worki=
ng copy)
@@ -1,83 +0,0 @@
-Fix Xvideo crash in X.org server 1.10
-
-http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=3D=
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;
- }
-=20
--
--/*
-- * 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 =3D &UpdateOverlay_Video;
--    viaPortPrivPtr pPriv =3D (viaPortPrivPtr) data;
--    VIAPtr pVia =3D VIAPTR(pScrn);
--
--    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
--        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
--        if (pPriv->autoPaint) {
--            if (pDraw->type =3D=3D DRAWABLE_WINDOW) {
--                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
--            } else {
--                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
--                    clipBoxes);
--            }
--        }
--    }
--
--    if (drw_x =3D=3D pPriv->old_drw_x &&
--        drw_y =3D=3D pPriv->old_drw_y &&
--        pVia->swov.oldPanningX =3D=3D pVia->swov.panning_x &&
--        pVia->swov.oldPanningY =3D=3D pVia->swov.panning_y) {
--        viaXvError(pScrn, pPriv, xve_none);
--        return Success;
--    }
--
--    lpUpdateOverlay->SrcLeft =3D pPriv->old_src_x;
--    lpUpdateOverlay->SrcTop =3D pPriv->old_src_y;
--    lpUpdateOverlay->SrcRight =3D pPriv->old_src_x + pPriv->old_src_w;
--    lpUpdateOverlay->SrcBottom =3D pPriv->old_src_y + pPriv->old_src_h;=

--
--    lpUpdateOverlay->DstLeft =3D drw_x;
--    lpUpdateOverlay->DstTop =3D drw_y;
--    lpUpdateOverlay->DstRight =3D drw_x + pPriv->old_drw_w;
--    lpUpdateOverlay->DstBottom =3D drw_y + pPriv->old_drw_h;
--    pPriv->old_drw_x =3D drw_x;
--    pPriv->old_drw_y =3D drw_y;
--
--    lpUpdateOverlay->dwFlags =3D DDOVER_KEYDEST;
--
--    if (pScrn->bitsPerPixel =3D=3D 8)
--        lpUpdateOverlay->dwColorSpaceLowValue =3D pPriv->colorKey & 0xf=
f;
--    else
--        lpUpdateOverlay->dwColorSpaceLowValue =3D 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 =3D viaGetPortAttribute;
-         viaAdaptPtr[i]->SetPortAttribute =3D viaSetPortAttribute;
-         viaAdaptPtr[i]->PutImage =3D viaPutImage;
--        viaAdaptPtr[i]->ReputImage =3D viaReputImage;
-+        viaAdaptPtr[i]->ReputImage =3D NULL;
-         viaAdaptPtr[i]->QueryImageAttributes =3D viaQueryImageAttribute=
s;
-         for (j =3D 0; j < numPorts; ++j) {
-             viaPortPriv[j].dmaBounceBuffer =3D NULL;
Index: x11-drivers/xf86-video-r128/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-r128/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-r128
-PORTVERSION=3D	6.8.1
+PORTVERSION=3D	6.8.4
 PORTREVISION=3D	3
 CATEGORIES=3D	x11-drivers
=20
@@ -15,7 +10,7 @@
=20
 USE_GL=3D		gl
 XORG_CAT=3D	driver
-USE_XORG=3D	glproto videoproto xextproto xf86driproto xf86miscproto xine=
ramaproto
+USE_XORG=3D	glproto xf86driproto xf86miscproto xineramaproto
 MAN4=3D		r128.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-r128/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-r128/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-r128/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) =3D 517e21cc83850b903=
549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
-SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) =3D 418251
+SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) =3D 6fbfbba2589c1daf4=
5f048009d6521bb687adbdf2f695eb961b316ce68935cd7
+SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) =3D 459364
Index: x11-drivers/xf86-video-rendition/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-rendition/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-rendition
-PORTVERSION=3D	4.2.4
+PORTVERSION=3D	4.2.5
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org rendition display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		rendition.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-rendition/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-rendition/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) =3D 3b9b8e6709c3=
a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) =3D 320573
+SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) =3D 39b556933823=
7de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
+SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) =3D 356351
Index: x11-drivers/xf86-video-s3/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-s3/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-s3
-PORTVERSION=3D	0.6.3
-PORTREVISION=3D	3
+PORTVERSION=3D	0.6.5
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org s3 display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		s3.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-s3/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-s3/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) =3D ed9f65aa6eb1811d8c1=
6cddfce00c5fc5880d6d46b907a83ef77700610085144
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) =3D 277148
+SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) =3D 4778cd4f1d61490c356=
2f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
+SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) =3D 325582
Index: x11-drivers/xf86-video-s3virge/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-s3virge/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-s3virge
-PORTVERSION=3D	1.10.4
-PORTREVISION=3D	2
+PORTVERSION=3D	1.10.6
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org s3virge display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		s3virge.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3virge/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-s3virge/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-s3virge/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) =3D 1cd00d6e71fdb=
d70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
-SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) =3D 300224
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) =3D 85e1f6bdd3f39=
d0348c53602f481b974c13fc752c94931882817751c8ec8363e
+SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) =3D 349790
Index: x11-drivers/xf86-video-savage/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-savage/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-savage
-PORTVERSION=3D	2.3.3
+PORTVERSION=3D	2.3.6
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -16,7 +11,7 @@
=20
 WITH_FBSD10_FIX=3Dyes
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86driproto videoproto xextproto glproto
+USE_XORG=3D	xf86driproto glproto
 MAN4=3D		savage.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-savage/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-savage/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-savage/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) =3D d3854d375dbf7d8=
3bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
-SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) =3D 371252
+SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) =3D 48813ed8f4a0885=
8e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
+SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) =3D 403495
Index: x11-drivers/xf86-video-siliconmotion/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-siliconmotion
-PORTVERSION=3D	1.7.5
+PORTVERSION=3D	1.7.7
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org siliconmotion display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		siliconmotion.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-siliconmotion/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-siliconmotion/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-siliconmotion/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) =3D 97dd5971=
86029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) =3D 351610
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) =3D 87b8b59d=
43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) =3D 385957
Index: x11-drivers/xf86-video-sis/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-sis/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-sis
-PORTVERSION=3D	0.10.3
+PORTVERSION=3D	0.10.7
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
@@ -17,11 +12,7 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscp=
roto xextproto glproto
+USE_XORG=3D	xf86dgaproto xf86driproto xineramaproto xf86miscproto glprot=
o
 MAN4=3D		sis.4x
=20
-post-patch:
-	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
-		${WRKSRC}/configure
-=09
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-sis/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-sis/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-sis/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) =3D 9b39b3e22fd2adab8=
12fea06073c37971c7235c02c7f457bf8b60c1ae351c737
-SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) =3D 649750
+SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) =3D be2eb6acba081e88d=
abc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
+SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) =3D 699499
Index: x11-drivers/xf86-video-tdfx/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tdfx/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-tdfx
-PORTVERSION=3D	1.4.3
+PORTVERSION=3D	1.4.5
 PORTREVISION=3D	2
 CATEGORIES=3D	x11-drivers
=20
@@ -16,7 +11,7 @@
 USE_GL=3D		gl
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86driproto videoproto xextproto glproto
+USE_XORG=3D	xf86driproto glproto
 MAN4=3D		tdfx.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tdfx/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tdfx/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-tdfx/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) =3D 3ad935ca0aa306d10=
d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
-SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) =3D 290172
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) =3D 70d5fbadfb60fc25e=
4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
+SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) =3D 339623
Index: x11-drivers/xf86-video-tga/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tga/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-tga
-PORTVERSION=3D	1.2.1
+PORTVERSION=3D	1.2.2
 PORTREVISION=3D	2
 CATEGORIES=3D	x11-drivers
=20
@@ -14,6 +9,6 @@
 COMMENT=3D	X.Org tga display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto xf86dgaproto
+USE_XORG=3D	xf86dgaproto
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tga/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tga/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-tga/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) =3D 70a4754ef6602cf48d=
910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
-SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) =3D 273334
+SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) =3D 2023818000200eb50a=
59476e36d59b07a361b110e73b1d9cc526beb669306131
+SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) =3D 318943
Index: x11-drivers/xf86-video-trident/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-trident/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-trident
-PORTVERSION=3D	1.3.4
+PORTVERSION=3D	1.3.6
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,7 @@
 COMMENT=3D	X.Org trident display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto xf86dgaproto
+USE_XORG=3D	xf86dgaproto
 MAN4=3D		trident.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-trident/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-trident/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-trident/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) =3D 58e61631e0ef2c=
58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
-SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) =3D 310898
+SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) =3D 6a58e3f3034abd=
8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
+SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) =3D 356092
Index: x11-drivers/xf86-video-tseng/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tseng/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-tseng
-PORTVERSION=3D	1.2.4
+PORTVERSION=3D	1.2.5
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,6 @@
 COMMENT=3D	X.Org tseng display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	videoproto xextproto
 MAN4=3D		tseng.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tseng/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-tseng/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-tseng/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) =3D d0dd5dfb4c6a8d0e=
0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
-SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) =3D 296314
+SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) =3D c06dc5205f627e5a=
fc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
+SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) =3D 330575
Index: x11-drivers/xf86-video-vesa/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-vesa/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-vesa
-PORTVERSION=3D	2.3.0
-PORTREVISION=3D	2
+PORTVERSION=3D	2.3.2
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT=3D	X.Org vesa display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xextproto videoproto
 MAN4=3D		vesa.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-vesa/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-vesa/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-vesa/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) =3D 8ed85a0e94523539d=
81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
-SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) =3D 264539
+SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) =3D 144a17ffae3c86603=
ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
+SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) =3D 298186
Index: x11-drivers/xf86-video-vmware/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-vmware/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-vmware
-PORTVERSION=3D	12.0.2
-PORTREVISION=3D	1
+PORTVERSION=3D	13.0.0
 CATEGORIES=3D	x11-drivers
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11-drivers/xf86-video-vmware/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-vmware/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-vmware/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) =3D c827875fd94805=
ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
-SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) =3D 432468
+SHA256 (xorg/driver/xf86-video-vmware-13.0.0.tar.bz2) =3D 44919ecd88654f=
2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6
+SIZE (xorg/driver/xf86-video-vmware-13.0.0.tar.bz2) =3D 445703
Index: x11-drivers/xf86-video-voodoo/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-voodoo/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xf86-video-voodoo
-PORTVERSION=3D	1.2.4
+PORTVERSION=3D	1.2.5
 PORTREVISION=3D	1
 CATEGORIES=3D	x11-drivers
=20
@@ -14,7 +9,7 @@
 COMMENT=3D	X.Org voodoo display driver
=20
 XORG_CAT=3D	driver
-USE_XORG=3D	xf86dgaproto xextproto videoproto
+USE_XORG=3D	xf86dgaproto
 MAN4=3D		voodoo.4x
=20
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-voodoo/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xf86-video-voodoo/distinfo	(revision 313938)
+++ x11-drivers/xf86-video-voodoo/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) =3D f00238bbcf61dba=
726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
-SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) =3D 274523
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) =3D 9e3eb8a3fdcc60c=
e4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
+SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) =3D 305489
Index: x11-drivers/xorg-drivers/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-drivers/xorg-drivers/Makefile	(revision 313938)
+++ x11-drivers/xorg-drivers/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
=20
 PORTNAME=3D	xorg-drivers
-PORTVERSION=3D	7.5.2
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-drivers
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
@@ -92,10 +92,9 @@
 OPENCHROME_DESC=3D	Install openchrome video driver
 SUNFFB_DESC=3D		Install sunffb video driver
=20
-# these drivers module name are different then the plugin they install
-QUIRKS=3D		keyboard:kbd
+# these drivers have a different module name compared to the plugin they=
 install
+QUIRKS=3D		keyboard:kbd jamstudio:js_x
=20
-
 .include <bsd.port.options.mk>
=20
 # Manual add arch specific drivers so they be added to depend lines.
Index: x11-fonts/fontsproto/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/fontsproto/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	fontsproto
-PORTVERSION=3D	2.1.1
+PORTVERSION=3D	2.1.2
 CATEGORIES=3D	x11-fonts
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11-fonts/fontsproto/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/fontsproto/distinfo	(revision 313938)
+++ x11-fonts/fontsproto/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) =3D 9c9abc81e2927e6b6ffc6ee=
ce1f3fbc7559f506a2848673a21e72c0ae4d639bc
-SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) =3D 131040
+SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) =3D 869c97e5a536a8f3c9bc8b9=
923780ff1f062094bab935e26f96df3d6f1aa68a9
+SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) =3D 141990
Index: x11-fonts/libFS/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libFS/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libFS
-PORTVERSION=3D	1.0.3
+PORTVERSION=3D	1.0.4
 CATEGORIES=3D	x11-fonts
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11-fonts/libFS/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libFS/distinfo	(revision 313938)
+++ x11-fonts/libFS/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) =3D ab7af9754568af60b54be67c0966cb=
742ad7eb7ff73faa2c76e0b71c988f2419
-SIZE (xorg/lib/libFS-1.0.3.tar.bz2) =3D 284331
+SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) =3D 7073761e7594d43180a922605fb64c=
ce60e5ccb8c06f8efa24f2d4621f5e8315
+SIZE (xorg/lib/libFS-1.0.4.tar.bz2) =3D 291155
Index: x11-fonts/libXfont/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXfont/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXfont
-PORTVERSION=3D	1.4.4
-PORTREVISION=3D	1
+PORTVERSION=3D	1.4.5
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11-fonts
=20
 MAINTAINER=3D	x11@FreeBSD.org
-COMMENT=3D	X font library
+COMMENT=3D	X font libary
=20
 LIB_DEPENDS=3D	freetype.9:${PORTSDIR}/print/freetype2
=20
Index: x11-fonts/libXfont/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXfont/distinfo	(revision 313938)
+++ x11-fonts/libXfont/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) =3D a2065f5f66882f7a9cb0eb674e1=
6d284da48e449af443eda272e99832be8239a
-SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) =3D 440022
+SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) =3D bbf96fb80b6b95cdb1dc9680850=
82a6e668193a54cd9d6e2af669909c0cb7170
+SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) =3D 470879
Index: x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(revision 31=
3938)
+++ x11-fonts/libXfont/files/patch-src_fontfile_decompress.c	(working cop=
y)
@@ -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[] =3D { "\03
- #define FIRST	257	/* first free entry */
- #define	CLEAR	256	/* table clear output code */
-=20
--#define STACK_SIZE  8192
-+#define STACK_SIZE  65300
-=20
- typedef struct _compressedFILE {
-     BufFilePtr	    file;
-@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
- 	file->tab_suffix[code] =3D (char_type) code;
-     }
-     file->free_ent =3D ((file->block_compress) ? FIRST : 256 );
-+    file->oldcode =3D -1;
-     file->clear_flg =3D 0;
-     file->offset =3D 0;
-     file->size =3D 0;
-     file->stackp =3D file->de_stack;
-     bzero(file->buf, BITS);
--    file->finchar =3D file->oldcode =3D getcode (file);
--    if (file->oldcode !=3D -1)
--	*file->stackp++ =3D file->finchar;
-     return BufFileCreate ((char *) file,
- 			  BufCompressedFill,
- 			  0,
-@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
- 	if (buf =3D=3D bufend)
- 	    break;
-=20
--	if (oldcode =3D=3D -1)
--	    break;
--
- 	code =3D getcode (file);
- 	if (code =3D=3D -1)
- 	    break;
-@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
- 	    for ( code =3D 255; code >=3D 0; code-- )
- 	    	file->tab_prefix[code] =3D 0;
- 	    file->clear_flg =3D 1;
--	    file->free_ent =3D FIRST - 1;
--	    if ( (code =3D getcode (file)) =3D=3D -1 )	/* O, untimely death! *=
/
--	    	break;
-+	    file->free_ent =3D FIRST;
-+	    oldcode =3D -1;
-+	    continue;
-     	}
-     	incode =3D code;
-     	/*
-      	 * Special case for KwKwK string.
-      	 */
-     	if ( code >=3D file->free_ent ) {
-+	    if ( code > file->free_ent || oldcode =3D=3D -1 ) {
-+		/* Bad stream. */
-+		return BUFFILEEOF;
-+	    }
- 	    *stackp++ =3D finchar;
- 	    code =3D oldcode;
-     	}
--   =20
-+
-+	/*
-+	 * 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 >=3D 256 )
-     	{
--	    if (stackp - de_stack >=3D STACK_SIZE - 1)
--		return BUFFILEEOF;
- 	    *stackp++ =3D file->tab_suffix[code];
- 	    code =3D file->tab_prefix[code];
-     	}
-@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
-     	/*
-      	 * Generate the new entry.
-      	 */
--    	if ( (code=3Dfile->free_ent) < file->maxmaxcode ) {
-+    	if ( (code=3Dfile->free_ent) < file->maxmaxcode && oldcode !=3D -1=
) {
- 	    file->tab_prefix[code] =3D (unsigned short)oldcode;
- 	    file->tab_suffix[code] =3D finchar;
- 	    file->free_ent =3D code+1;
Index: x11-fonts/libXft/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXft/Makefile	(revision 313938)
+++ x11-fonts/libXft/Makefile	(working copy)
@@ -1,25 +1,20 @@
-# New ports collection makefile for:	Xft
-# Date created:		06 October 2002
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
=20
 PORTNAME=3D	libXft
-PORTVERSION=3D	2.1.14
+PORTVERSION=3D	2.3.1
 CATEGORIES=3D	x11-fonts
=20
 MAINTAINER=3D	gnome@FreeBSD.org
 COMMENT=3D	A client-sided font API for X applications
=20
+BUILD_DEPENDS=3D	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 LIB_DEPENDS=3D	freetype.9:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=3D	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=3D	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
=20
 XORG_CAT=3D	lib
 USE_XORG=3D	xproto:both xrender
=20
-MAN1=3D		xft-config.1
 MAN3=3D		Xft.3
=20
 .include <bsd.port.mk>
Index: x11-fonts/libXft/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXft/distinfo	(revision 313938)
+++ x11-fonts/libXft/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXft-2.1.14.tar.bz2) =3D 700e9d594b81cad3dfd5fac4a5cf=
d0c4cf7780c812507ef04eb40139ebf5175e
-SIZE (xorg/lib/libXft-2.1.14.tar.bz2) =3D 289068
+SHA256 (xorg/lib/libXft-2.3.1.tar.bz2) =3D 7fce32b92dcb7b2869bed567af2ab=
c7bbad0d5d6fcf471b8a3e137964a31bbbd
+SIZE (xorg/lib/libXft-2.3.1.tar.bz2) =3D 311556
Index: x11-fonts/libXft/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libXft/pkg-plist	(revision 313938)
+++ x11-fonts/libXft/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
 lib/libXft.so.2
Index: x11-fonts/libfontenc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libfontenc/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libfontenc
-PORTVERSION=3D	1.1.0
+PORTVERSION=3D	1.1.1
 CATEGORIES=3D	x11-fonts
=20
 MAINTAINER=3D	x11@FreeBSD.org
Index: x11-fonts/libfontenc/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/libfontenc/distinfo	(revision 313938)
+++ x11-fonts/libfontenc/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) =3D 348a1b0142f61afeaafc9497e=
997d6f10074affed8682e202d019f10170b9cbf
-SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) =3D 268872
+SHA256 (xorg/lib/libfontenc-1.1.1.tar.bz2) =3D de72812f1856bb63bd2226ec8=
c2e2301931d3c72bd0f08b0d63a0cdf0722017f
+SIZE (xorg/lib/libfontenc-1.1.1.tar.bz2) =3D 289688
Index: x11-fonts/xfs/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xfs/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xfs
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.2
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11-fonts
=20
@@ -17,7 +12,8 @@
 USE_GMAKE=3D	yes
 USE_XORG=3D	libfs xfont xtrans
 USE_RC_SUBR=3D	xfs
-CONFIGURE_ENV+=3D	ac_cv_path_XMLTO=3D""
+CONFIGURE_ARGS=3D	--without-xmlto
+#CONFIGURE_ENV+=3D	ac_cv_path_XMLTO=3D""
=20
 MAN1=3D		xfs.1
=20
Index: x11-fonts/xfs/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xfs/distinfo	(revision 313938)
+++ x11-fonts/xfs/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfs-1.1.1.tar.bz2) =3D 0c83763a3c9843fdb1d420f18bea3632=
c5d7aaf91f94a6d9b3f0f5f1d541b5fb
-SIZE (xorg/app/xfs-1.1.1.tar.bz2) =3D 216188
+SHA256 (xorg/app/xfs-1.1.2.tar.bz2) =3D 0dea61cce3897b4d9d844bbd2c7850cd=
4e80e12c12b38158b4f92574b027e39d
+SIZE (xorg/app/xfs-1.1.2.tar.bz2) =3D 231065
Index: x11-fonts/xorg-fonts/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-100dpi/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-100dpi
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-75dpi/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-75dpi
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-cyrillic/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-cyrillic
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-miscbitmaps
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-truetype/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-truetype/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-truetype
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-fonts/xorg-fonts-type1/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-fonts/xorg-fonts-type1/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-fonts-type1
-PORTVERSION=3D	7.5.1
+PORTVERSION=3D	7.7
 CATEGORIES=3D	x11-fonts
 MASTER_SITES=3D	# none
 DISTFILES=3D	# none
Index: x11-servers/xephyr/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xephyr/Makefile	(revision 313938)
+++ x11-servers/xephyr/Makefile	(working copy)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xephyr
-# Date created:				2008-05-18
-# Whom:					Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
=20
 PORTNAME=3D	xephyr
 PORTREVISION=3D	0
@@ -22,8 +17,7 @@
=20
 CONFIGURE_ARGS=3D	--enable-kdrive --enable-xephyr	--disable-dmx --disabl=
e-xvfb \
 		--without-xmlto --disable-docs --disable-devel-docs \
-		--disable-xorg --disable-xnest \
-		--localstatedir=3D/var --without-dtrace
+		--disable-xnest --localstatedir=3D/var --without-dtrace
=20
 SLAVE_PORT=3D	yes
 PLIST_FILES=3D	bin/Xephyr
Index: x11-servers/xorg-dmx/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-dmx/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-dmx
 PORTREVISION=3D	0
@@ -21,7 +17,7 @@
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
 		xau dmx xtst xres pixman xtrans
=20
-CONFIGURE_ARGS=3D	--disable-xvfb --disable-xorg --disable-xnest \
+CONFIGURE_ARGS=3D	--disable-xvfb --disable-xnest \
 		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=3D/var --without-dtrace
=20
Index: x11-servers/xorg-dmx/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-dmx/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-nestserver/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-nestserver
-PORTREVISION=3D	1
=20
 COMMENT=3D	Nesting X server from X.Org
=20
@@ -20,7 +15,7 @@
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
=20
-CONFIGURE_ARGS=3D	--disable-dmx --disable-xvfb --disable-xorg \
+CONFIGURE_ARGS=3D	--disable-dmx --disable-xvfb \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=3D/var --without-dtrace
=20
Index: x11-servers/xorg-server/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME?=3D	xorg-server
 PORTVERSION=3D	${XORG_VERSION}
 PORTREVISION?=3D	${XORG_REVISION}
 PORTEPOCH?=3D	1
 CATEGORIES=3D	x11-servers
-MASTER_SITES=3D	http://xorg.freedesktop.org/releases/individual/xserver/=

-DISTFILES=3D	xorg-server-${PORTVERSION}.tar.bz2
+MASTER_SITES=3D	XORG
+MASTER_SITE_SUBDIR=3D	individual/xserver
+DISTNAME=3D	xorg-server-${PORTVERSION}
=20
 MAINTAINER=3D	x11@FreeBSD.org
 COMMENT?=3D	X.Org X server and related programs
=20
 LIB_DEPENDS=3D	drm:${PORTSDIR}/graphics/libdrm
-
-RUN_DEPENDS=3D	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11=
/xkeyboard-config \
+RUN_DEPENDS=3D	xkeyboard-config>=3D2.5:${PORTSDIR}/x11/xkeyboard-config =
\
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
=20
 XORG_CAT=3D	xserver
 SLAVE_PORT?=3D	no
=20
 .if defined(WITH_NEW_XORG)
-XORG_VERSION=3D	1.10.6
-XORG_REVISION=3D	2
+XORG_VERSION=3D	1.12.4
+XORG_REVISION=3D	0
 PLIST_SUB+=3D	OLD=3D"@comment " NEW=3D""
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
-		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
-		${FILESDIR}/extra-clang
+EXTRA_PATCHES+=3D	${FILESDIR}/extra-clang
 .else
 XORG_VERSION=3D	1.7.7
 XORG_REVISION=3D	6
 PLIST_SUB+=3D	OLD=3D"" NEW=3D"@comment "
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-dix_events.c
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-include_eventstr.h
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-patch-os-utils.c
+EXTRA_PATCHES+=3D	${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
=20
+USE_BZIP2=3D	yes
 USE_GMAKE=3D	yes
 USE_GL=3D		gl
 USE_XORG?=3D	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xa=
w7 \
@@ -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
=20
 MAKE_JOBS_UNSAFE=3D	yes
 USE_OPENSSL=3D	yes
@@ -96,7 +92,7 @@
 .endif
=20
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=3D	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=3D	hal:${PORTSDIR}/sysutils/hal
 CONFIGURE_ARGS+=3D	--enable-config-hal=3Dyes
 .else
 CONFIGURE_ARGS+=3D	--enable-config-hal=3Dno
@@ -115,8 +111,12 @@
 .endif
=20
 .if ${ARCH} =3D=3D i386
-EXTRA_PATCHES+=3D	${FILESDIR}/extra-arch-i386
+.if defined(WITH_NEW_XORG)
+EXTRA_PATCHES+=3D	${FILESDIR}/extra-new-arch-i386
+.else
+EXTRA_PATCHES+=3D	${FILESDIR}/extra-old-arch-i386
 .endif
+.endif
=20
 .if ${ARCH} =3D=3D ia64
 PLIST_SUB+=3D	IA64_NA=3D"@comment "
@@ -166,6 +166,7 @@
=20
 .if ${SLAVE_PORT} =3D=3D "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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/distinfo	(revision 313938)
+++ x11-servers/xorg-server/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) =3D 54c4d32bfeb8852adbea=
3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) =3D 4939257
-SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) =3D c4da5a97b6986688efe=
74bc9bff6a38795977019ac032dd6d787abad32c50682
-SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) =3D 5406712
+SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) =3D 8ac07c35306ba3fb3c0=
972722dd4e919303039eca1d40ac7862560e0b2c94cf7
+SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) =3D 5444761
Index: x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-=
bsd-sparc64_video.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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.0=
00000000 +0000
++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000=
000 +0000
+@@ -52,6 +52,10 @@
+ 	pVidMem->mapMem =3D sparc64MapVidMem;
+ 	pVidMem->unmapMem =3D sparc64UnmapVidMem;
+ 	pVidMem->initialised =3D TRUE;
++
++#if defined(__FreeBSD__)
++	pci_system_init_dev_mem(xf86Info.screenFd);
++#endif
+ }
+=20
+ static pointer

Property changes on: x11-servers/xorg-server/files/extra-Xserver-hw-xfree=
86-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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(revision 0)=

+++ x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c	(working cop=
y)
@@ -0,0 +1,12 @@
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprint=
f.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) =3D (src))
+ # endif
+ #endif
+    =20

Property changes on: x11-servers/xorg-server/files/extra-Xserver-os-xprin=
tf.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-arch-i386	(revision 313938)
+++ 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 +020=
0
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
-@@ -1021,7 +1021,7 @@
-=20
- #    if !defined(__SUNPRO_C)
- #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) =
&& !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defin=
ed(__m32r__)
--#     ifdef GCCUSESGAS
-+#     if defined(GCCUSESGAS) || defined(__clang__)
-=20
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of thes=
e
Index: x11-servers/xorg-server/files/extra-clang
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-clang	(revision 313938)
+++ 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 +0=
100
-+++ 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 =3D NULL;
++    QdEventPtr tmp;
+=20
+     inputInfo.numDevices =3D 0;
+     inputInfo.devices =3D (DeviceIntPtr) NULL;
+--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0=
200
++++ 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 =3D NULL;
 =20
      /* 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 +0=
100
-+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
-@@ -338,7 +338,8 @@
-     XF86ConfInputClassPtr prev;
-=20
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group =3D NULL;
-+        xf86MatchGroup *next;
-         char **list;
-=20
-         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 =3D NULL;
 =20
-     list_for_each_entry(ref, &pPriv->reference_list, link) {
- 	if (ref->id =3D=3D id)
-@@ -267,7 +267,8 @@
+     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
+         if (ref->id =3D=3D id)
+@@ -306,7 +306,8 @@
  {
      DRI2DrawablePtr pPriv =3D p;
-     DRI2ScreenPtr   ds =3D pPriv->dri2_screen;
+     DRI2ScreenPtr ds =3D pPriv->dri2_screen;
 -    DRI2DrawableRefPtr ref, next;
 +    DRI2DrawableRefPtr ref =3D NULL;
-+    DRI2DrawableRefPtr  next;
++    DRI2DrawableRefPtr next;
      WindowPtr pWin;
      PixmapPtr pPixmap;
      DrawablePtr pDraw;
-@@ -534,7 +535,7 @@
+@@ -587,7 +588,7 @@
  DRI2InvalidateDrawable(DrawablePtr pDraw)
  {
      DRI2DrawablePtr pPriv =3D DRI2GetDrawable(pDraw);
 -    DRI2DrawableRefPtr ref;
 +    DRI2DrawableRefPtr ref =3D NULL;
 =20
-     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 =3D { 0 };
+     struct child child[3];
+-    struct child *c;
++    struct child *c =3D NULL;
+     int i =3D 0;
+=20
+     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 =3D NULL;
+     struct PointerBarrier *nearest =3D NULL;
+     double min_distance =3D INT_MAX;      /* can't get higher than that=
 in X anyway */
+=20
Index: x11-servers/xorg-server/files/extra-dix_events.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-dix_events.c	(revision 313938)
+++ 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 =3D NULL;
--	Mask		mask =3D 0;
-=20
- 	gdev=3D grab->modifierDevice;
-         if (grab->grabtype =3D=3D GRABTYPE_CORE)
-@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE =3D &core;
-                 count =3D 1;
--                mask =3D grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |=3D pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc =3D EventToXI2((InternalEvent*)event, &xE);
-@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count =3D 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 vali=
d.
--                 * long-term we should use internal events for enter/fo=
cus
--                 * as well */
--                if (xE)
--                    mask =3D grab->xi2mask[device->id][((xGenericEvent*=
)xE)->evtype/8];
--                else if (event->type =3D=3D XI_Enter || event->type =3D=
=3D XI_FocusIn)
--                    mask =3D grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window)=
)
--                {
--                    InputClientsPtr icp =3D
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) =3D=3D rClient(grab))
--                        {
--                            int evtype =3D (xE) ? ((xGenericEvent*)xE)-=
>evtype : event->type;
--                            mask |=3D icp->xi2mask[device->id][evtype/8=
];
--                            break;
--                        }
--
--                        icp =3D icp->next;
--                    }
--                }
-             } else
-             {
-                 rc =3D EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->typ=
e, rc);
-                     continue;
-                 }
--                mask =3D grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window)=
)
--                {
--                    InputClientsPtr icp =3D
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) =3D=3D rClient(grab))
--                        {
--                            mask |=3D icp->mask[device->id];
--                            break;
--                        }
--
--                        icp =3D icp->next;
--                    }
--                }
-             }
-=20
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TR=
UE);
-=20
--                TryClientEvents(rClient(grab), device, xE, count, mask,=

-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab=
);
-             }
-=20
Index: x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(revis=
ion 313938)
+++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h	(worki=
ng 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 obtainin=
g
-+ * 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(revisi=
on 313938)
+++ x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h	(workin=
g 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 obtainin=
g
-+ * 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, GLbyt=
e *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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 +020=
0
++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
+@@ -1335,7 +1335,7 @@
+=20
+ #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__)
+=20
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of thes=
e

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 +020=
0
++++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
+@@ -1021,7 +1021,7 @@
+=20
+ #    if !defined(__SUNPRO_C)
+ #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) =
&& !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defin=
ed(__m32r__)
+-#     ifdef GCCUSESGAS
++#     if defined(GCCUSESGAS) || defined(__clang__)
+=20
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of thes=
e

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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);
+=20
+   /*
+@@ -336,7 +336,7 @@
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd =3D open(LockFile, O_RDONLY);
++      lfd =3D open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile);=20

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/extra-patch-os-utils.c	(revision 313938=
)
+++ 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);
-=20
-   /*
-@@ -336,7 +336,7 @@
-       /*
-        * Read the pid from the existing file
-        */
--      lfd =3D open(LockFile, O_RDONLY);
-+      lfd =3D open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);=20
Index: x11-servers/xorg-server/files/extra-servermd.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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__)
+=20
+ #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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd=
-sparc64_video.c	(revision 313938)
+++ 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.0=
00000000 +0000
-+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000=
000 +0000
-@@ -52,6 +52,10 @@
- 	pVidMem->mapMem =3D sparc64MapVidMem;
- 	pVidMem->unmapMem =3D sparc64UnmapVidMem;
- 	pVidMem->initialised =3D TRUE;
-+
-+#if defined(__FreeBSD__)
-+	pci_system_init_dev_mem(xf86Info.screenFd);
-+#endif
- }
-=20
- static pointer
Index: x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(revision 31=
3938)
+++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c	(working cop=
y)
@@ -1,12 +0,0 @@
-diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprint=
f.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) =3D (src))
- # endif
- #endif
-    =20
Index: x11-servers/xorg-server/files/patch-servermd.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/files/patch-servermd.h	(revision 313938)
+++ 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__)
-=20
- #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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-server/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-servers/xorg-vfbserver/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	xorg-vfbserver
-PORTREVISION=3D	1
=20
 COMMENT=3D	X virtual framebuffer server from X.Org
=20
@@ -20,8 +15,8 @@
 		xineramaproto xinerama evieproto xkbfile xfont fontenc \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
=20
-CONFIGURE_ARGS=3D	--disable-dmx --disable-xnest --disable-xorg \
-		--without-xmlto --disable-docs --disable-devel-docs \
+CONFIGURE_ARGS=3D	--disable-dmx --disable-xnest \
+		--without-xmlto --disable-docs --disable-devel1-docs \
 		--localstatedir=3D/var --without-dtrace
=20
 SLAVE_PORT=3D	yes
Index: x11-toolkits/libXaw/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXaw/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXaw
-PORTVERSION=3D	1.0.9
+PORTVERSION=3D	1.0.11
 PORTEPOCH=3D	2
 CATEGORIES=3D	x11-toolkits
=20
@@ -16,16 +12,8 @@
 XORG_CAT=3D	lib
 USE_XORG=3D	printproto:both x11 xau xext xextproto xmu xp xpm xproto:bot=
h xt
 USE_GMAKE=3D	yes
-CONFIGURE_ARGS=3D	--without-xmlto
+CONFIGURE_ARGS+=3D--without-xmlto
=20
-PORTDOCS=3D	*
-
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=3D--disable-specs
-post-configure:
-	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/=
 install-exec-am/' ${WRKSRC}/specs/Makefile
-.endif
-
 MAN3=3D		Xaw.3
=20
 .include <bsd.port.mk>
Index: x11-toolkits/libXaw/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXaw/distinfo	(revision 313938)
+++ x11-toolkits/libXaw/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) =3D a83977546b78e24ac5dca86affc10=
b6404a87c16272405b05386feca1a2db037
-SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) =3D 650634
+SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 87a874acbb71d1ee59b8047312fc=
91d89dcb373e2970f121184cdae29a3d9492
+SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 649633
Index: x11-toolkits/libXaw/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXaw/pkg-plist	(revision 313938)
+++ 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXmu/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXmu
-PORTVERSION=3D	1.1.0
+PORTVERSION=3D	1.1.1
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11-toolkits
=20
Index: x11-toolkits/libXmu/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXmu/distinfo	(revision 313938)
+++ x11-toolkits/libXmu/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) =3D 0fa91f303b70decc1ef6201c88c8a=
5f0b4ecd68c6c88bdcc891ecd1a689d36ad
-SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) =3D 360663
+SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 709081c550cc3a866d7c760a3f973=
84a1fe16e27fc38fe8169b8db9f33aa7edd
+SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 383473
Index: x11-toolkits/libXt/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXt/Makefile	(revision 313938)
+++ 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$
-#
=20
 PORTNAME=3D	libXt
-PORTVERSION=3D	1.1.1
+PORTVERSION=3D	1.1.3
 PORTEPOCH=3D	1
 CATEGORIES=3D	x11-toolkits
=20
@@ -15,6 +11,7 @@
=20
 XORG_CAT=3D	lib
 USE_XORG=3D	x11 sm xproto:both kbproto
+CONFIGURE_ARGS=3D	--disable-specs
=20
 MAN3=3D	MenuPopdown.3 \
 	MenuPopup.3 \
Index: x11-toolkits/libXt/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- x11-toolkits/libXt/distinfo	(revision 313938)
+++ x11-toolkits/libXt/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) =3D a2a1c29c684e3c9082cdb920b5aea8=
02b179d19107b9ab2170fda07575559da7
-SIZE (xorg/lib/libXt-1.1.1.tar.bz2) =3D 715424
+SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) =3D 8db593c3fc5ffc4e9cd854ba50af1e=
ac9b90d66521ba17802b8f1e0d2d7f05bd
+SIZE (xorg/lib/libXt-1.1.3.tar.bz2) =3D 734679

--------------050908080507080502050508--

------enig2JXQIDPXNBISVTIPHUMWL
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQIcBAEBCgAGBQJRPlGzAAoJELuNS1e7i1VRf5IP/RDKmZAbPR8GvXPZv7jvD3Gv
wmnU7jhB1bWQrZzbjI/KGiUXZebmVhrPvjw5D8byRiZOEau2buQTOmpuwlzbTWDm
Xt24wTHrI6vaT8JCnybUvLPuRxkgSPSXBnwG7ok20M0ywKTZ+cmgWmXcVubgSzDg
5Y5tXKM9pFSAPks+xdMR2QzpemEcd6jJRe9V640fzSjIIepwYjRSPPd9GPYHxpRB
x8k681J/zq1ItTYpwigrpQzjNg0PGZSdyQviJL7XQe5OCWXH55kcQf6tQTHFCKlu
jWlppQ/cMPz3R/a88UI29Lx3sFAZU4sBn70uzpbTYke2IKvant8XbyxIcu6Sp46S
jAhLAf8wVBIUphg6q9CaktN5oD+56ryznFy0922lcVGzatmPdlvhtGBj+wOAd2vx
QTHqjtSFlzYRguL+LBL/LS88vhyODQZkIJvQsvpHwp+aklTl4ZIFDC7hf6ZD2san
I0Zo8CgNKqcfPh4GUD8tWNZI8lsdPPQZ+LknsqWWlNAxEX1ZlZg5klzDZpm1JKv0
k6djOtDqoDnVd80gJhuQ+gMaANkI1qtrg0sCvaCw7NIGBRkWxdIn072LYD1b9NXe
/8Tlo45d+/69pCajwwEjWQseUCgMyf7y3S9hTkgtQ6aSugUh5qNvO0yk5XKjOKWc
tzcVEq7EF+K6gcgkCLlj
=8VcN
-----END PGP SIGNATURE-----

------enig2JXQIDPXNBISVTIPHUMWL--

---

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?513E5197.70509>

Legal Notices | © 1995-2024 The FreeBSD Project. All rights reserved.

Contact