The FreeBSD x11 team proudly presents

an zeising, kwm, miwi, bapt, eadler production: Xorg 7.7 Starring: xserver 1.12.4 (new xorg only) Mesa 8.0.4, including libGL, libGLU and dri (new xorg only) libX11 1.5.0 libxcb 1.9 libdrm 2.4.42 (new xorg only) freeglut 2.8.1 Also starring: Updates to drivers and other libraries and utilities Additional notes: Change pkgconf to be a build dependency. Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use this. Trim makefile headers. Take maintanership of x11/xcb-proto, ok'd by ashish. If you are running WITH_NEW_XORG=, you need to rebuild all installed drivers, see UPDATING for more information. Various fixes to make ports compile. PR: ports/177942 Exp-run by: miwi Approved by: portmgr (miwi) Thanks to all who helped testing!
author: zeising <zeising@FreeBSD.org> 2013-05-25 22:37:02 +0800
committer: zeising <zeising@FreeBSD.org> 2013-05-25 22:37:02 +0800
commit: 715298b528f23a6a763e28623a4c98f1365c81ce (patch)
tree: cf13f962932aab3646f0af684b2923c4e0f0825b /x11
parent: 0f8e632e50d273ba38d9d13f7e446a4a10d95cd4 (diff)
download: freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.tar.gz
freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.tar.zst
freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.zip
197 files changed, 2397 insertions, 828 deletions
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index c8428f5fb6ba..ecb538c20384 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Program to list application's resources
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros xt
+USE_XORG=	x11 xt
 
 MAN1=		appres.1
 PLIST_FILES=	bin/appres
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index f959c3290bfa..ad562a3909fd 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A sample screen saver for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
+USE_XORG=	x11 xscrnsaver xt xaw7 xt
 
 MAN1=		beforelight.1
 
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index 011b51c5ddb9..299229c9d855 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	bigreqsproto
-# Date Created:				07 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bigreqsproto
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
index 585c66bdae49..80d243bc21bd 100644
--- a/x11/bigreqsproto/distinfo
+++ b/x11/bigreqsproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
-SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
+SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e
+SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 0a5c5ffad1d4..8d81b7c6f8a8 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Bitmap editor and converter utilities for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xaw xbitmaps xmu xproto xorg-macros
+USE_XORG=	x11 xaw xbitmaps xmu xproto
 MAN1=		atobm.1 bitmap.1 bmtoa.1
 
 .include <bsd.port.mk>
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index a5cd8627df29..0a69b7211c41 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	compositeproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	compositeproto
 PORTVERSION=	0.4.2
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 6073e83bdacd..8fc997d6d934 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	damageproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	damageproto
 PORTVERSION=	1.2.1
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
index c4f509649cd5..b5876e920829 100644
--- a/x11/dmxproto/Makefile
+++ b/x11/dmxproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dmxproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	dmxproto
 PORTVERSION=	2.3.1
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 6693907e485c..dbefded77da1 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	dri2proto
-# Date Created:				Jul 28 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	dri2proto
-PORTVERSION=	2.6
+PORTVERSION=	2.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index f791a3e786d2..bdb207e719c7 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
-SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
+SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
+SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 01aeced0f162..b869fce3d493 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Dynamic resource editor for X Toolkit Applications
 
 XORG_CAT=	app
-USE_XORG=	x11 xt xmu xaw xorg-macros
+USE_XORG=	x11 xt xmu xaw
 
 MAN1=		editres.1
 
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
index 2ec1e910cf5e..3ed2745fc451 100644
--- a/x11/evieext/Makefile
+++ b/x11/evieext/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	evieext
-# Date Created:				25 Apr 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	evieext
 PORTVERSION=	1.1.1
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 7df50f273f41..17f348e3fbdd 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fixesproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fixesproto
 PORTVERSION=	5.0
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index 7fc569a44f96..13ca8b050c12 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	fstobdf
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	fstobdf
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
index 97b066dc8d1f..81014c497d2c 100644
--- a/x11/fstobdf/distinfo
+++ b/x11/fstobdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
-SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
+SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
+SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index bf23fc630757..5ae9713a79e3 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	glproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	glproto
-PORTVERSION=	1.4.15
+PORTVERSION=	1.4.16
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index e7b45bfa65de..53aa21d42d09 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
-SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
+SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
+SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index 9809144d0c67..881ae905feee 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Slightly improved screen locker based on slock
 LICENSE=	BSD
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
-		xcb.2:${PORTSDIR}/x11/libxcb \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 		xcb-image:${PORTSDIR}/x11/xcb-util-image \
 		ev.4:${PORTSDIR}/devel/libev
@@ -32,7 +31,7 @@ MAN1=	i3lock.1
 
 LDFLAGS+=	-liconv
 MAKE_JOBS_SAFE=	yes
-USE_XORG=	x11 xt xproto xext
+USE_XORG=	x11 xcb xt xproto xext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USES=		iconv
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index bb51bc5f5094..6578e99bc601 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	iceauth
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	iceauth
 PORTVERSION=	1.0.5
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index dd46062ee83f..85ce8085c4af 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Displays a wire-frame rotating plyhedron
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/ico
 
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 07ddd5d0bc2c..a3a6b0617e48 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	inputproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	inputproto
-PORTVERSION=	2.0.2
+PORTVERSION=	2.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,4 +10,6 @@ COMMENT=	Input extension headers
 
 XORG_CAT=	proto
 
+CONFIGURE_ARGS=	--without-asciidoc
+
 .include <bsd.port.mk>
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index 4f78cfd6d900..0499008a0b34 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
-SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535
+SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
+SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
index a08637eae856..3dab592571f5 100644
--- a/x11/inputproto/pkg-plist
+++ b/x11/inputproto/pkg-plist
@@ -3,7 +3,4 @@ include/X11/extensions/XI2.h
 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
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index 460e113a8f9c..284c182b7710 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	kbproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kbproto
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
index 98d94c36c8f4..b899f5c792cc 100644
--- a/x11/kbproto/distinfo
+++ b/x11/kbproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
-SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
+SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
+SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988
diff --git a/x11/kbproto/pkg-plist b/x11/kbproto/pkg-plist
index ee0808e94469..b603be3a8815 100644
--- a/x11/kbproto/pkg-plist
+++ b/x11/kbproto/pkg-plist
@@ -4,4 +4,38 @@ include/X11/extensions/XKBproto.h
 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
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index ed3c6056c4dd..4c0e454448a2 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libICE
-# Date Created:			09 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libICE
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index efdbf210e5da..93d40b34b365 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
-SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
+SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
+SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 1c5fa1d01a06..90ea1100bfce 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libSM
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -12,7 +12,7 @@ COMMENT=	Session Management library for X11
 LICENSE=	MIT
 
 XORG_CAT=	lib
-USE_XORG=	ice xproto:both xtrans xorg-macros
+USE_XORG=	ice xproto:both xtrans
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
 
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index f9b6a428fb55..ca43847ca6c3 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
-SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
+SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
+SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 013052c68389..5f0863957e50 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libX11
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.0
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -11,13 +11,11 @@ COMMENT=	X11 library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-
 XORG_CAT=	lib
 USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 		kbproto:both inputproto xf86bigfontproto xproto:both \
-		xorg-macros
+		xcb
+USE_PERL5_BUILD=yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--without-xmlto \
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 3b414ea70805..1c81e743e3b8 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
-SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
+SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
+SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 8a206ab25518..abc6f58b3247 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libXScrnSaver
-# Date Created:				15 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXScrnSaver
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 5b98617f6ef9..7239ebce5018 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
-SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
+SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
+SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index cf5c5b68d17a..5192edac2d8d 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libXTrap
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXTrap
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXTrap/distinfo b/x11/libXTrap/distinfo
index 465d88311da2..9d489856fd20 100644
--- a/x11/libXTrap/distinfo
+++ b/x11/libXTrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
-SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
+SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e
+SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 73ddb55609bf..76c560040c40 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXau
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXau
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 73f4bc42de9e..c0eadf794e43 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
-SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
+SHA256 (xorg/lib/libXau-1.0.8.tar.bz2) = fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2
+SIZE (xorg/lib/libXau-1.0.8.tar.bz2) = 295297
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index effee3169f91..b171a89eedd5 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXcomposite
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.4
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 48b4eb0d8986..c4e154403c42 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
-SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
+SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
+SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746
diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist
index 1fe48797e5d6..af59654c5698 100644
--- a/x11/libXcomposite/pkg-plist
+++ b/x11/libXcomposite/pkg-plist
@@ -4,3 +4,4 @@ lib/libXcomposite.la
 lib/libXcomposite.so
 lib/libXcomposite.so.1
 libdata/pkgconfig/xcomposite.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 31fb2148208a..0bbf537a8044 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXcursor
-# Date Created:			22 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXcursor
-PORTVERSION=	1.1.12
+PORTVERSION=	1.1.13
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index 7161de6c55b3..1fe7655141f3 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
-SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332
+SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
+SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index f27b13611b89..0f23abbea8de 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXdamage
-# Date Created:			13 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXdamage
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index dfea034c4fcf..80739d0ec039 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
-SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
+SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
+SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937
diff --git a/x11/libXdamage/pkg-plist b/x11/libXdamage/pkg-plist
index 530ce2e23685..0db2e1e8fcee 100644
--- a/x11/libXdamage/pkg-plist
+++ b/x11/libXdamage/pkg-plist
@@ -4,3 +4,4 @@ lib/libXdamage.la
 lib/libXdamage.so
 lib/libXdamage.so.1
 libdata/pkgconfig/xdamage.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index ad629cf5fb2e..3e3c7d21eb72 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXdmcp
-# Date Created:			28 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXdmcp
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index 6c4ff8ccd4cf..0f4a04b8d477 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
-SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256
+SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
+SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 11d67e701b89..dd3ed5c5cc36 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXevie
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXevie
 PORTVERSION=	1.0.3
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 24f7bad8d840..0f046e620cea 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXext
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 4b5594455d5e..62e30f6f288b 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
-SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
+SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
+SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 338fe642a411..35aacb4f6a04 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXfixes
 PORTVERSION=	5.0
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 3aaa0239733b..b36c6f4c4220 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXi
-# Date Created:			22 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXi
-PORTVERSION=	1.4.5
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -16,9 +12,14 @@ COMMENT=	X Input extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-USE_XORG=	xproto x11 xext xextproto inputproto:both
+USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
 
-CONFIGURE_ARGS+=--disable-specs --without-xmlto
+CONFIGURE_ARGS+=--disable-docs \
+		--disable-specs \
+	       	--without-xmlto \
+		--without-fop \
+		--without-asciidoc \
+		--without-xsltproc
 
 MAN3=		XAllowDeviceEvents.3 \
 		XChangeDeviceControl.3 \
@@ -47,6 +48,8 @@ MAN3=		XAllowDeviceEvents.3 \
 		XGrabDevice.3\
 		XGrabDeviceButton.3\
 		XGrabDeviceKey.3\
+		XIBarrierReleasePointer.3\
+		XIBarrierReleasePointers.3\
 		XIChangeHierarchy.3\
 		XIChangeProperty.3\
 		XIDefineCursor.3\
@@ -61,6 +64,7 @@ MAN3=		XAllowDeviceEvents.3 \
 		XIGrabEnter.3\
 		XIGrabFocusIn.3\
 		XIGrabKeycode.3\
+		XIGrabTouchBegin.3 \
 		XIListProperties.3\
 		XIQueryDevice.3\
 		XIQueryPointer.3\
@@ -74,6 +78,7 @@ MAN3=		XAllowDeviceEvents.3 \
 		XIUngrabEnter.3 \
 		XIUngrabFocusIn.3 \
 		XIUngrabKeycode.3 \
+		XIUngrabTouchBegin.3 \
 		XIWarpPointer.3 \
 		XListDeviceProperties.3 \
 		XListInputDevices.3 \
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 98b1cb1714a2..10f6fc7d053b 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
-SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
+SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
+SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index fef3e0aa68d0..30d0b179c7c9 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXinerama
-# Date Created:			7 May, 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXinerama
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index fa6d1671f99c..a039aabf99cf 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
-SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
+SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
+SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 6f99f71f6ec9..561199421d83 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXp
-# Date Created:			4 May 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXp
 PORTVERSION=	1.0.1
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 3e44c8540793..de296193571e 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXpm
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXpm
-PORTVERSION=	3.5.9
+PORTVERSION=	3.5.10
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index f6b9e4d07c04..ee9bb9ea9f1f 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
-SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
+SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
+SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index 58151094e88e..b592e9c59a19 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXprintAppUtil
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXprintAppUtil
 PORTVERSION=	1.0.1
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 1b9746946b04..67b3c4801f24 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXprintUtil
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXprintUtil
 PORTVERSION=	1.0.1
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 6d5e9610656d..da7abf5080f4 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXrandr
-# Date Created:			9 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXrandr
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo
index e2b60e9b16b8..11f34982fccf 100644
--- a/x11/libXrandr/distinfo
+++ b/x11/libXrandr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
-SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
+SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
+SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 301d1c153ece..0f605472b6a5 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   xrender
-# Date Created:			2 Jul, 2003
-# Whom:				Foxfair Hu <foxfair@FreeBSD.org>
-#
+# Created by: Foxfair Hu <foxfair@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXrender
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index 708a9b26a32a..a0865cc86371 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
-SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
+SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
+SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index a3d822122476..08f9da9bb393 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXext
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXres
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 9f40e7f90aea..f2ddd524023a 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
-SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
+SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890
+SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035
diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile
index d5bb50549b54..a311d50b463b 100644
--- a/x11/libXtrans/Makefile
+++ b/x11/libXtrans/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXtrans
-# Date Created:			28 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXtrans
 PORTVERSION=	0.1
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 1dd0f4219c1e..547b575c80b8 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXtst
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXtst
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
index 20e9e943d79a..89e0259ea1d5 100644
--- a/x11/libXtst/distinfo
+++ b/x11/libXtst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
-SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
+SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
+SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 333c8d841bb2..d3ee77e03550 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXv
-# Date Created:			13 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXv
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 3a0b5fc5f21f..05bce5162938 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
-SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
+SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
+SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index c192a8012e8c..c9e9a9e99082 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXvMC
-# Date Created:			8 Feb 206
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXvMC
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
index 9aa47c4b237e..9749f38aebc9 100644
--- a/x11/libXvMC/distinfo
+++ b/x11/libXvMC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392
-SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013
+SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3
+SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 6404f9752524..73e7dcf77411 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXxf86dga
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86dga
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
index 643f927aeb1e..d0b4606f504c 100644
--- a/x11/libXxf86dga/distinfo
+++ b/x11/libXxf86dga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
-SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
+SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
+SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347
diff --git a/x11/libXxf86dga/files/patch-src_XF86DGA2.c b/x11/libXxf86dga/files/patch-src_XF86DGA2.c
new file mode 100644
index 000000000000..69ede4ecd9da
--- /dev/null
+++ b/x11/libXxf86dga/files/patch-src_XF86DGA2.c
@@ -0,0 +1,20 @@
+--- src/XF86DGA2.c.orig	2013-03-25 20:23:42.796859881 +0100
++++ src/XF86DGA2.c	2013-03-25 20:23:17.997856725 +0100
+@@ -21,6 +21,8 @@
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+ 
++#include <stdint.h>
++
+ 
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+@@ -928,7 +930,7 @@
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index fd15d2ab7d40..5a267d13d1d9 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libXxf86misc
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86misc
 PORTVERSION=	1.0.3
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 1385ced799ad..995f210ac46d 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXxf86vm
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXxf86vm
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 531de86cf648..33220e85f47f 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
-SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
+SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
+SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 5ec77e3ad23d..12b60d3ff151 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libdmx
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libdmx
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
index 2d59bf47f7b1..292d922c7116 100644
--- a/x11/libdmx/distinfo
+++ b/x11/libdmx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
-SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
+SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba
+SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index 9cd544837b22..090dbbe3e901 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	liboldX
-# Date Created:				Dec 16 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	liboldX
 PORTVERSION=	1.0.1
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 80822da91407..27a6564c1de9 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for:	libxcb
-# Date Created:				2006-08-23
-# Whom:					Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libxcb
-PORTVERSION=	1.7
+PORTVERSION=	1.9
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) library
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
@@ -21,15 +20,12 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/l
 
 CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 USE_BZIP2=	yes
-USES=	pathfix
+USES=		pathfix
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xau xdmcp
-USE_PYTHON_BUILD=	2.5-2.7
+USE_PYTHON_BUILD=	2.5+
 
 GNU_CONFIGURE=	yes
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
@@ -46,8 +42,12 @@ XDMCP_LIBS=	-L${LOCALBASE}/lib -lXdmcp
 XPROTO_CFLAGS=	-I${LOCALBASE}/include
 XPROTO_LIBS=	-L${LOCALBASE}/lib
 
