Update the following Xorg components:

libXext to 1.3.3
libxcb and xcb-proto to 1.11
libxkbcommon to 0.5.0
pixman to 0.32.6
xinit to 1.3.4
xkeyboard-config to 2.13
xrandr to 1.4.3
xtrans to 1.3.5

Use INSTALL_TARGET=install-strip for stripping.
Drop @dirrm[try] from plist

Obtained from: xorg-dev repo

26 files changed, 35 insertions, 154 deletions

diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 29a8f8ee8e8d..e5ef344a33f8 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libXext
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.3.3
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -15,5 +14,6 @@ LICENSE=	MIT
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto:both xau
 CONFIGURE_ARGS+=--disable-specs --without-xmlto
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 9adb5b34a857..4e8a49d3b0eb 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXext-1.3.2.tar.bz2) = f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0
-SIZE (xorg/lib/libXext-1.3.2.tar.bz2) = 378901
+SHA256 (xorg/lib/libXext-1.3.3.tar.bz2) = b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35
+SIZE (xorg/lib/libXext-1.3.3.tar.bz2) = 389523
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 7bc69cf2a8fa..b234e43301f5 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -81,4 +81,3 @@ man/man3/XShmPixmapFormat.3.gz
 man/man3/XShmPutImage.3.gz
 man/man3/XShmQueryExtension.3.gz
 man/man3/XShmQueryVersion.3.gz
-@dirrmtry include/X11/extensions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index f466523d0a22..7af51a5f52d6 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxcb
-PORTVERSION=	1.10
-PORTREVISION=	2
+PORTVERSION=	1.11
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
@@ -24,6 +23,7 @@ XORG_CAT=	lib
 USES=		gmake python:2,build
 USE_GNOME=	libxslt:build
 USE_XORG=	xau xdmcp
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
@@ -41,9 +41,4 @@ XDMCP_LIBS=	-L${LOCALBASE}/lib -lXdmcp
 XPROTO_CFLAGS=	-I${LOCALBASE}/include
 XPROTO_LIBS=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxcb*.so.*
