summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/appres/Makefile2
-rw-r--r--x11/appres/distinfo6
-rw-r--r--x11/bigreqsproto/Makefile2
-rw-r--r--x11/bigreqsproto/distinfo6
-rw-r--r--x11/bigreqsproto/pkg-plist1
-rw-r--r--x11/bitmap/Makefile3
-rw-r--r--x11/bitmap/distinfo6
-rw-r--r--x11/compositeproto/Makefile2
-rw-r--r--x11/compositeproto/distinfo6
-rw-r--r--x11/damageproto/Makefile3
-rw-r--r--x11/damageproto/distinfo6
-rw-r--r--x11/dmxproto/Makefile2
-rw-r--r--x11/dmxproto/distinfo6
-rw-r--r--x11/dmxproto/pkg-plist2
-rw-r--r--x11/dri2proto/Makefile2
-rw-r--r--x11/dri2proto/distinfo6
-rw-r--r--x11/editres/Makefile3
-rw-r--r--x11/editres/distinfo6
-rw-r--r--x11/editres/pkg-plist2
-rw-r--r--x11/evieext/Makefile2
-rw-r--r--x11/evieext/distinfo6
-rw-r--r--x11/evieext/pkg-plist1
-rw-r--r--x11/fixesproto/Makefile2
-rw-r--r--x11/fixesproto/distinfo6
-rw-r--r--x11/fixesproto/pkg-plist3
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo6
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/iceauth/distinfo6
-rw-r--r--x11/inputproto/Makefile2
-rw-r--r--x11/inputproto/distinfo6
-rw-r--r--x11/inputproto/pkg-plist5
-rw-r--r--x11/kbproto/Makefile2
-rw-r--r--x11/kbproto/distinfo6
-rw-r--r--x11/libICE/Makefile3
-rw-r--r--x11/libICE/distinfo6
-rw-r--r--x11/libSM/Makefile3
-rw-r--r--x11/libSM/distinfo6
-rw-r--r--x11/libSM/files/patch-configure.ac18
-rw-r--r--x11/libSM/files/patch-src_Makefile.am13
-rw-r--r--x11/libSM/files/patch-src_sm_genid.c43
-rw-r--r--x11/libX11/Makefile4
-rw-r--r--x11/libX11/distinfo6
-rw-r--r--x11/libX11/manpages5
-rw-r--r--x11/libX11/pkg-plist16
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/distinfo6
-rw-r--r--x11/libXScrnSaver/pkg-plist3
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXau/distinfo6
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcomposite/distinfo6
-rw-r--r--x11/libXcursor/Makefile6
-rw-r--r--x11/libXcursor/distinfo6
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdamage/distinfo6
-rw-r--r--x11/libXdmcp/Makefile3
-rw-r--r--x11/libXdmcp/distinfo6
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXext/distinfo6
-rw-r--r--x11/libXext/pkg-plist20
-rw-r--r--x11/libXfixes/Makefile3
-rw-r--r--x11/libXfixes/distinfo6
-rw-r--r--x11/libXi/Makefile44
-rw-r--r--x11/libXi/distinfo6
-rw-r--r--x11/libXi/pkg-plist3
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXinerama/distinfo6
-rw-r--r--x11/libXinerama/pkg-plist3
-rw-r--r--x11/libXrender/Makefile3
-rw-r--r--x11/libXrender/distinfo6
-rw-r--r--x11/libXrender/pkg-plist3
-rw-r--r--x11/libXres/Makefile3
-rw-r--r--x11/libXres/distinfo6
-rw-r--r--x11/libXtst/Makefile18
-rw-r--r--x11/libXtst/distinfo6
-rw-r--r--x11/libXtst/pkg-plist3
-rw-r--r--x11/libXv/Makefile8
-rw-r--r--x11/libXv/distinfo6
-rw-r--r--x11/libXvMC/Makefile3
-rw-r--r--x11/libXvMC/distinfo6
-rw-r--r--x11/libXvMC/pkg-plist3
-rw-r--r--x11/libXxf86dga/Makefile2
-rw-r--r--x11/libXxf86dga/distinfo6
-rw-r--r--x11/libXxf86dga/pkg-plist2
-rw-r--r--x11/libXxf86misc/Makefile2
-rw-r--r--x11/libXxf86misc/distinfo6
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libXxf86vm/distinfo6
-rw-r--r--x11/libXxf86vm/pkg-plist1
-rw-r--r--x11/libdmx/Makefile3
-rw-r--r--x11/libdmx/distinfo6
-rw-r--r--x11/libdmx/pkg-plist1
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbfile/distinfo6
-rw-r--r--x11/listres/Makefile3
-rw-r--r--x11/listres/distinfo6
-rw-r--r--x11/luit/Makefile3
-rw-r--r--x11/luit/distinfo6
-rw-r--r--x11/mkcomposecache/Makefile3
-rw-r--r--x11/mkcomposecache/distinfo6
-rw-r--r--x11/randrproto/Makefile2
-rw-r--r--x11/randrproto/distinfo6
-rw-r--r--x11/recordproto/Makefile2
-rw-r--r--x11/recordproto/distinfo6
-rw-r--r--x11/recordproto/pkg-plist3
-rw-r--r--x11/renderproto/Makefile2
-rw-r--r--x11/renderproto/distinfo6
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/rgb/distinfo6
-rw-r--r--x11/rstart/Makefile2
-rw-r--r--x11/rstart/distinfo6
-rw-r--r--x11/rstart/pkg-plist18
-rw-r--r--x11/scrnsaverproto/Makefile2
-rw-r--r--x11/scrnsaverproto/distinfo6
-rw-r--r--x11/scrnsaverproto/pkg-plist7
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/sessreg/distinfo6
-rw-r--r--x11/sessreg/files/patch-utmpx68
-rw-r--r--x11/setxkbmap/Makefile2
-rw-r--r--x11/setxkbmap/distinfo6
-rw-r--r--x11/smproxy/Makefile2
-rw-r--r--x11/smproxy/distinfo6
-rw-r--r--x11/videoproto/Makefile2
-rw-r--r--x11/videoproto/distinfo6
-rw-r--r--x11/viewres/Makefile9
-rw-r--r--x11/viewres/distinfo6
-rw-r--r--x11/viewres/pkg-plist4
-rw-r--r--x11/x11perf/Makefile2
-rw-r--r--x11/x11perf/distinfo6
-rw-r--r--x11/xauth/Makefile2
-rw-r--r--x11/xauth/distinfo6
-rw-r--r--x11/xbacklight/Makefile2
-rw-r--r--x11/xbacklight/distinfo6
-rw-r--r--x11/xbiff/Makefile3
-rw-r--r--x11/xbiff/distinfo6
-rw-r--r--x11/xbitmaps/Makefile2
-rw-r--r--x11/xbitmaps/distinfo6
-rw-r--r--x11/xbitmaps/pkg-plist2
-rw-r--r--x11/xcalc/Makefile3
-rw-r--r--x11/xcalc/distinfo6
-rw-r--r--x11/xclipboard/Makefile3
-rw-r--r--x11/xclipboard/distinfo6
-rw-r--r--x11/xcmiscproto/Makefile2
-rw-r--r--x11/xcmiscproto/distinfo6
-rw-r--r--x11/xcmiscproto/pkg-plist1
-rw-r--r--x11/xcmsdb/Makefile2
-rw-r--r--x11/xcmsdb/distinfo6
-rw-r--r--x11/xcursorgen/Makefile5
-rw-r--r--x11/xcursorgen/distinfo6
-rw-r--r--x11/xdpyinfo/Makefile2
-rw-r--r--x11/xdpyinfo/distinfo6
-rw-r--r--x11/xdriinfo/Makefile2
-rw-r--r--x11/xdriinfo/distinfo6
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xev/distinfo6
-rw-r--r--x11/xextproto/Makefile2
-rw-r--r--x11/xextproto/distinfo6
-rw-r--r--x11/xextproto/pkg-plist64
-rw-r--r--x11/xeyes/Makefile4
-rw-r--r--x11/xeyes/distinfo6
-rw-r--r--x11/xf86dgaproto/Makefile2
-rw-r--r--x11/xf86dgaproto/distinfo6
-rw-r--r--x11/xf86dgaproto/pkg-plist5
-rw-r--r--x11/xf86driproto/Makefile2
-rw-r--r--x11/xf86driproto/distinfo6
-rw-r--r--x11/xf86driproto/pkg-plist5
-rw-r--r--x11/xf86miscproto/Makefile2
-rw-r--r--x11/xf86miscproto/distinfo6
-rw-r--r--x11/xf86vidmodeproto/Makefile2
-rw-r--r--x11/xf86vidmodeproto/distinfo6
-rw-r--r--x11/xf86vidmodeproto/pkg-plist3
-rw-r--r--x11/xgamma/Makefile2
-rw-r--r--x11/xgamma/distinfo6
-rw-r--r--x11/xgc/Makefile3
-rw-r--r--x11/xgc/distinfo6
-rw-r--r--x11/xgc/pkg-plist1
-rw-r--r--x11/xhost/Makefile2
-rw-r--r--x11/xhost/distinfo6
-rw-r--r--x11/xineramaproto/Makefile2
-rw-r--r--x11/xineramaproto/distinfo6
-rw-r--r--x11/xineramaproto/pkg-plist2
-rw-r--r--x11/xinit/Makefile3
-rw-r--r--x11/xinit/distinfo6
-rw-r--r--x11/xinput/Makefile2
-rw-r--r--x11/xinput/distinfo6
-rw-r--r--x11/xkbcomp/Makefile2
-rw-r--r--x11/xkbcomp/distinfo6
-rw-r--r--x11/xkbevd/Makefile2
-rw-r--r--x11/xkbevd/distinfo6
-rw-r--r--x11/xkeyboard-config/Makefile3
-rw-r--r--x11/xkeyboard-config/distinfo6
-rw-r--r--x11/xkeyboard-config/pkg-plist272
-rw-r--r--x11/xkill/Makefile2
-rw-r--r--x11/xkill/distinfo6
-rw-r--r--x11/xlogo/Makefile3
-rw-r--r--x11/xlogo/distinfo6
-rw-r--r--x11/xlsatoms/Makefile2
-rw-r--r--x11/xlsatoms/distinfo6
-rw-r--r--x11/xlsclients/Makefile2
-rw-r--r--x11/xlsclients/distinfo6
-rw-r--r--x11/xmag/Makefile3
-rw-r--r--x11/xmag/distinfo6
-rw-r--r--x11/xman/Makefile3
-rw-r--r--x11/xman/distinfo6
-rw-r--r--x11/xmessage/Makefile3
-rw-r--r--x11/xmessage/distinfo6
-rw-r--r--x11/xmodmap/Makefile2
-rw-r--r--x11/xmodmap/distinfo6
-rw-r--r--x11/xorg-apps/Makefile3
-rw-r--r--x11/xorg-cf-files/Makefile3
-rw-r--r--x11/xorg-cf-files/distinfo6
-rw-r--r--x11/xorg-libraries/Makefile2
-rw-r--r--x11/xorg/Makefile3
-rw-r--r--x11/xpr/Makefile2
-rw-r--r--x11/xpr/distinfo6
-rw-r--r--x11/xprop/Makefile2
-rw-r--r--x11/xprop/distinfo6
-rw-r--r--x11/xproto/Makefile2
-rw-r--r--x11/xproto/distinfo6
-rw-r--r--x11/xproxymanagementprotocol/Makefile2
-rw-r--r--x11/xproxymanagementprotocol/distinfo6
-rw-r--r--x11/xproxymanagementprotocol/pkg-plist4
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo6
-rw-r--r--x11/xrdb/Makefile2
-rw-r--r--x11/xrdb/distinfo6
-rw-r--r--x11/xrefresh/Makefile2
-rw-r--r--x11/xrefresh/distinfo6
-rw-r--r--x11/xrx/Makefile3
-rw-r--r--x11/xrx/distinfo6
-rw-r--r--x11/xrx/pkg-plist11
-rw-r--r--x11/xset/Makefile2
-rw-r--r--x11/xset/distinfo6
-rw-r--r--x11/xsetroot/Makefile2
-rw-r--r--x11/xsetroot/distinfo6
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xtrans/distinfo6
-rw-r--r--x11/xtrans/pkg-plist1
-rw-r--r--x11/xvidtune/Makefile3
-rw-r--r--x11/xvidtune/distinfo6
-rw-r--r--x11/xvinfo/Makefile2
-rw-r--r--x11/xvinfo/distinfo6
-rw-r--r--x11/xwd/Makefile2
-rw-r--r--x11/xwd/distinfo6
-rw-r--r--x11/xwininfo/Makefile2
-rw-r--r--x11/xwininfo/distinfo6
-rw-r--r--x11/xwud/Makefile2
-rw-r--r--x11/xwud/distinfo6
249 files changed, 752 insertions, 819 deletions
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index bc9a32721fdb..858078de1123 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= appres
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
index fef58715f111..ba6193bd920d 100644
--- a/x11/appres/distinfo
+++ b/x11/appres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/appres-1.0.1.tar.bz2) = 420e6cdf38bb771ec8b00228bf09e8ff
-SHA256 (xorg/app/appres-1.0.1.tar.bz2) = 15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
-SIZE (xorg/app/appres-1.0.1.tar.bz2) = 85320
+MD5 (xorg/app/appres-1.0.2.tar.bz2) = 6f2f5d9f41669d498b56d73dc3206951
+SHA256 (xorg/app/appres-1.0.2.tar.bz2) = 37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36
+SIZE (xorg/app/appres-1.0.2.tar.bz2) = 95494
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index b1d7036899f8..587c2e9eece7 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bigreqsproto
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
index b1c8a2736651..f339e050ddf1 100644
--- a/x11/bigreqsproto/distinfo
+++ b/x11/bigreqsproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 95c29d9d10bf2868996c0c47a3b9a8dc
-SHA256 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
-SIZE (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 36676
+MD5 (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = d30c5dbf19ca6dffcd9788227ecff8c5
+SHA256 (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = 4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
+SIZE (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = 48575
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
index 1a1af677b0cd..8244fb5a8137 100644
--- a/x11/bigreqsproto/pkg-plist
+++ b/x11/bigreqsproto/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/bigreqsproto.h
include/X11/extensions/bigreqstr.h
libdata/pkgconfig/bigreqsproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index e88e35318ec6..558a99c8bc15 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= bitmap
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
index f6dee763e9f8..b8a5dbb0b638 100644
--- a/x11/bitmap/distinfo
+++ b/x11/bitmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/bitmap-1.0.3.tar.bz2) = 98200c358e5401d648b980564d9ae39d
-SHA256 (xorg/app/bitmap-1.0.3.tar.bz2) = 863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
-SIZE (xorg/app/bitmap-1.0.3.tar.bz2) = 129364
+MD5 (xorg/app/bitmap-1.0.4.tar.bz2) = 7d0c1ac193be2491c72a91ccf37ef18e
+SHA256 (xorg/app/bitmap-1.0.4.tar.bz2) = 2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8
+SIZE (xorg/app/bitmap-1.0.4.tar.bz2) = 140565
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index d91e3c61957e..495fb0b93553 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= compositeproto
-PORTVERSION= 0.4
+PORTVERSION= 0.4.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index 163eaf2e50dc..716ffd452d31 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/compositeproto-0.4.tar.bz2) = 6281344d656d4e0c8e9db4918efe3d1d
-SHA256 (xorg/proto/compositeproto-0.4.tar.bz2) = 6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003
-SIZE (xorg/proto/compositeproto-0.4.tar.bz2) = 45390
+MD5 (xorg/proto/compositeproto-0.4.1.tar.bz2) = 3692f3f8b2ea10dff3d2cede8dc65e79
+SHA256 (xorg/proto/compositeproto-0.4.1.tar.bz2) = e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984
+SIZE (xorg/proto/compositeproto-0.4.1.tar.bz2) = 90083
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 13fbd41b7039..779e955b278f 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= damageproto
-PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
index 94794a9b8037..03253db8dc6e 100644
--- a/x11/damageproto/distinfo
+++ b/x11/damageproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/damageproto-1.1.0.tar.bz2) = 33ee591e0b1ca5ad7902934541db7d24
-SHA256 (xorg/proto/damageproto-1.1.0.tar.bz2) = 9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
-SIZE (xorg/proto/damageproto-1.1.0.tar.bz2) = 41449
+MD5 (xorg/proto/damageproto-1.2.0.tar.bz2) = 434b931b02bd83ed9fc44951df81cdac
+SHA256 (xorg/proto/damageproto-1.2.0.tar.bz2) = a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f
+SIZE (xorg/proto/damageproto-1.2.0.tar.bz2) = 53133
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
index a568291d4cf1..15c4f51a2d55 100644
--- a/x11/dmxproto/Makefile
+++ b/x11/dmxproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dmxproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
index 9c74d443d02e..368a78d3dce9 100644
--- a/x11/dmxproto/distinfo
+++ b/x11/dmxproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/dmxproto-2.2.2.tar.bz2) = d80acad88411e7944b9b085463d53302
-SHA256 (xorg/proto/dmxproto-2.2.2.tar.bz2) = aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
-SIZE (xorg/proto/dmxproto-2.2.2.tar.bz2) = 39380
+MD5 (xorg/proto/dmxproto-2.3.tar.bz2) = 880a41720b2937e2660dcdc0d34a8791
+SHA256 (xorg/proto/dmxproto-2.3.tar.bz2) = 3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
+SIZE (xorg/proto/dmxproto-2.3.tar.bz2) = 83906
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
index 6a6ab38e4e10..98accdce0c96 100644
--- a/x11/dmxproto/pkg-plist
+++ b/x11/dmxproto/pkg-plist
@@ -1,4 +1,4 @@
-include/X11/extensions/dmxext.h
+include/X11/extensions/dmx.h
include/X11/extensions/dmxproto.h
libdata/pkgconfig/dmxproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 53bb0cfcc37f..638ff0f2f76d 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dri2proto
-PORTVERSION= 2.1
+PORTVERSION= 2.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index 9cd2c8eb8189..71dc2fb3621b 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/dri2proto-2.1.tar.bz2) = 5cb7987d29db068153bdc8f23c767c43
-SHA256 (xorg/proto/dri2proto-2.1.tar.bz2) = 2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
-SIZE (xorg/proto/dri2proto-2.1.tar.bz2) = 51362
+MD5 (xorg/proto/dri2proto-2.2.tar.bz2) = 3ca8ddb42cd4ee31b8690031303221af
+SHA256 (xorg/proto/dri2proto-2.2.tar.bz2) = f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
+SIZE (xorg/proto/dri2proto-2.2.tar.bz2) = 94772
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 389b9c9f9b74..245843f9092c 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= editres
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
index 7c38b72c4e1e..a5b442702ae9 100644
--- a/x11/editres/distinfo
+++ b/x11/editres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/editres-1.0.3.tar.bz2) = a25f931cc6c8d03daaed434f5db5df2d
-SHA256 (xorg/app/editres-1.0.3.tar.bz2) = a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
-SIZE (xorg/app/editres-1.0.3.tar.bz2) = 127231
+MD5 (xorg/app/editres-1.0.4.tar.bz2) = 1800dda934ebb7c588ea686278a10e9f
+SHA256 (xorg/app/editres-1.0.4.tar.bz2) = d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302
+SIZE (xorg/app/editres-1.0.4.tar.bz2) = 136331
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
index 1474c4d5fc82..c447ad5d18af 100644
--- a/x11/editres/pkg-plist
+++ b/x11/editres/pkg-plist
@@ -1,5 +1,5 @@
bin/editres
-share/X11/app-defaults/Editres-color
share/X11/app-defaults/Editres
+share/X11/app-defaults/Editres-color
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
index ef8cde3d8614..f014fc23efd5 100644
--- a/x11/evieext/Makefile
+++ b/x11/evieext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= evieext
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/evieext/distinfo b/x11/evieext/distinfo
index 6e3bafd63156..01647643b3cb 100644
--- a/x11/evieext/distinfo
+++ b/x11/evieext/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/evieext-1.0.2.tar.bz2) = 2507b5d0f4b2848147fbddd155aa6cfe
-SHA256 (xorg/proto/evieext-1.0.2.tar.bz2) = 0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
-SIZE (xorg/proto/evieext-1.0.2.tar.bz2) = 37534
+MD5 (xorg/proto/evieext-1.1.0.tar.bz2) = 5c74f61d6f77b2e6a083b2b31000be42
+SHA256 (xorg/proto/evieext-1.1.0.tar.bz2) = 47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
+SIZE (xorg/proto/evieext-1.1.0.tar.bz2) = 48997
diff --git a/x11/evieext/pkg-plist b/x11/evieext/pkg-plist
index b10aee8e8811..203a5e91426e 100644
--- a/x11/evieext/pkg-plist
+++ b/x11/evieext/pkg-plist
@@ -1,3 +1,4 @@
include/X11/extensions/Xeviestr.h
+include/X11/extensions/evieproto.h
libdata/pkgconfig/evieproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 3ea2a4e24ebf..45350f54ecab 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fixesproto
-PORTVERSION= 4.0
+PORTVERSION= 4.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
index 9bca631147e5..fa215cec2baf 100644
--- a/x11/fixesproto/distinfo
+++ b/x11/fixesproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/fixesproto-4.0.tar.bz2) = 8b298cc3424597f8138c7faf7763dce9
-SHA256 (xorg/proto/fixesproto-4.0.tar.bz2) = b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
-SIZE (xorg/proto/fixesproto-4.0.tar.bz2) = 38550
+MD5 (xorg/proto/fixesproto-4.1.1.tar.bz2) = 4c1cb4f2ed9f34de59f2f04783ca9483
+SHA256 (xorg/proto/fixesproto-4.1.1.tar.bz2) = e72a32916ad4bbd03847f8945c55582bdbafc039d286ded7365d402a7ff164ef
+SIZE (xorg/proto/fixesproto-4.1.1.tar.bz2) = 91338
diff --git a/x11/fixesproto/pkg-plist b/x11/fixesproto/pkg-plist
index f1bec6c8e826..be82504b2f31 100644
--- a/x11/fixesproto/pkg-plist
+++ b/x11/fixesproto/pkg-plist
@@ -1,4 +1,7 @@
include/X11/extensions/xfixesproto.h
include/X11/extensions/xfixeswire.h
libdata/pkgconfig/fixesproto.pc
+%%DOCSDIR%%/fixesproto.txt
+@dirrm %%DOCSDIR%%
@dirrmtry include/X11/extensions
+
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 293db6c256eb..5b82b42dd78b 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glproto
-PORTVERSION= 1.4.10
+PORTVERSION= 1.4.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index 7adcc681ec3f..a4adc7a86fff 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/glproto-1.4.10.tar.bz2) = c9f8cebfba72bfab674bc0170551fb8d
-SHA256 (xorg/proto/glproto-1.4.10.tar.bz2) = 7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
-SIZE (xorg/proto/glproto-1.4.10.tar.bz2) = 67332
+MD5 (xorg/proto/glproto-1.4.11.tar.bz2) = 78e7c4dc7dcb74b1869fee7897e00f59
+SHA256 (xorg/proto/glproto-1.4.11.tar.bz2) = fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+SIZE (xorg/proto/glproto-1.4.11.tar.bz2) = 108416
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 5cd0b59d5d8b..4699ed3e42cf 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= iceauth
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
index 7f8e6e961ded..201ac6b8f701 100644
--- a/x11/iceauth/distinfo
+++ b/x11/iceauth/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/iceauth-1.0.2.tar.bz2) = 7ab8b64edf0212a9d9a3c8129901a450
-SHA256 (xorg/app/iceauth-1.0.2.tar.bz2) = 06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb
-SIZE (xorg/app/iceauth-1.0.2.tar.bz2) = 97052
+MD5 (xorg/app/iceauth-1.0.3.tar.bz2) = 975ade3f238c1eb10705da0a91e6e8e7
+SHA256 (xorg/app/iceauth-1.0.3.tar.bz2) = abca3ff6c9f2da2600a474f0e92ae5e62c43914f7bd3d948b91b0a7f9117d81e
+SIZE (xorg/app/iceauth-1.0.3.tar.bz2) = 106197
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 4f9336765ec2..d64ee328b583 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= inputproto
-PORTVERSION= 1.5.0
+PORTVERSION= 2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index 2488042f8d40..3ca4f2ab2ddd 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/inputproto-1.5.0.tar.bz2) = dcc36554aea1338b3813943daf1e9988
-SHA256 (xorg/proto/inputproto-1.5.0.tar.bz2) = ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
-SIZE (xorg/proto/inputproto-1.5.0.tar.bz2) = 57358
+MD5 (xorg/proto/inputproto-2.0.tar.bz2) = 0f7acbc14a082f9ae03744396527d23d
+SHA256 (xorg/proto/inputproto-2.0.tar.bz2) = 472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4
+SIZE (xorg/proto/inputproto-2.0.tar.bz2) = 140071
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
index 7f234dc66b02..8ed21c47ef29 100644
--- a/x11/inputproto/pkg-plist
+++ b/x11/inputproto/pkg-plist
@@ -1,5 +1,6 @@
include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
libdata/pkgconfig/inputproto.pc
-@dirrmtry include/X11/extensions
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index ba1da4fb0d31..c9bbfc0d25f9 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kbproto
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
index 8d4d2db92fc7..30c2135b94e9 100644
--- a/x11/kbproto/distinfo
+++ b/x11/kbproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/kbproto-1.0.3.tar.bz2) = 6092cdb0a1225f95356ddbe6c2abaad5
-SHA256 (xorg/proto/kbproto-1.0.3.tar.bz2) = 7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
-SIZE (xorg/proto/kbproto-1.0.3.tar.bz2) = 57440
+MD5 (xorg/proto/kbproto-1.0.4.tar.bz2) = 7f439166a9b2bf81471a33951883019f
+SHA256 (xorg/proto/kbproto-1.0.4.tar.bz2) = 1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
+SIZE (xorg/proto/kbproto-1.0.4.tar.bz2) = 104959
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index b186082dccb1..d2051d568cb0 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libICE
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.6
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index a4f6ed9128ca..a83bf7400aeb 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libICE-1.0.4.tar.bz2) = 4ab4e67e0b8845aa201e984153087f4a
-SHA256 (xorg/lib/libICE-1.0.4.tar.bz2) = 13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
-SIZE (xorg/lib/libICE-1.0.4.tar.bz2) = 252304
+MD5 (xorg/lib/libICE-1.0.6.tar.bz2) = 2d39bc924af24325dae589e9a849180c
+SHA256 (xorg/lib/libICE-1.0.6.tar.bz2) = a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b
+SIZE (xorg/lib/libICE-1.0.6.tar.bz2) = 279257
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 36215b86fdc1..758d90f25dbe 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libSM
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index fdaef1635659..424f4737bdf0 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733
-SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
-SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599
+MD5 (xorg/lib/libSM-1.1.1.tar.bz2) = 6889a455496aaaa65b1fa05fc518d179
+SHA256 (xorg/lib/libSM-1.1.1.tar.bz2) = f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
+SIZE (xorg/lib/libSM-1.1.1.tar.bz2) = 262305
diff --git a/x11/libSM/files/patch-configure.ac b/x11/libSM/files/patch-configure.ac
deleted file mode 100644
index 2fe7d332d26a..000000000000
--- a/x11/libSM/files/patch-configure.ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.ac.orig 2008-07-02 21:58:05.000000000 +0400
-+++ configure.ac 2009-02-23 18:50:18.000000000 +0300
-@@ -35,10 +35,13 @@
- # Needed to check for TCP & IPv6 support and set flags appropriately
- XTRANS_CONNECTION_FLAGS
-
-+AC_ARG_WITH(stduuid, AC_HELP_STRING([--with-stduuid], [Build with DCE 1.1 uuid support for client IDs]))
-+AM_CONDITIONAL(WITH_STDUUID, test x"$with_stduuid" != "xno")
-+
- AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
--AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno)
-+AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno")
-
--if test x"$with_libuuid" != xno; then
-+if test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno"; then
- PKG_CHECK_MODULES(LIBUUID, uuid)
- fi
-
diff --git a/x11/libSM/files/patch-src_Makefile.am b/x11/libSM/files/patch-src_Makefile.am
deleted file mode 100644
index 7a855fab2e0d..000000000000
--- a/x11/libSM/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.am.orig 2008-06-24 21:09:29.000000000 +0400
-+++ src/Makefile.am 2009-02-23 18:48:20.000000000 +0300
-@@ -2,6 +2,10 @@
-
- AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
-
-+if WITH_STDUUID
-+AM_CFLAGS += -DHAVE_STDUUID
-+endif
-+
- if WITH_LIBUUID
- AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
- endif
diff --git a/x11/libSM/files/patch-src_sm_genid.c b/x11/libSM/files/patch-src_sm_genid.c
deleted file mode 100644
index 2d685115acdb..000000000000
--- a/x11/libSM/files/patch-src_sm_genid.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/sm_genid.c.orig 2008-06-24 21:11:27.000000000 +0400
-+++ src/sm_genid.c 2009-02-23 18:51:22.000000000 +0300
-@@ -76,7 +76,9 @@
- #define TCPCONN
- #endif
-
--#if defined(HAVE_LIBUUID)
-+#if defined(HAVE_STDUUID)
-+#include <uuid.h>
-+#elif defined(HAVE_LIBUUID)
- #include <uuid/uuid.h>
- #endif
-
-@@ -85,7 +87,28 @@
- SmsGenerateClientID (smsConn)
- SmsConn smsConn;
- {
--#if defined(HAVE_LIBUUID)
-+#if defined(HAVE_STDUUID)
-+ char *id;
-+ char *str;
-+ uuid_t uuid;
-+ uint32_t status;
-+
-+ uuid_create(&uuid, &status);
-+ if (status != uuid_s_ok)
-+ return NULL;
-+
-+ uuid_to_string(&uuid, &str, &status);
-+ if (status != uuid_s_ok)
-+ return NULL;
-+
-+ if ((id = malloc (strlen (str) + 2)) != NULL) {
-+ id[0] = '2';
-+ strcpy(&id[1], str);
-+ }
-+ free(str);
-+
-+ return id;
-+#elif defined(HAVE_LIBUUID)
- char *id;
- char temp[256];
- uuid_t uuid;
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d0bcf1ca34bf..fcd11438971f 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libX11
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.3.3
PORTEPOCH= 1
CATEGORIES= x11
@@ -26,6 +25,7 @@ ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
--with-xcb=yes
+CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
.include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 7f8cc3e502e3..f45af2697f1e 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libX11-1.2.1.tar.bz2) = 2f2beb98e71f397e1209beaca4e97cb1
-SHA256 (xorg/lib/libX11-1.2.1.tar.bz2) = d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
-SIZE (xorg/lib/libX11-1.2.1.tar.bz2) = 1798407
+MD5 (xorg/lib/libX11-1.3.3.tar.bz2) = 5d74971360f194ce33d2bd2e4d9b066c
+SHA256 (xorg/lib/libX11-1.3.3.tar.bz2) = 8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
+SIZE (xorg/lib/libX11-1.3.3.tar.bz2) = 2166076
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index fce86a29b4d6..57f14cdff6e6 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -207,6 +207,7 @@ XFree.3 \
XFreeColormap.3 \
XFreeColors.3 \
XFreeCursor.3 \
+XFreeEventData.3 \
XFreeExtensionList.3 \
XFreeFont.3 \
XFreeFontInfo.3 \
@@ -219,10 +220,12 @@ XFreePixmap.3 \
XFreeStringList.3 \
XGCValues.3 \
XGContextFromGC.3 \
+XGenericEventCookie.3 \
XGetAtomName.3 \
XGetAtomNames.3 \
XGetClassHint.3 \
XGetCommand.3 \
+XGetEventData.3 \
XGetErrorDatabaseText.3 \
XGetErrorText.3 \
XGetFontPath.3 \
@@ -812,3 +815,5 @@ XwcTextExtents.3 \
XwcTextListToTextProperty.3 \
XwcTextPerCharExtents.3 \
XwcTextPropertyToTextList.3
+MAN5= \
+Compose.5 \
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 37e21cee9093..d304d0ab3c7c 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -1,3 +1,18 @@
+%%DOCSDIR%%/libX11.txt
+%%DOCSDIR%%/libX11.ps
+%%DOCSDIR%%/libX11.html
+%%DOCSDIR%%/Framework.txt
+%%DOCSDIR%%/LocaleDB.txt
+%%DOCSDIR%%/Trans.txt
+%%DOCSDIR%%/Framework.ps
+%%DOCSDIR%%/LocaleDB.ps
+%%DOCSDIR%%/Trans.ps
+%%DOCSDIR%%/Framework.html
+%%DOCSDIR%%/LocaleDB.html
+%%DOCSDIR%%/Trans.html
+%%DOCSDIR%%/xim.txt
+%%DOCSDIR%%/xim.ps
+%%DOCSDIR%%/xim.html
include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
@@ -206,6 +221,7 @@ lib/X11/locale/zh_TW.UTF-8/Compose
lib/X11/locale/locale.alias
lib/X11/locale/locale.dir
lib/X11/locale/compose.dir
+@dirrmtry %%DOCSDIR%%
@dirrm lib/X11/locale/zh_TW.UTF-8
@dirrm lib/X11/locale/zh_TW.big5
@dirrm lib/X11/locale/zh_HK.UTF-8
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 4a8704ce1f86..028d7174a5ad 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXScrnSaver
-PORTVERSION= 1.1.3
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 401b30f193b1..63ce298845b5 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 93f84b6797f2f29cae1ce23b0355d00d
-SHA256 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
-SIZE (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 219568
+MD5 (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 33e54f64b55f22d8bbe822a5b62568cb
+SHA256 (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
+SIZE (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 248744
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
index 508ec72f3e26..98c944fc81fe 100644
--- a/x11/libXScrnSaver/pkg-plist
+++ b/x11/libXScrnSaver/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/scrnsaver.h
lib/libXss.so.1
lib/libXss.so
lib/libXss.la
lib/libXss.a
libdata/pkgconfig/xscrnsaver.pc
+@dirrmtry include/X11/extensions
+
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index f7494c8bd50f..40543be06354 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXau
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 9f908d675730..9befc51bb79e 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXau-1.0.4.tar.bz2) = 0f2b88d857e0a3f5898e4759c541af46
-SHA256 (xorg/lib/libXau-1.0.4.tar.bz2) = 10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
-SIZE (xorg/lib/libXau-1.0.4.tar.bz2) = 227753
+MD5 (xorg/lib/libXau-1.0.5.tar.bz2) = 993b3185c629e4b89401fca072dcb663
+SHA256 (xorg/lib/libXau-1.0.5.tar.bz2) = a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
+SIZE (xorg/lib/libXau-1.0.5.tar.bz2) = 249998
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index eb8ab75eaa6c..0fa753492499 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 0.4.0
+PORTVERSION= 0.4.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 7f7a424888e1..6285cb28bddd 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7e95395dea89be21bae929b9b7f16641
-SHA256 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510
-SIZE (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 217145
+MD5 (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 0f1367f57fdf5df17a8dd71d0fa68248
+SHA256 (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13
+SIZE (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 249284
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 0c031f6e7a33..4101cf19b9eb 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= libXcursor
-PORTVERSION= 1.1.9
-PORTREVISION= 1
+PORTVERSION= 1.1.10
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X client-side cursor loading library
XORG_CAT= lib
-USE_XORG= xrender x11 xfixes fixesproto xproto:both
+USE_XORG= xrender x11 xfixes fixesproto xproto:both \
+ xextproto
CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index 459db7d00f82..b2154aac90d6 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 99b7554037a92b260891091e81815a0a
-SHA256 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4
-SIZE (xorg/lib/libXcursor-1.1.9.tar.bz2) = 234749
+MD5 (xorg/lib/libXcursor-1.1.10.tar.bz2) = 7dcdad1c10daea872cb3355af414b2ca
+SHA256 (xorg/lib/libXcursor-1.1.10.tar.bz2) = b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd
+SIZE (xorg/lib/libXcursor-1.1.10.tar.bz2) = 264543
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 9b11eb0ff0de..0b3799832d35 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXdamage
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index de3ea7517055..b36c4fc3495f 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXdamage-1.1.1.tar.bz2) = ac0ce6b0063a9858c8f24ddb4c60487d
-SHA256 (xorg/lib/libXdamage-1.1.1.tar.bz2) = 0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
-SIZE (xorg/lib/libXdamage-1.1.1.tar.bz2) = 201096
+MD5 (xorg/lib/libXdamage-1.1.2.tar.bz2) = b42780bce703ec202a33e5693991c09d
+SHA256 (xorg/lib/libXdamage-1.1.2.tar.bz2) = a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a
+SIZE (xorg/lib/libXdamage-1.1.2.tar.bz2) = 238443
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index d69f768f7755..04edd136738d 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXdmcp
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index 65cc796890cf..40306e8c49d3 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 10facf2bc7cbd5e5c1a698b8a210a582
-SHA256 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
-SIZE (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 220946
+MD5 (xorg/lib/libXdmcp-1.0.3.tar.bz2) = d60941d471800f41a3f19b24bea855a7
+SHA256 (xorg/lib/libXdmcp-1.0.3.tar.bz2) = d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
+SIZE (xorg/lib/libXdmcp-1.0.3.tar.bz2) = 256963
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 272d3c45139b..afed4dc10da7 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXext
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 3b67bac63dcc..2c515cd352d8 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXext-1.0.5.tar.bz2) = aa11d859cc8e9a0bad3bb55e1666547b
-SHA256 (xorg/lib/libXext-1.0.5.tar.bz2) = 1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
-SIZE (xorg/lib/libXext-1.0.5.tar.bz2) = 271301
+MD5 (xorg/lib/libXext-1.1.1.tar.bz2) = c417c0e8df39a067f90a2a2e7133637d
+SHA256 (xorg/lib/libXext-1.1.1.tar.bz2) = 110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3
+SIZE (xorg/lib/libXext-1.1.1.tar.bz2) = 318737
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 4e47d7451237..d25c0db798c7 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -2,4 +2,24 @@ lib/libXext.a
lib/libXext.la
lib/libXext.so
lib/libXext.so.6
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
+include/X11/extensions/dpms.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/security.h
+include/X11/extensions/shape.h
+include/X11/extensions/sync.h
+include/X11/extensions/xtestext1.h
libdata/pkgconfig/xext.pc
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index ac3d0cc4ba1b..832b47796c86 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXfixes
-PORTVERSION= 4.0.3
-PORTREVISION= 1
+PORTVERSION= 4.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo
index 7c852b9d00ab..59c648beff39 100644
--- a/x11/libXfixes/distinfo
+++ b/x11/libXfixes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 1990d19725a3c7f32290037f02d3737f
-SHA256 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
-SIZE (xorg/lib/libXfixes-4.0.3.tar.bz2) = 214287
+MD5 (xorg/lib/libXfixes-4.0.4.tar.bz2) = 7f2c40852eb337b237ad944ca5c30d49
+SHA256 (xorg/lib/libXfixes-4.0.4.tar.bz2) = ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
+SIZE (xorg/lib/libXfixes-4.0.4.tar.bz2) = 246305
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index bb301a30f0a2..9b81e4cd7ea4 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXi
-PORTVERSION= 1.2.1
+PORTVERSION= 1.3
PORTEPOCH= 1
CATEGORIES= x11
@@ -16,46 +16,4 @@ COMMENT= X Input extension library
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto inputproto:both
-MAN3= XAllowDeviceEvents.3 \
- XChangeDeviceControl.3 \
- XChangeDeviceDontPropagateList.3 \
- XChangeDeviceKeyMapping.3 \
- XChangeDeviceProperty.3 \
- XChangeFeedbackControl.3 \
- XChangeKeyboardDevice.3 \
- XChangePointerDevice.3 \
- XCloseDevice.3 \
- XDeleteDeviceProperty.3 \
- XDeviceBell.3 \
- XDeviceTimeCoord.3 \
- XFreeDeviceList.3 \
- XGetDeviceControl.3 \
- XGetDeviceKeyMapping.3 \
- XGetDeviceModifierMapping.3 \
- XGetDeviceMotionEvents.3 \
- XGetDeviceProperty.3 \
- XGetExtensionVersion.3 \
- XGetFeedbackControl.3 \
- XGetDeviceButtonMapping.3 \
- XGetDeviceDontPropagateList.3 \
- XGetDeviceFocus.3 \
- XGetSelectedExtensionEvents.3 \
- XGrabDevice.3 \
- XGrabDeviceButton.3 \
- XGrabDeviceKey.3 \
- XListDeviceProperties.3 \
- XListInputDevices.3 \
- XOpenDevice.3 \
- XQueryDeviceState.3 \
- XSelectExtensionEvent.3 \
- XSendExtensionEvent.3 \
- XSetDeviceButtonMapping.3 \
- XSetDeviceFocus.3 \
- XSetDeviceMode.3 \
- XSetDeviceModifierMapping.3 \
- XSetDeviceValuators.3 \
- XUngrabDeviceButton.3 \
- XUngrabDeviceKey.3 \
- XUngrabDevice.3 \
-
.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 7f2988b0b8cc..02a33ca8c6ae 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXi-1.2.1.tar.bz2) = cfb36307e8e7ffafe40848dba24e0b11
-SHA256 (xorg/lib/libXi-1.2.1.tar.bz2) = a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
-SIZE (xorg/lib/libXi-1.2.1.tar.bz2) = 279752
+MD5 (xorg/lib/libXi-1.3.tar.bz2) = 8df4ece9bd1efb02c28acb2b6f485e09
+SHA256 (xorg/lib/libXi-1.3.tar.bz2) = 362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
+SIZE (xorg/lib/libXi-1.3.tar.bz2) = 350827
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
index e1cbeac40e06..0f704e228faf 100644
--- a/x11/libXi/pkg-plist
+++ b/x11/libXi/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
lib/libXi.a
lib/libXi.la
lib/libXi.so
lib/libXi.so.6
libdata/pkgconfig/xi.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 70b0496790c4..a38a7dab2b11 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 0955c5e2ae1c..6bd493ea9385 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXinerama-1.0.3.tar.bz2) = cd9f7c46439ac40e0517a302d2434d2c
-SHA256 (xorg/lib/libXinerama-1.0.3.tar.bz2) = 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
-SIZE (xorg/lib/libXinerama-1.0.3.tar.bz2) = 236386
+MD5 (xorg/lib/libXinerama-1.1.tar.bz2) = a2ac01fc0426cdbb713c5d59cf9955ed
+SHA256 (xorg/lib/libXinerama-1.1.tar.bz2) = e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
+SIZE (xorg/lib/libXinerama-1.1.tar.bz2) = 245133
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index 9915dec27089..ff8b840ac2d8 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/Xinerama.h
+include/X11/extensions/panoramiXext.h
lib/libXinerama.a
lib/libXinerama.la
lib/libXinerama.so
lib/libXinerama.so.1
libdata/pkgconfig/xinerama.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 553f8ff678d6..b8c6871d7660 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXrender
-PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTVERSION= 0.9.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index 61d5242d086b..50d7466ca8e4 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXrender-0.9.4.tar.bz2) = dc266e850c51368f964e0d67bf5fb5e6
-SHA256 (xorg/lib/libXrender-0.9.4.tar.bz2) = 5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
-SIZE (xorg/lib/libXrender-0.9.4.tar.bz2) = 226512
+MD5 (xorg/lib/libXrender-0.9.5.tar.bz2) = 276dd9e85daf0680616cd9f132b354c9
+SHA256 (xorg/lib/libXrender-0.9.5.tar.bz2) = bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
+SIZE (xorg/lib/libXrender-0.9.5.tar.bz2) = 261483
diff --git a/x11/libXrender/pkg-plist b/x11/libXrender/pkg-plist
index 08f3673bf8de..ea82f6f49779 100644
--- a/x11/libXrender/pkg-plist
+++ b/x11/libXrender/pkg-plist
@@ -4,3 +4,6 @@ lib/libXrender.la
lib/libXrender.so
lib/libXrender.so.1
libdata/pkgconfig/xrender.pc
+%%DOCSDIR%%/libXrender.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 6174f57faa5a..e67698bb6b59 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXres
-PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 71c6e58e9d51..f9d2f9871b22 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXres-1.0.3.tar.bz2) = de66ffb657aba64c9d6dbdeabb757f3e
-SHA256 (xorg/lib/libXres-1.0.3.tar.bz2) = a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230
-SIZE (xorg/lib/libXres-1.0.3.tar.bz2) = 218203
+MD5 (xorg/lib/libXres-1.0.4.tar.bz2) = 4daf91f93d924e693f6f6ed276791be2
+SHA256 (xorg/lib/libXres-1.0.4.tar.bz2) = 457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df
+SIZE (xorg/lib/libXres-1.0.4.tar.bz2) = 249779
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 98d0dda564d7..6400ec95a453 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -6,27 +6,15 @@
#
PORTNAME= libXtst
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Test extension
XORG_CAT= lib
-USE_XORG= x11 xext recordproto:both xextproto inputproto:both
+USE_XORG= x11 xext recordproto:both xextproto inputproto:both \
+ xi
USE_AUTOTOOLS= libtool:22
-MAN3= XTestQueryExtension.3 \
- XTestCompareCursorWithWindow.3 \
- XTestCompareCurrentCursorWithWindow.3 \
- XTestFakeKeyEvent.3 \
- XTestFakeButtonEvent.3 \
- XTestFakeMotionEvent.3 \
- XTestFakeRelativeMotionEvent.3 \
- XTestGrabControl.3 \
- XTestSetGContextOfGC.3 \
- XTestSetVisualIDOfVisual.3 \
- XTestDiscard.3
-
.include <bsd.port.mk>
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
index 1bbf04582e3a..cb8096294360 100644
--- a/x11/libXtst/distinfo
+++ b/x11/libXtst/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXtst-1.0.3.tar.bz2) = 090c1ad04e34982eada5cf3b1a0792fd
-SHA256 (xorg/lib/libXtst-1.0.3.tar.bz2) = b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
-SIZE (xorg/lib/libXtst-1.0.3.tar.bz2) = 224637
+MD5 (xorg/lib/libXtst-1.1.0.tar.bz2) = dd6f3e20b87310187121539f9605d977
+SHA256 (xorg/lib/libXtst-1.1.0.tar.bz2) = bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
+SIZE (xorg/lib/libXtst-1.1.0.tar.bz2) = 256889
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index 03c03012321d..9c3e055d2f42 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -1,6 +1,9 @@
+include/X11/extensions/XTest.h
+include/X11/extensions/record.h
lib/libXtst.a
lib/libXtst.la
lib/libXtst.so
lib/libXtst.so.6
libdata/pkgconfig/xtst.pc
@dirrmtry include/X11/extensions
+
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 6924e39ca93d..149117f450de 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXv
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
PORTEPOCH= 1
CATEGORIES= x11
@@ -19,10 +19,13 @@ USE_XORG= x11 xext xextproto videoproto:both xproto:both
MAN3= Xv.3 \
XvFreeAdaptorInfo.3 \
XvFreeEncodingInfo.3 \
+ XvCreateImage.3 \
XvGetPortAttribute.3 \
XvGetStill.3 \
XvGetVideo.3 \
XvGrabPort.3 \
+ XvListImageFormats.3 \
+ XvPutImage.3 \
XvPortNotify.3 \
XvPutStill.3 \
XvPutVideo.3 \
@@ -30,9 +33,12 @@ MAN3= Xv.3 \
XvQueryBestSize.3 \
XvQueryEncodings.3 \
XvQueryExtension.3 \
+ XvQueryPortAttributes.3 \
XvSelectPortNotify.3 \
XvSelectVideoNotify.3 \
XvSetPortAttribute.3 \
+ XvShmCreateImage.3 \
+ XvShmPutImage.3 \
XvStopVideo.3 \
XvUngrabPort.3 \
XvVideoNotify.3
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 839e7857cf8b..cfe86c732ed8 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXv-1.0.4.tar.bz2) = 723a0275227165383e967a1ca8899b52
-SHA256 (xorg/lib/libXv-1.0.4.tar.bz2) = 4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
-SIZE (xorg/lib/libXv-1.0.4.tar.bz2) = 229227
+MD5 (xorg/lib/libXv-1.0.5.tar.bz2) = 1d97798b1d8bbf8d9085e1b223a0738f
+SHA256 (xorg/lib/libXv-1.0.5.tar.bz2) = d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
+SIZE (xorg/lib/libXv-1.0.5.tar.bz2) = 267466
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index d5c4d3a38ac0..fdbeac00c3b5 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXvMC
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
index d29fc2e6aff9..770100ceb6ba 100644
--- a/x11/libXvMC/distinfo
+++ b/x11/libXvMC/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXvMC-1.0.4.tar.bz2) = b54600573daf9d1a29b952e8d35b389e
-SHA256 (xorg/lib/libXvMC-1.0.4.tar.bz2) = 1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
-SIZE (xorg/lib/libXvMC-1.0.4.tar.bz2) = 225137
+MD5 (xorg/lib/libXvMC-1.0.5.tar.bz2) = 16c3a11add14979beb7510e44623cac6
+SHA256 (xorg/lib/libXvMC-1.0.5.tar.bz2) = 0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f
+SIZE (xorg/lib/libXvMC-1.0.5.tar.bz2) = 256570
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
index 83c0a166cc5d..b22d278a2167 100644
--- a/x11/libXvMC/pkg-plist
+++ b/x11/libXvMC/pkg-plist
@@ -8,3 +8,6 @@ lib/libXvMCW.la
lib/libXvMCW.so
lib/libXvMCW.so.1
libdata/pkgconfig/xvmc.pc
+%%DOCSDIR%%/XvMC_API.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index c81cd3802e59..74d1d56312e5 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86dga
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
index 26caf50e6b9c..89cde8234c9b 100644
--- a/x11/libXxf86dga/distinfo
+++ b/x11/libXxf86dga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 6f5f621804ee652b6cc6f2025c517c78
-SHA256 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
-SIZE (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 217092
+MD5 (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 368837d3d7a4d3b4f70be48383e3544e
+SHA256 (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
+SIZE (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 254317
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
index 6c9724d75e96..77c173b86ef7 100644
--- a/x11/libXxf86dga/pkg-plist
+++ b/x11/libXxf86dga/pkg-plist
@@ -1,3 +1,5 @@
+include/X11/extensions/Xxf86dga.h
+include/X11/extensions/xf86dga1.h
lib/libXxf86dga.a
lib/libXxf86dga.la
lib/libXxf86dga.so
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 2476778b3bea..59881e413b6b 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86misc
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/distinfo b/x11/libXxf86misc/distinfo
index 91cdedeaf6ab..5aee8054c5a6 100644
--- a/x11/libXxf86misc/distinfo
+++ b/x11/libXxf86misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 7cee0df63903cef7f7a3fb68cdd99eef
-SHA256 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
-SIZE (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 222736
+MD5 (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 51fed53e8de067d4b8666f75a0212400
+SHA256 (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
+SIZE (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 246038
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index f164840f92e2..1eed4e6f34b3 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86vm
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 5f6d92ebe9ea..020d4acf10c9 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 304d37bd0a10d9b58aa9b64469ad73e5
-SHA256 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
-SIZE (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 240637
+MD5 (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = b431ad7084e1055fef99a9115237edd8
+SHA256 (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
+SIZE (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 248769
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
index ae0c9e9b2ed5..17f8d37f31b7 100644
--- a/x11/libXxf86vm/pkg-plist
+++ b/x11/libXxf86vm/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/xf86vmode.h
lib/libXxf86vm.a
lib/libXxf86vm.la
lib/libXxf86vm.so
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 31f854975596..8870929611ef 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libdmx
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
index 8131963fa474..bbe5bd0072b1 100644
--- a/x11/libdmx/distinfo
+++ b/x11/libdmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libdmx-1.0.2.tar.bz2) = 4d866967210d06098fc9f302ed4c79b1
-SHA256 (xorg/lib/libdmx-1.0.2.tar.bz2) = fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
-SIZE (xorg/lib/libdmx-1.0.2.tar.bz2) = 231083
+MD5 (xorg/lib/libdmx-1.1.0.tar.bz2) = a2fcf0382837888d3781b714489a8999
+SHA256 (xorg/lib/libdmx-1.1.0.tar.bz2) = 1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5
+SIZE (xorg/lib/libdmx-1.1.0.tar.bz2) = 252069
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
index 1d6c42c745e2..933f89e9c78f 100644
--- a/x11/libdmx/pkg-plist
+++ b/x11/libdmx/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/dmxext.h
lib/libdmx.a
lib/libdmx.la
lib/libdmx.so
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index a51273a6dfc8..e98cafed69bf 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxkbfile
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 106e9f45c522..5d203d729b48 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0726a845fe5a56551de2718c9f6b0e35
-SHA256 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
-SIZE (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 259790
+MD5 (xorg/lib/libxkbfile-1.0.6.tar.bz2) = b01156e263eca8177e6b7f10441951c4
+SHA256 (xorg/lib/libxkbfile-1.0.6.tar.bz2) = 2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039
+SIZE (xorg/lib/libxkbfile-1.0.6.tar.bz2) = 285307
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index a2722836ff4f..8dd7ae4457ac 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= listres
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/listres/distinfo b/x11/listres/distinfo
index 0670e158e3e4..df102269bd44 100644
--- a/x11/listres/distinfo
+++ b/x11/listres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/listres-1.0.1.tar.bz2) = 827a1ac5adf9aadd0c13b54a897e297b
-SHA256 (xorg/app/listres-1.0.1.tar.bz2) = 7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
-SIZE (xorg/app/listres-1.0.1.tar.bz2) = 76709
+MD5 (xorg/app/listres-1.0.2.tar.bz2) = 3c0d5d8d6abaf411cd0647bc7073ac38
+SHA256 (xorg/app/listres-1.0.2.tar.bz2) = 4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7
+SIZE (xorg/app/listres-1.0.2.tar.bz2) = 101937
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index 16fca9ba908e..01cc31db8bc1 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= luit
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
index 054a7b31af39..20e4d0103f53 100644
--- a/x11/luit/distinfo
+++ b/x11/luit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/luit-1.0.3.tar.bz2) = b01e4f71c20fc1c79ed727759c1df40c
-SHA256 (xorg/app/luit-1.0.3.tar.bz2) = 2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
-SIZE (xorg/app/luit-1.0.3.tar.bz2) = 104642
+MD5 (xorg/app/luit-1.0.5.tar.bz2) = fd8579a993c4480978e3504a4c53c189
+SHA256 (xorg/app/luit-1.0.5.tar.bz2) = 8eeb1cf7809acc17cf6cecfdc899613854560052229b21e6115b03a088cd059b
+SIZE (xorg/app/luit-1.0.5.tar.bz2) = 122192
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
index 357153c18c84..14e4ee241684 100644
--- a/x11/mkcomposecache/Makefile
+++ b/x11/mkcomposecache/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mkcomposecache
-PORTVERSION= 1.2
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/mkcomposecache/distinfo b/x11/mkcomposecache/distinfo
index 3d45d86ba287..97d756dae4e0 100644
--- a/x11/mkcomposecache/distinfo
+++ b/x11/mkcomposecache/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkcomposecache-1.2.tar.bz2) = c8237b4aea1ae0c15441deab6b12c5c0
-SHA256 (xorg/app/mkcomposecache-1.2.tar.bz2) = 8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
-SIZE (xorg/app/mkcomposecache-1.2.tar.bz2) = 65262
+MD5 (xorg/app/mkcomposecache-1.2.1.tar.bz2) = 25b774e1b64833d0cdc00663931efc73
+SHA256 (xorg/app/mkcomposecache-1.2.1.tar.bz2) = c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf
+SIZE (xorg/app/mkcomposecache-1.2.1.tar.bz2) = 97359
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index e2c6c57b8b04..19af07408460 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= randrproto
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 47c563878673..66c3ba96f463 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/randrproto-1.3.0.tar.bz2) = a49416013fff33c853efb32f1926551e
-SHA256 (xorg/proto/randrproto-1.3.0.tar.bz2) = cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
-SIZE (xorg/proto/randrproto-1.3.0.tar.bz2) = 74817
+MD5 (xorg/proto/randrproto-1.3.1.tar.bz2) = a5c244c36382b0de39b2828cea4b651d
+SHA256 (xorg/proto/randrproto-1.3.1.tar.bz2) = d93ca3c0ae710a45da6a27e1eeadfb3c9d4aee47f23657c996e1124c0d9985ca
+SIZE (xorg/proto/randrproto-1.3.1.tar.bz2) = 110435
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
index 208c23a5f52d..eeed45e081c3 100644
--- a/x11/recordproto/Makefile
+++ b/x11/recordproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= recordproto
-PORTVERSION= 1.13.2
+PORTVERSION= 1.14
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo
index ea16d442c939..02d5a1166ee4 100644
--- a/x11/recordproto/distinfo
+++ b/x11/recordproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/recordproto-1.13.2.tar.bz2) = 0ed4706564a34fc2aff724aa16d3ff00
-SHA256 (xorg/proto/recordproto-1.13.2.tar.bz2) = 04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
-SIZE (xorg/proto/recordproto-1.13.2.tar.bz2) = 39340
+MD5 (xorg/proto/recordproto-1.14.tar.bz2) = 70f5998c673aa510e2acd6d8fb3799de
+SHA256 (xorg/proto/recordproto-1.14.tar.bz2) = 1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
+SIZE (xorg/proto/recordproto-1.14.tar.bz2) = 84439
diff --git a/x11/recordproto/pkg-plist b/x11/recordproto/pkg-plist
index 7b90206b4504..51be84759ad1 100644
--- a/x11/recordproto/pkg-plist
+++ b/x11/recordproto/pkg-plist
@@ -1,4 +1,5 @@
-include/X11/extensions/record.h
+include/X11/extensions/recordconst.h
+include/X11/extensions/recordproto.h
include/X11/extensions/recordstr.h
libdata/pkgconfig/recordproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
index 04f97b98ae7f..7cb5ce399434 100644
--- a/x11/renderproto/Makefile
+++ b/x11/renderproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= renderproto
-PORTVERSION= 0.9.3
+PORTVERSION= 0.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo
index db7ada8b4864..39841cac17eb 100644
--- a/x11/renderproto/distinfo
+++ b/x11/renderproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/renderproto-0.9.3.tar.bz2) = 598bc9a493deee2e48e4434e94467189
-SHA256 (xorg/proto/renderproto-0.9.3.tar.bz2) = c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b
-SIZE (xorg/proto/renderproto-0.9.3.tar.bz2) = 54128
+MD5 (xorg/proto/renderproto-0.11.tar.bz2) = b160a9733fe91b666e74fca284333148
+SHA256 (xorg/proto/renderproto-0.11.tar.bz2) = c4d1d6d9b0b6ed9a328a94890c171d534f62708f0982d071ccd443322bedffc2
+SIZE (xorg/proto/renderproto-0.11.tar.bz2) = 66112
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index 3f6c75193467..a0ffa9062a10 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rgb
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
index 43941f4519aa..aa594a1f8330 100644
--- a/x11/rgb/distinfo
+++ b/x11/rgb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/rgb-1.0.1.tar.bz2) = 255222b3ab3af671289a6b4844e9f393
-SHA256 (xorg/app/rgb-1.0.1.tar.bz2) = f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
-SIZE (xorg/app/rgb-1.0.1.tar.bz2) = 91473
+MD5 (xorg/app/rgb-1.0.3.tar.bz2) = 44ea16cc3104de6401bc74035f642357
+SHA256 (xorg/app/rgb-1.0.3.tar.bz2) = 162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
+SIZE (xorg/app/rgb-1.0.3.tar.bz2) = 103803
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
index 258bc19dda44..645aa6bc5f90 100644
--- a/x11/rstart/Makefile
+++ b/x11/rstart/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rstart
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rstart/distinfo b/x11/rstart/distinfo
index f648424763a9..3e18d4fd086a 100644
--- a/x11/rstart/distinfo
+++ b/x11/rstart/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/rstart-1.0.2.tar.bz2) = 99aea04a27197056368a4431f30f9cdb
-SHA256 (xorg/app/rstart-1.0.2.tar.bz2) = 02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
-SIZE (xorg/app/rstart-1.0.2.tar.bz2) = 92924
+MD5 (xorg/app/rstart-1.0.3.tar.bz2) = e09c14cf1ac78260f95a9aa45bccab4c
+SHA256 (xorg/app/rstart-1.0.3.tar.bz2) = d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc
+SIZE (xorg/app/rstart-1.0.3.tar.bz2) = 106171
diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist
index 39e8858e79fb..53445f8d1135 100644
--- a/x11/rstart/pkg-plist
+++ b/x11/rstart/pkg-plist
@@ -1,16 +1,20 @@
bin/rstart
bin/rstartd
-lib/X11/rstart/config
-lib/X11/rstart/rstartd.real
-lib/X11/rstart/commands/x11r6/@List
-lib/X11/rstart/commands/x11r6/Terminal
-lib/X11/rstart/commands/x11r6/LoadMonitor
-lib/X11/rstart/commands/ListGenericCommands
lib/X11/rstart/commands/@List
lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/config
+lib/X11/rstart/contexts/@List
lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x
+lib/X11/rstart/contexts/x11
lib/X11/rstart/contexts/x11r6
-lib/X11/rstart/contexts/@List
+lib/X11/rstart/rstartd.real
@dirrm lib/X11/rstart/contexts
@dirrm lib/X11/rstart/commands/x11r6
@dirrm lib/X11/rstart/commands
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
index c622be384be5..f3d215b63fa7 100644
--- a/x11/scrnsaverproto/Makefile
+++ b/x11/scrnsaverproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scrnsaverproto
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo
index fa64dda6cb0a..8296c0695691 100644
--- a/x11/scrnsaverproto/distinfo
+++ b/x11/scrnsaverproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 5d551850e6f4acdf49a13f4eb3a5bbfa
-SHA256 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
-SIZE (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 38066
+MD5 (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = 9040c991a56ee9b5976936f8c65d5c8a
+SHA256 (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99
+SIZE (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = 49623
diff --git a/x11/scrnsaverproto/pkg-plist b/x11/scrnsaverproto/pkg-plist
index 61b64df0f8b2..40ab10e2ac40 100644
--- a/x11/scrnsaverproto/pkg-plist
+++ b/x11/scrnsaverproto/pkg-plist
@@ -1,5 +1,4 @@
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-libdata/pkgconfig/scrnsaverproto.pc
+include/X11/extensions/saver.h
+include/X11/extensions/saverproto.h
+libdata/pkgconfig/scrnsaverproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index 03de0618f141..b7f12836029b 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= sessreg
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index d300de9c3d59..226ac2586014 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/sessreg-1.0.4.tar.bz2) = 839e968d7197b9563f0fd8a5a3aac2e3
-SHA256 (xorg/app/sessreg-1.0.4.tar.bz2) = 23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
-SIZE (xorg/app/sessreg-1.0.4.tar.bz2) = 96209
+MD5 (xorg/app/sessreg-1.0.5.tar.bz2) = 00e834c3cbfd990e9d7d5ddc834242df
+SHA256 (xorg/app/sessreg-1.0.5.tar.bz2) = 3308fbd0018d53bb818fee9de1cde484965b740073d5d240efa4cfc881c9d1a9
+SIZE (xorg/app/sessreg-1.0.5.tar.bz2) = 103142
diff --git a/x11/sessreg/files/patch-utmpx b/x11/sessreg/files/patch-utmpx
index 67fdf2974975..7ae4da842dbd 100644
--- a/x11/sessreg/files/patch-utmpx
+++ b/x11/sessreg/files/patch-utmpx
@@ -1,6 +1,6 @@
---- configure.ac
-+++ configure.ac
-@@ -39,13 +39,14 @@ AC_PROG_INSTALL
+--- configure.ac.orig 2009-10-12 13:10:57.000000000 -0500
++++ configure.ac 2010-03-27 08:12:08.000000000 -0500
+@@ -39,13 +39,14 @@
XORG_DEFAULT_OPTIONS
@@ -16,9 +16,9 @@
AC_SYS_LARGEFILE
---- sessreg.c
-+++ sessreg.c
-@@ -80,7 +80,6 @@
+--- sessreg.c.orig 2009-10-12 12:52:12.000000000 -0500
++++ sessreg.c 2010-03-27 08:13:46.000000000 -0500
+@@ -81,7 +81,6 @@
# include <X11/Xfuncs.h>
# include <stdio.h>
# include <stdlib.h>
@@ -26,7 +26,7 @@
#if defined(__SVR4) || defined(SVR4) || defined(linux) || defined(__GLIBC__)
# define SYSV
-@@ -89,7 +88,10 @@
+@@ -90,7 +89,10 @@
#include <time.h>
#define Time_t time_t
@@ -38,9 +38,9 @@
#ifdef USE_UTMPX
static void set_utmpx (struct utmpx *u, const char *line, const char *user,
-@@ -99,7 +101,12 @@
- int wflag, uflag, lflag;
- char *wtmp_file, *utmp_file, *line;
+@@ -100,7 +102,12 @@
+ static int wflag, uflag, lflag;
+ static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
-static char *wtmpx_file = NULL, *utmpx_file = NULL;
+#ifdef HAVE_UPDWTMPX
@@ -50,19 +50,19 @@
+static char *utmpx_file = NULL;
+#endif
#endif
- int utmp_none, wtmp_none;
+ static int utmp_none, wtmp_none;
/*
-@@ -108,7 +115,9 @@
+@@ -109,7 +116,9 @@
*/
- int hflag, sflag, xflag, tflag;
- char *host_name = NULL;
+ static int hflag, sflag, xflag, tflag;
+ static char *host_name = NULL;
+#ifdef USE_UTMP
- int slot_number;
+ static int slot_number;
+#endif
- char *xservers_file, *ttys_file;
- char *user_name;
- int aflag, dflag;
-@@ -180,7 +189,7 @@
+ static char *xservers_file, *ttys_file;
+ static char *user_name;
+ static int aflag, dflag;
+@@ -181,7 +190,7 @@
int
main (int argc, char **argv)
{
@@ -71,7 +71,7 @@
int utmp;
#endif
char *line_tmp;
-@@ -188,7 +197,9 @@
+@@ -189,7 +198,9 @@
int wtmp;
#endif
Time_t current_time;
@@ -81,7 +81,7 @@
#ifdef USE_UTMPX
struct utmpx utmpx_entry;
#endif
-@@ -223,7 +234,9 @@
+@@ -224,7 +235,9 @@
host_name = getstring (&argv, &hflag);
break;
case 's':
@@ -91,7 +91,7 @@
break;
case 'x':
xservers_file = getstring (&argv, &xflag);
-@@ -249,14 +262,14 @@
+@@ -250,14 +263,14 @@
/* set up default file names */
if (!wflag) {
wtmp_file = WTMP_FILE;
@@ -108,7 +108,7 @@
utmpx_file = UTMPX_FILE;
#endif
}
-@@ -267,7 +280,7 @@
+@@ -268,7 +281,7 @@
if (!Lflag)
llog_file = LLOG_FILE;
#endif
@@ -117,7 +117,7 @@
if (!tflag)
ttys_file = TTYS_FILE;
if (!sflag && !utmp_none) {
-@@ -286,34 +299,42 @@
+@@ -287,34 +300,42 @@
line = line_tmp;
}
time (&current_time);
@@ -163,7 +163,7 @@
utmp = open (utmp_file, O_RDWR);
if (utmp != -1) {
syserr ((int) lseek (utmp, (long) slot_number * sizeof (struct utmp), 0), "lseek");
-@@ -321,13 +342,16 @@
+@@ -322,13 +343,16 @@
== sizeof (utmp_entry), "write utmp entry");
close (utmp);
}
@@ -181,7 +181,7 @@
#else
wtmp = open (wtmp_file, O_WRONLY|O_APPEND);
if (wtmp != -1) {
-@@ -370,6 +394,7 @@
+@@ -371,6 +395,7 @@
* fill in the appropriate records of the utmp entry
*/
@@ -189,7 +189,7 @@
static void
set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp)
{
-@@ -416,6 +441,7 @@
+@@ -417,6 +442,7 @@
#endif
u->ut_time = date;
}
@@ -197,7 +197,7 @@
#ifdef USE_UTMPX
static int
-@@ -423,6 +449,8 @@
+@@ -424,6 +450,8 @@
{
struct utmpx *u; /* pointer to entry in utmp file */
int status = 1; /* return code */
@@ -206,7 +206,7 @@
while ( (u = getutxent()) != NULL ) {
-@@ -434,7 +462,7 @@
+@@ -435,7 +463,7 @@
}
}
@@ -215,7 +215,7 @@
return (status);
}
-@@ -453,14 +481,16 @@
+@@ -454,14 +482,16 @@
(void) strncpy (u->ut_line, line, sizeof (u->ut_line));
strncpy(u->ut_host, line, sizeof(u->ut_host));
@@ -234,7 +234,7 @@
if (line) {
int i;
-@@ -519,7 +549,7 @@
+@@ -520,7 +550,7 @@
}
#endif /* USE_UTMPX */
@@ -243,9 +243,9 @@
/*
* compute the slot-number for an X display. This is computed
* by counting the lines in /etc/ttys and adding the line-number
---- sessreg.h
-+++ sessreg.h
-@@ -51,13 +51,15 @@
+--- sessreg.h.orig 2008-06-11 16:30:54.000000000 -0500
++++ sessreg.h 2010-03-27 08:12:08.000000000 -0500
+@@ -57,13 +57,15 @@
#include <sys/types.h>
#include <time.h>
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index 1a4548f9df77..c45ae6aa94a4 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= setxkbmap
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
index ce37b1be9094..a3456a7036f7 100644
--- a/x11/setxkbmap/distinfo
+++ b/x11/setxkbmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 6fab3bb176be9e510c5613d054ef1ca4
-SHA256 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
-SIZE (xorg/app/setxkbmap-1.0.4.tar.bz2) = 92758
+MD5 (xorg/app/setxkbmap-1.1.0.tar.bz2) = 2f902e0a89aaf2b19e06e7f26c6efb3a
+SHA256 (xorg/app/setxkbmap-1.1.0.tar.bz2) = 932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64
+SIZE (xorg/app/setxkbmap-1.1.0.tar.bz2) = 99040
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
index 33b7cf2ac697..71aaa5ff9ade 100644
--- a/x11/smproxy/Makefile
+++ b/x11/smproxy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= smproxy
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/smproxy/distinfo b/x11/smproxy/distinfo
index 77a9c7b77116..4a6db83686d0 100644
--- a/x11/smproxy/distinfo
+++ b/x11/smproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/smproxy-1.0.2.tar.bz2) = 31da204a0255ba8c6a65386e65dc1c90
-SHA256 (xorg/app/smproxy-1.0.2.tar.bz2) = 76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
-SIZE (xorg/app/smproxy-1.0.2.tar.bz2) = 87139
+MD5 (xorg/app/smproxy-1.0.3.tar.bz2) = ba7dbde81be24fc1bd4156b360e5f8cf
+SHA256 (xorg/app/smproxy-1.0.3.tar.bz2) = 1b8dd25483280fc2a4a7d977b4a43dc4228b9c65e904c3d4ee68245705d4ae35
+SIZE (xorg/app/smproxy-1.0.3.tar.bz2) = 103272
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
index fef7e25c2993..dee630301077 100644
--- a/x11/videoproto/Makefile
+++ b/x11/videoproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= videoproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo
index a38e0b813efb..7c878ad85faa 100644
--- a/x11/videoproto/distinfo
+++ b/x11/videoproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/videoproto-2.2.2.tar.bz2) = 44292d74a9a3c94b1ecb9d77a0da83e8
-SHA256 (xorg/proto/videoproto-2.2.2.tar.bz2) = ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
-SIZE (xorg/proto/videoproto-2.2.2.tar.bz2) = 42744
+MD5 (xorg/proto/videoproto-2.3.0.tar.bz2) = fb762146a18207a1e8bc9f299dfc7ac0
+SHA256 (xorg/proto/videoproto-2.3.0.tar.bz2) = 4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
+SIZE (xorg/proto/videoproto-2.3.0.tar.bz2) = 54499
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index abcd108d8eab..189f665d423d 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= viewres
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -18,4 +17,10 @@ USE_XORG= xt xaw
MAN1= viewres.1
+PLIST_FILES+= bin/viewres \
+ share/X11/app-defaults/Viewres \
+ share/X11/app-defaults/Viewres-color
+PLIST_DIRS+= share/X11/app-defaults \
+ share/X11
+
.include <bsd.port.mk>
diff --git a/x11/viewres/distinfo b/x11/viewres/distinfo
index 82ff7aa8c86c..fd19e0a18cdd 100644
--- a/x11/viewres/distinfo
+++ b/x11/viewres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/viewres-1.0.1.tar.bz2) = cdbed540daf7975b56000420c9aa5bf9
-SHA256 (xorg/app/viewres-1.0.1.tar.bz2) = bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
-SIZE (xorg/app/viewres-1.0.1.tar.bz2) = 84802
+MD5 (xorg/app/viewres-1.0.2.tar.bz2) = f35c4ad7e1aa1ee2b25373dcdc34345b
+SHA256 (xorg/app/viewres-1.0.2.tar.bz2) = 85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b
+SIZE (xorg/app/viewres-1.0.2.tar.bz2) = 111217
diff --git a/x11/viewres/pkg-plist b/x11/viewres/pkg-plist
deleted file mode 100644
index 3c7cd4718db5..000000000000
--- a/x11/viewres/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/viewres
-share/X11/app-defaults/Viewres
-@dirrmtry share/X11/app-defaults
-@dirrmtry share/X11
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 3137317a9e43..f77321245bf2 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x11perf
-PORTVERSION= 1.5
+PORTVERSION= 1.5.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
index 2ad476a138e3..6563d4ec7c86 100644
--- a/x11/x11perf/distinfo
+++ b/x11/x11perf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/x11perf-1.5.tar.bz2) = 31283bfc3c78718ac1bd71e510d4e774
-SHA256 (xorg/app/x11perf-1.5.tar.bz2) = 4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233
-SIZE (xorg/app/x11perf-1.5.tar.bz2) = 142378
+MD5 (xorg/app/x11perf-1.5.1.tar.bz2) = 66e4aa4645f83809071eb69553ed0222
+SHA256 (xorg/app/x11perf-1.5.1.tar.bz2) = ab4c6a579f93fa9485ef5be8760a3da0d22acfa743f2114057c5262b77ff7056
+SIZE (xorg/app/x11perf-1.5.1.tar.bz2) = 151356
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 29702575169f..802701e66748 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xauth
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
index 14a99ab151a0..015228ddeacb 100644
--- a/x11/xauth/distinfo
+++ b/x11/xauth/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xauth-1.0.3.tar.bz2) = e91e10ace1df0d5f2cbc74ead256407a
-SHA256 (xorg/app/xauth-1.0.3.tar.bz2) = 1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c
-SIZE (xorg/app/xauth-1.0.3.tar.bz2) = 112331
+MD5 (xorg/app/xauth-1.0.4.tar.bz2) = fa00078c414c4a57cab7a6d89a0c8734
+SHA256 (xorg/app/xauth-1.0.4.tar.bz2) = f91190c8b8bb18270b86b00f30da5684bb5e5bd1ed0ccf352322f8145e076a59
+SIZE (xorg/app/xauth-1.0.4.tar.bz2) = 119274
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 2130579ee442..091ee5794a6d 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbacklight
-PORTVERSION= 1.1
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbacklight/distinfo b/x11/xbacklight/distinfo
index 6049f5e5478c..ef5f6b8ca255 100644
--- a/x11/xbacklight/distinfo
+++ b/x11/xbacklight/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xbacklight-1.1.tar.bz2) = 51b4a1c0ae2b3bd77417306fd78a3e94
-SHA256 (xorg/app/xbacklight-1.1.tar.bz2) = c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
-SIZE (xorg/app/xbacklight-1.1.tar.bz2) = 79964
+MD5 (xorg/app/xbacklight-1.1.1.tar.bz2) = 3e39eec6d0fd5c587ca6d55aa7bb8fe1
+SHA256 (xorg/app/xbacklight-1.1.1.tar.bz2) = 5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2
+SIZE (xorg/app/xbacklight-1.1.1.tar.bz2) = 93639
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 463d3b17e0df..3b9f4d1c56d3 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xbiff
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
index fdbf55355a2c..5e3c46290e31 100644
--- a/x11/xbiff/distinfo
+++ b/x11/xbiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xbiff-1.0.1.tar.bz2) = 404f5add4537d22dd109c33e518a5190
-SHA256 (xorg/app/xbiff-1.0.1.tar.bz2) = 9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
-SIZE (xorg/app/xbiff-1.0.1.tar.bz2) = 83634
+MD5 (xorg/app/xbiff-1.0.2.tar.bz2) = 1d4ad06725f9dc4b877ecd210b7b1607
+SHA256 (xorg/app/xbiff-1.0.2.tar.bz2) = 7c21763a90599ad627739804ba76dd33516b76cce440294e1154bf680eca60f7
+SIZE (xorg/app/xbiff-1.0.2.tar.bz2) = 107832
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index debaed25a78d..af33e577e0af 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbitmaps
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbitmaps/distinfo b/x11/xbitmaps/distinfo
index a53229f90ba2..1937ca1ff1f1 100644
--- a/x11/xbitmaps/distinfo
+++ b/x11/xbitmaps/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/data/xbitmaps-1.0.1.tar.bz2) = b28a9840cde3c38d7c09716372fea257
-SHA256 (xorg/data/xbitmaps-1.0.1.tar.bz2) = 5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
-SIZE (xorg/data/xbitmaps-1.0.1.tar.bz2) = 55570
+MD5 (xorg/data/xbitmaps-1.1.0.tar.bz2) = f9ddd4e70a5375508b3acaf17be0d0ab
+SHA256 (xorg/data/xbitmaps-1.1.0.tar.bz2) = c9a2059c8b0636b7ee1169647bb22f6eb4a0589e36fdb98936002e2569ad8761
+SIZE (xorg/data/xbitmaps-1.1.0.tar.bz2) = 101645
diff --git a/x11/xbitmaps/pkg-plist b/x11/xbitmaps/pkg-plist
index a2c9f61cc2d6..d19e6f2dc13b 100644
--- a/x11/xbitmaps/pkg-plist
+++ b/x11/xbitmaps/pkg-plist
@@ -1,6 +1,8 @@
include/X11/bitmaps/1x1
include/X11/bitmaps/2x2
include/X11/bitmaps/black
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
include/X11/bitmaps/boxes
include/X11/bitmaps/calculator
include/X11/bitmaps/cntr_ptr
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index b55debe03f1c..c8c770ae7117 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcalc
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
index de9a191412ee..7103d0cdb4a5 100644
--- a/x11/xcalc/distinfo
+++ b/x11/xcalc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcalc-1.0.2.tar.bz2) = d31a99795b9668f047aa11bf36df6df0
-SHA256 (xorg/app/xcalc-1.0.2.tar.bz2) = 96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32
-SIZE (xorg/app/xcalc-1.0.2.tar.bz2) = 106117
+MD5 (xorg/app/xcalc-1.0.3.tar.bz2) = 0b981e360b54584fcb6dc2ec4658c406
+SHA256 (xorg/app/xcalc-1.0.3.tar.bz2) = 96c413998c664a8397313d749b20e18308bcd82187a89446a64b3557b089b42f
+SIZE (xorg/app/xcalc-1.0.3.tar.bz2) = 120230
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 809edc066678..ee8713558239 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xclipboard
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xclipboard/distinfo b/x11/xclipboard/distinfo
index eee5df66f41c..68435f6d4653 100644
--- a/x11/xclipboard/distinfo
+++ b/x11/xclipboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xclipboard-1.0.1.tar.bz2) = 2c6ecedb10dc51adbb64c95f22fd99c2
-SHA256 (xorg/app/xclipboard-1.0.1.tar.bz2) = 3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
-SIZE (xorg/app/xclipboard-1.0.1.tar.bz2) = 83681
+MD5 (xorg/app/xclipboard-1.1.0.tar.bz2) = 113eccea3ee73a1ef7b43d2291ca1e09
+SHA256 (xorg/app/xclipboard-1.1.0.tar.bz2) = de0f37c7bf69c3aac3362bc0cbe470a622c2a85b62c5483c113ea88512232710
+SIZE (xorg/app/xclipboard-1.1.0.tar.bz2) = 105762
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
index 481facc39c45..f93d0087da8c 100644
--- a/x11/xcmiscproto/Makefile
+++ b/x11/xcmiscproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcmiscproto
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo
index 44a00f483a14..04935e35b1c2 100644
--- a/x11/xcmiscproto/distinfo
+++ b/x11/xcmiscproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = fde0b050901f024b19159cdacdcfbd20
-SHA256 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
-SIZE (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = 36750
+MD5 (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = 7b83e4a7e9f4edc9c6cfb0500f4a7196
+SHA256 (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
+SIZE (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = 48697
diff --git a/x11/xcmiscproto/pkg-plist b/x11/xcmiscproto/pkg-plist
index 384401d8ac76..3ab2c9cd539a 100644
--- a/x11/xcmiscproto/pkg-plist
+++ b/x11/xcmiscproto/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/xcmiscproto.h
include/X11/extensions/xcmiscstr.h
libdata/pkgconfig/xcmiscproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
index fd4c90e38ca6..c52af7a34ce8 100644
--- a/x11/xcmsdb/Makefile
+++ b/x11/xcmsdb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcmsdb
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcmsdb/distinfo b/x11/xcmsdb/distinfo
index 95d33176320c..74744beede8f 100644
--- a/x11/xcmsdb/distinfo
+++ b/x11/xcmsdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcmsdb-1.0.1.tar.bz2) = 8579d5f50ba7f0c4a5bf16b9670fea01
-SHA256 (xorg/app/xcmsdb-1.0.1.tar.bz2) = e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
-SIZE (xorg/app/xcmsdb-1.0.1.tar.bz2) = 96423
+MD5 (xorg/app/xcmsdb-1.0.2.tar.bz2) = 7f2bed9f4dd3301d18d83eb296c3be0d
+SHA256 (xorg/app/xcmsdb-1.0.2.tar.bz2) = bfcac66634ea4d4a1607f1c8a4170e6089db13355357fc143281a6fc0216face
+SIZE (xorg/app/xcmsdb-1.0.2.tar.bz2) = 117482
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 8edee29df014..2e40f105421d 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcursorgen
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -16,7 +15,7 @@ COMMENT= Create an X cursor file from a collection of PNG images
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
XORG_CAT= app
-USE_XORG= x11 xcursor
+USE_XORG= x11 xcursor xextproto
PLIST_FILES= bin/xcursorgen
diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo
index ed02e837bff5..45b489637b2c 100644
--- a/x11/xcursorgen/distinfo
+++ b/x11/xcursorgen/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcursorgen-1.0.2.tar.bz2) = 6fc90896b8c786cb1a2100b4167f7874
-SHA256 (xorg/app/xcursorgen-1.0.2.tar.bz2) = e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e
-SIZE (xorg/app/xcursorgen-1.0.2.tar.bz2) = 89978
+MD5 (xorg/app/xcursorgen-1.0.3.tar.bz2) = 69df079b3950a0db4e5f4e6f0e00ddee
+SHA256 (xorg/app/xcursorgen-1.0.3.tar.bz2) = ed5f3ffe881c21ffca85406e5a5f553ed4985cc5e9acdb535f682c33bebac254
+SIZE (xorg/app/xcursorgen-1.0.3.tar.bz2) = 99262
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index b01fd1ad6821..93397e8716c3 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xdpyinfo
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
index 53dd02d960b2..965ced3182fc 100644
--- a/x11/xdpyinfo/distinfo
+++ b/x11/xdpyinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = b7cbab6cbcd12bf7ad65dbc12d86e104
-SHA256 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
-SIZE (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 103116
+MD5 (xorg/app/xdpyinfo-1.1.0.tar.bz2) = d1d516610316138105cd07064b257c5c
+SHA256 (xorg/app/xdpyinfo-1.1.0.tar.bz2) = 780d8dfe65653f42ee26d35928ab7f72f5f27ab08eda692fe4baad05126a0631
+SIZE (xorg/app/xdpyinfo-1.1.0.tar.bz2) = 116427
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index b3bf781c5fdc..0d92920b8663 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xdriinfo
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
index ea842f032185..f7d17e7c8eb9 100644
--- a/x11/xdriinfo/distinfo
+++ b/x11/xdriinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdriinfo-1.0.2.tar.bz2) = a5ec51ed9f0a55dc3462d90d52ff899c
-SHA256 (xorg/app/xdriinfo-1.0.2.tar.bz2) = 7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265
-SIZE (xorg/app/xdriinfo-1.0.2.tar.bz2) = 88240
+MD5 (xorg/app/xdriinfo-1.0.3.tar.bz2) = cb304d1ce562ac48b68eedeba38c662f
+SHA256 (xorg/app/xdriinfo-1.0.3.tar.bz2) = 2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c
+SIZE (xorg/app/xdriinfo-1.0.3.tar.bz2) = 97688
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 09bb49017558..256d130881f4 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xev
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
index bd2ca1d458f3..97da9d85d17b 100644
--- a/x11/xev/distinfo
+++ b/x11/xev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xev-1.0.3.tar.bz2) = a9532c3d1683c99bb5df1895cb3a60b1
-SHA256 (xorg/app/xev-1.0.3.tar.bz2) = d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a
-SIZE (xorg/app/xev-1.0.3.tar.bz2) = 92292
+MD5 (xorg/app/xev-1.0.4.tar.bz2) = 5f98c0a2725a33d60ef4956befe078fb
+SHA256 (xorg/app/xev-1.0.4.tar.bz2) = 7fad9c9755a624e677f44633dee218e9c22b4ba9a83e6709a6cbf8c1a501fde8
+SIZE (xorg/app/xev-1.0.4.tar.bz2) = 101286
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index c89b1ea31266..461732f15381 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xextproto
-PORTVERSION= 7.0.5
+PORTVERSION= 7.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index ee9680b76e43..af249729fc93 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xextproto-7.0.5.tar.bz2) = e6841018a7c64983b0954aa2c564d115
-SHA256 (xorg/proto/xextproto-7.0.5.tar.bz2) = d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
-SIZE (xorg/proto/xextproto-7.0.5.tar.bz2) = 80831
+MD5 (xorg/proto/xextproto-7.1.1.tar.bz2) = fb6ccaae76db7a35e49b12aea60ca6ff
+SHA256 (xorg/proto/xextproto-7.1.1.tar.bz2) = 6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99
+SIZE (xorg/proto/xextproto-7.1.1.tar.bz2) = 71234
diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist
index 30e106267b84..04d24a194218 100644
--- a/x11/xextproto/pkg-plist
+++ b/x11/xextproto/pkg-plist
@@ -1,40 +1,32 @@
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xge.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
include/X11/extensions/ge.h
include/X11/extensions/geproto.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
+include/X11/extensions/lbx.h
+include/X11/extensions/lbxproto.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
+include/X11/extensions/secur.h
+include/X11/extensions/securproto.h
+include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
+include/X11/extensions/xtestconst.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
libdata/pkgconfig/xextproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index e398a8780fcd..3ec4359bd1e5 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= xeyes
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= A follow the mouse X demo
XORG_CAT= app
-USE_XORG= x11 xt xext xmu
+USE_XORG= x11 xt xext xmu xrender
PLIST_FILES= bin/xeyes
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
index bd62c4efe34d..e27d47e38cc2 100644
--- a/x11/xeyes/distinfo
+++ b/x11/xeyes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xeyes-1.0.1.tar.bz2) = 033f14f7c4e30d1f4edbb22d5ef86883
-SHA256 (xorg/app/xeyes-1.0.1.tar.bz2) = 530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
-SIZE (xorg/app/xeyes-1.0.1.tar.bz2) = 81097
+MD5 (xorg/app/xeyes-1.1.0.tar.bz2) = 933f6d2b132d14f707f1f3c87b39ebe2
+SHA256 (xorg/app/xeyes-1.1.0.tar.bz2) = 996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507
+SIZE (xorg/app/xeyes-1.1.0.tar.bz2) = 106292
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
index be4d701a3bc1..f264ab50f3c6 100644
--- a/x11/xf86dgaproto/Makefile
+++ b/x11/xf86dgaproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86dgaproto
-PORTVERSION= 2.0.3
+PORTVERSION= 2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo
index 5ffd2751e13a..da5a1a0816fe 100644
--- a/x11/xf86dgaproto/distinfo
+++ b/x11/xf86dgaproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 42fdcebc66efac02ab4beec2b1b0ad6e
-SHA256 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
-SIZE (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 43191
+MD5 (xorg/proto/xf86dgaproto-2.1.tar.bz2) = a036dc2fcbf052ec10621fd48b68dbb1
+SHA256 (xorg/proto/xf86dgaproto-2.1.tar.bz2) = ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
+SIZE (xorg/proto/xf86dgaproto-2.1.tar.bz2) = 85934
diff --git a/x11/xf86dgaproto/pkg-plist b/x11/xf86dgaproto/pkg-plist
index 6ffd6b28b310..0ed8d3ba7d21 100644
--- a/x11/xf86dgaproto/pkg-plist
+++ b/x11/xf86dgaproto/pkg-plist
@@ -1,6 +1,9 @@
include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1const.h
+include/X11/extensions/xf86dga1proto.h
include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgaconst.h
+include/X11/extensions/xf86dgaproto.h
include/X11/extensions/xf86dgastr.h
libdata/pkgconfig/xf86dgaproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index 1104a6b57f89..c81475908ec6 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86driproto
-PORTVERSION= 2.0.4
+PORTVERSION= 2.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
index e32be9fa367d..b74423df1b10 100644
--- a/x11/xf86driproto/distinfo
+++ b/x11/xf86driproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 01470d088da3a8a3deefa8e1f45d69cb
-SHA256 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
-SIZE (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 43814
+MD5 (xorg/proto/xf86driproto-2.1.0.tar.bz2) = 309d552732666c3333d7dc63e80d042f
+SHA256 (xorg/proto/xf86driproto-2.1.0.tar.bz2) = d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
+SIZE (xorg/proto/xf86driproto-2.1.0.tar.bz2) = 50111
diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist
index 93dac2da7258..0b747176c520 100644
--- a/x11/xf86driproto/pkg-plist
+++ b/x11/xf86driproto/pkg-plist
@@ -1,6 +1,5 @@
include/X11/dri/xf86dri.h
+include/X11/dri/xf86driproto.h
include/X11/dri/xf86dristr.h
libdata/pkgconfig/xf86driproto.pc
-@dirrm include/X11/dri
-@dirrmtry include/GL/internal
-@dirrmtry include/GL
+@dirrmtry include/X11/dri
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
index 3b6abc2c0808..db9b6a257ff9 100644
--- a/x11/xf86miscproto/Makefile
+++ b/x11/xf86miscproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86miscproto
-PORTVERSION= 0.9.2
+PORTVERSION= 0.9.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo
index 8a92b725454e..8b9b9e2197f6 100644
--- a/x11/xf86miscproto/distinfo
+++ b/x11/xf86miscproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = acae8edeb05a406f7f60bcbb218a8f1d
-SHA256 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
-SIZE (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = 38464
+MD5 (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = ca63bbb31cf5b7f37b2237e923ff257a
+SHA256 (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095
+SIZE (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 84950
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
index 8c081362db1a..8ac6eb8436a4 100644
--- a/x11/xf86vidmodeproto/Makefile
+++ b/x11/xf86vidmodeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86vidmodeproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo
index 81b04a7cf261..c5a1eb9f2f9c 100644
--- a/x11/xf86vidmodeproto/distinfo
+++ b/x11/xf86vidmodeproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = f00844a63d6e76b69eb0eb5e41eed843
-SHA256 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
-SIZE (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 39615
+MD5 (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 4434894fc7d4eeb4a22e6b876d56fdaa
+SHA256 (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
+SIZE (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 84476
diff --git a/x11/xf86vidmodeproto/pkg-plist b/x11/xf86vidmodeproto/pkg-plist
index 410f26100f65..06c19ee57605 100644
--- a/x11/xf86vidmodeproto/pkg-plist
+++ b/x11/xf86vidmodeproto/pkg-plist
@@ -1,4 +1,5 @@
-include/X11/extensions/xf86vmode.h
+include/X11/extensions/xf86vm.h
+include/X11/extensions/xf86vmproto.h
include/X11/extensions/xf86vmstr.h
libdata/pkgconfig/xf86vidmodeproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 950bb7012809..4a4d44108d33 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xgamma
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
index d7029e635d49..8b728ea30b72 100644
--- a/x11/xgamma/distinfo
+++ b/x11/xgamma/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xgamma-1.0.2.tar.bz2) = f13ddedaa63a608d3b025d326f4f5b5d
-SHA256 (xorg/app/xgamma-1.0.2.tar.bz2) = 5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e
-SIZE (xorg/app/xgamma-1.0.2.tar.bz2) = 86528
+MD5 (xorg/app/xgamma-1.0.3.tar.bz2) = e8a88bf1a18f35b724619849dca97f4f
+SHA256 (xorg/app/xgamma-1.0.3.tar.bz2) = e5eb2588fbbdc5c2db5571b304204487a9c22eed15ac6cb816f605ec403e6e1a
+SIZE (xorg/app/xgamma-1.0.3.tar.bz2) = 95767
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index b4dec16e2638..caf249287d4f 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xgc
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgc/distinfo b/x11/xgc/distinfo
index 6e43f4e242db..27b7d4c659e9 100644
--- a/x11/xgc/distinfo
+++ b/x11/xgc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xgc-1.0.1.tar.bz2) = 72fc8dd68f585000c0a542eba0264571
-SHA256 (xorg/app/xgc-1.0.1.tar.bz2) = 7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
-SIZE (xorg/app/xgc-1.0.1.tar.bz2) = 128931
+MD5 (xorg/app/xgc-1.0.2.tar.bz2) = fec79887ca14575bef4c757b4e95a693
+SHA256 (xorg/app/xgc-1.0.2.tar.bz2) = fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002
+SIZE (xorg/app/xgc-1.0.2.tar.bz2) = 157260
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
index 2ac82d6ce291..3dce453f0156 100644
--- a/x11/xgc/pkg-plist
+++ b/x11/xgc/pkg-plist
@@ -1,4 +1,5 @@
bin/xgc
share/X11/app-defaults/Xgc
+share/X11/app-defaults/Xgc-color
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 86ee9ee304b4..ce9c24e93e4d 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xhost
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
index 4759e957cd94..ee8a79ac98df 100644
--- a/x11/xhost/distinfo
+++ b/x11/xhost/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xhost-1.0.2.tar.bz2) = f746aba36f075ae4cae313d849a94f4e
-SHA256 (xorg/app/xhost-1.0.2.tar.bz2) = edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6
-SIZE (xorg/app/xhost-1.0.2.tar.bz2) = 98006
+MD5 (xorg/app/xhost-1.0.3.tar.bz2) = c7f91b4a750d297f269c2a0a3206a1b2
+SHA256 (xorg/app/xhost-1.0.3.tar.bz2) = 2d63007c65e89fe273a43f3e45b3c0133acbc3ceeda6bfc9671388409134ad17
+SIZE (xorg/app/xhost-1.0.3.tar.bz2) = 104910
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
index 54c0efcae56e..f2a15f362bbd 100644
--- a/x11/xineramaproto/Makefile
+++ b/x11/xineramaproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xineramaproto
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo
index bab5c1b43688..73fe25761403 100644
--- a/x11/xineramaproto/distinfo
+++ b/x11/xineramaproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 1cc292c562962ad0ad3a253cae68c632
-SHA256 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
-SIZE (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 38413
+MD5 (xorg/proto/xineramaproto-1.2.tar.bz2) = a8aadcb281b9c11a91303e24cdea45f5
+SHA256 (xorg/proto/xineramaproto-1.2.tar.bz2) = 58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
+SIZE (xorg/proto/xineramaproto-1.2.tar.bz2) = 83852
diff --git a/x11/xineramaproto/pkg-plist b/x11/xineramaproto/pkg-plist
index 10905a2ac56d..37747a1cf0d4 100644
--- a/x11/xineramaproto/pkg-plist
+++ b/x11/xineramaproto/pkg-plist
@@ -1,5 +1,3 @@
-include/X11/extensions/Xinerama.h
-include/X11/extensions/panoramiXext.h
include/X11/extensions/panoramiXproto.h
libdata/pkgconfig/xineramaproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index c586a951d8f7..035cea72c22a 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xinit
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 1d65aebe28e7..789e677aa6d2 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinit-1.1.1.tar.bz2) = 93c73705ed9eb1e1a6b6938405672f2b
-SHA256 (xorg/app/xinit-1.1.1.tar.bz2) = b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
-SIZE (xorg/app/xinit-1.1.1.tar.bz2) = 129365
+MD5 (xorg/app/xinit-1.2.0.tar.bz2) = fe1696cab2fbed6fa059d0cd1c53ac13
+SHA256 (xorg/app/xinit-1.2.0.tar.bz2) = ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
+SIZE (xorg/app/xinit-1.2.0.tar.bz2) = 136781
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 2518eb7df5ea..37386c365a1f 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinput
-PORTVERSION= 1.4.2
+PORTVERSION= 1.5.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index bdf7924e64ed..9dcf0b7a37ef 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinput-1.4.2.tar.bz2) = 58e619576cbf4b6057eebb7a97fe2ddf
-SHA256 (xorg/app/xinput-1.4.2.tar.bz2) = 3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b
-SIZE (xorg/app/xinput-1.4.2.tar.bz2) = 108003
+MD5 (xorg/app/xinput-1.5.0.tar.bz2) = 3e8a5f1faccc8ab00c6190e5a34e0a45
+SHA256 (xorg/app/xinput-1.5.0.tar.bz2) = a84728e34bb5edd36ecc1b5489f48ad1467ad5aab1f74f1b7789f826a1ffcaf9
+SIZE (xorg/app/xinput-1.5.0.tar.bz2) = 121172
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 58ce09c89e75..22576101585d 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkbcomp
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index db401baa9923..0052c928714d 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 6cc96c3e4ed5d9802fe717beac008f19
-SHA256 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
-SIZE (xorg/app/xkbcomp-1.0.5.tar.bz2) = 201382
+MD5 (xorg/app/xkbcomp-1.1.0.tar.bz2) = 362380be3b3bed56c9ce45622eafc2c9
+SHA256 (xorg/app/xkbcomp-1.1.0.tar.bz2) = cc6714454b88b3dd8086f99b42bbca77cd76bbeaef17a81070f22a21d75a168e
+SIZE (xorg/app/xkbcomp-1.1.0.tar.bz2) = 218419
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
index d807980d4f91..071ceaf27301 100644
--- a/x11/xkbevd/Makefile
+++ b/x11/xkbevd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkbevd
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbevd/distinfo b/x11/xkbevd/distinfo
index 7f1a7af88f21..0e69e244bac5 100644
--- a/x11/xkbevd/distinfo
+++ b/x11/xkbevd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkbevd-1.0.2.tar.bz2) = 68f2a143716c23b566f8509d9498f516
-SHA256 (xorg/app/xkbevd-1.0.2.tar.bz2) = 4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
-SIZE (xorg/app/xkbevd-1.0.2.tar.bz2) = 107794
+MD5 (xorg/app/xkbevd-1.1.0.tar.bz2) = 8d3c1485c2dd62ea7395a37377958a39
+SHA256 (xorg/app/xkbevd-1.1.0.tar.bz2) = 46037add20321ff13954ad91aa5f5f5ec52d78006f9d7c52aa6167622b34a2df
+SIZE (xorg/app/xkbevd-1.1.0.tar.bz2) = 126967
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c9415530ea77..6110eb29baa2 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xkeyboard-config
-PORTVERSION= 1.6
-PORTREVISION= 1
+PORTVERSION= 1.8
CATEGORIES= x11
MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
DISTNAME= xkeyboard-config-${PORTVERSION}
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index b71e49607959..dd69262f5a56 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-1.6.tar.bz2) = 5ae575a9073af12cd71773e065b38b3a
-SHA256 (xkeyboard-config-1.6.tar.bz2) = 50784b02a434887c5abd1b7e73986eb6cad8a7efa79248bfc192f1f1769a3f9a
-SIZE (xkeyboard-config-1.6.tar.bz2) = 631474
+MD5 (xkeyboard-config-1.8.tar.bz2) = 37ae41628cd2ce35d202d30b1820c8ba
+SHA256 (xkeyboard-config-1.8.tar.bz2) = 7dc3e6ca00adb105f46e40f8382e83d50b3fcd626bc8654293dae8b1e80506ce
+SIZE (xkeyboard-config-1.8.tar.bz2) = 650683
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index a26c18c6bed2..21c744ac3924 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,4 +1,5 @@
share/X11/xkb/compat.dir
+share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
share/X11/xkb/compat/complete
@@ -18,18 +19,16 @@ share/X11/xkb/compat/pc
share/X11/xkb/compat/pc98
share/X11/xkb/compat/xfree86
share/X11/xkb/compat/xtest
-share/X11/xkb/compat/README
share/X11/xkb/compiled
-share/X11/xkb/geometry/digital_vndr/lk
-share/X11/xkb/geometry/digital_vndr/pc
-share/X11/xkb/geometry/digital_vndr/unix
-share/X11/xkb/geometry/sgi_vndr/indigo
-share/X11/xkb/geometry/sgi_vndr/indy
-share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry.dir
+share/X11/xkb/geometry/README
share/X11/xkb/geometry/amiga
share/X11/xkb/geometry/ataritt
share/X11/xkb/geometry/chicony
share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
share/X11/xkb/geometry/everex
share/X11/xkb/geometry/fujitsu
share/X11/xkb/geometry/hhk
@@ -39,34 +38,42 @@ share/X11/xkb/geometry/kinesis
share/X11/xkb/geometry/macintosh
share/X11/xkb/geometry/microsoft
share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/nokia
share/X11/xkb/geometry/northgate
share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/sgi_vndr/indigo
+share/X11/xkb/geometry/sgi_vndr/indy
share/X11/xkb/geometry/sony
share/X11/xkb/geometry/sun
share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/typematrix
share/X11/xkb/geometry/winbook
-share/X11/xkb/geometry/README
-share/X11/xkb/geometry.dir
-share/X11/xkb/keycodes/digital_vndr/lk
-share/X11/xkb/keycodes/digital_vndr/pc
-share/X11/xkb/keycodes/sgi_vndr/indigo
-share/X11/xkb/keycodes/sgi_vndr/indy
-share/X11/xkb/keycodes/sgi_vndr/iris
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keycodes/README
share/X11/xkb/keycodes/aliases
share/X11/xkb/keycodes/amiga
share/X11/xkb/keycodes/ataritt
+share/X11/xkb/keycodes/digital_vndr/lk
+share/X11/xkb/keycodes/digital_vndr/pc
share/X11/xkb/keycodes/evdev
share/X11/xkb/keycodes/fujitsu
share/X11/xkb/keycodes/hp
share/X11/xkb/keycodes/ibm
share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
share/X11/xkb/keycodes/sony
share/X11/xkb/keycodes/sun
share/X11/xkb/keycodes/xfree86
share/X11/xkb/keycodes/xfree98
-share/X11/xkb/keycodes/README
-share/X11/xkb/keycodes.dir
+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
@@ -90,6 +97,7 @@ 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
@@ -101,18 +109,15 @@ 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/amiga
-share/X11/xkb/keymap/ataritt
-share/X11/xkb/keymap/macintosh
-share/X11/xkb/keymap/sony
share/X11/xkb/keymap/xfree86
share/X11/xkb/keymap/xfree98
-share/X11/xkb/keymap/README
-share/X11/xkb/keymap.dir
+share/X11/xkb/rules/README
share/X11/xkb/rules/base
+share/X11/xkb/rules/base.extras.xml
share/X11/xkb/rules/base.lst
share/X11/xkb/rules/base.xml
share/X11/xkb/rules/evdev
+share/X11/xkb/rules/evdev.extras.xml
share/X11/xkb/rules/evdev.lst
share/X11/xkb/rules/evdev.xml
share/X11/xkb/rules/xfree98
@@ -120,124 +125,102 @@ 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/rules/README
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/digital_vndr/lk
-share/X11/xkb/symbols/digital_vndr/pc
-share/X11/xkb/symbols/digital_vndr/us
-share/X11/xkb/symbols/digital_vndr/vt
-share/X11/xkb/symbols/fujitsu_vndr/jp
-share/X11/xkb/symbols/fujitsu_vndr/us
-share/X11/xkb/symbols/hp_vndr/us
-share/X11/xkb/symbols/kpdl
-share/X11/xkb/symbols/macintosh_vndr/apple
-share/X11/xkb/symbols/macintosh_vndr/ch
-share/X11/xkb/symbols/macintosh_vndr/de
-share/X11/xkb/symbols/macintosh_vndr/dk
-share/X11/xkb/symbols/macintosh_vndr/es
-share/X11/xkb/symbols/macintosh_vndr/fi
-share/X11/xkb/symbols/macintosh_vndr/fr
-share/X11/xkb/symbols/macintosh_vndr/gb
-share/X11/xkb/symbols/macintosh_vndr/is
-share/X11/xkb/symbols/macintosh_vndr/it
-share/X11/xkb/symbols/macintosh_vndr/latam
-share/X11/xkb/symbols/macintosh_vndr/nl
-share/X11/xkb/symbols/macintosh_vndr/no
-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/nec_vndr/jp
-share/X11/xkb/symbols/olpc
-share/X11/xkb/symbols/sgi_vndr/jp
-share/X11/xkb/symbols/shift
-share/X11/xkb/symbols/sony_vndr/us
-share/X11/xkb/symbols/sun_vndr/cs
-share/X11/xkb/symbols/sun_vndr/cz
-share/X11/xkb/symbols/sun_vndr/de
-share/X11/xkb/symbols/sun_vndr/dk
-share/X11/xkb/symbols/sun_vndr/es
-share/X11/xkb/symbols/sun_vndr/fi
-share/X11/xkb/symbols/sun_vndr/fr
-share/X11/xkb/symbols/sun_vndr/gb
-share/X11/xkb/symbols/sun_vndr/gr
-share/X11/xkb/symbols/sun_vndr/hu
-share/X11/xkb/symbols/sun_vndr/it
-share/X11/xkb/symbols/sun_vndr/jp
-share/X11/xkb/symbols/sun_vndr/ko
-share/X11/xkb/symbols/sun_vndr/lt
-share/X11/xkb/symbols/sun_vndr/lv
-share/X11/xkb/symbols/sun_vndr/nl
-share/X11/xkb/symbols/sun_vndr/no
-share/X11/xkb/symbols/sun_vndr/pl
-share/X11/xkb/symbols/sun_vndr/pt
-share/X11/xkb/symbols/sun_vndr/ru
-share/X11/xkb/symbols/sun_vndr/se
-share/X11/xkb/symbols/sun_vndr/solaris
-share/X11/xkb/symbols/sun_vndr/sw
-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/us
-share/X11/xkb/symbols/sun_vndr/usb
-share/X11/xkb/symbols/xfree68_vndr/amiga
-share/X11/xkb/symbols/xfree68_vndr/ataritt
+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
share/X11/xkb/symbols/am
share/X11/xkb/symbols/ara
share/X11/xkb/symbols/az
-share/X11/xkb/symbols/be
+share/X11/xkb/symbols/ba
share/X11/xkb/symbols/bd
+share/X11/xkb/symbols/be
share/X11/xkb/symbols/bg
share/X11/xkb/symbols/br
-share/X11/xkb/symbols/ba
+share/X11/xkb/symbols/brai
share/X11/xkb/symbols/bt
share/X11/xkb/symbols/by
share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/capslock
share/X11/xkb/symbols/cd
share/X11/xkb/symbols/ch
share/X11/xkb/symbols/cn
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/ctrl
share/X11/xkb/symbols/cz
share/X11/xkb/symbols/de
+share/X11/xkb/symbols/digital_vndr/lk
+share/X11/xkb/symbols/digital_vndr/pc
+share/X11/xkb/symbols/digital_vndr/us
+share/X11/xkb/symbols/digital_vndr/vt
share/X11/xkb/symbols/dk
share/X11/xkb/symbols/ee
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/rs
+share/X11/xkb/symbols/extras/us
share/X11/xkb/symbols/fi
share/X11/xkb/symbols/fo
share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
share/X11/xkb/symbols/gb
share/X11/xkb/symbols/ge
share/X11/xkb/symbols/gh
share/X11/xkb/symbols/gn
share/X11/xkb/symbols/gr
+share/X11/xkb/symbols/group
+share/X11/xkb/symbols/hp_vndr/us
share/X11/xkb/symbols/hr
share/X11/xkb/symbols/hu
share/X11/xkb/symbols/ie
share/X11/xkb/symbols/il
share/X11/xkb/symbols/in
+share/X11/xkb/symbols/inet
share/X11/xkb/symbols/iq
share/X11/xkb/symbols/ir
share/X11/xkb/symbols/is
share/X11/xkb/symbols/it
share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/keypad
share/X11/xkb/symbols/kg
share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kpdl
share/X11/xkb/symbols/kr
share/X11/xkb/symbols/kz
share/X11/xkb/symbols/la
share/X11/xkb/symbols/latam
share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
share/X11/xkb/symbols/lk
share/X11/xkb/symbols/lt
share/X11/xkb/symbols/lv
share/X11/xkb/symbols/ma
+share/X11/xkb/symbols/macintosh_vndr/apple
+share/X11/xkb/symbols/macintosh_vndr/ch
+share/X11/xkb/symbols/macintosh_vndr/de
+share/X11/xkb/symbols/macintosh_vndr/dk
+share/X11/xkb/symbols/macintosh_vndr/fi
+share/X11/xkb/symbols/macintosh_vndr/fr
+share/X11/xkb/symbols/macintosh_vndr/gb
+share/X11/xkb/symbols/macintosh_vndr/is
+share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/latam
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+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/me
share/X11/xkb/symbols/mk
@@ -246,10 +229,15 @@ share/X11/xkb/symbols/mn
share/X11/xkb/symbols/mt
share/X11/xkb/symbols/mv
share/X11/xkb/symbols/nbsp
+share/X11/xkb/symbols/nec_vndr/jp
share/X11/xkb/symbols/ng
share/X11/xkb/symbols/nl
share/X11/xkb/symbols/no
+share/X11/xkb/symbols/nokia_vndr/rx-44
+share/X11/xkb/symbols/nokia_vndr/rx-51
+share/X11/xkb/symbols/nokia_vndr/su-8w
share/X11/xkb/symbols/np
+share/X11/xkb/symbols/olpc
share/X11/xkb/symbols/pc
share/X11/xkb/symbols/pk
share/X11/xkb/symbols/pl
@@ -258,35 +246,57 @@ share/X11/xkb/symbols/ro
share/X11/xkb/symbols/rs
share/X11/xkb/symbols/ru
share/X11/xkb/symbols/se
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
share/X11/xkb/symbols/si
share/X11/xkb/symbols/sk
share/X11/xkb/symbols/sn
+share/X11/xkb/symbols/sony_vndr/us
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/es
+share/X11/xkb/symbols/sun_vndr/fi
+share/X11/xkb/symbols/sun_vndr/fr
+share/X11/xkb/symbols/sun_vndr/gb
+share/X11/xkb/symbols/sun_vndr/gr
+share/X11/xkb/symbols/sun_vndr/hu
+share/X11/xkb/symbols/sun_vndr/it
+share/X11/xkb/symbols/sun_vndr/jp
+share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/lt
+share/X11/xkb/symbols/sun_vndr/lv
+share/X11/xkb/symbols/sun_vndr/nl
+share/X11/xkb/symbols/sun_vndr/no
+share/X11/xkb/symbols/sun_vndr/pl
+share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ru
+share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/solaris
+share/X11/xkb/symbols/sun_vndr/sw
+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/us
+share/X11/xkb/symbols/sun_vndr/usb
share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/terminate
share/X11/xkb/symbols/th
share/X11/xkb/symbols/tj
share/X11/xkb/symbols/tm
share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/typo
share/X11/xkb/symbols/ua
share/X11/xkb/symbols/us
share/X11/xkb/symbols/uz
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/symbols/altwin
-share/X11/xkb/symbols/brai
-share/X11/xkb/symbols/capslock
-share/X11/xkb/symbols/compose
-share/X11/xkb/symbols/ctrl
-share/X11/xkb/symbols/group
-share/X11/xkb/symbols/inet
-share/X11/xkb/symbols/keypad
-share/X11/xkb/symbols/level3
-share/X11/xkb/symbols/level5
-share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/terminate
-share/X11/xkb/symbols/typo
-share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols.dir
share/X11/xkb/types.dir
+share/X11/xkb/types/README
share/X11/xkb/types/basic
share/X11/xkb/types/cancel
share/X11/xkb/types/caps
@@ -296,9 +306,9 @@ share/X11/xkb/types/extra
share/X11/xkb/types/iso9995
share/X11/xkb/types/level5
share/X11/xkb/types/mousekeys
+share/X11/xkb/types/nokia
share/X11/xkb/types/numpad
share/X11/xkb/types/pc
-share/X11/xkb/types/README
share/X11/xkb/xkbcomp
%%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
@@ -335,37 +345,39 @@ share/X11/xkb/xkbcomp
%%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
+%%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
@exec mkdir -p /var/lib/xkb
-@dirrm share/X11/xkb/compat
-@dirrm share/X11/xkb/geometry/digital_vndr
-@dirrm share/X11/xkb/geometry/sgi_vndr
-@dirrm share/X11/xkb/geometry
-@dirrm share/X11/xkb/keycodes/digital_vndr
-@dirrm share/X11/xkb/keycodes/sgi_vndr
-@dirrm share/X11/xkb/keycodes
-@dirrm share/X11/xkb/keymap/digital_vndr
-@dirrm share/X11/xkb/keymap/sgi_vndr
-@dirrm share/X11/xkb/keymap/sun_vndr
-@dirrm share/X11/xkb/keymap
-@dirrm share/X11/xkb/rules
-@dirrm share/X11/xkb/semantics
-@dirrm share/X11/xkb/symbols/digital_vndr
-@dirrm share/X11/xkb/symbols/fujitsu_vndr
-@dirrm share/X11/xkb/symbols/hp_vndr
-@dirrm share/X11/xkb/symbols/macintosh_vndr
-@dirrm share/X11/xkb/symbols/nec_vndr
-@dirrm share/X11/xkb/symbols/sgi_vndr
-@dirrm share/X11/xkb/symbols/sony_vndr
-@dirrm share/X11/xkb/symbols/sun_vndr
+@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/sgi_vndr
+@dirrm share/X11/xkb/symbols/nokia_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@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/types
+@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
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/compat
@dirrm share/X11/xkb
-@dirrmtry share/X11
-@dirrmtry /var/lib/xkb
-%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/crh
-%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ky
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
+@dirrm share/X11
+@dirrmtry var/lib/xkb
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 2abf419eb3d9..758b6f66fe91 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkill
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
index 31c0d15973af..65e83cbf40ad 100644
--- a/x11/xkill/distinfo
+++ b/x11/xkill/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkill-1.0.1.tar.bz2) = f66d76abb0f75514ca32272e23cca757
-SHA256 (xorg/app/xkill-1.0.1.tar.bz2) = 77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
-SIZE (xorg/app/xkill-1.0.1.tar.bz2) = 77172
+MD5 (xorg/app/xkill-1.0.2.tar.bz2) = dca031355b4afcf8517a8258eeb730c3
+SHA256 (xorg/app/xkill-1.0.2.tar.bz2) = 532df0398d3f4eab1cba8d0367c02a293ca74f2d89a27ef014854a2bde9a5a27
+SIZE (xorg/app/xkill-1.0.2.tar.bz2) = 98306
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 0704a6d8a089..709b9611d54d 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xlogo
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlogo/distinfo b/x11/xlogo/distinfo
index a1d249922a91..6bb9bc6f82ba 100644
--- a/x11/xlogo/distinfo
+++ b/x11/xlogo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlogo-1.0.1.tar.bz2) = 4c5482552f38a7d42398a694cc9b2ee6
-SHA256 (xorg/app/xlogo-1.0.1.tar.bz2) = de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
-SIZE (xorg/app/xlogo-1.0.1.tar.bz2) = 87107
+MD5 (xorg/app/xlogo-1.0.2.tar.bz2) = 7365c0852750134119734bc1879f60ca
+SHA256 (xorg/app/xlogo-1.0.2.tar.bz2) = 47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130
+SIZE (xorg/app/xlogo-1.0.2.tar.bz2) = 111909
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
index 1ba6c2505936..1cfb69187258 100644
--- a/x11/xlsatoms/Makefile
+++ b/x11/xlsatoms/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xlsatoms
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlsatoms/distinfo b/x11/xlsatoms/distinfo
index 34c95c27736d..3e895af5774c 100644
--- a/x11/xlsatoms/distinfo
+++ b/x11/xlsatoms/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 69adcda848479acc3b82b3928812d191
-SHA256 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
-SIZE (xorg/app/xlsatoms-1.0.1.tar.bz2) = 74852
+MD5 (xorg/app/xlsatoms-1.0.2.tar.bz2) = dc8b420bbfa35091ea30edf57c952ec2
+SHA256 (xorg/app/xlsatoms-1.0.2.tar.bz2) = d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b
+SIZE (xorg/app/xlsatoms-1.0.2.tar.bz2) = 95320
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index 4d87441eaf3c..834799f92e42 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xlsclients
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlsclients/distinfo b/x11/xlsclients/distinfo
index baa6753a1493..7ce3a981ed23 100644
--- a/x11/xlsclients/distinfo
+++ b/x11/xlsclients/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlsclients-1.0.1.tar.bz2) = 44473b880d26bfbe8b3d4d72b183cba7
-SHA256 (xorg/app/xlsclients-1.0.1.tar.bz2) = 988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
-SIZE (xorg/app/xlsclients-1.0.1.tar.bz2) = 75484
+MD5 (xorg/app/xlsclients-1.0.2.tar.bz2) = df270f7dd5528ae1b7d80c47585d8278
+SHA256 (xorg/app/xlsclients-1.0.2.tar.bz2) = 8527cdd29d4fcc67df014bc8b371be98901c9082b8de81ea2302bf705c887698
+SIZE (xorg/app/xlsclients-1.0.2.tar.bz2) = 96011
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index b6fa26726734..0a0536b60086 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmag
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo
index 771733429c19..58a5600dc7e6 100644
--- a/x11/xmag/distinfo
+++ b/x11/xmag/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmag-1.0.2.tar.bz2) = 7c6a783e42c88360ac31d259a864a19d
-SHA256 (xorg/app/xmag-1.0.2.tar.bz2) = 51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43
-SIZE (xorg/app/xmag-1.0.2.tar.bz2) = 106793
+MD5 (xorg/app/xmag-1.0.3.tar.bz2) = 32f7ed4c089365cadb9382f6fbd750a9
+SHA256 (xorg/app/xmag-1.0.3.tar.bz2) = 0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
+SIZE (xorg/app/xmag-1.0.3.tar.bz2) = 111523
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index b44407a9b1d1..37a00785927b 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xman
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xman/distinfo b/x11/xman/distinfo
index 773d58a7ace0..3caa172c85c8 100644
--- a/x11/xman/distinfo
+++ b/x11/xman/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xman-1.0.3.tar.bz2) = 3d3a4b310a65ccce82472ef83acbbf97
-SHA256 (xorg/app/xman-1.0.3.tar.bz2) = 38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a
-SIZE (xorg/app/xman-1.0.3.tar.bz2) = 142846
+MD5 (xorg/app/xman-1.1.0.tar.bz2) = 5e5b3351bac26cc1f8490faf1c1402bb
+SHA256 (xorg/app/xman-1.1.0.tar.bz2) = 9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0
+SIZE (xorg/app/xman-1.1.0.tar.bz2) = 152855
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index d31818d631e2..f48aedf9137f 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmessage
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo
index 1d795d74c182..58c0d9d60c9f 100644
--- a/x11/xmessage/distinfo
+++ b/x11/xmessage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmessage-1.0.2.tar.bz2) = b4b561ef11fd184989a6062962e86748
-SHA256 (xorg/app/xmessage-1.0.2.tar.bz2) = 02b4016e93acab94105fa61f6dbe13082669276ab4650b871835fb7884b0c3c3
-SIZE (xorg/app/xmessage-1.0.2.tar.bz2) = 94805
+MD5 (xorg/app/xmessage-1.0.3.tar.bz2) = 76ac52710234ebb9d0e2762bb5d11ea1
+SHA256 (xorg/app/xmessage-1.0.3.tar.bz2) = cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b
+SIZE (xorg/app/xmessage-1.0.3.tar.bz2) = 110604
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index c252f7b22bf1..a3012cfc6114 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xmodmap
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmodmap/distinfo b/x11/xmodmap/distinfo
index 1fbcd64f9b46..ed3663a4e914 100644
--- a/x11/xmodmap/distinfo
+++ b/x11/xmodmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmodmap-1.0.3.tar.bz2) = 626731003ec22a74ecf9e44ed098bbdf
-SHA256 (xorg/app/xmodmap-1.0.3.tar.bz2) = c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
-SIZE (xorg/app/xmodmap-1.0.3.tar.bz2) = 102730
+MD5 (xorg/app/xmodmap-1.0.4.tar.bz2) = bbe021f812e0014a8ee3692317788119
+SHA256 (xorg/app/xmodmap-1.0.4.tar.bz2) = 805a63525d99f59d60a11aa89121fb9cdb001c8d542237ac4deafbadc7bd0bed
+SIZE (xorg/app/xmodmap-1.0.4.tar.bz2) = 115513
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index aa1d21abbd06..21ae19683dac 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-apps
-PORTVERSION= 7.4
-PORTREVISION= 2
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 27d30b73587a..935167635034 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-cf-files
-PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 06ed7fc59d3d..7d5c563f6dd7 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 5f62dd5545b782c74f6e4e70d0e6552c
-SHA256 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = e34613aec2d3d56e1917bd8469f228b9654558f41e335d7e8e49020779fa9597
-SIZE (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 264638
+MD5 (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = 10546b5ddda3cdda7950bb56bf98e0ea
+SHA256 (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = bc32ded8fb8dacdbbe44012ff51e3b797da1f1199cc673bddc3028bec4e1e20b
+SIZE (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = 342708
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 1bf7d561b2a4..05c3301dbb56 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 9bfe85af33af..ef934294dbea 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.4
-PORTREVISION= 4
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
index 2ffa20de640e..e3402695b346 100644
--- a/x11/xpr/Makefile
+++ b/x11/xpr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xpr
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xpr/distinfo b/x11/xpr/distinfo
index f058ba16c643..a41fbb2a165e 100644
--- a/x11/xpr/distinfo
+++ b/x11/xpr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xpr-1.0.2.tar.bz2) = 6b3a6896081f628bf5a2c9129417c86f
-SHA256 (xorg/app/xpr-1.0.2.tar.bz2) = c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
-SIZE (xorg/app/xpr-1.0.2.tar.bz2) = 117849
+MD5 (xorg/app/xpr-1.0.3.tar.bz2) = 1c2c540d240def3ea65ff2030f059f8a
+SHA256 (xorg/app/xpr-1.0.3.tar.bz2) = 2878d6b04ef81ec415fa81313565bee521bf94132127615b9d717d5a489b937d
+SIZE (xorg/app/xpr-1.0.3.tar.bz2) = 128135
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index ce521badd5c9..be7851470943 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xprop
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo
index 4db994cbd5ee..517fcf3e8dbd 100644
--- a/x11/xprop/distinfo
+++ b/x11/xprop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xprop-1.0.4.tar.bz2) = 48aa8fd78802f477dcbf9ef0dfd9f783
-SHA256 (xorg/app/xprop-1.0.4.tar.bz2) = daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772
-SIZE (xorg/app/xprop-1.0.4.tar.bz2) = 109102
+MD5 (xorg/app/xprop-1.1.0.tar.bz2) = f0bacbd30f0dd1c1e9ccafe97687b7a4
+SHA256 (xorg/app/xprop-1.1.0.tar.bz2) = cc8e07901574895f113baffda19272c54545879e02012314527ebbf2dcc66226
+SIZE (xorg/app/xprop-1.1.0.tar.bz2) = 117342
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index c6a6196d29e9..8a1d46593c42 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xproto
-PORTVERSION= 7.0.15
+PORTVERSION= 7.0.16
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 1609395879e3..fbd196082d2f 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xproto-7.0.15.tar.bz2) = 1a2b31430d04340be2e49e8b6445e076
-SHA256 (xorg/proto/xproto-7.0.15.tar.bz2) = fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
-SIZE (xorg/proto/xproto-7.0.15.tar.bz2) = 159189
+MD5 (xorg/proto/xproto-7.0.16.tar.bz2) = 75c9edff1f3823e5ab6bb9e66821a901
+SHA256 (xorg/proto/xproto-7.0.16.tar.bz2) = 8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672
+SIZE (xorg/proto/xproto-7.0.16.tar.bz2) = 159876
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
index 06c625b5eeb6..56ba5be03c57 100644
--- a/x11/xproxymanagementprotocol/Makefile
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xproxymanagementprotocol
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo
index f7807bd4334d..27690f37a8ef 100644
--- a/x11/xproxymanagementprotocol/distinfo
+++ b/x11/xproxymanagementprotocol/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = d28007a50976204960fc1fc07b4ca093
-SHA256 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
-SIZE (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = 37007
+MD5 (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 9de22ca1522008c28fb03dfc41ba2d30
+SHA256 (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2
+SIZE (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 84154
diff --git a/x11/xproxymanagementprotocol/pkg-plist b/x11/xproxymanagementprotocol/pkg-plist
index 19895969c0e2..38f8435bcd44 100644
--- a/x11/xproxymanagementprotocol/pkg-plist
+++ b/x11/xproxymanagementprotocol/pkg-plist
@@ -1,4 +1,6 @@
include/X11/PM/PM.h
include/X11/PM/PMproto.h
libdata/pkgconfig/xproxymngproto.pc
-@dirrm include/X11/PM
+%%DOCSDIR%%/PM_spec
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/PM
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 9626ee6d3ca5..50fa56d2d19d 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index ae0d200b9566..be89f342d3a4 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrandr-1.3.0.tar.bz2) = 616612a15711a4422e71be6acc42ca3c
-SHA256 (xorg/app/xrandr-1.3.0.tar.bz2) = 24c93868edd34519df76c736e20b39653a31eb2609bea61e538e45dc340556f0
-SIZE (xorg/app/xrandr-1.3.0.tar.bz2) = 128126
+MD5 (xorg/app/xrandr-1.3.2.tar.bz2) = 2cb19bb1c19ccf77c40032b03dbe06f0
+SHA256 (xorg/app/xrandr-1.3.2.tar.bz2) = 34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249
+SIZE (xorg/app/xrandr-1.3.2.tar.bz2) = 129645
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index bbd25bc386fd..7f30c744adc6 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrdb
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo
index a0467d148b27..6b92f9a72978 100644
--- a/x11/xrdb/distinfo
+++ b/x11/xrdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrdb-1.0.5.tar.bz2) = 9c30b8e1709d5367beb7706146640c07
-SHA256 (xorg/app/xrdb-1.0.5.tar.bz2) = c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa
-SIZE (xorg/app/xrdb-1.0.5.tar.bz2) = 101484
+MD5 (xorg/app/xrdb-1.0.6.tar.bz2) = 8dd881cd5a7dcb6e456549817f0fb475
+SHA256 (xorg/app/xrdb-1.0.6.tar.bz2) = 8d062a3764665fcf22b14df4a5aca6af1e6d7d613296875b31b68e74ef66fc99
+SIZE (xorg/app/xrdb-1.0.6.tar.bz2) = 108542
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 2214a510b18c..23e68fed7d12 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrefresh
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrefresh/distinfo b/x11/xrefresh/distinfo
index c17a1d26377c..a2af461f1a62 100644
--- a/x11/xrefresh/distinfo
+++ b/x11/xrefresh/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrefresh-1.0.2.tar.bz2) = 1228f890f86148e4e6ae22aa73118cbb
-SHA256 (xorg/app/xrefresh-1.0.2.tar.bz2) = 522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
-SIZE (xorg/app/xrefresh-1.0.2.tar.bz2) = 80590
+MD5 (xorg/app/xrefresh-1.0.3.tar.bz2) = 8f4fafcfb77b3c6972cc44bb3f1c899c
+SHA256 (xorg/app/xrefresh-1.0.3.tar.bz2) = 3ee0a5f7aeb14bbffbcafcff8e7806c9a59f08e1a58322a50f5fca023a7d7ed9
+SIZE (xorg/app/xrefresh-1.0.3.tar.bz2) = 96931
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index d3f92e777c91..0aeb45597f8e 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xrx
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
index 86280543a985..93aa10ae1b59 100644
--- a/x11/xrx/distinfo
+++ b/x11/xrx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrx-1.0.1.tar.bz2) = 5f65e24f8a225e255beb2059e33d6b37
-SHA256 (xorg/app/xrx-1.0.1.tar.bz2) = a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
-SIZE (xorg/app/xrx-1.0.1.tar.bz2) = 265332
+MD5 (xorg/app/xrx-1.0.3.tar.bz2) = c121945afcfc84e99af17158fda68be9
+SHA256 (xorg/app/xrx-1.0.3.tar.bz2) = 9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
+SIZE (xorg/app/xrx-1.0.3.tar.bz2) = 323776
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
index 7fa9e3aa3093..db6dd2cfe397 100644
--- a/x11/xrx/pkg-plist
+++ b/x11/xrx/pkg-plist
@@ -1,9 +1,8 @@
bin/xrx
-lib/libxrx.so.0
-lib/libxrx.so
-lib/libxrx.la
lib/libxrx.a
-lib/libxrxnest.so.0
-lib/libxrxnest.so
-lib/libxrxnest.la
+lib/libxrx.la
+lib/libxrx.so
lib/libxrxnest.a
+lib/libxrxnest.la
+lib/libxrxnest.so
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index b0f144e6ac24..df112ad4c363 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xset
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
index 0202548cfcb1..ed7e109af19a 100644
--- a/x11/xset/distinfo
+++ b/x11/xset/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xset-1.0.4.tar.bz2) = 2f41fd983ba4d89419204854936025e2
-SHA256 (xorg/app/xset-1.0.4.tar.bz2) = 6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
-SIZE (xorg/app/xset-1.0.4.tar.bz2) = 103613
+MD5 (xorg/app/xset-1.1.0.tar.bz2) = eeb0d02f69c76bd40470dede99b4bd49
+SHA256 (xorg/app/xset-1.1.0.tar.bz2) = 72c859c6030890a25cf828d0b2743454e50eadab30f6be8c17172fe97a554643
+SIZE (xorg/app/xset-1.1.0.tar.bz2) = 113643
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index 796333308f54..816b59954fb2 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xsetroot
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xsetroot/distinfo b/x11/xsetroot/distinfo
index f5f9b99aae52..c4f81ff1434d 100644
--- a/x11/xsetroot/distinfo
+++ b/x11/xsetroot/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xsetroot-1.0.2.tar.bz2) = 9af7db9f3052aef0b11636720b3101dd
-SHA256 (xorg/app/xsetroot-1.0.2.tar.bz2) = 4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d
-SIZE (xorg/app/xsetroot-1.0.2.tar.bz2) = 88136
+MD5 (xorg/app/xsetroot-1.0.3.tar.bz2) = cbda9b9b8da5af4614110883d5a276b8
+SHA256 (xorg/app/xsetroot-1.0.3.tar.bz2) = d7e512cc686de3ab5fcd3c9f9e605d7cae68a4b50f2c0786f0f09ce08c728f48
+SIZE (xorg/app/xsetroot-1.0.3.tar.bz2) = 101384
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 598e49e6ffe4..20e6269b27dd 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xtrans
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index 4a936d325253..2ef62bf41c7a 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/xtrans-1.2.3.tar.bz2) = f9cf791dfad59cf044e276aab3a71e1d
-SHA256 (xorg/lib/xtrans-1.2.3.tar.bz2) = a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
-SIZE (xorg/lib/xtrans-1.2.3.tar.bz2) = 104280
+MD5 (xorg/lib/xtrans-1.2.5.tar.bz2) = 2d1e57e82acc5f21797e92341415af2f
+SHA256 (xorg/lib/xtrans-1.2.5.tar.bz2) = cc71a391f4da8176e5daeeac1ddf5137ba5e8d2263cb93a49f9e2a9976b90899
+SIZE (xorg/lib/xtrans-1.2.5.tar.bz2) = 141859
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index e0184a46f275..d14b3a3c5aa6 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -8,4 +8,5 @@ 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/xvidtune/Makefile b/x11/xvidtune/Makefile
index 776e444287eb..e7e9cc266e6e 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xvidtune
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo
index b04774c7a092..1ec0c6cb543f 100644
--- a/x11/xvidtune/distinfo
+++ b/x11/xvidtune/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xvidtune-1.0.1.tar.bz2) = e0744594f4e5969b20df28d897781318
-SHA256 (xorg/app/xvidtune-1.0.1.tar.bz2) = 6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
-SIZE (xorg/app/xvidtune-1.0.1.tar.bz2) = 87986
+MD5 (xorg/app/xvidtune-1.0.2.tar.bz2) = e40eeb4454f2a7cdde3a14f5dfd3aadd
+SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
+SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index 80dfc8a71a86..66a860921028 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xvinfo
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xvinfo/distinfo b/x11/xvinfo/distinfo
index 139b7efd11d7..de5aea0c8429 100644
--- a/x11/xvinfo/distinfo
+++ b/x11/xvinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xvinfo-1.0.2.tar.bz2) = e1e318436f49e2f0f3764593dadd9ad2
-SHA256 (xorg/app/xvinfo-1.0.2.tar.bz2) = 126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150
-SIZE (xorg/app/xvinfo-1.0.2.tar.bz2) = 86657
+MD5 (xorg/app/xvinfo-1.1.0.tar.bz2) = 8cc299b2cb636b5f7fe672610789d3d4
+SHA256 (xorg/app/xvinfo-1.1.0.tar.bz2) = 0a318f6ca0d92bd5cc2ab9d2690f6120b3e1537b7902ce110469864869e86efb
+SIZE (xorg/app/xvinfo-1.1.0.tar.bz2) = 96282
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index b909d9460c29..5ab0a8bfac1e 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwd
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo
index 0ba03d387318..ba238e0eeb58 100644
--- a/x11/xwd/distinfo
+++ b/x11/xwd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwd-1.0.2.tar.bz2) = 0a6ef08a2ac08ad5c4dd1522eb3788a3
-SHA256 (xorg/app/xwd-1.0.2.tar.bz2) = ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
-SIZE (xorg/app/xwd-1.0.2.tar.bz2) = 111673
+MD5 (xorg/app/xwd-1.0.3.tar.bz2) = 007cea1f389abde5c93162dcd5541351
+SHA256 (xorg/app/xwd-1.0.3.tar.bz2) = fff2dbea086c554463d4309209ee05e026b7f19900598f55e0a24a6d7a7ee3fd
+SIZE (xorg/app/xwd-1.0.3.tar.bz2) = 117735
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 0ac45befdcd4..a841100d3242 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwininfo
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
index ddf5cfda9e93..5e54d3094b81 100644
--- a/x11/xwininfo/distinfo
+++ b/x11/xwininfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwininfo-1.0.4.tar.bz2) = e2a9bf5ab7f2a0866700a3b49dd8c6bf
-SHA256 (xorg/app/xwininfo-1.0.4.tar.bz2) = df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
-SIZE (xorg/app/xwininfo-1.0.4.tar.bz2) = 101541
+MD5 (xorg/app/xwininfo-1.0.5.tar.bz2) = 908f8bc3255f639effa9780fb1c19ea4
+SHA256 (xorg/app/xwininfo-1.0.5.tar.bz2) = 8db6b81a7b0bc4e7acce6c6d41df9747b0b19e12c21c5a70b51bbc63a42cdcd9
+SIZE (xorg/app/xwininfo-1.0.5.tar.bz2) = 109834
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
index 34e7c66542dc..24efdfee5372 100644
--- a/x11/xwud/Makefile
+++ b/x11/xwud/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwud
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwud/distinfo b/x11/xwud/distinfo
index 540f453341e1..21242b38a184 100644
--- a/x11/xwud/distinfo
+++ b/x11/xwud/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwud-1.0.1.tar.bz2) = 6e3c5d0297d88e890b6f5df31f73dd60
-SHA256 (xorg/app/xwud-1.0.1.tar.bz2) = d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
-SIZE (xorg/app/xwud-1.0.1.tar.bz2) = 83104
+MD5 (xorg/app/xwud-1.0.2.tar.bz2) = 20bc5d85634964d4ceee77cdfcd131ed
+SHA256 (xorg/app/xwud-1.0.2.tar.bz2) = 84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1
+SIZE (xorg/app/xwud-1.0.2.tar.bz2) = 103954