+.include "${.CURDIR}/manpages"
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
 .endif
 
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 635468546602..adcd292ded24 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
-SIZE (libxcb-1.7.tar.bz2) = 318619
+SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
+SIZE (libxcb-1.9.tar.bz2) = 387612
diff --git a/x11/libxcb/manpages b/x11/libxcb/manpages
new file mode 100644
index 000000000000..64b60b1d3c69
--- /dev/null
+++ b/x11/libxcb/manpages
@@ -0,0 +1,2041 @@
+MAN3 = \
+xcb-examples.3 \
+xcb-requests.3 \
+xcb_alloc_color.3 \
+xcb_alloc_color_cells.3 \
+xcb_alloc_color_cells_masks.3 \
+xcb_alloc_color_cells_masks_end.3 \
+xcb_alloc_color_cells_masks_length.3 \
+xcb_alloc_color_cells_pixels.3 \
+xcb_alloc_color_cells_pixels_end.3 \
+xcb_alloc_color_cells_pixels_length.3 \
+xcb_alloc_color_cells_reply.3 \
+xcb_alloc_color_cells_unchecked.3 \
+xcb_alloc_color_planes.3 \
+xcb_alloc_color_planes_pixels.3 \
+xcb_alloc_color_planes_pixels_end.3 \
+xcb_alloc_color_planes_pixels_length.3 \
+xcb_alloc_color_planes_reply.3 \
+xcb_alloc_color_planes_unchecked.3 \
+xcb_alloc_color_reply.3 \
+xcb_alloc_color_unchecked.3 \
+xcb_alloc_named_color.3 \
+xcb_alloc_named_color_reply.3 \
+xcb_alloc_named_color_unchecked.3 \
+xcb_allow_events.3 \
+xcb_allow_events_checked.3 \
+xcb_bell.3 \
+xcb_bell_checked.3 \
+xcb_big_requests_enable.3 \
+xcb_big_requests_enable_reply.3 \
+xcb_big_requests_enable_unchecked.3 \
+xcb_button_press_event_t.3 \
+xcb_button_release_event_t.3 \
+xcb_change_active_pointer_grab.3 \
+xcb_change_active_pointer_grab_checked.3 \
+xcb_change_gc.3 \
+xcb_change_gc_checked.3 \
+xcb_change_hosts.3 \
+xcb_change_hosts_checked.3 \
+xcb_change_keyboard_control.3 \
+xcb_change_keyboard_control_checked.3 \
+xcb_change_keyboard_mapping.3 \
+xcb_change_keyboard_mapping_checked.3 \
+xcb_change_pointer_control.3 \
+xcb_change_pointer_control_checked.3 \
+xcb_change_property.3 \
+xcb_change_property_checked.3 \
+xcb_change_save_set.3 \
+xcb_change_save_set_checked.3 \
+xcb_change_window_attributes.3 \
+xcb_change_window_attributes_checked.3 \
+xcb_circulate_notify_event_t.3 \
+xcb_circulate_request_event_t.3 \
+xcb_circulate_window.3 \
+xcb_circulate_window_checked.3 \
+xcb_clear_area.3 \
+xcb_clear_area_checked.3 \
+xcb_client_message_event_t.3 \
+xcb_close_font.3 \
+xcb_close_font_checked.3 \
+xcb_colormap_notify_event_t.3 \
+xcb_composite_create_region_from_border_clip.3 \
+xcb_composite_create_region_from_border_clip_checked.3 \
+xcb_composite_get_overlay_window.3 \
+xcb_composite_get_overlay_window_reply.3 \
+xcb_composite_get_overlay_window_unchecked.3 \
+xcb_composite_name_window_pixmap.3 \
+xcb_composite_name_window_pixmap_checked.3 \
+xcb_composite_query_version.3 \
+xcb_composite_query_version_reply.3 \
+xcb_composite_query_version_unchecked.3 \
+xcb_composite_redirect_subwindows.3 \
+xcb_composite_redirect_subwindows_checked.3 \
+xcb_composite_redirect_window.3 \
+xcb_composite_redirect_window_checked.3 \
+xcb_composite_release_overlay_window.3 \
+xcb_composite_release_overlay_window_checked.3 \
+xcb_composite_unredirect_subwindows.3 \
+xcb_composite_unredirect_subwindows_checked.3 \
+xcb_composite_unredirect_window.3 \
+xcb_composite_unredirect_window_checked.3 \
+xcb_configure_notify_event_t.3 \
+xcb_configure_request_event_t.3 \
+xcb_configure_window.3 \
+xcb_configure_window_checked.3 \
+xcb_convert_selection.3 \
+xcb_convert_selection_checked.3 \
+xcb_copy_area.3 \
+xcb_copy_area_checked.3 \
+xcb_copy_colormap_and_free.3 \
+xcb_copy_colormap_and_free_checked.3 \
+xcb_copy_gc.3 \
+xcb_copy_gc_checked.3 \
+xcb_copy_plane.3 \
+xcb_copy_plane_checked.3 \
+xcb_create_colormap.3 \
+xcb_create_colormap_checked.3 \
+xcb_create_cursor.3 \
+xcb_create_cursor_checked.3 \
+xcb_create_gc.3 \
+xcb_create_gc_checked.3 \
+xcb_create_glyph_cursor.3 \
+xcb_create_glyph_cursor_checked.3 \
+xcb_create_notify_event_t.3 \
+xcb_create_pixmap.3 \
+xcb_create_pixmap_checked.3 \
+xcb_create_window.3 \
+xcb_create_window_checked.3 \
+xcb_damage_add.3 \
+xcb_damage_add_checked.3 \
+xcb_damage_create.3 \
+xcb_damage_create_checked.3 \
+xcb_damage_destroy.3 \
+xcb_damage_destroy_checked.3 \
+xcb_damage_notify_event_t.3 \
+xcb_damage_query_version.3 \
+xcb_damage_query_version_reply.3 \
+xcb_damage_query_version_unchecked.3 \
+xcb_damage_subtract.3 \
+xcb_damage_subtract_checked.3 \
+xcb_delete_property.3 \
+xcb_delete_property_checked.3 \
+xcb_destroy_notify_event_t.3 \
+xcb_destroy_subwindows.3 \
+xcb_destroy_subwindows_checked.3 \
+xcb_destroy_window.3 \
+xcb_destroy_window_checked.3 \
+xcb_dpms_capable.3 \
+xcb_dpms_capable_reply.3 \
+xcb_dpms_capable_unchecked.3 \
+xcb_dpms_disable.3 \
+xcb_dpms_disable_checked.3 \
+xcb_dpms_enable.3 \
+xcb_dpms_enable_checked.3 \
+xcb_dpms_force_level.3 \
+xcb_dpms_force_level_checked.3 \
+xcb_dpms_get_timeouts.3 \
+xcb_dpms_get_timeouts_reply.3 \
+xcb_dpms_get_timeouts_unchecked.3 \
+xcb_dpms_get_version.3 \
+xcb_dpms_get_version_reply.3 \
+xcb_dpms_get_version_unchecked.3 \
+xcb_dpms_info.3 \
+xcb_dpms_info_reply.3 \
+xcb_dpms_info_unchecked.3 \
+xcb_dpms_set_timeouts.3 \
+xcb_dpms_set_timeouts_checked.3 \
+xcb_dri2_authenticate.3 \
+xcb_dri2_authenticate_reply.3 \
+xcb_dri2_authenticate_unchecked.3 \
+xcb_dri2_buffer_swap_complete_event_t.3 \
+xcb_dri2_connect.3 \
+xcb_dri2_connect_alignment_pad.3 \
+xcb_dri2_connect_alignment_pad_end.3 \
+xcb_dri2_connect_alignment_pad_length.3 \
+xcb_dri2_connect_device_name.3 \
+xcb_dri2_connect_device_name_end.3 \
+xcb_dri2_connect_device_name_length.3 \
+xcb_dri2_connect_driver_name.3 \
+xcb_dri2_connect_driver_name_end.3 \
+xcb_dri2_connect_driver_name_length.3 \
+xcb_dri2_connect_reply.3 \
+xcb_dri2_connect_unchecked.3 \
+xcb_dri2_copy_region.3 \
+xcb_dri2_copy_region_reply.3 \
+xcb_dri2_copy_region_unchecked.3 \
+xcb_dri2_create_drawable.3 \
+xcb_dri2_create_drawable_checked.3 \
+xcb_dri2_destroy_drawable.3 \
+xcb_dri2_destroy_drawable_checked.3 \
+xcb_dri2_get_buffers.3 \
+xcb_dri2_get_buffers_buffers.3 \
+xcb_dri2_get_buffers_buffers_iterator.3 \
+xcb_dri2_get_buffers_buffers_length.3 \
+xcb_dri2_get_buffers_reply.3 \
+xcb_dri2_get_buffers_unchecked.3 \
+xcb_dri2_get_buffers_with_format.3 \
+xcb_dri2_get_buffers_with_format_buffers.3 \
+xcb_dri2_get_buffers_with_format_buffers_iterator.3 \
+xcb_dri2_get_buffers_with_format_buffers_length.3 \
+xcb_dri2_get_buffers_with_format_reply.3 \
+xcb_dri2_get_buffers_with_format_unchecked.3 \
+xcb_dri2_get_msc.3 \
+xcb_dri2_get_msc_reply.3 \
+xcb_dri2_get_msc_unchecked.3 \
+xcb_dri2_get_param.3 \
+xcb_dri2_get_param_reply.3 \
+xcb_dri2_get_param_unchecked.3 \
+xcb_dri2_invalidate_buffers_event_t.3 \
+xcb_dri2_query_version.3 \
+xcb_dri2_query_version_reply.3 \
+xcb_dri2_query_version_unchecked.3 \
+xcb_dri2_swap_buffers.3 \
+xcb_dri2_swap_buffers_reply.3 \
+xcb_dri2_swap_buffers_unchecked.3 \
+xcb_dri2_swap_interval.3 \
+xcb_dri2_swap_interval_checked.3 \
+xcb_dri2_wait_msc.3 \
+xcb_dri2_wait_msc_reply.3 \
+xcb_dri2_wait_msc_unchecked.3 \
+xcb_dri2_wait_sbc.3 \
+xcb_dri2_wait_sbc_reply.3 \
+xcb_dri2_wait_sbc_unchecked.3 \
+xcb_enter_notify_event_t.3 \
+xcb_expose_event_t.3 \
+xcb_fill_poly.3 \
+xcb_fill_poly_checked.3 \
+xcb_focus_in_event_t.3 \
+xcb_focus_out_event_t.3 \
+xcb_force_screen_saver.3 \
+xcb_force_screen_saver_checked.3 \
+xcb_free_colormap.3 \
+xcb_free_colormap_checked.3 \
+xcb_free_colors.3 \
+xcb_free_colors_checked.3 \
+xcb_free_cursor.3 \
+xcb_free_cursor_checked.3 \
+xcb_free_gc.3 \
+xcb_free_gc_checked.3 \
+xcb_free_pixmap.3 \
+xcb_free_pixmap_checked.3 \
+xcb_get_atom_name.3 \
+xcb_get_atom_name_name.3 \
+xcb_get_atom_name_name_end.3 \
+xcb_get_atom_name_name_length.3 \
+xcb_get_atom_name_reply.3 \
+xcb_get_atom_name_unchecked.3 \
+xcb_get_font_path.3 \
+xcb_get_font_path_path_iterator.3 \
+xcb_get_font_path_path_length.3 \
+xcb_get_font_path_reply.3 \
+xcb_get_font_path_unchecked.3 \
+xcb_get_geometry.3 \
+xcb_get_geometry_reply.3 \
+xcb_get_geometry_unchecked.3 \
+xcb_get_image.3 \
+xcb_get_image_data.3 \
+xcb_get_image_data_end.3 \
+xcb_get_image_data_length.3 \
+xcb_get_image_reply.3 \
+xcb_get_image_unchecked.3 \
+xcb_get_input_focus.3 \
+xcb_get_input_focus_reply.3 \
+xcb_get_input_focus_unchecked.3 \
+xcb_get_keyboard_control.3 \
+xcb_get_keyboard_control_reply.3 \
+xcb_get_keyboard_control_unchecked.3 \
+xcb_get_keyboard_mapping.3 \
+xcb_get_keyboard_mapping_keysyms.3 \
+xcb_get_keyboard_mapping_keysyms_end.3 \
+xcb_get_keyboard_mapping_keysyms_length.3 \
+xcb_get_keyboard_mapping_reply.3 \
+xcb_get_keyboard_mapping_unchecked.3 \
+xcb_get_modifier_mapping.3 \
+xcb_get_modifier_mapping_keycodes.3 \
+xcb_get_modifier_mapping_keycodes_end.3 \
+xcb_get_modifier_mapping_keycodes_length.3 \
+xcb_get_modifier_mapping_reply.3 \
+xcb_get_modifier_mapping_unchecked.3 \
+xcb_get_motion_events.3 \
+xcb_get_motion_events_events.3 \
+xcb_get_motion_events_events_iterator.3 \
+xcb_get_motion_events_events_length.3 \
+xcb_get_motion_events_reply.3 \
+xcb_get_motion_events_unchecked.3 \
+xcb_get_pointer_control.3 \
+xcb_get_pointer_control_reply.3 \
+xcb_get_pointer_control_unchecked.3 \
+xcb_get_pointer_mapping.3 \
+xcb_get_pointer_mapping_map.3 \
+xcb_get_pointer_mapping_map_end.3 \
+xcb_get_pointer_mapping_map_length.3 \
+xcb_get_pointer_mapping_reply.3 \
+xcb_get_pointer_mapping_unchecked.3 \
+xcb_get_property.3 \
+xcb_get_property_reply.3 \
+xcb_get_property_unchecked.3 \
+xcb_get_property_value.3 \
+xcb_get_property_value_end.3 \
+xcb_get_property_value_length.3 \
+xcb_get_screen_saver.3 \
+xcb_get_screen_saver_reply.3 \
+xcb_get_screen_saver_unchecked.3 \
+xcb_get_selection_owner.3 \
+xcb_get_selection_owner_reply.3 \
+xcb_get_selection_owner_unchecked.3 \
+xcb_get_window_attributes.3 \
+xcb_get_window_attributes_reply.3 \
+xcb_get_window_attributes_unchecked.3 \
+xcb_glx_are_textures_resident.3 \
+xcb_glx_are_textures_resident_data.3 \
+xcb_glx_are_textures_resident_data_end.3 \
+xcb_glx_are_textures_resident_data_length.3 \
+xcb_glx_are_textures_resident_reply.3 \
+xcb_glx_are_textures_resident_unchecked.3 \
+xcb_glx_change_drawable_attributes.3 \
+xcb_glx_change_drawable_attributes_checked.3 \
+xcb_glx_client_info.3 \
+xcb_glx_client_info_checked.3 \
+xcb_glx_copy_context.3 \
+xcb_glx_copy_context_checked.3 \
+xcb_glx_create_context.3 \
+xcb_glx_create_context_attribs_arb.3 \
+xcb_glx_create_context_attribs_arb_checked.3 \
+xcb_glx_create_context_checked.3 \
+xcb_glx_create_glx_pixmap.3 \
+xcb_glx_create_glx_pixmap_checked.3 \
+xcb_glx_create_new_context.3 \
+xcb_glx_create_new_context_checked.3 \
+xcb_glx_create_pbuffer.3 \
+xcb_glx_create_pbuffer_checked.3 \
+xcb_glx_create_pixmap.3 \
+xcb_glx_create_pixmap_checked.3 \
+xcb_glx_create_window.3 \
+xcb_glx_create_window_checked.3 \
+xcb_glx_delete_lists.3 \
+xcb_glx_delete_lists_checked.3 \
+xcb_glx_delete_queries_arb.3 \
+xcb_glx_delete_queries_arb_checked.3 \
+xcb_glx_delete_textures.3 \
+xcb_glx_delete_textures_checked.3 \
+xcb_glx_delete_window.3 \
+xcb_glx_delete_window_checked.3 \
+xcb_glx_destroy_context.3 \
+xcb_glx_destroy_context_checked.3 \
+xcb_glx_destroy_glx_pixmap.3 \
+xcb_glx_destroy_glx_pixmap_checked.3 \
+xcb_glx_destroy_pbuffer.3 \
+xcb_glx_destroy_pbuffer_checked.3 \
+xcb_glx_destroy_pixmap.3 \
+xcb_glx_destroy_pixmap_checked.3 \
+xcb_glx_end_list.3 \
+xcb_glx_end_list_checked.3 \
+xcb_glx_feedback_buffer.3 \
+xcb_glx_feedback_buffer_checked.3 \
+xcb_glx_finish.3 \
+xcb_glx_finish_reply.3 \
+xcb_glx_finish_unchecked.3 \
+xcb_glx_flush.3 \
+xcb_glx_flush_checked.3 \
+xcb_glx_gen_lists.3 \
+xcb_glx_gen_lists_reply.3 \
+xcb_glx_gen_lists_unchecked.3 \
+xcb_glx_gen_queries_arb.3 \
+xcb_glx_gen_queries_arb_data.3 \
+xcb_glx_gen_queries_arb_data_end.3 \
+xcb_glx_gen_queries_arb_data_length.3 \
+xcb_glx_gen_queries_arb_reply.3 \
+xcb_glx_gen_queries_arb_unchecked.3 \
+xcb_glx_gen_textures.3 \
+xcb_glx_gen_textures_data.3 \
+xcb_glx_gen_textures_data_end.3 \
+xcb_glx_gen_textures_data_length.3 \
+xcb_glx_gen_textures_reply.3 \
+xcb_glx_gen_textures_unchecked.3 \
+xcb_glx_get_booleanv.3 \
+xcb_glx_get_booleanv_data.3 \
+xcb_glx_get_booleanv_data_end.3 \
+xcb_glx_get_booleanv_data_length.3 \
+xcb_glx_get_booleanv_reply.3 \
+xcb_glx_get_booleanv_unchecked.3 \
+xcb_glx_get_clip_plane.3 \
+xcb_glx_get_clip_plane_data.3 \
+xcb_glx_get_clip_plane_data_end.3 \
+xcb_glx_get_clip_plane_data_length.3 \
+xcb_glx_get_clip_plane_reply.3 \
+xcb_glx_get_clip_plane_unchecked.3 \
+xcb_glx_get_color_table.3 \
+xcb_glx_get_color_table_data.3 \
+xcb_glx_get_color_table_data_end.3 \
+xcb_glx_get_color_table_data_length.3 \
+xcb_glx_get_color_table_parameterfv.3 \
+xcb_glx_get_color_table_parameterfv_data.3 \
+xcb_glx_get_color_table_parameterfv_data_end.3 \
+xcb_glx_get_color_table_parameterfv_data_length.3 \
+xcb_glx_get_color_table_parameterfv_reply.3 \
+xcb_glx_get_color_table_parameterfv_unchecked.3 \
+xcb_glx_get_color_table_parameteriv.3 \
+xcb_glx_get_color_table_parameteriv_data.3 \
+xcb_glx_get_color_table_parameteriv_data_end.3 \
+xcb_glx_get_color_table_parameteriv_data_length.3 \
+xcb_glx_get_color_table_parameteriv_reply.3 \
+xcb_glx_get_color_table_parameteriv_unchecked.3 \
+xcb_glx_get_color_table_reply.3 \
+xcb_glx_get_color_table_unchecked.3 \
+xcb_glx_get_compressed_tex_image_arb.3 \
+xcb_glx_get_compressed_tex_image_arb_data.3 \
+xcb_glx_get_compressed_tex_image_arb_data_end.3 \
+xcb_glx_get_compressed_tex_image_arb_data_length.3 \
+xcb_glx_get_compressed_tex_image_arb_reply.3 \
+xcb_glx_get_compressed_tex_image_arb_unchecked.3 \
+xcb_glx_get_convolution_filter.3 \
+xcb_glx_get_convolution_filter_data.3 \
+xcb_glx_get_convolution_filter_data_end.3 \
+xcb_glx_get_convolution_filter_data_length.3 \
+xcb_glx_get_convolution_filter_reply.3 \
+xcb_glx_get_convolution_filter_unchecked.3 \
+xcb_glx_get_convolution_parameterfv.3 \
+xcb_glx_get_convolution_parameterfv_data.3 \
+xcb_glx_get_convolution_parameterfv_data_end.3 \
+xcb_glx_get_convolution_parameterfv_data_length.3 \
+xcb_glx_get_convolution_parameterfv_reply.3 \
+xcb_glx_get_convolution_parameterfv_unchecked.3 \
+xcb_glx_get_convolution_parameteriv.3 \
+xcb_glx_get_convolution_parameteriv_data.3 \
+xcb_glx_get_convolution_parameteriv_data_end.3 \
+xcb_glx_get_convolution_parameteriv_data_length.3 \
+xcb_glx_get_convolution_parameteriv_reply.3 \
+xcb_glx_get_convolution_parameteriv_unchecked.3 \
+xcb_glx_get_doublev.3 \
+xcb_glx_get_doublev_data.3 \
+xcb_glx_get_doublev_data_end.3 \
+xcb_glx_get_doublev_data_length.3 \
+xcb_glx_get_doublev_reply.3 \
+xcb_glx_get_doublev_unchecked.3 \
+xcb_glx_get_drawable_attributes.3 \
+xcb_glx_get_drawable_attributes_attribs.3 \
+xcb_glx_get_drawable_attributes_attribs_end.3 \
+xcb_glx_get_drawable_attributes_attribs_length.3 \
+xcb_glx_get_drawable_attributes_reply.3 \
+xcb_glx_get_drawable_attributes_unchecked.3 \
+xcb_glx_get_error.3 \
+xcb_glx_get_error_reply.3 \
+xcb_glx_get_error_unchecked.3 \
+xcb_glx_get_fb_configs.3 \
+xcb_glx_get_fb_configs_property_list.3 \
+xcb_glx_get_fb_configs_property_list_end.3 \
+xcb_glx_get_fb_configs_property_list_length.3 \
+xcb_glx_get_fb_configs_reply.3 \
+xcb_glx_get_fb_configs_unchecked.3 \
+xcb_glx_get_floatv.3 \
+xcb_glx_get_floatv_data.3 \
+xcb_glx_get_floatv_data_end.3 \
+xcb_glx_get_floatv_data_length.3 \
+xcb_glx_get_floatv_reply.3 \
+xcb_glx_get_floatv_unchecked.3 \
+xcb_glx_get_histogram.3 \
+xcb_glx_get_histogram_data.3 \
+xcb_glx_get_histogram_data_end.3 \
+xcb_glx_get_histogram_data_length.3 \
+xcb_glx_get_histogram_parameterfv.3 \
+xcb_glx_get_histogram_parameterfv_data.3 \
+xcb_glx_get_histogram_parameterfv_data_end.3 \
+xcb_glx_get_histogram_parameterfv_data_length.3 \
+xcb_glx_get_histogram_parameterfv_reply.3 \
+xcb_glx_get_histogram_parameterfv_unchecked.3 \
+xcb_glx_get_histogram_parameteriv.3 \
+xcb_glx_get_histogram_parameteriv_data.3 \
+xcb_glx_get_histogram_parameteriv_data_end.3 \
+xcb_glx_get_histogram_parameteriv_data_length.3 \
+xcb_glx_get_histogram_parameteriv_reply.3 \
+xcb_glx_get_histogram_parameteriv_unchecked.3 \
+xcb_glx_get_histogram_reply.3 \
+xcb_glx_get_histogram_unchecked.3 \
+xcb_glx_get_integerv.3 \
+xcb_glx_get_integerv_data.3 \
+xcb_glx_get_integerv_data_end.3 \
+xcb_glx_get_integerv_data_length.3 \
+xcb_glx_get_integerv_reply.3 \
+xcb_glx_get_integerv_unchecked.3 \
+xcb_glx_get_lightfv.3 \
+xcb_glx_get_lightfv_data.3 \
+xcb_glx_get_lightfv_data_end.3 \
+xcb_glx_get_lightfv_data_length.3 \
+xcb_glx_get_lightfv_reply.3 \
+xcb_glx_get_lightfv_unchecked.3 \
+xcb_glx_get_lightiv.3 \
+xcb_glx_get_lightiv_data.3 \
+xcb_glx_get_lightiv_data_end.3 \
+xcb_glx_get_lightiv_data_length.3 \
+xcb_glx_get_lightiv_reply.3 \
+xcb_glx_get_lightiv_unchecked.3 \
+xcb_glx_get_mapdv.3 \
+xcb_glx_get_mapdv_data.3 \
+xcb_glx_get_mapdv_data_end.3 \
+xcb_glx_get_mapdv_data_length.3 \
+xcb_glx_get_mapdv_reply.3 \
+xcb_glx_get_mapdv_unchecked.3 \
+xcb_glx_get_mapfv.3 \
+xcb_glx_get_mapfv_data.3 \
+xcb_glx_get_mapfv_data_end.3 \
+xcb_glx_get_mapfv_data_length.3 \
+xcb_glx_get_mapfv_reply.3 \
+xcb_glx_get_mapfv_unchecked.3 \
+xcb_glx_get_mapiv.3 \
+xcb_glx_get_mapiv_data.3 \
+xcb_glx_get_mapiv_data_end.3 \
+xcb_glx_get_mapiv_data_length.3 \
+xcb_glx_get_mapiv_reply.3 \
+xcb_glx_get_mapiv_unchecked.3 \
+xcb_glx_get_materialfv.3 \
+xcb_glx_get_materialfv_data.3 \
+xcb_glx_get_materialfv_data_end.3 \
+xcb_glx_get_materialfv_data_length.3 \
+xcb_glx_get_materialfv_reply.3 \
+xcb_glx_get_materialfv_unchecked.3 \
+xcb_glx_get_materialiv.3 \
+xcb_glx_get_materialiv_data.3 \
+xcb_glx_get_materialiv_data_end.3 \
+xcb_glx_get_materialiv_data_length.3 \
+xcb_glx_get_materialiv_reply.3 \
+xcb_glx_get_materialiv_unchecked.3 \
+xcb_glx_get_minmax.3 \
+xcb_glx_get_minmax_data.3 \
+xcb_glx_get_minmax_data_end.3 \
+xcb_glx_get_minmax_data_length.3 \
+xcb_glx_get_minmax_parameterfv.3 \
+xcb_glx_get_minmax_parameterfv_data.3 \
+xcb_glx_get_minmax_parameterfv_data_end.3 \
+xcb_glx_get_minmax_parameterfv_data_length.3 \
+xcb_glx_get_minmax_parameterfv_reply.3 \
+xcb_glx_get_minmax_parameterfv_unchecked.3 \
+xcb_glx_get_minmax_parameteriv.3 \
+xcb_glx_get_minmax_parameteriv_data.3 \
+xcb_glx_get_minmax_parameteriv_data_end.3 \
+xcb_glx_get_minmax_parameteriv_data_length.3 \
+xcb_glx_get_minmax_parameteriv_reply.3 \
+xcb_glx_get_minmax_parameteriv_unchecked.3 \
+xcb_glx_get_minmax_reply.3 \
+xcb_glx_get_minmax_unchecked.3 \
+xcb_glx_get_pixel_mapfv.3 \
+xcb_glx_get_pixel_mapfv_data.3 \
+xcb_glx_get_pixel_mapfv_data_end.3 \
+xcb_glx_get_pixel_mapfv_data_length.3 \
+xcb_glx_get_pixel_mapfv_reply.3 \
+xcb_glx_get_pixel_mapfv_unchecked.3 \
+xcb_glx_get_pixel_mapuiv.3 \
+xcb_glx_get_pixel_mapuiv_data.3 \
+xcb_glx_get_pixel_mapuiv_data_end.3 \
+xcb_glx_get_pixel_mapuiv_data_length.3 \
+xcb_glx_get_pixel_mapuiv_reply.3 \
+xcb_glx_get_pixel_mapuiv_unchecked.3 \
+xcb_glx_get_pixel_mapusv.3 \
+xcb_glx_get_pixel_mapusv_data.3 \
+xcb_glx_get_pixel_mapusv_data_end.3 \
+xcb_glx_get_pixel_mapusv_data_length.3 \
+xcb_glx_get_pixel_mapusv_reply.3 \
+xcb_glx_get_pixel_mapusv_unchecked.3 \
+xcb_glx_get_polygon_stipple.3 \
+xcb_glx_get_polygon_stipple_data.3 \
+xcb_glx_get_polygon_stipple_data_end.3 \
+xcb_glx_get_polygon_stipple_data_length.3 \
+xcb_glx_get_polygon_stipple_reply.3 \
+xcb_glx_get_polygon_stipple_unchecked.3 \
+xcb_glx_get_query_objectiv_arb.3 \
+xcb_glx_get_query_objectiv_arb_data.3 \
+xcb_glx_get_query_objectiv_arb_data_end.3 \
+xcb_glx_get_query_objectiv_arb_data_length.3 \
+xcb_glx_get_query_objectiv_arb_reply.3 \
+xcb_glx_get_query_objectiv_arb_unchecked.3 \
+xcb_glx_get_query_objectuiv_arb.3 \
+xcb_glx_get_query_objectuiv_arb_data.3 \
+xcb_glx_get_query_objectuiv_arb_data_end.3 \
+xcb_glx_get_query_objectuiv_arb_data_length.3 \
+xcb_glx_get_query_objectuiv_arb_reply.3 \
+xcb_glx_get_query_objectuiv_arb_unchecked.3 \
+xcb_glx_get_queryiv_arb.3 \
+xcb_glx_get_queryiv_arb_data.3 \
+xcb_glx_get_queryiv_arb_data_end.3 \
+xcb_glx_get_queryiv_arb_data_length.3 \
+xcb_glx_get_queryiv_arb_reply.3 \
+xcb_glx_get_queryiv_arb_unchecked.3 \
+xcb_glx_get_separable_filter.3 \
+xcb_glx_get_separable_filter_reply.3 \
+xcb_glx_get_separable_filter_rows_and_cols.3 \
+xcb_glx_get_separable_filter_rows_and_cols_end.3 \
+xcb_glx_get_separable_filter_rows_and_cols_length.3 \
+xcb_glx_get_separable_filter_unchecked.3 \
+xcb_glx_get_string.3 \
+xcb_glx_get_string_reply.3 \
+xcb_glx_get_string_string.3 \
+xcb_glx_get_string_string_end.3 \
+xcb_glx_get_string_string_length.3 \
+xcb_glx_get_string_unchecked.3 \
+xcb_glx_get_tex_envfv.3 \
+xcb_glx_get_tex_envfv_data.3 \
+xcb_glx_get_tex_envfv_data_end.3 \
+xcb_glx_get_tex_envfv_data_length.3 \
+xcb_glx_get_tex_envfv_reply.3 \
+xcb_glx_get_tex_envfv_unchecked.3 \
+xcb_glx_get_tex_enviv.3 \
+xcb_glx_get_tex_enviv_data.3 \
+xcb_glx_get_tex_enviv_data_end.3 \
+xcb_glx_get_tex_enviv_data_length.3 \
+xcb_glx_get_tex_enviv_reply.3 \
+xcb_glx_get_tex_enviv_unchecked.3 \
+xcb_glx_get_tex_gendv.3 \
+xcb_glx_get_tex_gendv_data.3 \
+xcb_glx_get_tex_gendv_data_end.3 \
+xcb_glx_get_tex_gendv_data_length.3 \
+xcb_glx_get_tex_gendv_reply.3 \
+xcb_glx_get_tex_gendv_unchecked.3 \
+xcb_glx_get_tex_genfv.3 \
+xcb_glx_get_tex_genfv_data.3 \
+xcb_glx_get_tex_genfv_data_end.3 \
+xcb_glx_get_tex_genfv_data_length.3 \
+xcb_glx_get_tex_genfv_reply.3 \
+xcb_glx_get_tex_genfv_unchecked.3 \
+xcb_glx_get_tex_geniv.3 \
+xcb_glx_get_tex_geniv_data.3 \
+xcb_glx_get_tex_geniv_data_end.3 \
+xcb_glx_get_tex_geniv_data_length.3 \
+xcb_glx_get_tex_geniv_reply.3 \
+xcb_glx_get_tex_geniv_unchecked.3 \
+xcb_glx_get_tex_image.3 \
+xcb_glx_get_tex_image_data.3 \
+xcb_glx_get_tex_image_data_end.3 \
+xcb_glx_get_tex_image_data_length.3 \
+xcb_glx_get_tex_image_reply.3 \
+xcb_glx_get_tex_image_unchecked.3 \
+xcb_glx_get_tex_level_parameterfv.3 \
+xcb_glx_get_tex_level_parameterfv_data.3 \
+xcb_glx_get_tex_level_parameterfv_data_end.3 \
+xcb_glx_get_tex_level_parameterfv_data_length.3 \
+xcb_glx_get_tex_level_parameterfv_reply.3 \
+xcb_glx_get_tex_level_parameterfv_unchecked.3 \
+xcb_glx_get_tex_level_parameteriv.3 \
+xcb_glx_get_tex_level_parameteriv_data.3 \
+xcb_glx_get_tex_level_parameteriv_data_end.3 \
+xcb_glx_get_tex_level_parameteriv_data_length.3 \
+xcb_glx_get_tex_level_parameteriv_reply.3 \
+xcb_glx_get_tex_level_parameteriv_unchecked.3 \
+xcb_glx_get_tex_parameterfv.3 \
+xcb_glx_get_tex_parameterfv_data.3 \
+xcb_glx_get_tex_parameterfv_data_end.3 \
+xcb_glx_get_tex_parameterfv_data_length.3 \
+xcb_glx_get_tex_parameterfv_reply.3 \
+xcb_glx_get_tex_parameterfv_unchecked.3 \
+xcb_glx_get_tex_parameteriv.3 \
+xcb_glx_get_tex_parameteriv_data.3 \
+xcb_glx_get_tex_parameteriv_data_end.3 \
+xcb_glx_get_tex_parameteriv_data_length.3 \
+xcb_glx_get_tex_parameteriv_reply.3 \
+xcb_glx_get_tex_parameteriv_unchecked.3 \
+xcb_glx_get_visual_configs.3 \
+xcb_glx_get_visual_configs_property_list.3 \
+xcb_glx_get_visual_configs_property_list_end.3 \
+xcb_glx_get_visual_configs_property_list_length.3 \
+xcb_glx_get_visual_configs_reply.3 \
+xcb_glx_get_visual_configs_unchecked.3 \
+xcb_glx_is_direct.3 \
+xcb_glx_is_direct_reply.3 \
+xcb_glx_is_direct_unchecked.3 \
+xcb_glx_is_list.3 \
+xcb_glx_is_list_reply.3 \
+xcb_glx_is_list_unchecked.3 \
+xcb_glx_is_query_arb.3 \
+xcb_glx_is_query_arb_reply.3 \
+xcb_glx_is_query_arb_unchecked.3 \
+xcb_glx_is_texture.3 \
+xcb_glx_is_texture_reply.3 \
+xcb_glx_is_texture_unchecked.3 \
+xcb_glx_make_context_current.3 \
+xcb_glx_make_context_current_reply.3 \
+xcb_glx_make_context_current_unchecked.3 \
+xcb_glx_make_current.3 \
+xcb_glx_make_current_reply.3 \
+xcb_glx_make_current_unchecked.3 \
+xcb_glx_new_list.3 \
+xcb_glx_new_list_checked.3 \
+xcb_glx_pbuffer_clobber_event_t.3 \
+xcb_glx_pixel_storef.3 \
+xcb_glx_pixel_storef_checked.3 \
+xcb_glx_pixel_storei.3 \
+xcb_glx_pixel_storei_checked.3 \
+xcb_glx_query_context.3 \
+xcb_glx_query_context_attribs.3 \
+xcb_glx_query_context_attribs_end.3 \
+xcb_glx_query_context_attribs_length.3 \
+xcb_glx_query_context_reply.3 \
+xcb_glx_query_context_unchecked.3 \
+xcb_glx_query_extensions_string.3 \
+xcb_glx_query_extensions_string_reply.3 \
+xcb_glx_query_extensions_string_unchecked.3 \
+xcb_glx_query_server_string.3 \
+xcb_glx_query_server_string_reply.3 \
+xcb_glx_query_server_string_string.3 \
+xcb_glx_query_server_string_string_end.3 \
+xcb_glx_query_server_string_string_length.3 \
+xcb_glx_query_server_string_unchecked.3 \
+xcb_glx_query_version.3 \
+xcb_glx_query_version_reply.3 \
+xcb_glx_query_version_unchecked.3 \
+xcb_glx_read_pixels.3 \
+xcb_glx_read_pixels_data.3 \
+xcb_glx_read_pixels_data_end.3 \
+xcb_glx_read_pixels_data_length.3 \
+xcb_glx_read_pixels_reply.3 \
+xcb_glx_read_pixels_unchecked.3 \
+xcb_glx_render.3 \
+xcb_glx_render_checked.3 \
+xcb_glx_render_large.3 \
+xcb_glx_render_large_checked.3 \
+xcb_glx_render_mode.3 \
+xcb_glx_render_mode_data.3 \
+xcb_glx_render_mode_data_end.3 \
+xcb_glx_render_mode_data_length.3 \
+xcb_glx_render_mode_reply.3 \
+xcb_glx_render_mode_unchecked.3 \
+xcb_glx_select_buffer.3 \
+xcb_glx_select_buffer_checked.3 \
+xcb_glx_set_client_info_2arb.3 \
+xcb_glx_set_client_info_2arb_checked.3 \
+xcb_glx_set_client_info_arb.3 \
+xcb_glx_set_client_info_arb_checked.3 \
+xcb_glx_swap_buffers.3 \
+xcb_glx_swap_buffers_checked.3 \
+xcb_glx_use_x_font.3 \
+xcb_glx_use_x_font_checked.3 \
+xcb_glx_vendor_private.3 \
+xcb_glx_vendor_private_checked.3 \
+xcb_glx_vendor_private_with_reply.3 \
+xcb_glx_vendor_private_with_reply_data_2.3 \
+xcb_glx_vendor_private_with_reply_data_2_end.3 \
+xcb_glx_vendor_private_with_reply_data_2_length.3 \
+xcb_glx_vendor_private_with_reply_reply.3 \
+xcb_glx_vendor_private_with_reply_unchecked.3 \
+xcb_glx_wait_gl.3 \
+xcb_glx_wait_gl_checked.3 \
+xcb_glx_wait_x.3 \
+xcb_glx_wait_x_checked.3 \
+xcb_grab_button.3 \
+xcb_grab_button_checked.3 \
+xcb_grab_key.3 \
+xcb_grab_key_checked.3 \
+xcb_grab_keyboard.3 \
+xcb_grab_keyboard_reply.3 \
+xcb_grab_keyboard_unchecked.3 \
+xcb_grab_pointer.3 \
+xcb_grab_pointer_reply.3 \
+xcb_grab_pointer_unchecked.3 \
+xcb_grab_server.3 \
+xcb_grab_server_checked.3 \
+xcb_graphics_exposure_event_t.3 \
+xcb_gravity_notify_event_t.3 \
+xcb_image_text_16.3 \
+xcb_image_text_16_checked.3 \
+xcb_image_text_8.3 \
+xcb_image_text_8_checked.3 \
+xcb_input_allow_device_events.3 \
+xcb_input_allow_device_events_checked.3 \
+xcb_input_change_device_dont_propagate_list.3 \
+xcb_input_change_device_dont_propagate_list_checked.3 \
+xcb_input_change_device_key_mapping.3 \
+xcb_input_change_device_key_mapping_checked.3 \
+xcb_input_change_device_notify_event_t.3 \
+xcb_input_change_keyboard_device.3 \
+xcb_input_change_keyboard_device_reply.3 \
+xcb_input_change_keyboard_device_unchecked.3 \
+xcb_input_change_pointer_device.3 \
+xcb_input_change_pointer_device_reply.3 \
+xcb_input_change_pointer_device_unchecked.3 \
+xcb_input_close_device.3 \
+xcb_input_close_device_checked.3 \
+xcb_input_device_bell.3 \
+xcb_input_device_bell_checked.3 \
+xcb_input_device_button_press_event_t.3 \
+xcb_input_device_button_release_event_t.3 \
+xcb_input_device_button_state_notify_event_t.3 \
+xcb_input_device_key_press_event_t.3 \
+xcb_input_device_key_release_event_t.3 \
+xcb_input_device_key_state_notify_event_t.3 \
+xcb_input_device_mapping_notify_event_t.3 \
+xcb_input_device_motion_notify_event_t.3 \
+xcb_input_device_presence_notify_event_t.3 \
+xcb_input_device_state_notify_event_t.3 \
+xcb_input_device_valuator_event_t.3 \
+xcb_input_focus_in_event_t.3 \
+xcb_input_focus_out_event_t.3 \
+xcb_input_get_device_button_mapping.3 \
+xcb_input_get_device_button_mapping_map.3 \
+xcb_input_get_device_button_mapping_map_end.3 \
+xcb_input_get_device_button_mapping_map_length.3 \
+xcb_input_get_device_button_mapping_reply.3 \
+xcb_input_get_device_button_mapping_unchecked.3 \
+xcb_input_get_device_control.3 \
+xcb_input_get_device_control_reply.3 \
+xcb_input_get_device_control_unchecked.3 \
+xcb_input_get_device_dont_propagate_list.3 \
+xcb_input_get_device_dont_propagate_list_classes.3 \
+xcb_input_get_device_dont_propagate_list_classes_end.3 \
+xcb_input_get_device_dont_propagate_list_classes_length.3 \
+xcb_input_get_device_dont_propagate_list_reply.3 \
+xcb_input_get_device_dont_propagate_list_unchecked.3 \
+xcb_input_get_device_focus.3 \
+xcb_input_get_device_focus_reply.3 \
+xcb_input_get_device_focus_unchecked.3 \
+xcb_input_get_device_key_mapping.3 \
+xcb_input_get_device_key_mapping_keysyms.3 \
+xcb_input_get_device_key_mapping_keysyms_end.3 \
+xcb_input_get_device_key_mapping_keysyms_length.3 \
+xcb_input_get_device_key_mapping_reply.3 \
+xcb_input_get_device_key_mapping_unchecked.3 \
+xcb_input_get_device_modifier_mapping.3 \
+xcb_input_get_device_modifier_mapping_keymaps.3 \
+xcb_input_get_device_modifier_mapping_keymaps_end.3 \
+xcb_input_get_device_modifier_mapping_keymaps_length.3 \
+xcb_input_get_device_modifier_mapping_reply.3 \
+xcb_input_get_device_modifier_mapping_unchecked.3 \
+xcb_input_get_device_motion_events.3 \
+xcb_input_get_device_motion_events_reply.3 \
+xcb_input_get_device_motion_events_unchecked.3 \
+xcb_input_get_extension_version.3 \
+xcb_input_get_extension_version_reply.3 \
+xcb_input_get_extension_version_unchecked.3 \
+xcb_input_get_feedback_control.3 \
+xcb_input_get_feedback_control_reply.3 \
+xcb_input_get_feedback_control_unchecked.3 \
+xcb_input_get_selected_extension_events.3 \
+xcb_input_get_selected_extension_events_all_classes.3 \
+xcb_input_get_selected_extension_events_all_classes_end.3 \
+xcb_input_get_selected_extension_events_all_classes_length.3 \
+xcb_input_get_selected_extension_events_reply.3 \
+xcb_input_get_selected_extension_events_this_classes.3 \
+xcb_input_get_selected_extension_events_this_classes_end.3 \
+xcb_input_get_selected_extension_events_this_classes_length.3 \
+xcb_input_get_selected_extension_events_unchecked.3 \
+xcb_input_grab_device.3 \
+xcb_input_grab_device_button.3 \
+xcb_input_grab_device_button_checked.3 \
+xcb_input_grab_device_key.3 \
+xcb_input_grab_device_key_checked.3 \
+xcb_input_grab_device_reply.3 \
+xcb_input_grab_device_unchecked.3 \
+xcb_input_list_input_devices.3 \
+xcb_input_list_input_devices_devices.3 \
+xcb_input_list_input_devices_devices_iterator.3 \
+xcb_input_list_input_devices_devices_length.3 \
+xcb_input_list_input_devices_reply.3 \
+xcb_input_list_input_devices_unchecked.3 \
+xcb_input_open_device.3 \
+xcb_input_open_device_class_info.3 \
+xcb_input_open_device_class_info_iterator.3 \
+xcb_input_open_device_class_info_length.3 \
+xcb_input_open_device_reply.3 \
+xcb_input_open_device_unchecked.3 \
+xcb_input_proximity_in_event_t.3 \
+xcb_input_proximity_out_event_t.3 \
+xcb_input_query_device_state.3 \
+xcb_input_query_device_state_reply.3 \
+xcb_input_query_device_state_unchecked.3 \
+xcb_input_select_extension_event.3 \
+xcb_input_select_extension_event_checked.3 \
+xcb_input_send_extension_event.3 \
+xcb_input_send_extension_event_checked.3 \
+xcb_input_set_device_button_mapping.3 \
+xcb_input_set_device_button_mapping_reply.3 \
+xcb_input_set_device_button_mapping_unchecked.3 \
+xcb_input_set_device_focus.3 \
+xcb_input_set_device_focus_checked.3 \
+xcb_input_set_device_mode.3 \
+xcb_input_set_device_mode_reply.3 \
+xcb_input_set_device_mode_unchecked.3 \
+xcb_input_set_device_modifier_mapping.3 \
+xcb_input_set_device_modifier_mapping_reply.3 \
+xcb_input_set_device_modifier_mapping_unchecked.3 \
+xcb_input_set_device_valuators.3 \
+xcb_input_set_device_valuators_reply.3 \
+xcb_input_set_device_valuators_unchecked.3 \
+xcb_input_ungrab_device.3 \
+xcb_input_ungrab_device_button.3 \
+xcb_input_ungrab_device_button_checked.3 \
+xcb_input_ungrab_device_checked.3 \
+xcb_input_ungrab_device_key.3 \
+xcb_input_ungrab_device_key_checked.3 \
+xcb_install_colormap.3 \
+xcb_install_colormap_checked.3 \
+xcb_intern_atom.3 \
+xcb_intern_atom_reply.3 \
+xcb_intern_atom_unchecked.3 \
+xcb_key_press_event_t.3 \
+xcb_key_release_event_t.3 \
+xcb_keymap_notify_event_t.3 \
+xcb_kill_client.3 \
+xcb_kill_client_checked.3 \
+xcb_leave_notify_event_t.3 \
+xcb_list_extensions.3 \
+xcb_list_extensions_names_iterator.3 \
+xcb_list_extensions_names_length.3 \
+xcb_list_extensions_reply.3 \
+xcb_list_extensions_unchecked.3 \
+xcb_list_fonts.3 \
+xcb_list_fonts_names_iterator.3 \
+xcb_list_fonts_names_length.3 \
+xcb_list_fonts_reply.3 \
+xcb_list_fonts_unchecked.3 \
+xcb_list_fonts_with_info.3 \
+xcb_list_fonts_with_info_name.3 \
+xcb_list_fonts_with_info_name_end.3 \
+xcb_list_fonts_with_info_name_length.3 \
+xcb_list_fonts_with_info_properties.3 \
+xcb_list_fonts_with_info_properties_iterator.3 \
+xcb_list_fonts_with_info_properties_length.3 \
+xcb_list_fonts_with_info_reply.3 \
+xcb_list_fonts_with_info_unchecked.3 \
+xcb_list_hosts.3 \
+xcb_list_hosts_hosts_iterator.3 \
+xcb_list_hosts_hosts_length.3 \
+xcb_list_hosts_reply.3 \
+xcb_list_hosts_unchecked.3 \
+xcb_list_installed_colormaps.3 \
+xcb_list_installed_colormaps_cmaps.3 \
+xcb_list_installed_colormaps_cmaps_end.3 \
+xcb_list_installed_colormaps_cmaps_length.3 \
+xcb_list_installed_colormaps_reply.3 \
+xcb_list_installed_colormaps_unchecked.3 \
+xcb_list_properties.3 \
+xcb_list_properties_atoms.3 \
+xcb_list_properties_atoms_end.3 \
+xcb_list_properties_atoms_length.3 \
+xcb_list_properties_reply.3 \
+xcb_list_properties_unchecked.3 \
+xcb_lookup_color.3 \
+xcb_lookup_color_reply.3 \
+xcb_lookup_color_unchecked.3 \
+xcb_map_notify_event_t.3 \
+xcb_map_request_event_t.3 \
+xcb_map_subwindows.3 \
+xcb_map_subwindows_checked.3 \
+xcb_map_window.3 \
+xcb_map_window_checked.3 \
+xcb_mapping_notify_event_t.3 \
+xcb_motion_notify_event_t.3 \
+xcb_no_exposure_event_t.3 \
+xcb_no_operation.3 \
+xcb_no_operation_checked.3 \
+xcb_open_font.3 \
+xcb_open_font_checked.3 \
+xcb_poly_arc.3 \
+xcb_poly_arc_checked.3 \
+xcb_poly_fill_arc.3 \
+xcb_poly_fill_arc_checked.3 \
+xcb_poly_fill_rectangle.3 \
+xcb_poly_fill_rectangle_checked.3 \
+xcb_poly_line.3 \
+xcb_poly_line_checked.3 \
+xcb_poly_point.3 \
+xcb_poly_point_checked.3 \
+xcb_poly_rectangle.3 \
+xcb_poly_rectangle_checked.3 \
+xcb_poly_segment.3 \
+xcb_poly_segment_checked.3 \
+xcb_poly_text_16.3 \
+xcb_poly_text_16_checked.3 \
+xcb_poly_text_8.3 \
+xcb_poly_text_8_checked.3 \
+xcb_property_notify_event_t.3 \
+xcb_put_image.3 \
+xcb_put_image_checked.3 \
+xcb_query_best_size.3 \
+xcb_query_best_size_reply.3 \
+xcb_query_best_size_unchecked.3 \
+xcb_query_colors.3 \
+xcb_query_colors_colors.3 \
+xcb_query_colors_colors_iterator.3 \
+xcb_query_colors_colors_length.3 \
+xcb_query_colors_reply.3 \
+xcb_query_colors_unchecked.3 \
+xcb_query_extension.3 \
+xcb_query_extension_reply.3 \
+xcb_query_extension_unchecked.3 \
+xcb_query_font.3 \
+xcb_query_font_char_infos.3 \
+xcb_query_font_char_infos_iterator.3 \
+xcb_query_font_char_infos_length.3 \
+xcb_query_font_properties.3 \
+xcb_query_font_properties_iterator.3 \
+xcb_query_font_properties_length.3 \
+xcb_query_font_reply.3 \
+xcb_query_font_unchecked.3 \
+xcb_query_keymap.3 \
+xcb_query_keymap_reply.3 \
+xcb_query_keymap_unchecked.3 \
+xcb_query_pointer.3 \
+xcb_query_pointer_reply.3 \
+xcb_query_pointer_unchecked.3 \
+xcb_query_text_extents.3 \
+xcb_query_text_extents_reply.3 \
+xcb_query_text_extents_unchecked.3 \
+xcb_query_tree.3 \
+xcb_query_tree_children.3 \
+xcb_query_tree_children_end.3 \
+xcb_query_tree_children_length.3 \
+xcb_query_tree_reply.3 \
+xcb_query_tree_unchecked.3 \
+xcb_randr_add_output_mode.3 \
+xcb_randr_add_output_mode_checked.3 \
+xcb_randr_change_output_property.3 \
+xcb_randr_change_output_property_checked.3 \
+xcb_randr_configure_output_property.3 \
+xcb_randr_configure_output_property_checked.3 \
+xcb_randr_create_mode.3 \
+xcb_randr_create_mode_reply.3 \
+xcb_randr_create_mode_unchecked.3 \
+xcb_randr_delete_output_mode.3 \
+xcb_randr_delete_output_mode_checked.3 \
+xcb_randr_delete_output_property.3 \
+xcb_randr_delete_output_property_checked.3 \
+xcb_randr_destroy_mode.3 \
+xcb_randr_destroy_mode_checked.3 \
+xcb_randr_get_crtc_gamma.3 \
+xcb_randr_get_crtc_gamma_blue.3 \
+xcb_randr_get_crtc_gamma_blue_end.3 \
+xcb_randr_get_crtc_gamma_blue_length.3 \
+xcb_randr_get_crtc_gamma_green.3 \
+xcb_randr_get_crtc_gamma_green_end.3 \
+xcb_randr_get_crtc_gamma_green_length.3 \
+xcb_randr_get_crtc_gamma_red.3 \
+xcb_randr_get_crtc_gamma_red_end.3 \
+xcb_randr_get_crtc_gamma_red_length.3 \
+xcb_randr_get_crtc_gamma_reply.3 \
+xcb_randr_get_crtc_gamma_size.3 \
+xcb_randr_get_crtc_gamma_size_reply.3 \
+xcb_randr_get_crtc_gamma_size_unchecked.3 \
+xcb_randr_get_crtc_gamma_unchecked.3 \
+xcb_randr_get_crtc_info.3 \
+xcb_randr_get_crtc_info_outputs.3 \
+xcb_randr_get_crtc_info_outputs_end.3 \
+xcb_randr_get_crtc_info_outputs_length.3 \
+xcb_randr_get_crtc_info_possible.3 \
+xcb_randr_get_crtc_info_possible_end.3 \
+xcb_randr_get_crtc_info_possible_length.3 \
+xcb_randr_get_crtc_info_reply.3 \
+xcb_randr_get_crtc_info_unchecked.3 \
+xcb_randr_get_crtc_transform.3 \
+xcb_randr_get_crtc_transform_current_filter_name.3 \
+xcb_randr_get_crtc_transform_current_filter_name_end.3 \
+xcb_randr_get_crtc_transform_current_filter_name_length.3 \
+xcb_randr_get_crtc_transform_current_params.3 \
+xcb_randr_get_crtc_transform_current_params_end.3 \
+xcb_randr_get_crtc_transform_current_params_length.3 \
+xcb_randr_get_crtc_transform_pending_filter_name.3 \
+xcb_randr_get_crtc_transform_pending_filter_name_end.3 \
+xcb_randr_get_crtc_transform_pending_filter_name_length.3 \
+xcb_randr_get_crtc_transform_pending_params.3 \
+xcb_randr_get_crtc_transform_pending_params_end.3 \
+xcb_randr_get_crtc_transform_pending_params_length.3 \
+xcb_randr_get_crtc_transform_reply.3 \
+xcb_randr_get_crtc_transform_unchecked.3 \
+xcb_randr_get_output_info.3 \
+xcb_randr_get_output_info_clones.3 \
+xcb_randr_get_output_info_clones_end.3 \
+xcb_randr_get_output_info_clones_length.3 \
+xcb_randr_get_output_info_crtcs.3 \
+xcb_randr_get_output_info_crtcs_end.3 \
+xcb_randr_get_output_info_crtcs_length.3 \
+xcb_randr_get_output_info_modes.3 \
+xcb_randr_get_output_info_modes_end.3 \
+xcb_randr_get_output_info_modes_length.3 \
+xcb_randr_get_output_info_name.3 \
+xcb_randr_get_output_info_name_end.3 \
+xcb_randr_get_output_info_name_length.3 \
+xcb_randr_get_output_info_reply.3 \
+xcb_randr_get_output_info_unchecked.3 \
+xcb_randr_get_output_primary.3 \
+xcb_randr_get_output_primary_reply.3 \
+xcb_randr_get_output_primary_unchecked.3 \
+xcb_randr_get_output_property.3 \
+xcb_randr_get_output_property_data.3 \
+xcb_randr_get_output_property_data_end.3 \
+xcb_randr_get_output_property_data_length.3 \
+xcb_randr_get_output_property_reply.3 \
+xcb_randr_get_output_property_unchecked.3 \
+xcb_randr_get_panning.3 \
+xcb_randr_get_panning_reply.3 \
+xcb_randr_get_panning_unchecked.3 \
+xcb_randr_get_screen_info.3 \
+xcb_randr_get_screen_info_rates_iterator.3 \
+xcb_randr_get_screen_info_rates_length.3 \
+xcb_randr_get_screen_info_reply.3 \
+xcb_randr_get_screen_info_sizes.3 \
+xcb_randr_get_screen_info_sizes_iterator.3 \
+xcb_randr_get_screen_info_sizes_length.3 \
+xcb_randr_get_screen_info_unchecked.3 \
+xcb_randr_get_screen_resources.3 \
+xcb_randr_get_screen_resources_crtcs.3 \
+xcb_randr_get_screen_resources_crtcs_end.3 \
+xcb_randr_get_screen_resources_crtcs_length.3 \
+xcb_randr_get_screen_resources_current.3 \
+xcb_randr_get_screen_resources_current_crtcs.3 \
+xcb_randr_get_screen_resources_current_crtcs_end.3 \
+xcb_randr_get_screen_resources_current_crtcs_length.3 \
+xcb_randr_get_screen_resources_current_modes.3 \
+xcb_randr_get_screen_resources_current_modes_iterator.3 \
+xcb_randr_get_screen_resources_current_modes_length.3 \
+xcb_randr_get_screen_resources_current_names.3 \
+xcb_randr_get_screen_resources_current_names_end.3 \
+xcb_randr_get_screen_resources_current_names_length.3 \
+xcb_randr_get_screen_resources_current_outputs.3 \
+xcb_randr_get_screen_resources_current_outputs_end.3 \
+xcb_randr_get_screen_resources_current_outputs_length.3 \
+xcb_randr_get_screen_resources_current_reply.3 \
+xcb_randr_get_screen_resources_current_unchecked.3 \
+xcb_randr_get_screen_resources_modes.3 \
+xcb_randr_get_screen_resources_modes_iterator.3 \
+xcb_randr_get_screen_resources_modes_length.3 \
+xcb_randr_get_screen_resources_names.3 \
+xcb_randr_get_screen_resources_names_end.3 \
+xcb_randr_get_screen_resources_names_length.3 \
+xcb_randr_get_screen_resources_outputs.3 \
+xcb_randr_get_screen_resources_outputs_end.3 \
+xcb_randr_get_screen_resources_outputs_length.3 \
+xcb_randr_get_screen_resources_reply.3 \
+xcb_randr_get_screen_resources_unchecked.3 \
+xcb_randr_get_screen_size_range.3 \
+xcb_randr_get_screen_size_range_reply.3 \
+xcb_randr_get_screen_size_range_unchecked.3 \
+xcb_randr_list_output_properties.3 \
+xcb_randr_list_output_properties_atoms.3 \
+xcb_randr_list_output_properties_atoms_end.3 \
+xcb_randr_list_output_properties_atoms_length.3 \
+xcb_randr_list_output_properties_reply.3 \
+xcb_randr_list_output_properties_unchecked.3 \
+xcb_randr_notify_event_t.3 \
+xcb_randr_query_output_property.3 \
+xcb_randr_query_output_property_reply.3 \
+xcb_randr_query_output_property_unchecked.3 \
+xcb_randr_query_output_property_valid_values.3 \
+xcb_randr_query_output_property_valid_values_end.3 \
+xcb_randr_query_output_property_valid_values_length.3 \
+xcb_randr_query_version.3 \
+xcb_randr_query_version_reply.3 \
+xcb_randr_query_version_unchecked.3 \
+xcb_randr_screen_change_notify_event_t.3 \
+xcb_randr_select_input.3 \
+xcb_randr_select_input_checked.3 \
+xcb_randr_set_crtc_config.3 \
+xcb_randr_set_crtc_config_reply.3 \
+xcb_randr_set_crtc_config_unchecked.3 \
+xcb_randr_set_crtc_gamma.3 \
+xcb_randr_set_crtc_gamma_checked.3 \
+xcb_randr_set_crtc_transform.3 \
+xcb_randr_set_crtc_transform_checked.3 \
+xcb_randr_set_output_primary.3 \
+xcb_randr_set_output_primary_checked.3 \
+xcb_randr_set_panning.3 \
+xcb_randr_set_panning_reply.3 \
+xcb_randr_set_panning_unchecked.3 \
+xcb_randr_set_screen_config.3 \
+xcb_randr_set_screen_config_reply.3 \
+xcb_randr_set_screen_config_unchecked.3 \
+xcb_randr_set_screen_size.3 \
+xcb_randr_set_screen_size_checked.3 \
+xcb_recolor_cursor.3 \
+xcb_recolor_cursor_checked.3 \
+xcb_record_create_context.3 \
+xcb_record_create_context_checked.3 \
+xcb_record_disable_context.3 \
+xcb_record_disable_context_checked.3 \
+xcb_record_enable_context.3 \
+xcb_record_enable_context_data.3 \
+xcb_record_enable_context_data_end.3 \
+xcb_record_enable_context_data_length.3 \
+xcb_record_enable_context_reply.3 \
+xcb_record_enable_context_unchecked.3 \
+xcb_record_free_context.3 \
+xcb_record_free_context_checked.3 \
+xcb_record_get_context.3 \
+xcb_record_get_context_intercepted_clients_iterator.3 \
+xcb_record_get_context_intercepted_clients_length.3 \
+xcb_record_get_context_reply.3 \
+xcb_record_get_context_unchecked.3 \
+xcb_record_query_version.3 \
+xcb_record_query_version_reply.3 \
+xcb_record_query_version_unchecked.3 \
+xcb_record_register_clients.3 \
+xcb_record_register_clients_checked.3 \
+xcb_record_unregister_clients.3 \
+xcb_record_unregister_clients_checked.3 \
+xcb_render_add_glyphs.3 \
+xcb_render_add_glyphs_checked.3 \
+xcb_render_add_traps.3 \
+xcb_render_add_traps_checked.3 \
+xcb_render_change_picture.3 \
+xcb_render_change_picture_checked.3 \
+xcb_render_composite.3 \
+xcb_render_composite_checked.3 \
+xcb_render_composite_glyphs_16.3 \
+xcb_render_composite_glyphs_16_checked.3 \
+xcb_render_composite_glyphs_32.3 \
+xcb_render_composite_glyphs_32_checked.3 \
+xcb_render_composite_glyphs_8.3 \
+xcb_render_composite_glyphs_8_checked.3 \
+xcb_render_create_anim_cursor.3 \
+xcb_render_create_anim_cursor_checked.3 \
+xcb_render_create_conical_gradient.3 \
+xcb_render_create_conical_gradient_checked.3 \
+xcb_render_create_cursor.3 \
+xcb_render_create_cursor_checked.3 \
+xcb_render_create_glyph_set.3 \
+xcb_render_create_glyph_set_checked.3 \
+xcb_render_create_linear_gradient.3 \
+xcb_render_create_linear_gradient_checked.3 \
+xcb_render_create_picture.3 \
+xcb_render_create_picture_checked.3 \
+xcb_render_create_radial_gradient.3 \
+xcb_render_create_radial_gradient_checked.3 \
+xcb_render_create_solid_fill.3 \
+xcb_render_create_solid_fill_checked.3 \
+xcb_render_fill_rectangles.3 \
+xcb_render_fill_rectangles_checked.3 \
+xcb_render_free_glyph_set.3 \
+xcb_render_free_glyph_set_checked.3 \
+xcb_render_free_glyphs.3 \
+xcb_render_free_glyphs_checked.3 \
+xcb_render_free_picture.3 \
+xcb_render_free_picture_checked.3 \
+xcb_render_query_filters.3 \
+xcb_render_query_filters_aliases.3 \
+xcb_render_query_filters_aliases_end.3 \
+xcb_render_query_filters_aliases_length.3 \
+xcb_render_query_filters_filters_iterator.3 \
+xcb_render_query_filters_filters_length.3 \
+xcb_render_query_filters_reply.3 \
+xcb_render_query_filters_unchecked.3 \
+xcb_render_query_pict_formats.3 \
+xcb_render_query_pict_formats_formats.3 \
+xcb_render_query_pict_formats_formats_iterator.3 \
+xcb_render_query_pict_formats_formats_length.3 \
+xcb_render_query_pict_formats_reply.3 \
+xcb_render_query_pict_formats_screens_iterator.3 \
+xcb_render_query_pict_formats_screens_length.3 \
+xcb_render_query_pict_formats_subpixels.3 \
+xcb_render_query_pict_formats_subpixels_end.3 \
+xcb_render_query_pict_formats_subpixels_length.3 \
+xcb_render_query_pict_formats_unchecked.3 \
+xcb_render_query_pict_index_values.3 \
+xcb_render_query_pict_index_values_reply.3 \
+xcb_render_query_pict_index_values_unchecked.3 \
+xcb_render_query_pict_index_values_values.3 \
+xcb_render_query_pict_index_values_values_iterator.3 \
+xcb_render_query_pict_index_values_values_length.3 \
+xcb_render_query_version.3 \
+xcb_render_query_version_reply.3 \
+xcb_render_query_version_unchecked.3 \
+xcb_render_reference_glyph_set.3 \
+xcb_render_reference_glyph_set_checked.3 \
+xcb_render_set_picture_clip_rectangles.3 \
+xcb_render_set_picture_clip_rectangles_checked.3 \
+xcb_render_set_picture_filter.3 \
+xcb_render_set_picture_filter_checked.3 \
+xcb_render_set_picture_transform.3 \
+xcb_render_set_picture_transform_checked.3 \
+xcb_render_trapezoids.3 \
+xcb_render_trapezoids_checked.3 \
+xcb_render_tri_fan.3 \
+xcb_render_tri_fan_checked.3 \
+xcb_render_tri_strip.3 \
+xcb_render_tri_strip_checked.3 \
+xcb_render_triangles.3 \
+xcb_render_triangles_checked.3 \
+xcb_reparent_notify_event_t.3 \
+xcb_reparent_window.3 \
+xcb_reparent_window_checked.3 \
+xcb_res_query_client_pixmap_bytes.3 \
+xcb_res_query_client_pixmap_bytes_reply.3 \
+xcb_res_query_client_pixmap_bytes_unchecked.3 \
+xcb_res_query_client_resources.3 \
+xcb_res_query_client_resources_reply.3 \
+xcb_res_query_client_resources_types.3 \
+xcb_res_query_client_resources_types_iterator.3 \
+xcb_res_query_client_resources_types_length.3 \
+xcb_res_query_client_resources_unchecked.3 \
+xcb_res_query_clients.3 \
+xcb_res_query_clients_clients.3 \
+xcb_res_query_clients_clients_iterator.3 \
+xcb_res_query_clients_clients_length.3 \
+xcb_res_query_clients_reply.3 \
+xcb_res_query_clients_unchecked.3 \
+xcb_res_query_version.3 \
+xcb_res_query_version_reply.3 \
+xcb_res_query_version_unchecked.3 \
+xcb_resize_request_event_t.3 \
+xcb_rotate_properties.3 \
+xcb_rotate_properties_checked.3 \
+xcb_screensaver_notify_event_t.3 \
+xcb_screensaver_query_info.3 \
+xcb_screensaver_query_info_reply.3 \
+xcb_screensaver_query_info_unchecked.3 \
+xcb_screensaver_query_version.3 \
+xcb_screensaver_query_version_reply.3 \
+xcb_screensaver_query_version_unchecked.3 \
+xcb_screensaver_select_input.3 \
+xcb_screensaver_select_input_checked.3 \
+xcb_screensaver_set_attributes.3 \
+xcb_screensaver_set_attributes_checked.3 \
+xcb_screensaver_suspend.3 \
+xcb_screensaver_suspend_checked.3 \
+xcb_screensaver_unset_attributes.3 \
+xcb_screensaver_unset_attributes_checked.3 \
+xcb_selection_clear_event_t.3 \
+xcb_selection_notify_event_t.3 \
+xcb_selection_request_event_t.3 \
+xcb_selinux_get_client_context.3 \
+xcb_selinux_get_client_context_context.3 \
+xcb_selinux_get_client_context_context_end.3 \
+xcb_selinux_get_client_context_context_length.3 \
+xcb_selinux_get_client_context_reply.3 \
+xcb_selinux_get_client_context_unchecked.3 \
+xcb_selinux_get_device_context.3 \
+xcb_selinux_get_device_context_context.3 \
+xcb_selinux_get_device_context_context_end.3 \
+xcb_selinux_get_device_context_context_length.3 \
+xcb_selinux_get_device_context_reply.3 \
+xcb_selinux_get_device_context_unchecked.3 \
+xcb_selinux_get_device_create_context.3 \
+xcb_selinux_get_device_create_context_context.3 \
+xcb_selinux_get_device_create_context_context_end.3 \
+xcb_selinux_get_device_create_context_context_length.3 \
+xcb_selinux_get_device_create_context_reply.3 \
+xcb_selinux_get_device_create_context_unchecked.3 \
+xcb_selinux_get_property_context.3 \
+xcb_selinux_get_property_context_context.3 \
+xcb_selinux_get_property_context_context_end.3 \
+xcb_selinux_get_property_context_context_length.3 \
+xcb_selinux_get_property_context_reply.3 \
+xcb_selinux_get_property_context_unchecked.3 \
+xcb_selinux_get_property_create_context.3 \
+xcb_selinux_get_property_create_context_context.3 \
+xcb_selinux_get_property_create_context_context_end.3 \
+xcb_selinux_get_property_create_context_context_length.3 \
+xcb_selinux_get_property_create_context_reply.3 \
+xcb_selinux_get_property_create_context_unchecked.3 \
+xcb_selinux_get_property_data_context.3 \
+xcb_selinux_get_property_data_context_context.3 \
+xcb_selinux_get_property_data_context_context_end.3 \
+xcb_selinux_get_property_data_context_context_length.3 \
+xcb_selinux_get_property_data_context_reply.3 \
+xcb_selinux_get_property_data_context_unchecked.3 \
+xcb_selinux_get_property_use_context.3 \
+xcb_selinux_get_property_use_context_context.3 \
+xcb_selinux_get_property_use_context_context_end.3 \
+xcb_selinux_get_property_use_context_context_length.3 \
+xcb_selinux_get_property_use_context_reply.3 \
+xcb_selinux_get_property_use_context_unchecked.3 \
+xcb_selinux_get_selection_context.3 \
+xcb_selinux_get_selection_context_context.3 \
+xcb_selinux_get_selection_context_context_end.3 \
+xcb_selinux_get_selection_context_context_length.3 \
+xcb_selinux_get_selection_context_reply.3 \
+xcb_selinux_get_selection_context_unchecked.3 \
+xcb_selinux_get_selection_create_context.3 \
+xcb_selinux_get_selection_create_context_context.3 \
+xcb_selinux_get_selection_create_context_context_end.3 \
+xcb_selinux_get_selection_create_context_context_length.3 \
+xcb_selinux_get_selection_create_context_reply.3 \
+xcb_selinux_get_selection_create_context_unchecked.3 \
+xcb_selinux_get_selection_data_context.3 \
+xcb_selinux_get_selection_data_context_context.3 \
+xcb_selinux_get_selection_data_context_context_end.3 \
+xcb_selinux_get_selection_data_context_context_length.3 \
+xcb_selinux_get_selection_data_context_reply.3 \
+xcb_selinux_get_selection_data_context_unchecked.3 \
+xcb_selinux_get_selection_use_context.3 \
+xcb_selinux_get_selection_use_context_context.3 \
+xcb_selinux_get_selection_use_context_context_end.3 \
+xcb_selinux_get_selection_use_context_context_length.3 \
+xcb_selinux_get_selection_use_context_reply.3 \
+xcb_selinux_get_selection_use_context_unchecked.3 \
+xcb_selinux_get_window_context.3 \
+xcb_selinux_get_window_context_context.3 \
+xcb_selinux_get_window_context_context_end.3 \
+xcb_selinux_get_window_context_context_length.3 \
+xcb_selinux_get_window_context_reply.3 \
+xcb_selinux_get_window_context_unchecked.3 \
+xcb_selinux_get_window_create_context.3 \
+xcb_selinux_get_window_create_context_context.3 \
+xcb_selinux_get_window_create_context_context_end.3 \
+xcb_selinux_get_window_create_context_context_length.3 \
+xcb_selinux_get_window_create_context_reply.3 \
+xcb_selinux_get_window_create_context_unchecked.3 \
+xcb_selinux_list_properties.3 \
+xcb_selinux_list_properties_properties_iterator.3 \
+xcb_selinux_list_properties_properties_length.3 \
+xcb_selinux_list_properties_reply.3 \
+xcb_selinux_list_properties_unchecked.3 \
+xcb_selinux_list_selections.3 \
+xcb_selinux_list_selections_reply.3 \
+xcb_selinux_list_selections_selections_iterator.3 \
+xcb_selinux_list_selections_selections_length.3 \
+xcb_selinux_list_selections_unchecked.3 \
+xcb_selinux_query_version.3 \
+xcb_selinux_query_version_reply.3 \
+xcb_selinux_query_version_unchecked.3 \
+xcb_selinux_set_device_context.3 \
+xcb_selinux_set_device_context_checked.3 \
+xcb_selinux_set_device_create_context.3 \
+xcb_selinux_set_device_create_context_checked.3 \
+xcb_selinux_set_property_create_context.3 \
+xcb_selinux_set_property_create_context_checked.3 \
+xcb_selinux_set_property_use_context.3 \
+xcb_selinux_set_property_use_context_checked.3 \
+xcb_selinux_set_selection_create_context.3 \
+xcb_selinux_set_selection_create_context_checked.3 \
+xcb_selinux_set_selection_use_context.3 \
+xcb_selinux_set_selection_use_context_checked.3 \
+xcb_selinux_set_window_create_context.3 \
+xcb_selinux_set_window_create_context_checked.3 \
+xcb_send_event.3 \
+xcb_send_event_checked.3 \
+xcb_set_access_control.3 \
+xcb_set_access_control_checked.3 \
+xcb_set_clip_rectangles.3 \
+xcb_set_clip_rectangles_checked.3 \
+xcb_set_close_down_mode.3 \
+xcb_set_close_down_mode_checked.3 \
+xcb_set_dashes.3 \
+xcb_set_dashes_checked.3 \
+xcb_set_font_path.3 \
+xcb_set_font_path_checked.3 \
+xcb_set_input_focus.3 \
+xcb_set_input_focus_checked.3 \
+xcb_set_modifier_mapping.3 \
+xcb_set_modifier_mapping_reply.3 \
+xcb_set_modifier_mapping_unchecked.3 \
+xcb_set_pointer_mapping.3 \
+xcb_set_pointer_mapping_reply.3 \
+xcb_set_pointer_mapping_unchecked.3 \
+xcb_set_screen_saver.3 \
+xcb_set_screen_saver_checked.3 \
+xcb_set_selection_owner.3 \
+xcb_set_selection_owner_checked.3 \
+xcb_shape_combine.3 \
+xcb_shape_combine_checked.3 \
+xcb_shape_get_rectangles.3 \
+xcb_shape_get_rectangles_rectangles.3 \
+xcb_shape_get_rectangles_rectangles_iterator.3 \
+xcb_shape_get_rectangles_rectangles_length.3 \
+xcb_shape_get_rectangles_reply.3 \
+xcb_shape_get_rectangles_unchecked.3 \
+xcb_shape_input_selected.3 \
+xcb_shape_input_selected_reply.3 \
+xcb_shape_input_selected_unchecked.3 \
+xcb_shape_mask.3 \
+xcb_shape_mask_checked.3 \
+xcb_shape_notify_event_t.3 \
+xcb_shape_offset.3 \
+xcb_shape_offset_checked.3 \
+xcb_shape_query_extents.3 \
+xcb_shape_query_extents_reply.3 \
+xcb_shape_query_extents_unchecked.3 \
+xcb_shape_query_version.3 \
+xcb_shape_query_version_reply.3 \
+xcb_shape_query_version_unchecked.3 \
+xcb_shape_rectangles.3 \
+xcb_shape_rectangles_checked.3 \
+xcb_shape_select_input.3 \
+xcb_shape_select_input_checked.3 \
+xcb_shm_attach.3 \
+xcb_shm_attach_checked.3 \
+xcb_shm_completion_event_t.3 \
+xcb_shm_create_pixmap.3 \
+xcb_shm_create_pixmap_checked.3 \
+xcb_shm_detach.3 \
+xcb_shm_detach_checked.3 \
+xcb_shm_get_image.3 \
+xcb_shm_get_image_reply.3 \
+xcb_shm_get_image_unchecked.3 \
+xcb_shm_put_image.3 \
+xcb_shm_put_image_checked.3 \
+xcb_shm_query_version.3 \
+xcb_shm_query_version_reply.3 \
+xcb_shm_query_version_unchecked.3 \
+xcb_store_colors.3 \
+xcb_store_colors_checked.3 \
+xcb_store_named_color.3 \
+xcb_store_named_color_checked.3 \
+xcb_sync_alarm_notify_event_t.3 \
+xcb_sync_await.3 \
+xcb_sync_await_checked.3 \
+xcb_sync_await_fence.3 \
+xcb_sync_await_fence_checked.3 \
+xcb_sync_change_alarm.3 \
+xcb_sync_change_alarm_checked.3 \
+xcb_sync_change_counter.3 \
+xcb_sync_change_counter_checked.3 \
+xcb_sync_counter_notify_event_t.3 \
+xcb_sync_create_alarm.3 \
+xcb_sync_create_alarm_checked.3 \
+xcb_sync_create_counter.3 \
+xcb_sync_create_counter_checked.3 \
+xcb_sync_create_fence.3 \
+xcb_sync_create_fence_checked.3 \
+xcb_sync_destroy_alarm.3 \
+xcb_sync_destroy_alarm_checked.3 \
+xcb_sync_destroy_counter.3 \
+xcb_sync_destroy_counter_checked.3 \
+xcb_sync_destroy_fence.3 \
+xcb_sync_destroy_fence_checked.3 \
+xcb_sync_get_priority.3 \
+xcb_sync_get_priority_reply.3 \
+xcb_sync_get_priority_unchecked.3 \
+xcb_sync_initialize.3 \
+xcb_sync_initialize_reply.3 \
+xcb_sync_initialize_unchecked.3 \
+xcb_sync_list_system_counters.3 \
+xcb_sync_list_system_counters_counters_iterator.3 \
+xcb_sync_list_system_counters_counters_length.3 \
+xcb_sync_list_system_counters_reply.3 \
+xcb_sync_list_system_counters_unchecked.3 \
+xcb_sync_query_alarm.3 \
+xcb_sync_query_alarm_reply.3 \
+xcb_sync_query_alarm_unchecked.3 \
+xcb_sync_query_counter.3 \
+xcb_sync_query_counter_reply.3 \
+xcb_sync_query_counter_unchecked.3 \
+xcb_sync_query_fence.3 \
+xcb_sync_query_fence_reply.3 \
+xcb_sync_query_fence_unchecked.3 \
+xcb_sync_reset_fence.3 \
+xcb_sync_reset_fence_checked.3 \
+xcb_sync_set_counter.3 \
+xcb_sync_set_counter_checked.3 \
+xcb_sync_set_priority.3 \
+xcb_sync_set_priority_checked.3 \
+xcb_sync_trigger_fence.3 \
+xcb_sync_trigger_fence_checked.3 \
+xcb_test_compare_cursor.3 \
+xcb_test_compare_cursor_reply.3 \
+xcb_test_compare_cursor_unchecked.3 \
+xcb_test_fake_input.3 \
+xcb_test_fake_input_checked.3 \
+xcb_test_get_version.3 \
+xcb_test_get_version_reply.3 \
+xcb_test_get_version_unchecked.3 \
+xcb_test_grab_control.3 \
+xcb_test_grab_control_checked.3 \
+xcb_translate_coordinates.3 \
+xcb_translate_coordinates_reply.3 \
+xcb_translate_coordinates_unchecked.3 \
+xcb_ungrab_button.3 \
+xcb_ungrab_button_checked.3 \
+xcb_ungrab_key.3 \
+xcb_ungrab_key_checked.3 \
+xcb_ungrab_keyboard.3 \
+xcb_ungrab_keyboard_checked.3 \
+xcb_ungrab_pointer.3 \
+xcb_ungrab_pointer_checked.3 \
+xcb_ungrab_server.3 \
+xcb_ungrab_server_checked.3 \
+xcb_uninstall_colormap.3 \
+xcb_uninstall_colormap_checked.3 \
+xcb_unmap_notify_event_t.3 \
+xcb_unmap_subwindows.3 \
+xcb_unmap_subwindows_checked.3 \
+xcb_unmap_window.3 \
+xcb_unmap_window_checked.3 \
+xcb_visibility_notify_event_t.3 \
+xcb_warp_pointer.3 \
+xcb_warp_pointer_checked.3 \
+xcb_x_print_attribut_notify_event_t.3 \
+xcb_x_print_create_context.3 \
+xcb_x_print_create_context_checked.3 \
+xcb_x_print_notify_event_t.3 \
+xcb_x_print_print_destroy_context.3 \
+xcb_x_print_print_destroy_context_checked.3 \
+xcb_x_print_print_end_doc.3 \
+xcb_x_print_print_end_doc_checked.3 \
+xcb_x_print_print_end_job.3 \
+xcb_x_print_print_end_job_checked.3 \
+xcb_x_print_print_end_page.3 \
+xcb_x_print_print_end_page_checked.3 \
+xcb_x_print_print_get_attributes.3 \
+xcb_x_print_print_get_attributes_reply.3 \
+xcb_x_print_print_get_attributes_unchecked.3 \
+xcb_x_print_print_get_context.3 \
+xcb_x_print_print_get_context_reply.3 \
+xcb_x_print_print_get_context_unchecked.3 \
+xcb_x_print_print_get_document_data.3 \
+xcb_x_print_print_get_document_data_data.3 \
+xcb_x_print_print_get_document_data_data_end.3 \
+xcb_x_print_print_get_document_data_data_length.3 \
+xcb_x_print_print_get_document_data_reply.3 \
+xcb_x_print_print_get_document_data_unchecked.3 \
+xcb_x_print_print_get_image_resolution.3 \
+xcb_x_print_print_get_image_resolution_reply.3 \
+xcb_x_print_print_get_image_resolution_unchecked.3 \
+xcb_x_print_print_get_one_attributes.3 \
+xcb_x_print_print_get_one_attributes_reply.3 \
+xcb_x_print_print_get_one_attributes_unchecked.3 \
+xcb_x_print_print_get_one_attributes_value.3 \
+xcb_x_print_print_get_one_attributes_value_end.3 \
+xcb_x_print_print_get_one_attributes_value_length.3 \
+xcb_x_print_print_get_page_dimensions.3 \
+xcb_x_print_print_get_page_dimensions_reply.3 \
+xcb_x_print_print_get_page_dimensions_unchecked.3 \
+xcb_x_print_print_get_printer_list.3 \
+xcb_x_print_print_get_printer_list_printers_iterator.3 \
+xcb_x_print_print_get_printer_list_printers_length.3 \
+xcb_x_print_print_get_printer_list_reply.3 \
+xcb_x_print_print_get_printer_list_unchecked.3 \
+xcb_x_print_print_get_screen_of_context.3 \
+xcb_x_print_print_get_screen_of_context_reply.3 \
+xcb_x_print_print_get_screen_of_context_unchecked.3 \
+xcb_x_print_print_input_selected.3 \
+xcb_x_print_print_input_selected_all_events_list.3 \
+xcb_x_print_print_input_selected_all_events_list_end.3 \
+xcb_x_print_print_input_selected_all_events_list_length.3 \
+xcb_x_print_print_input_selected_event_list.3 \
+xcb_x_print_print_input_selected_event_list_end.3 \
+xcb_x_print_print_input_selected_event_list_length.3 \
+xcb_x_print_print_input_selected_reply.3 \
+xcb_x_print_print_input_selected_unchecked.3 \
+xcb_x_print_print_put_document_data.3 \
+xcb_x_print_print_put_document_data_checked.3 \
+xcb_x_print_print_query_screens.3 \
+xcb_x_print_print_query_screens_reply.3 \
+xcb_x_print_print_query_screens_roots.3 \
+xcb_x_print_print_query_screens_roots_end.3 \
+xcb_x_print_print_query_screens_roots_length.3 \
+xcb_x_print_print_query_screens_unchecked.3 \
+xcb_x_print_print_query_version.3 \
+xcb_x_print_print_query_version_reply.3 \
+xcb_x_print_print_query_version_unchecked.3 \
+xcb_x_print_print_rehash_printer_list.3 \
+xcb_x_print_print_rehash_printer_list_checked.3 \
+xcb_x_print_print_select_input.3 \
+xcb_x_print_print_select_input_checked.3 \
+xcb_x_print_print_set_attributes.3 \
+xcb_x_print_print_set_attributes_checked.3 \
+xcb_x_print_print_set_context.3 \
+xcb_x_print_print_set_context_checked.3 \
+xcb_x_print_print_set_image_resolution.3 \
+xcb_x_print_print_set_image_resolution_reply.3 \
+xcb_x_print_print_set_image_resolution_unchecked.3 \
+xcb_x_print_print_start_doc.3 \
+xcb_x_print_print_start_doc_checked.3 \
+xcb_x_print_print_start_job.3 \
+xcb_x_print_print_start_job_checked.3 \
+xcb_x_print_print_start_page.3 \
+xcb_x_print_print_start_page_checked.3 \
+xcb_xc_misc_get_version.3 \
+xcb_xc_misc_get_version_reply.3 \
+xcb_xc_misc_get_version_unchecked.3 \
+xcb_xc_misc_get_xid_list.3 \
+xcb_xc_misc_get_xid_list_ids.3 \
+xcb_xc_misc_get_xid_list_ids_end.3 \
+xcb_xc_misc_get_xid_list_ids_length.3 \
+xcb_xc_misc_get_xid_list_reply.3 \
+xcb_xc_misc_get_xid_list_unchecked.3 \
+xcb_xc_misc_get_xid_range.3 \
+xcb_xc_misc_get_xid_range_reply.3 \
+xcb_xc_misc_get_xid_range_unchecked.3 \
+xcb_xevie_end.3 \
+xcb_xevie_end_reply.3 \
+xcb_xevie_end_unchecked.3 \
+xcb_xevie_query_version.3 \
+xcb_xevie_query_version_reply.3 \
+xcb_xevie_query_version_unchecked.3 \
+xcb_xevie_select_input.3 \
+xcb_xevie_select_input_reply.3 \
+xcb_xevie_select_input_unchecked.3 \
+xcb_xevie_send.3 \
+xcb_xevie_send_reply.3 \
+xcb_xevie_send_unchecked.3 \
+xcb_xevie_start.3 \
+xcb_xevie_start_reply.3 \
+xcb_xevie_start_unchecked.3 \
+xcb_xf86dri_auth_connection.3 \
+xcb_xf86dri_auth_connection_reply.3 \
+xcb_xf86dri_auth_connection_unchecked.3 \
+xcb_xf86dri_close_connection.3 \
+xcb_xf86dri_close_connection_checked.3 \
+xcb_xf86dri_create_context.3 \
+xcb_xf86dri_create_context_reply.3 \
+xcb_xf86dri_create_context_unchecked.3 \
+xcb_xf86dri_create_drawable.3 \
+xcb_xf86dri_create_drawable_reply.3 \
+xcb_xf86dri_create_drawable_unchecked.3 \
+xcb_xf86dri_destroy_context.3 \
+xcb_xf86dri_destroy_context_checked.3 \
+xcb_xf86dri_destroy_drawable.3 \
+xcb_xf86dri_destroy_drawable_checked.3 \
+xcb_xf86dri_get_client_driver_name.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \
+xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \
+xcb_xf86dri_get_client_driver_name_reply.3 \
+xcb_xf86dri_get_client_driver_name_unchecked.3 \
+xcb_xf86dri_get_device_info.3 \
+xcb_xf86dri_get_device_info_device_private.3 \
+xcb_xf86dri_get_device_info_device_private_end.3 \
+xcb_xf86dri_get_device_info_device_private_length.3 \
+xcb_xf86dri_get_device_info_reply.3 \
+xcb_xf86dri_get_device_info_unchecked.3 \
+xcb_xf86dri_get_drawable_info.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \
+xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \
+xcb_xf86dri_get_drawable_info_clip_rects.3 \
+xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \
+xcb_xf86dri_get_drawable_info_clip_rects_length.3 \
+xcb_xf86dri_get_drawable_info_reply.3 \
+xcb_xf86dri_get_drawable_info_unchecked.3 \
+xcb_xf86dri_open_connection.3 \
+xcb_xf86dri_open_connection_bus_id.3 \
+xcb_xf86dri_open_connection_bus_id_end.3 \
+xcb_xf86dri_open_connection_bus_id_length.3 \
+xcb_xf86dri_open_connection_reply.3 \
+xcb_xf86dri_open_connection_unchecked.3 \
+xcb_xf86dri_query_direct_rendering_capable.3 \
+xcb_xf86dri_query_direct_rendering_capable_reply.3 \
+xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \
+xcb_xf86dri_query_version.3 \
+xcb_xf86dri_query_version_reply.3 \
+xcb_xf86dri_query_version_unchecked.3 \
+xcb_xfixes_change_cursor.3 \
+xcb_xfixes_change_cursor_by_name.3 \
+xcb_xfixes_change_cursor_by_name_checked.3 \
+xcb_xfixes_change_cursor_checked.3 \
+xcb_xfixes_change_save_set.3 \
+xcb_xfixes_change_save_set_checked.3 \
+xcb_xfixes_copy_region.3 \
+xcb_xfixes_copy_region_checked.3 \
+xcb_xfixes_create_region.3 \
+xcb_xfixes_create_region_checked.3 \
+xcb_xfixes_create_region_from_bitmap.3 \
+xcb_xfixes_create_region_from_bitmap_checked.3 \
+xcb_xfixes_create_region_from_gc.3 \
+xcb_xfixes_create_region_from_gc_checked.3 \
+xcb_xfixes_create_region_from_picture.3 \
+xcb_xfixes_create_region_from_picture_checked.3 \
+xcb_xfixes_create_region_from_window.3 \
+xcb_xfixes_create_region_from_window_checked.3 \
+xcb_xfixes_cursor_notify_event_t.3 \
+xcb_xfixes_destroy_region.3 \
+xcb_xfixes_destroy_region_checked.3 \
+xcb_xfixes_expand_region.3 \
+xcb_xfixes_expand_region_checked.3 \
+xcb_xfixes_fetch_region.3 \
+xcb_xfixes_fetch_region_rectangles.3 \
+xcb_xfixes_fetch_region_rectangles_iterator.3 \
+xcb_xfixes_fetch_region_rectangles_length.3 \
+xcb_xfixes_fetch_region_reply.3 \
+xcb_xfixes_fetch_region_unchecked.3 \
+xcb_xfixes_get_cursor_image.3 \
+xcb_xfixes_get_cursor_image_and_name.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \
+xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \
+xcb_xfixes_get_cursor_image_and_name_name.3 \
+xcb_xfixes_get_cursor_image_and_name_name_end.3 \
+xcb_xfixes_get_cursor_image_and_name_name_length.3 \
+xcb_xfixes_get_cursor_image_and_name_reply.3 \
+xcb_xfixes_get_cursor_image_and_name_unchecked.3 \
+xcb_xfixes_get_cursor_image_cursor_image.3 \
+xcb_xfixes_get_cursor_image_cursor_image_end.3 \
+xcb_xfixes_get_cursor_image_cursor_image_length.3 \
+xcb_xfixes_get_cursor_image_reply.3 \
+xcb_xfixes_get_cursor_image_unchecked.3 \
+xcb_xfixes_get_cursor_name.3 \
+xcb_xfixes_get_cursor_name_name.3 \
+xcb_xfixes_get_cursor_name_name_end.3 \
+xcb_xfixes_get_cursor_name_name_length.3 \
+xcb_xfixes_get_cursor_name_reply.3 \
+xcb_xfixes_get_cursor_name_unchecked.3 \
+xcb_xfixes_hide_cursor.3 \
+xcb_xfixes_hide_cursor_checked.3 \
+xcb_xfixes_intersect_region.3 \
+xcb_xfixes_intersect_region_checked.3 \
+xcb_xfixes_invert_region.3 \
+xcb_xfixes_invert_region_checked.3 \
+xcb_xfixes_query_version.3 \
+xcb_xfixes_query_version_reply.3 \
+xcb_xfixes_query_version_unchecked.3 \
+xcb_xfixes_region_extents.3 \
+xcb_xfixes_region_extents_checked.3 \
+xcb_xfixes_select_cursor_input.3 \
+xcb_xfixes_select_cursor_input_checked.3 \
+xcb_xfixes_select_selection_input.3 \
+xcb_xfixes_select_selection_input_checked.3 \
+xcb_xfixes_selection_notify_event_t.3 \
+xcb_xfixes_set_cursor_name.3 \
+xcb_xfixes_set_cursor_name_checked.3 \
+xcb_xfixes_set_gc_clip_region.3 \
+xcb_xfixes_set_gc_clip_region_checked.3 \
+xcb_xfixes_set_picture_clip_region.3 \
+xcb_xfixes_set_picture_clip_region_checked.3 \
+xcb_xfixes_set_region.3 \
+xcb_xfixes_set_region_checked.3 \
+xcb_xfixes_set_window_shape_region.3 \
+xcb_xfixes_set_window_shape_region_checked.3 \
+xcb_xfixes_show_cursor.3 \
+xcb_xfixes_show_cursor_checked.3 \
+xcb_xfixes_subtract_region.3 \
+xcb_xfixes_subtract_region_checked.3 \
+xcb_xfixes_translate_region.3 \
+xcb_xfixes_translate_region_checked.3 \
+xcb_xfixes_union_region.3 \
+xcb_xfixes_union_region_checked.3 \
+xcb_xinerama_get_screen_count.3 \
+xcb_xinerama_get_screen_count_reply.3 \
+xcb_xinerama_get_screen_count_unchecked.3 \
+xcb_xinerama_get_screen_size.3 \
+xcb_xinerama_get_screen_size_reply.3 \
+xcb_xinerama_get_screen_size_unchecked.3 \
+xcb_xinerama_get_state.3 \
+xcb_xinerama_get_state_reply.3 \
+xcb_xinerama_get_state_unchecked.3 \
+xcb_xinerama_is_active.3 \
+xcb_xinerama_is_active_reply.3 \
+xcb_xinerama_is_active_unchecked.3 \
+xcb_xinerama_query_screens.3 \
+xcb_xinerama_query_screens_reply.3 \
+xcb_xinerama_query_screens_screen_info.3 \
+xcb_xinerama_query_screens_screen_info_iterator.3 \
+xcb_xinerama_query_screens_screen_info_length.3 \
+xcb_xinerama_query_screens_unchecked.3 \
+xcb_xinerama_query_version.3 \
+xcb_xinerama_query_version_reply.3 \
+xcb_xinerama_query_version_unchecked.3 \
+xcb_xkb_access_x_notify_event_t.3 \
+xcb_xkb_action_message_event_t.3 \
+xcb_xkb_bell.3 \
+xcb_xkb_bell_checked.3 \
+xcb_xkb_bell_notify_event_t.3 \
+xcb_xkb_compat_map_notify_event_t.3 \
+xcb_xkb_controls_notify_event_t.3 \
+xcb_xkb_extension_device_notify_event_t.3 \
+xcb_xkb_get_compat_map.3 \
+xcb_xkb_get_compat_map_group_rtrn.3 \
+xcb_xkb_get_compat_map_group_rtrn_iterator.3 \
+xcb_xkb_get_compat_map_group_rtrn_length.3 \
+xcb_xkb_get_compat_map_reply.3 \
+xcb_xkb_get_compat_map_si_rtrn.3 \
+xcb_xkb_get_compat_map_si_rtrn_end.3 \
+xcb_xkb_get_compat_map_si_rtrn_length.3 \
+xcb_xkb_get_compat_map_unchecked.3 \
+xcb_xkb_get_controls.3 \
+xcb_xkb_get_controls_reply.3 \
+xcb_xkb_get_controls_unchecked.3 \
+xcb_xkb_get_device_info.3 \
+xcb_xkb_get_device_info_btn_actions.3 \
+xcb_xkb_get_device_info_btn_actions_iterator.3 \
+xcb_xkb_get_device_info_btn_actions_length.3 \
+xcb_xkb_get_device_info_leds_iterator.3 \
+xcb_xkb_get_device_info_leds_length.3 \
+xcb_xkb_get_device_info_name.3 \
+xcb_xkb_get_device_info_name_end.3 \
+xcb_xkb_get_device_info_name_length.3 \
+xcb_xkb_get_device_info_reply.3 \
+xcb_xkb_get_device_info_unchecked.3 \
+xcb_xkb_get_geometry.3 \
+xcb_xkb_get_geometry_colors_iterator.3 \
+xcb_xkb_get_geometry_colors_length.3 \
+xcb_xkb_get_geometry_doodads_iterator.3 \
+xcb_xkb_get_geometry_doodads_length.3 \
+xcb_xkb_get_geometry_key_aliases.3 \
+xcb_xkb_get_geometry_key_aliases_iterator.3 \
+xcb_xkb_get_geometry_key_aliases_length.3 \
+xcb_xkb_get_geometry_label_font.3 \
+xcb_xkb_get_geometry_properties_iterator.3 \
+xcb_xkb_get_geometry_properties_length.3 \
+xcb_xkb_get_geometry_reply.3 \
+xcb_xkb_get_geometry_sections_iterator.3 \
+xcb_xkb_get_geometry_sections_length.3 \
+xcb_xkb_get_geometry_shapes_iterator.3 \
+xcb_xkb_get_geometry_shapes_length.3 \
+xcb_xkb_get_geometry_unchecked.3 \
+xcb_xkb_get_indicator_map.3 \
+xcb_xkb_get_indicator_map_maps.3 \
+xcb_xkb_get_indicator_map_maps_iterator.3 \
+xcb_xkb_get_indicator_map_maps_length.3 \
+xcb_xkb_get_indicator_map_reply.3 \
+xcb_xkb_get_indicator_map_unchecked.3 \
+xcb_xkb_get_indicator_state.3 \
+xcb_xkb_get_indicator_state_reply.3 \
+xcb_xkb_get_indicator_state_unchecked.3 \
+xcb_xkb_get_kbd_by_name.3 \
+xcb_xkb_get_kbd_by_name_replies.3 \
+xcb_xkb_get_kbd_by_name_reply.3 \
+xcb_xkb_get_kbd_by_name_unchecked.3 \
+xcb_xkb_get_map.3 \
+xcb_xkb_get_map_map.3 \
+xcb_xkb_get_map_reply.3 \
+xcb_xkb_get_map_unchecked.3 \
+xcb_xkb_get_named_indicator.3 \
+xcb_xkb_get_named_indicator_reply.3 \
+xcb_xkb_get_named_indicator_unchecked.3 \
+xcb_xkb_get_names.3 \
+xcb_xkb_get_names_reply.3 \
+xcb_xkb_get_names_unchecked.3 \
+xcb_xkb_get_names_value_list.3 \
+xcb_xkb_get_state.3 \
+xcb_xkb_get_state_reply.3 \
+xcb_xkb_get_state_unchecked.3 \
+xcb_xkb_indicator_map_notify_event_t.3 \
+xcb_xkb_indicator_state_notify_event_t.3 \
+xcb_xkb_latch_lock_state.3 \
+xcb_xkb_latch_lock_state_checked.3 \
+xcb_xkb_list_components.3 \
+xcb_xkb_list_components_compat_maps_iterator.3 \
+xcb_xkb_list_components_compat_maps_length.3 \
+xcb_xkb_list_components_geometries_iterator.3 \
+xcb_xkb_list_components_geometries_length.3 \
+xcb_xkb_list_components_keycodes_iterator.3 \
+xcb_xkb_list_components_keycodes_length.3 \
+xcb_xkb_list_components_keymaps_iterator.3 \
+xcb_xkb_list_components_keymaps_length.3 \
+xcb_xkb_list_components_reply.3 \
+xcb_xkb_list_components_symbols_iterator.3 \
+xcb_xkb_list_components_symbols_length.3 \
+xcb_xkb_list_components_types_iterator.3 \
+xcb_xkb_list_components_types_length.3 \
+xcb_xkb_list_components_unchecked.3 \
+xcb_xkb_map_notify_event_t.3 \
+xcb_xkb_names_notify_event_t.3 \
+xcb_xkb_new_keyboard_notify_event_t.3 \
+xcb_xkb_per_client_flags.3 \
+xcb_xkb_per_client_flags_reply.3 \
+xcb_xkb_per_client_flags_unchecked.3 \
+xcb_xkb_select_events.3 \
+xcb_xkb_select_events_checked.3 \
+xcb_xkb_set_compat_map.3 \
+xcb_xkb_set_compat_map_checked.3 \
+xcb_xkb_set_controls.3 \
+xcb_xkb_set_controls_checked.3 \
+xcb_xkb_set_debugging_flags.3 \
+xcb_xkb_set_debugging_flags_reply.3 \
+xcb_xkb_set_debugging_flags_unchecked.3 \
+xcb_xkb_set_device_info.3 \
+xcb_xkb_set_device_info_checked.3 \
+xcb_xkb_set_geometry.3 \
+xcb_xkb_set_geometry_checked.3 \
+xcb_xkb_set_indicator_map.3 \
+xcb_xkb_set_indicator_map_checked.3 \
+xcb_xkb_set_map.3 \
+xcb_xkb_set_map_checked.3 \
+xcb_xkb_set_named_indicator.3 \
+xcb_xkb_set_named_indicator_checked.3 \
+xcb_xkb_set_names.3 \
+xcb_xkb_set_names_checked.3 \
+xcb_xkb_state_notify_event_t.3 \
+xcb_xkb_use_extension.3 \
+xcb_xkb_use_extension_reply.3 \
+xcb_xkb_use_extension_unchecked.3 \
+xcb_xv_get_port_attribute.3 \
+xcb_xv_get_port_attribute_reply.3 \
+xcb_xv_get_port_attribute_unchecked.3 \
+xcb_xv_get_still.3 \
+xcb_xv_get_still_checked.3 \
+xcb_xv_get_video.3 \
+xcb_xv_get_video_checked.3 \
+xcb_xv_grab_port.3 \
+xcb_xv_grab_port_reply.3 \
+xcb_xv_grab_port_unchecked.3 \
+xcb_xv_list_image_formats.3 \
+xcb_xv_list_image_formats_format.3 \
+xcb_xv_list_image_formats_format_iterator.3 \
+xcb_xv_list_image_formats_format_length.3 \
+xcb_xv_list_image_formats_reply.3 \
+xcb_xv_list_image_formats_unchecked.3 \
+xcb_xv_port_notify_event_t.3 \
+xcb_xv_put_image.3 \
+xcb_xv_put_image_checked.3 \
+xcb_xv_put_still.3 \
+xcb_xv_put_still_checked.3 \
+xcb_xv_put_video.3 \
+xcb_xv_put_video_checked.3 \
+xcb_xv_query_adaptors.3 \
+xcb_xv_query_adaptors_info_iterator.3 \
+xcb_xv_query_adaptors_info_length.3 \
+xcb_xv_query_adaptors_reply.3 \
+xcb_xv_query_adaptors_unchecked.3 \
+xcb_xv_query_best_size.3 \
+xcb_xv_query_best_size_reply.3 \
+xcb_xv_query_best_size_unchecked.3 \
+xcb_xv_query_encodings.3 \
+xcb_xv_query_encodings_info_iterator.3 \
+xcb_xv_query_encodings_info_length.3 \
+xcb_xv_query_encodings_reply.3 \
+xcb_xv_query_encodings_unchecked.3 \
+xcb_xv_query_extension.3 \
+xcb_xv_query_extension_reply.3 \
+xcb_xv_query_extension_unchecked.3 \
+xcb_xv_query_image_attributes.3 \
+xcb_xv_query_image_attributes_offsets.3 \
+xcb_xv_query_image_attributes_offsets_end.3 \
+xcb_xv_query_image_attributes_offsets_length.3 \
+xcb_xv_query_image_attributes_pitches.3 \
+xcb_xv_query_image_attributes_pitches_end.3 \
+xcb_xv_query_image_attributes_pitches_length.3 \
+xcb_xv_query_image_attributes_reply.3 \
+xcb_xv_query_image_attributes_unchecked.3 \
+xcb_xv_query_port_attributes.3 \
+xcb_xv_query_port_attributes_attributes_iterator.3 \
+xcb_xv_query_port_attributes_attributes_length.3 \
+xcb_xv_query_port_attributes_reply.3 \
+xcb_xv_query_port_attributes_unchecked.3 \
+xcb_xv_select_port_notify.3 \
+xcb_xv_select_port_notify_checked.3 \
+xcb_xv_select_video_notify.3 \
+xcb_xv_select_video_notify_checked.3 \
+xcb_xv_set_port_attribute.3 \
+xcb_xv_set_port_attribute_checked.3 \
+xcb_xv_shm_put_image.3 \
+xcb_xv_shm_put_image_checked.3 \
+xcb_xv_stop_video.3 \
+xcb_xv_stop_video_checked.3 \
+xcb_xv_ungrab_port.3 \
+xcb_xv_ungrab_port_checked.3 \
+xcb_xv_video_notify_event_t.3 \
+xcb_xvmc_create_context.3 \
+xcb_xvmc_create_context_priv_data.3 \
+xcb_xvmc_create_context_priv_data_end.3 \
+xcb_xvmc_create_context_priv_data_length.3 \
+xcb_xvmc_create_context_reply.3 \
+xcb_xvmc_create_context_unchecked.3 \
+xcb_xvmc_create_subpicture.3 \
+xcb_xvmc_create_subpicture_priv_data.3 \
+xcb_xvmc_create_subpicture_priv_data_end.3 \
+xcb_xvmc_create_subpicture_priv_data_length.3 \
+xcb_xvmc_create_subpicture_reply.3 \
+xcb_xvmc_create_subpicture_unchecked.3 \
+xcb_xvmc_create_surface.3 \
+xcb_xvmc_create_surface_priv_data.3 \
+xcb_xvmc_create_surface_priv_data_end.3 \
+xcb_xvmc_create_surface_priv_data_length.3 \
+xcb_xvmc_create_surface_reply.3 \
+xcb_xvmc_create_surface_unchecked.3 \
+xcb_xvmc_destroy_context.3 \
+xcb_xvmc_destroy_context_checked.3 \
+xcb_xvmc_destroy_subpicture.3 \
+xcb_xvmc_destroy_subpicture_checked.3 \
+xcb_xvmc_destroy_surface.3 \
+xcb_xvmc_destroy_surface_checked.3 \
+xcb_xvmc_list_subpicture_types.3 \
+xcb_xvmc_list_subpicture_types_reply.3 \
+xcb_xvmc_list_subpicture_types_types.3 \
+xcb_xvmc_list_subpicture_types_types_iterator.3 \
+xcb_xvmc_list_subpicture_types_types_length.3 \
+xcb_xvmc_list_subpicture_types_unchecked.3 \
+xcb_xvmc_list_surface_types.3 \
+xcb_xvmc_list_surface_types_reply.3 \
+xcb_xvmc_list_surface_types_surfaces.3 \
+xcb_xvmc_list_surface_types_surfaces_iterator.3 \
+xcb_xvmc_list_surface_types_surfaces_length.3 \
+xcb_xvmc_list_surface_types_unchecked.3 \
+xcb_xvmc_query_version.3 \
+xcb_xvmc_query_version_reply.3 \
+xcb_xvmc_query_version_unchecked.3 \
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index dc30e21b2e45..80bc7abc7fa9 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -18,6 +18,7 @@ include/xcb/xcbext.h
 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
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index c957f7884a20..304bde7c769c 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libxkbfile
-# Date Created:			7 May 2004
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libxkbfile
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 52a82f0ced0b..5d954fcae481 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5
-SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847
+SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
+SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index c4cb3351c379..0be3234f5aa9 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libxkbui
-# Date Created:			8 Feb 2006
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libxkbui
 PORTVERSION=	1.0.2
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index ddba419a0df9..6423f4835cf5 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	List resources in widgets
 
 XORG_CAT=	app