-
 .include <bsd.port.mk>
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 333e256967e6..6e9588c380f0 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxcb-1.10.tar.bz2) = 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5
-SIZE (xorg/lib/libxcb-1.10.tar.bz2) = 475211
+SHA256 (xorg/lib/libxcb-1.11.tar.bz2) = 03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7
+SIZE (xorg/lib/libxcb-1.11.tar.bz2) = 517700
diff --git a/x11/libxcb/files/patch-64bit-packed b/x11/libxcb/files/patch-64bit-packed
deleted file mode 100644
index 467c9d95fa04..000000000000
--- a/x11/libxcb/files/patch-64bit-packed
+++ /dev/null
@@ -1,102 +0,0 @@
-From 3b72a2c9d1d656c74c691a45689e1d637f669e3a Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke <kenneth@whitecape.org>
-Date: Fri, 03 Jan 2014 23:08:33 +0000
-Subject: Force XCB event structures with 64-bit extended fields to be packed.
-
-With the advent of the Present extension, some events (such as
-PresentCompleteNotify) now use native 64-bit types on the wire.
-
-For XGE events, we insert an extra "uint32_t full_sequence" field
-immediately after the first 32 bytes of data.  Normally, this causes
-the subsequent fields to be shifted over by 4 bytes, and the structure
-to grow in size by 4 bytes.  Everything works fine.
-
-However, if event contains 64-bit extended fields, this may result in
-the compiler adding an extra 4 bytes of padding so that those fields
-remain aligned on 64-bit boundaries.  This causes the structure to grow
-by 8 bytes, not 4.  Unfortunately, XCB doesn't realize this, and
-always believes that the length only increased by 4.  read_packet()
-then fails to malloc enough memory to hold the event, and the event
-processing code uses the wrong offsets.
-
-To fix this, mark any event structures containing 64-bit extended
-fields with __attribute__((__packed__)).
-
-v2: Use any(...) instead of True in (...), as suggested by
-    Daniel Martin.
-
-v3 (Alan Coopersmith): Fix build with Solaris Studio 12.3 by moving the
-attribute to after the structure definition.
-
-Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
-Reviewed-by: Keith Packard <keithp@keithp.com> [v1]
-Reviewed-by: Josh Triplett <josh@joshtriplett.org> [v1]
-Reviewed-by: Daniel Martin <consume.noise@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/src/c_client.py b/src/c_client.py
-index 99fd307..45de544 100644
---- src/c_client.py
-+++ src/c_client.py
-@@ -1762,7 +1762,7 @@ def c_simple(self, name):
-         # Iterator
-         _c_iterator(self, name)
- 
--def _c_complex(self):
-+def _c_complex(self, force_packed = False):
-     '''
-     Helper function for handling all structure types.
-     Called for all structs, requests, replies, events, errors.
-@@ -1817,7 +1817,7 @@ def _c_complex(self):
-             if b.type.has_name:
-                 _h('    } %s;', b.c_field_name)
- 
--    _h('} %s;', self.c_type)
-+    _h('} %s%s;', 'XCB_PACKED ' if force_packed else '', self.c_type)
- 
- def c_struct(self, name):
-     '''
-@@ -2902,6 +2902,7 @@ def c_event(self, name):
-     # events while generating the structure for them. Otherwise we would read
-     # garbage (the internal full_sequence) when accessing normal event fields
-     # there.
-+    force_packed = False
-     if hasattr(self, 'is_ge_event') and self.is_ge_event and self.name == name:
-         event_size = 0
-         for field in self.fields:
-@@ -2911,6 +2912,11 @@ def c_event(self, name):
-                 full_sequence = Field(tcard32, tcard32.name, 'full_sequence', False, True, True)
-                 idx = self.fields.index(field)
-                 self.fields.insert(idx + 1, full_sequence)
-+
-+                # If the event contains any 64-bit extended fields, they need
-+                # to remain aligned on a 64-bit boundary.  Adding full_sequence
-+                # would normally break that; force the struct to be packed.
-+                force_packed = any(f.type.size == 8 and f.type.is_simple for f in self.fields[(idx+1):])
-                 break
- 
-     _c_type_setup(self, name, ('event',))
-@@ -2920,7 +2926,7 @@ def c_event(self, name):
- 
-     if self.name == name:
-         # Structure definition
--        _c_complex(self)
-+        _c_complex(self, force_packed)
-     else:
-         # Typedef
-         _h('')
-diff --git a/src/xcb.h b/src/xcb.h
-index e62c985..73c77a3 100644
---- src/xcb.h
-+++ src/xcb.h
-@@ -51,6 +51,8 @@ extern "C" {
-  * @file xcb.h
-  */
- 
-+#define XCB_PACKED __attribute__((__packed__))
-+
- /**
-  * @defgroup XCB_Core_API XCB Core API
-  * @brief Core API of the XCB library.
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index 73bba0157c08..4245622ea7c4 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -1968,6 +1968,9 @@ man/man3/xcb_x_print_print_end_job_checked.3.gz
 man/man3/xcb_x_print_print_end_page.3.gz
 man/man3/xcb_x_print_print_end_page_checked.3.gz
 man/man3/xcb_x_print_print_get_attributes.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes_end.3.gz
+man/man3/xcb_x_print_print_get_attributes_attributes_length.3.gz
 man/man3/xcb_x_print_print_get_attributes_reply.3.gz
 man/man3/xcb_x_print_print_get_attributes_unchecked.3.gz
 man/man3/xcb_x_print_print_get_context.3.gz
@@ -2433,6 +2436,3 @@ man/man3/xcb_xvmc_query_version_reply.3.gz
 man/man3/xcb_xvmc_query_version_unchecked.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/xcb.css
-@dirrmtry include/xcb
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index dafa37cffce5..c8b792141d28 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxkbcommon
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xkbcommon.org/download/
 
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 76d6cc4a40f6..384344aaf111 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxkbcommon-0.4.2.tar.xz) = a0fc71b07eeddba4af62bd709e24cec219778bb6871384aa850b2f5798a48957
-SIZE (xorg/lib/libxkbcommon-0.4.2.tar.xz) = 552316
+SHA256 (xorg/lib/libxkbcommon-0.5.0.tar.xz) = 90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c
+SIZE (xorg/lib/libxkbcommon-0.5.0.tar.xz) = 615504
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 820d355c8cbd..c7a1f5da6379 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,5 +1,6 @@
 include/xkbcommon/xkbcommon.h
 include/xkbcommon/xkbcommon-compat.h
+include/xkbcommon/xkbcommon-compose.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 include/xkbcommon/xkbcommon-x11.h
@@ -15,4 +16,3 @@ lib/libxkbcommon-x11.la
 lib/libxkbcommon-x11.so
 lib/libxkbcommon-x11.so.0
 lib/libxkbcommon-x11.so.0.0.0
-@dirrm include/xkbcommon
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 3de4e320c7b5..a04065a0abac 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pixman
-PORTVERSION=	0.32.4
-PORTREVISION=	3
+PORTVERSION=	0.32.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index a2dcca7a51e8..a36788b37d74 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/pixman-0.32.4.tar.bz2) = ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c
-SIZE (xorg/lib/pixman-0.32.4.tar.bz2) = 701414
+SHA256 (xorg/lib/pixman-0.32.6.tar.bz2) = 201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4
+SIZE (xorg/lib/pixman-0.32.6.tar.bz2) = 672201
diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
index f7fddfe1655a..b1851c0cf05d 100644
--- a/x11/pixman/pkg-plist
+++ b/x11/pixman/pkg-plist
@@ -4,6 +4,5 @@ lib/libpixman-1.a
 lib/libpixman-1.la
 lib/libpixman-1.so
 lib/libpixman-1.so.0
-lib/libpixman-1.so.0.32.4
+lib/libpixman-1.so.0.32.6
 libdata/pkgconfig/pixman-1.pc
-@dirrm include/pixman-1
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index b776713b8ed3..0eae6a369e21 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -2,16 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	1.11
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
-BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
-
+USE_GNOME=	libxml2:build
 XORG_CAT=	proto
 USES=		python:2
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index e844ae798276..3d21b1fb7555 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xcb-proto-1.10.tar.bz2) = 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05
-SIZE (xorg/proto/xcb-proto-1.10.tar.bz2) = 138834
+SHA256 (xorg/proto/xcb-proto-1.11.tar.bz2) = b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e
+SIZE (xorg/proto/xcb-proto-1.11.tar.bz2) = 139213
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index 7b7cec797e70..890c040a3e3a 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -49,5 +49,3 @@ libdata/pkgconfig/xcb-proto.pc
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/xcbgen
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 37fb950c627a..f8288f18c306 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xinit
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 761291574401..da6a6f5c39e9 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinit-1.3.3.tar.bz2) = 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af
-SIZE (xorg/app/xinit-1.3.3.tar.bz2) = 163905
+SHA256 (xorg/app/xinit-1.3.4.tar.bz2) = 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3
+SIZE (xorg/app/xinit-1.3.4.tar.bz2) = 165881
diff --git a/x11/xinit/pkg-plist b/x11/xinit/pkg-plist
index c83f92eecef7..35e76c3ff750 100644
--- a/x11/xinit/pkg-plist
+++ b/x11/xinit/pkg-plist
@@ -3,5 +3,3 @@ bin/xinit
 man/man1/startx.1.gz
 man/man1/xinit.1.gz
 etc/X11/xinit/xinitrc
-@dirrm etc/X11/xinit
-@dirrmtry etc/X11
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 53411015ea54..4f00e00c2d1b 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.12
+PORTVERSION=	2.13
 CATEGORIES=	x11
 MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index b23e31e78795..055cd7a857ce 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.12.tar.bz2) = 65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44
-SIZE (xorg/data/xkeyboard-config-2.12.tar.bz2) = 934200
+SHA256 (xorg/data/xkeyboard-config-2.13.tar.bz2) = 7b5be9f2b9a30102512b15308aec55f7f54289df24ac21de82ebb4bf145f9fce
+SIZE (xorg/data/xkeyboard-config-2.13.tar.bz2) = 944375
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 7916db846b54..db65c48b78d8 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xrandr
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index dc42f1296741..a912fc5e037f 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrandr-1.4.2.tar.bz2) = b2e76ee92ff827f1c52ded7c666fe6f2704ca81cdeef882397da4e3e8ab490bc
-SIZE (xorg/app/xrandr-1.4.2.tar.bz2) = 174654
+SHA256 (xorg/app/xrandr-1.4.3.tar.bz2) = 7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b
+SIZE (xorg/app/xrandr-1.4.3.tar.bz2) = 169850
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 8573356dde9e..a4b499d14023 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xtrans
-PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTVERSION=	1.3.5
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index 3f1861d2c248..ddb8b17f7b8e 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.3.4.tar.bz2) = 054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a
-SIZE (xorg/lib/xtrans-1.3.4.tar.bz2) = 182341
+SHA256 (xorg/lib/xtrans-1.3.5.tar.bz2) = adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301
+SIZE (xorg/lib/xtrans-1.3.5.tar.bz2) = 186833
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index 056a695d5cf5..c49878b23f40 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -7,4 +7,3 @@ include/X11/Xtrans/Xtransutil.c
 include/X11/Xtrans/transport.c
 libdata/pkgconfig/xtrans.pc
 share/aclocal/xtrans.m4
-@dirrm include/X11/Xtrans