25 files changed, 42 insertions, 59 deletions

diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
index 15c4f51a2d55..c4f509649cd5 100644
--- a/x11/dmxproto/Makefile
+++ b/x11/dmxproto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dmxproto
-PORTVERSION=	2.3
+PORTVERSION=	2.3.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
index f9842688e46c..9ab13c66218c 100644
--- a/x11/dmxproto/distinfo
+++ b/x11/dmxproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dmxproto-2.3.tar.bz2) = 3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
-SIZE (xorg/proto/dmxproto-2.3.tar.bz2) = 83906
+SHA256 (xorg/proto/dmxproto-2.3.1.tar.bz2) = e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509
+SIZE (xorg/proto/dmxproto-2.3.1.tar.bz2) = 96467
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 5709b1c2ae1f..6693907e485c 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dri2proto
-PORTVERSION=	2.3
+PORTVERSION=	2.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index eb210316420d..f791a3e786d2 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dri2proto-2.3.tar.bz2) = b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677
-SIZE (xorg/proto/dri2proto-2.3.tar.bz2) = 95466
+SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
+SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist
index 006d862e9fce..f9a13c3529be 100644
--- a/x11/dri2proto/pkg-plist
+++ b/x11/dri2proto/pkg-plist
@@ -1,4 +1,6 @@
 include/X11/extensions/dri2proto.h
 include/X11/extensions/dri2tokens.h
 libdata/pkgconfig/dri2proto.pc
+share/doc/dri2proto/dri2proto.txt
+@dirrm share/doc/dri2proto
 @dirrmtry include/X11/extensions
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index e7a1804122d4..bf23fc630757 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glproto
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.15
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index 73bbc435bcb0..e7b45bfa65de 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.12.tar.bz2) = 48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de
-SIZE (xorg/proto/glproto-1.4.12.tar.bz2) = 106968
+SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
+SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index d4ab0714e8ca..3aaa0239733b 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXi
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.5
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 19ae0f9ba982..98b1cb1714a2 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.4.3.tar.bz2) = 08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0
-SIZE (xorg/lib/libXi-1.4.3.tar.bz2) = 422637
+SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
+SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index c92e1518a45c..1f41da6f3cab 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -15,8 +15,7 @@ COMMENT=	The X protocol C-language Binding (XCB) library
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
-		xcb-proto>=1.6:${PORTSDIR}/x11/xcb-proto \
+		xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 862fd3d2b03b..76b920676202 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index ec8a161d9a42..3ed55f7e4566 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.6.tar.bz2) = f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2
-SIZE (xcb-proto-1.6.tar.bz2) = 92829
+SHA256 (xcb-proto-1.7.tar.bz2) = e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
+SIZE (xcb-proto-1.7.tar.bz2) = 104353
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index f7d743d7b4fb..05dff4e8b685 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -18,6 +18,7 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xevie.xml
 %%DATADIR%%/xf86dri.xml
 %%DATADIR%%/xfixes.xml