-USE_XORG=	xproto xt xmu xaw xorg-macros
+USE_XORG=	xproto xt xmu xaw
 
 PLIST_FILES=	bin/listres
 
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index b9e1a3c831bb..7fe634dffa3e 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	luit
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	luit
 PORTVERSION=	1.1.0
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
index 14e4ee241684..e630296b62b3 100644
--- a/x11/mkcomposecache/Makefile
+++ b/x11/mkcomposecache/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mkcomposecache
-# Date Created:				30 Jan 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	mkcomposecache
 PORTVERSION=	1.2.1
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index 810702ec852c..923d7396e406 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	ooxcb
-# Date created:				26 June 2009
-# Whom:					gahr
-#
+# Created by: gahr
 # $FreeBSD$
-#
 
 PORTNAME=	ooxcb
 PORTVERSION=	1.1
@@ -13,9 +9,8 @@ MASTER_SITES=	http://samurai-x.org/downloads/
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Python binding to the X server using xcb
 
-LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
-
 USE_PYTHON=	yes
+USE_XORG=	xcb
 USE_PYDISTUTILS=easy_install
 PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
 
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 4d57c990c40a..dd8745a0a1a4 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pixman
-PORTVERSION=	0.24.2
+PORTVERSION=	0.28.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	SIMD
 
 .include <bsd.port.options.mk>
 
-.if !${PORT_OPTIONS:MSIMD}
+.if ! {PORT_OPTIONS:MSIMD}
 CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
 . if ! ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--disable-mmx
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index c94445cc5399..60b30c88552f 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
-SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979
+SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
+SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
index afb368e705bc..a7366ca5c440 100644
--- a/x11/printproto/Makefile
+++ b/x11/printproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	printproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	printproto
 PORTVERSION=	1.0.5
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index 532c6da5e1ee..e1d3b5f6aa45 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	randrproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	randrproto
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 52245621dee0..0069318e7dca 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
-SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
+SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
+SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
index 8da0e5bd1ba5..998579005b36 100644
--- a/x11/recordproto/Makefile
+++ b/x11/recordproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	recordproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	recordproto
-PORTVERSION=	1.14.1
+PORTVERSION=	1.14.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo
index e425cf21fab6..6c42289b4d3c 100644
--- a/x11/recordproto/distinfo
+++ b/x11/recordproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
-SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238
+SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
+SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
index 47bd933ffdba..ff5359f4998b 100644
--- a/x11/renderproto/Makefile
+++ b/x11/renderproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	renderproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	renderproto
 PORTVERSION=	0.11.1
diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile
index 13fc552389b7..7f0d91b21997 100644
--- a/x11/resourceproto/Makefile
+++ b/x11/resourceproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	resourceproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	resourceproto
 PORTVERSION=	1.2.0
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
index 0925acc728bf..1be4387f4152 100644
--- a/x11/rstart/Makefile
+++ b/x11/rstart/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Sample implementation of a Remote Start client
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 MAN1=		rstart.1 rstartd.1
 
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
index e6342c364759..38861cca4eb3 100644
--- a/x11/scripts/Makefile
+++ b/x11/scripts/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	scripts
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	scripts
 PORTVERSION=	1.0.1
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
index 194f8eca6c54..74279749dadb 100644
--- a/x11/scrnsaverproto/Makefile
+++ b/x11/scrnsaverproto/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	scrnsaverproto
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	scrnsaverproto
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo
index 3ee8c2987261..3d1e15ef8557 100644
--- a/x11/scrnsaverproto/distinfo
+++ b/x11/scrnsaverproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
-SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997
+SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
+SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index ee1b12abc0ea..88bc9e05d746 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Manage utmp/wtmp entries for non-init X clients
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/sessreg
 
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index cfd7211fd6d2..23378c3c99da 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -19,11 +19,10 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		freetype:${PORTSDIR}/print/freetype2 \
 		ck-connector:${PORTSDIR}/sysutils/consolekit \
 		expat:${PORTSDIR}/textproc/expat2 \