+%%DATADIR%%/xkb.xml
 %%DATADIR%%/xinerama.xml
 %%DATADIR%%/xinput.xml
 %%DATADIR%%/xprint.xml
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index 667fb1b65e61..e4a5fd3070da 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdpyinfo
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
index 94560818f5c6..08247da216cf 100644
--- a/x11/xdpyinfo/distinfo
+++ b/x11/xdpyinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdpyinfo-1.2.0.tar.bz2) = fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
-SIZE (xorg/app/xdpyinfo-1.2.0.tar.bz2) = 121514
+SHA256 (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f
+SIZE (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 127611
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index 0d92920b8663..429a606f22c4 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdriinfo
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
index 0808b19da372..689c1f436a01 100644
--- a/x11/xdriinfo/distinfo
+++ b/x11/xdriinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdriinfo-1.0.3.tar.bz2) = 2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c
-SIZE (xorg/app/xdriinfo-1.0.3.tar.bz2) = 97688
+SHA256 (xorg/app/xdriinfo-1.0.4.tar.bz2) = 35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
+SIZE (xorg/app/xdriinfo-1.0.4.tar.bz2) = 104296
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 253ed9a303ea..3bf4fc47fc78 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xinit
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 9c363d13e8f3..dbe3d873a2a6 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinit-1.3.1.tar.bz2) = c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
-SIZE (xorg/app/xinit-1.3.1.tar.bz2) = 147067
+SHA256 (xorg/app/xinit-1.3.2.tar.bz2) = a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
+SIZE (xorg/app/xinit-1.3.2.tar.bz2) = 148443
diff --git a/x11/xinit/files/patch-xinit.c b/x11/xinit/files/patch-xinit.c
deleted file mode 100644
index abe8803b8282..000000000000
--- a/x11/xinit/files/patch-xinit.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- xinit.c.orig	2011-04-26 07:03:42.000000000 +0200
-+++ xinit.c	2011-08-06 22:14:03.000000000 +0200
-@@ -49,10 +49,10 @@
- #endif
- 
- /* For PRIO_PROCESS and setpriority() */
--#ifdef __DragonFly__
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
- #include <sys/time.h>
- #include <sys/resource.h>
--#endif /* __DragonFly__ */
-+#endif
- 
- #include <stdlib.h>
- 
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c699bd4f5cda..d23fcabca085 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.1
+PORTVERSION=	2.5.1
 CATEGORIES=	x11
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
-
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
+		xsltproc:${PORTSDIR}/textproc/libxslt
 XORG_CAT=	data
 
 USE_BZIP2=	yes
@@ -29,6 +28,8 @@ CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+MAN7=		xkeyboard-config.7
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
@@ -42,9 +43,6 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
-.if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} '/^SUBDIR/s/ po//' ${WRKSRC}/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 7ee61f2538dd..a1b76612dc5c 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.1.tar.bz2) = f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
-SIZE (xorg/data/xkeyboard-config-2.1.tar.bz2) = 699368
+SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
+SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index e9824e6bd004..1292125f7d22 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -140,6 +140,7 @@ share/X11/xkb/symbols/af
 share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
 share/X11/xkb/symbols/am
+share/X11/xkb/symbols/apl
 share/X11/xkb/symbols/ara
 share/X11/xkb/symbols/at
 share/X11/xkb/symbols/az
@@ -156,6 +157,7 @@ share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/capslock
 share/X11/xkb/symbols/cd
 share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cm
 share/X11/xkb/symbols/cn
 share/X11/xkb/symbols/compose
 share/X11/xkb/symbols/ctrl
@@ -172,11 +174,6 @@ share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
 share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols/extras/apl
-share/X11/xkb/symbols/extras/ir
-share/X11/xkb/symbols/extras/rs
-share/X11/xkb/symbols/extras/ru
-share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -306,6 +303,7 @@ share/X11/xkb/symbols/th
 share/X11/xkb/symbols/tj
 share/X11/xkb/symbols/tm
 share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/tw
 share/X11/xkb/symbols/typo
 share/X11/xkb/symbols/tz
 share/X11/xkb/symbols/ua
@@ -347,6 +345,7 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/hu/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
 %%NLS%%share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ky/LC_MESSAGES/xkeyboard-config.mo
@@ -372,8 +371,8 @@ share/X11/xkb/types/pc
 %%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
@@ -384,7 +383,6 @@ share/X11/xkb/types/pc
 @dirrm share/X11/xkb/symbols/macintosh_vndr
 @dirrm share/X11/xkb/symbols/hp_vndr
 @dirrm share/X11/xkb/symbols/fujitsu_vndr
-@dirrm share/X11/xkb/symbols/extras
 @dirrm share/X11/xkb/symbols/digital_vndr
 @dirrm share/X11/xkb/symbols
 @dirrm share/X11/xkb/semantics
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index b54bfac28427..c9443e1a8aa7 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-apps
-PORTVERSION=	7.5.1
+PORTVERSION=	7.5.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 68fa7fef2466..500b64cbd6e6 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg
-PORTVERSION=	7.5.1
+PORTVERSION=	7.5.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none