-		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
 USES=		cmake pkgconfig
-USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
+USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt
 USE_RC_SUBR=	slim
 SUB_FILES=	pkg-message
 
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
index 76d204e10ef5..3f12ed8661e8 100644
--- a/x11/smproxy/Makefile
+++ b/x11/smproxy/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	smproxy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	smproxy
 PORTVERSION=	1.0.5
diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile
index c9fbcd9788c1..dd42adb42869 100644
--- a/x11/trapproto/Makefile
+++ b/x11/trapproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	trapproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	trapproto
 PORTVERSION=	3.4.3
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
index f3119f2f9211..58ee66ace11b 100644
--- a/x11/videoproto/Makefile
+++ b/x11/videoproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	videoproto
-# Date Created:				09 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	videoproto
 PORTVERSION=	2.3.1
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index 36cc6cf45ef6..5949e600dc72 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Graphical class browser for Xt
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		viewres.1
 
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index b2cf649aa507..d09031b340de 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	x11perf
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	x11perf
 PORTVERSION=	1.5.4
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index ef35bf6c7331..f1e0f6e4e163 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xbacklight
-# Date Created:				11 Sep 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xbacklight
 PORTVERSION=	1.1.2
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index b62dabda66b1..1350b0e8e1fc 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xbiff
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xbiff
 PORTVERSION=	1.0.3
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index f0e568126b05..872fb52a1f3e 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xbitmaps
-# Date Created:				17 Feb 2006
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xbitmaps
 PORTVERSION=	1.1.1
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index ecbc56073722..eba3f6dc166f 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,25 +1,18 @@
-# New ports collection makefile for:	xcb-proto
-# Date Created:				2006-08-23
-# Whom:					Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8
 CATEGORIES=	x11 python
-MASTER_SITES=	http://xcb.freedesktop.org/dist/ \
-		http://distfiles.pirateparty.in/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ashish
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
 BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
 
 USE_BZIP2=	yes
-USES=	pathfix
+USES=		pathfix
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index b9618daec6a7..e92e4ee65e2b 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
-SIZE (xcb-proto-1.7.1.tar.bz2) = 106040
+SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
+SIZE (xcb-proto-1.8.tar.bz2) = 125072
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index e5cc17260be6..b5d61a175428 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A port of Xlib's XImage and XShmImage functions
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
 #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	xcb xorg-macros
 #USE_XORG=	xau xdmcp
 #USE_AUTOTOOLS=	libtool
 
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 5d2be4794ccf..007e87bf60e7 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Standard X key constants and conversion to/from keycodes
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
 #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	xcb xorg-macros
 #USE_XORG=	xau xdmcp
 #USE_AUTOTOOLS=	libtool
 
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index c8749e993d4f..b8c3014e7f73 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -8,12 +8,12 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Convenience functions for the Render extension
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
 #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_XORG=	xcb xorg-macros
 USE_LDCONFIG=	yes
 #USE_XORG=	xau xdmcp
 #USE_AUTOTOOLS=	libtool
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index aa44f5e17782..5fa88f63d2ba 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Framework for window manager implementation
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util
 #BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	xcb xorg-macros
 #USE_XORG=	xau xdmcp
 #USE_AUTOTOOLS=	libtool
 
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 59e252f01999..6499b0577cd3 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -11,12 +11,10 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A module with libxcb/libX11 extension/replacement libraries
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_XORG=	xau xdmcp
+USE_XORG=	xau xcb xdmcp xorg-macros
 USE_AUTOTOOLS=	libtool
 
 GNU_CONFIGURE=	yes
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index aac2518db396..883ec17b1d67 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -11,7 +11,7 @@ COMMENT=	X clipboard client
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xclipboard.1 xcutsel.1
 
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
index 27852006fbc4..73b3e5e4b709 100644
--- a/x11/xcmiscproto/Makefile
+++ b/x11/xcmiscproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xcmiscproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xcmiscproto
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo
index 8570cf603fbf..b38fec5dac10 100644
--- a/x11/xcmiscproto/distinfo
+++ b/x11/xcmiscproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
-SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926
+SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
+SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
index 676e3fe2c1e9..e8c0681561f2 100644
--- a/x11/xdbedizzy/Makefile
+++ b/x11/xdbedizzy/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xdbedizzy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xdbedizzy
 PORTVERSION=	1.1.0
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index 3df19f2770e2..6f79c7216abe 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Display ditroff output
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xditview.1
 
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index b75e4ea1e30c..68affd52aeb1 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -10,8 +10,7 @@ COMMENT=	Display information utility for X
 LICENSE=	MIT
 
 XORG_CAT=	app
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb
-USE_XORG=	dmx x11 xcomposite xext xinerama xorg-macros xproto xrender \
+USE_XORG=	dmx x11 xcb xcomposite xext xinerama xproto xrender \
 		xtst xxf86dga xxf86misc xxf86vm
 
 PLIST_FILES=	bin/xdpyinfo
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index 429a606f22c4..8f636c30bf63 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xdriinfo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xdriinfo
 PORTVERSION=	1.0.4
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 19375842d3d7..d4b828cd8cf9 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Simple text editor for X
 
 XORG_CAT=	app
-USE_XORG=	xt xaw7 xorg-macros
+USE_XORG=	xt xaw7
 
 MAN1=		xedit.1
 
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index 7c69b65ac712..2777cf8a643f 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xextproto
-# Date Created:				07 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xextproto
-PORTVERSION=	7.2.0
+PORTVERSION=	7.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index 1d242d92b9c6..cadb3dbd5405 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
-SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724
+SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
+SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 2054a22b8386..7555ffc6b5d9 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xeyes
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xeyes
 PORTVERSION=	1.1.1
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index 7d7525912917..878cd5e3d78e 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xf86dga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86dga
 PORTVERSION=	1.0.3
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
index f264ab50f3c6..2c5db9aa1128 100644
--- a/x11/xf86dgaproto/Makefile
+++ b/x11/xf86dgaproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86dgaproto
 PORTVERSION=	2.1
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index d1f9d2f32e25..faf570d7fb1d 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86driproto
 PORTVERSION=	2.1.1
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
index db9b6a257ff9..45415f2c67ab 100644
--- a/x11/xf86miscproto/Makefile
+++ b/x11/xf86miscproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86miscproto
 PORTVERSION=	0.9.3
diff --git a/x11/xf86rushproto/Makefile b/x11/xf86rushproto/Makefile
index 95916a3433cc..ced306f81f11 100644
--- a/x11/xf86rushproto/Makefile
+++ b/x11/xf86rushproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86rushproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86rushproto
 PORTVERSION=	1.1.2
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
index 951d509b0196..c892870877b9 100644
--- a/x11/xf86vidmodeproto/Makefile
+++ b/x11/xf86vidmodeproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86vidmodeproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86vidmodeproto
 PORTVERSION=	2.3.1
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index 275411bfc6eb..8a910f59d8dc 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xfd
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfd
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xfd/distinfo b/x11/xfd/distinfo
index ca9b01dade4d..87220a4ddeb9 100644
--- a/x11/xfd/distinfo
+++ b/x11/xfd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
-SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
+SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
+SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
index 82ef17733d41..6f3bce5c6dd8 100644
--- a/x11/xfindproxy/Makefile
+++ b/x11/xfindproxy/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xfindproxy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfindproxy
 PORTVERSION=	1.0.2
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
index 85ed265ae3fe..96d82b70962f 100644
--- a/x11/xfwp/Makefile
+++ b/x11/xfwp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xfwp
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfwp
 PORTVERSION=	1.0.2
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
index 28a39cb6f0be..89d9efa5c87c 100644
--- a/x11/xineramaproto/Makefile
+++ b/x11/xineramaproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xineramaproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xineramaproto
 PORTVERSION=	1.2.1
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 52d388fe3d53..dd6ca0031910 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xinit
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xinit
 PORTVERSION=	1.3.2
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 35050d502f44..460806b2a14c 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for:	xinput
-# Date created:			05 July 2003
-# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
-#
+# Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xinput
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Very useful utility for configuring and testing XInput devices
 
 XORG_CAT=	app
-USE_XORG=	inputproto x11 xi xext
+USE_XORG=	inputproto x11 xi xext xrandr xinerama
 
 PLIST_FILES=	bin/xinput
 
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index bc8aba2f4d92..2ed8d9dc2c5b 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
-SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702
+SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
+SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 9434ca642372..72f340ea1878 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Compile XKB keyboard description
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	x11 xkbfile xorg-macros
+USE_XORG=	x11 xkbfile
 USES=		pathfix
 
 PLIST_FILES=	bin/xkbcomp \
diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile
index 56f1935737aa..36282db38061 100644
--- a/x11/xkbprint/Makefile
+++ b/x11/xkbprint/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xkbprint
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xkbprint
 PORTVERSION=	1.0.3
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index 66fa64535cb4..964182bd758c 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -10,7 +10,7 @@ COMMENT=	XKB utility demos
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
+USE_XORG=	xkbfile x11 xaw inputproto
 
 MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
 
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c92b694835ac..412970b66ad6 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,12 +1,12 @@
-# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.5.1
+PORTVERSION=	2.8
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
+MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 LICENSE=	MIT
 
@@ -14,12 +14,14 @@ BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 XORG_CAT=	data
 
-USES=		pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intlhack
+USES=		pathfix
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=yes
+
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -33,10 +35,7 @@ MAN7=		xkeyboard-config.7
 USES+=		gettext iconv
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
-CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
-		XGETTEXT="/bin/echo '(GNU '" \
-		MSGMERGE="/bin/echo '(GNU '"
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index a1b76612dc5c..683ece1fdce3 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
-SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
+SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
+SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index b36678ff3000..6529344aea0f 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -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/sun
 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/sony
 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/xkb.dtd
 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/pt
 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/ru
 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/se
 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/vn
 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 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
@@ -366,17 +315,18 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/crh
 @exec mkdir -p /var/lib/xkb
-@dirrmtry share/locale/crh
 @dirrm share/X11/xkb/types
 @dirrm share/X11/xkb/symbols/xfree68_vndr
 @dirrm share/X11/xkb/symbols/sun_vndr
 @dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sharp_vndr
 @dirrm share/X11/xkb/symbols/sgi_vndr
 @dirrm share/X11/xkb/symbols/nokia_vndr
 @dirrm share/X11/xkb/symbols/nec_vndr
@@ -385,12 +335,7 @@ share/X11/xkb/types/pc
 @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
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 812062cc824b..23019a45b0e2 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xkill
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xkill
 PORTVERSION=	1.0.3
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index 5d6a86ae9650..cc3038ce550b 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -10,7 +10,7 @@ COMMENT=	System load average display for X
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xload.1
 
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index c43f5eab7332..100460783ec9 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Displays the X Window System logo
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
+USE_XORG=	xrender xft xext xt xaw xp xprintutil
 
 MAN1=		xlogo.1
 
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index 21d2739352a2..a2cb524df5c1 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xlsclients
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xlsclients
 PORTVERSION=	1.1.2
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index da27d37ddaca..361c1a259d2c 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -10,7 +10,7 @@ COMMENT=	X application for screen magnifying
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xmag.1
 
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index 94380950d9da..eace83f510ca 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xman
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xman
 PORTVERSION=	1.1.2
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
index e1f2d6aa7e83..2f38a2df4c80 100644
--- a/x11/xmh/Makefile
+++ b/x11/xmh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmh
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmh
 PORTVERSION=	1.0.2
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 5b1a7c3cd96e..fb88a02d326b 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmore
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmore
 PORTVERSION=	1.0.2
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index f1a00360a3d8..797567e302a4 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -10,14 +10,13 @@ MASTER_SITES=	GNU
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	X events recorder and player
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		xcb:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_XORG=	x11 xau xdmcp xext xi xtst
+USE_XORG=	x11 xau xcb xdmcp xext xi xtst
 USE_GNOME=	gnomehack
 MAKE_JOBS_SAFE=	yes
 
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index d7e84dcc4f42..d844aadc6b13 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-apps
-PORTVERSION=	7.5.2
-PORTREVISION=	1
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index fdeae0346d8d..3e3bd6a51645 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xorg-cf-files
-# Date created:				Nov 18 2006
-# Whom:					Dave Grochowski
-#
+# Created by: Dave Grochowski
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-cf-files
 PORTVERSION=	1.0.4
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
index fecfece17e15..f2349d50eaa8 100644
--- a/x11/xorg-docs/Makefile
+++ b/x11/xorg-docs/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xorg-docs
-# Date Created:				Nov 2 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-docs
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/xorg-docs/distinfo b/x11/xorg-docs/distinfo
index b915a5539750..003a6192d50e 100644
--- a/x11/xorg-docs/distinfo
+++ b/x11/xorg-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32
-SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028
+SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
+SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 585f829facfd..c296e0271243 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-libraries
-# Date created:		29 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-libraries
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 500b64cbd6e6..87adc576fdcf 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg
-# Date created:		18 Jun 2004
-# Whom:			anholt
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg
-PORTVERSION=	7.5.2
+PORTVERSION=	7.7
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -23,8 +19,10 @@ RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
 		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
+.include <bsd.port.options.mk>
+
 # doc
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
 .endif
 
@@ -57,8 +55,4 @@ DEPENDS_TARGET="package"
 .endif
 .endif
 
-.if ${ARCH} != "alpha"
-RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
index 004d78f26dea..090ce7971f5e 100644
--- a/x11/xplsprinters/Makefile
+++ b/x11/xplsprinters/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xplsprinters
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xplsprinters
 PORTVERSION=	1.0.1
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
index bc93bd596eb8..1b8fee042f22 100644
--- a/x11/xprehashprinterlist/Makefile
+++ b/x11/xprehashprinterlist/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xprehashprinterlist
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xprehashprinterlist
 PORTVERSION=	1.0.1
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index c2aa6d82901e..1fc162fe8c01 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xprop
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xprop
 PORTVERSION=	1.2.1
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index ae97d28b469b..3fbb50b717af 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,20 +1,15 @@
-# New ports collection makefile for:   xproto
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xproto
-PORTVERSION=	7.0.22
+PORTVERSION=	7.0.24
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 protocol headers
 
 XORG_CAT=	proto
-USE_GNOME=	pkgconfig
 
-CONFIGURE_ARGS+=--disable-specs
+CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
 
 .include <bsd.port.mk>
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index f8a88925f65e..88deba2211c1 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
-SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763
+SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
+SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
index 56ba5be03c57..68fdb37ddf4e 100644
--- a/x11/xproxymanagementprotocol/Makefile
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   xproxymanagementprotocol
-# Date Created:			Jun 21 2006
-# Whom:				Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xproxymanagementprotocol
 PORTVERSION=	1.0.3
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index a7f8d5f534c7..ba19c97c20e5 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xpyb
-# Date created:		2008-08-27
-# Whom:			Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xpyb
 PORTVERSION=	1.3.1
@@ -17,10 +13,10 @@ COMMENT=	Python bindings to access X Window System protocol via libxcb
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
 		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
-LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
 
 USE_BZIP2=	yes
 USE_PYTHON=	2.5+
+USE_XORG=	xcb
 USES=	pathfix
 PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
 
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 7e7b70db04bd..8d6107f75840 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xrandr
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrandr
-PORTVERSION=	1.3.5
+PORTVERSION=	1.4.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index 93465a549282..752235d1a9de 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e
-SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891
+SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693
+SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index 2ebf34cf1744..24597504a012 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xrdb
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrdb
 PORTVERSION=	1.0.9
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 9eb7d9efcab6..8f699ffd1f89 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Refresh all or part of an X screen
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/xrefresh
 
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index fa7768484c52..b77507d196de 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xrx
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xrx
 PORTVERSION=	1.0.4
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index 7d593982ab37..37192baa381a 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xset
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xset
 PORTVERSION=	1.2.2
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
index 58297f54fd72..7d954d015c1b 100644
--- a/x11/xsetmode/Makefile
+++ b/x11/xsetmode/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xsetmode
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xsetmode
 PORTVERSION=	1.0.0
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
index 5e38412bfef7..a971390c2553 100644
--- a/x11/xsetpointer/Makefile
+++ b/x11/xsetpointer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xsetpointer
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xsetpointer
 PORTVERSION=	1.0.1
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index 43f713990a71..3a5e5a0920c5 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Session Manager
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xsm.1
 
diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile
index e5780f966675..cb92d34f57d1 100644
--- a/x11/xstdcmap/Makefile
+++ b/x11/xstdcmap/Makefile
@@ -10,7 +10,7 @@ COMMENT=	X standard colormap utility
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xmu x11 xorg-macros
+USE_XORG=	xmu x11
 
 PLIST_FILES=	bin/xstdcmap
 
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index fa0e9ce55c72..6a268d80d78d 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xtrans
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xtrans
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.7
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index a74a739575f4..15557067df4c 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
-SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600
+SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
+SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index d14b3a3c5aa6..e0184a46f275 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -8,5 +8,4 @@ include/X11/Xtrans/Xtransutil.c
 include/X11/Xtrans/transport.c
 libdata/pkgconfig/xtrans.pc
 share/aclocal/xtrans.m4
-@dirrmtry %%DOCSDIR%%
 @dirrm include/X11/Xtrans
diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile
index c222d0301ec3..ad3c507883d8 100644
--- a/x11/xtrap/Makefile
+++ b/x11/xtrap/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xtrap
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xtrap
 PORTVERSION=	1.0.2
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index e7e9cc266e6e..48d7b0a6f24d 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xvidtune
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xvidtune
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo
index 35a6538d2724..cf179107d9ac 100644
--- a/x11/xvidtune/distinfo
+++ b/x11/xvidtune/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
-SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
+SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
+SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index d053e294a99b..868797ad5a55 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Print out X-Video extension adaptor information
 
 XORG_CAT=	app
-USE_XORG=	xv x11 xorg-macros
+USE_XORG=	xv x11
 
 PLIST_FILES=	bin/xvinfo
 
diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile
index 0c423323ca80..67cc32cd703b 100644
--- a/x11/xvmcinfo/Makefile
+++ b/x11/xvmcinfo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xvmcinfo
-# Date Created:				6 Dec 2008
-# Whom:					bms
-#
+# Created by: Bruce M Simpson <bms@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xvmcinfo
 PORTVERSION=	0.1
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index dcc857837a8e..a4484f728cac 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for:	xwininfo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xwininfo
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Window information utility for X
 
 XORG_CAT=	app
-USE_XORG=	xmuu xext x11
+USES=		iconv
+USE_XORG=	x11 xcb xproto xorg-macros
 
 PLIST_FILES=	bin/xwininfo
 
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
index 4c403c41d8bd..c50dd3eefcff 100644
--- a/x11/xwininfo/distinfo
+++ b/x11/xwininfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xwininfo-1.1.2.tar.bz2) = 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a
-SIZE (xorg/app/xwininfo-1.1.2.tar.bz2) = 135415
+SHA256 (xorg/app/xwininfo-1.1.3.tar.bz2) = 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8
+SIZE (xorg/app/xwininfo-1.1.3.tar.bz2) = 157512
author	zeising <zeising@FreeBSD.org>	2013-05-25 22:37:02 +0800
committer	zeising <zeising@FreeBSD.org>	2013-05-25 22:37:02 +0800
commit	715298b528f23a6a763e28623a4c98f1365c81ce (patch)
tree	cf13f962932aab3646f0af684b2923c4e0f0825b /x11
parent	0f8e632e50d273ba38d9d13f7e446a4a10d95cd4 (diff)
download	freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.tar.gz freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.tar.zst freebsd-ports-gnome-715298b528f23a6a763e28623a4c98f1365c81ce.zip