aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/appres/Makefile2
-rw-r--r--x11/appres/distinfo5
-rw-r--r--x11/beforelight/Makefile3
-rw-r--r--x11/beforelight/distinfo5
-rw-r--r--x11/beforelight/pkg-descr3
-rw-r--r--x11/bigreqsproto/Makefile2
-rw-r--r--x11/bigreqsproto/distinfo5
-rw-r--r--x11/bigreqsproto/pkg-descr3
-rw-r--r--x11/bigreqsproto/pkg-plist2
-rw-r--r--x11/bitmap/Makefile2
-rw-r--r--x11/bitmap/distinfo5
-rw-r--r--x11/bitmap/pkg-descr3
-rw-r--r--x11/compositeproto/Makefile2
-rw-r--r--x11/compositeproto/distinfo5
-rw-r--r--x11/compositeproto/pkg-descr3
-rw-r--r--x11/damageproto/Makefile2
-rw-r--r--x11/damageproto/distinfo5
-rw-r--r--x11/damageproto/pkg-descr3
-rw-r--r--x11/dmxproto/pkg-descr3
-rw-r--r--x11/dmxproto/pkg-plist2
-rw-r--r--x11/dri2proto/Makefile2
-rw-r--r--x11/dri2proto/distinfo5
-rw-r--r--x11/dri2proto/pkg-descr3
-rw-r--r--x11/editres/Makefile2
-rw-r--r--x11/editres/distinfo5
-rw-r--r--x11/editres/pkg-descr3
-rw-r--r--x11/evieext/pkg-descr3
-rw-r--r--x11/fixesproto/Makefile2
-rw-r--r--x11/fixesproto/distinfo5
-rw-r--r--x11/fixesproto/pkg-descr3
-rw-r--r--x11/fstobdf/Makefile2
-rw-r--r--x11/fstobdf/distinfo5
-rw-r--r--x11/fstobdf/pkg-descr3
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo5
-rw-r--r--x11/glproto/pkg-descr3
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/iceauth/distinfo5
-rw-r--r--x11/iceauth/pkg-descr3
-rw-r--r--x11/ico/Makefile2
-rw-r--r--x11/ico/distinfo5
-rw-r--r--x11/ico/pkg-descr3
-rw-r--r--x11/inputproto/Makefile2
-rw-r--r--x11/inputproto/distinfo5
-rw-r--r--x11/inputproto/pkg-descr3
-rw-r--r--x11/inputproto/pkg-plist5
-rw-r--r--x11/kbproto/Makefile2
-rw-r--r--x11/kbproto/distinfo5
-rw-r--r--x11/kbproto/pkg-descr3
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libICE/distinfo5
-rw-r--r--x11/libICE/pkg-descr3
-rw-r--r--x11/libICE/pkg-plist3
-rw-r--r--x11/libSM/pkg-descr3
-rw-r--r--x11/libX11/Makefile9
-rw-r--r--x11/libX11/distinfo5
-rw-r--r--x11/libX11/manpages5
-rw-r--r--x11/libX11/pkg-descr3
-rw-r--r--x11/libX11/pkg-plist221
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/distinfo5
-rw-r--r--x11/libXScrnSaver/pkg-descr3
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXau/distinfo5
-rw-r--r--x11/libXau/pkg-descr3
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcomposite/distinfo5
-rw-r--r--x11/libXcomposite/pkg-descr3
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXcursor/distinfo5
-rw-r--r--x11/libXcursor/pkg-descr3
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdamage/distinfo5
-rw-r--r--x11/libXdamage/pkg-descr3
-rw-r--r--x11/libXdmcp/pkg-descr3
-rw-r--r--x11/libXevie/pkg-descr3
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXext/distinfo5
-rw-r--r--x11/libXext/pkg-descr4
-rw-r--r--x11/libXext/pkg-plist3
-rw-r--r--x11/libXfixes/pkg-descr3
-rw-r--r--x11/libXi/Makefile72
-rw-r--r--x11/libXi/distinfo5
-rw-r--r--x11/libXi/pkg-descr3
-rw-r--r--x11/libXinerama/pkg-descr3
-rw-r--r--x11/libXprintAppUtil/pkg-descr3
-rw-r--r--x11/libXprintUtil/pkg-descr3
-rw-r--r--x11/libXrandr/pkg-descr3
-rw-r--r--x11/libXres/pkg-descr3
-rw-r--r--x11/libXtrans/pkg-descr3
-rw-r--r--x11/libXtst/pkg-descr3
-rw-r--r--x11/libXv/pkg-descr3
-rw-r--r--x11/libXvMC/pkg-descr3
-rw-r--r--x11/libXxf86dga/pkg-descr3
-rw-r--r--x11/libXxf86misc/pkg-descr3
-rw-r--r--x11/libXxf86vm/pkg-descr3
-rw-r--r--x11/libdmx/Makefile2
-rw-r--r--x11/libdmx/distinfo5
-rw-r--r--x11/libdmx/pkg-descr3
-rw-r--r--x11/liboldX/pkg-descr3
-rw-r--r--x11/libxkbfile/pkg-descr3
-rw-r--r--x11/libxkbui/pkg-descr3
-rw-r--r--x11/listres/pkg-descr3
-rw-r--r--x11/luit/pkg-descr3
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/pixman/distinfo5
-rw-r--r--x11/pixman/pkg-descr3
-rw-r--r--x11/printproto/pkg-descr3
-rw-r--r--x11/randrproto/Makefile2
-rw-r--r--x11/randrproto/distinfo5
-rw-r--r--x11/randrproto/pkg-descr3
-rw-r--r--x11/recordproto/pkg-descr3
-rw-r--r--x11/renderproto/pkg-descr3
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/rgb/distinfo5
-rw-r--r--x11/rgb/pkg-descr3
-rw-r--r--x11/rstart/pkg-descr3
-rw-r--r--x11/scrnsaverproto/pkg-descr3
-rw-r--r--x11/sessreg/Makefile3
-rw-r--r--x11/sessreg/distinfo5
-rw-r--r--x11/sessreg/pkg-descr3
-rw-r--r--x11/setxkbmap/Makefile2
-rw-r--r--x11/setxkbmap/distinfo5
-rw-r--r--x11/setxkbmap/pkg-descr3
-rw-r--r--x11/smproxy/pkg-descr3
-rw-r--r--x11/videoproto/pkg-descr3
-rw-r--r--x11/viewres/pkg-descr3
-rw-r--r--x11/wrapper/pkg-descr2
-rw-r--r--x11/x11perf/Makefile2
-rw-r--r--x11/x11perf/distinfo5
-rw-r--r--x11/x11perf/pkg-descr3
-rw-r--r--x11/xauth/Makefile2
-rw-r--r--x11/xauth/distinfo5
-rw-r--r--x11/xauth/pkg-descr3
-rw-r--r--x11/xbiff/Makefile2
-rw-r--r--x11/xbiff/distinfo5
-rw-r--r--x11/xbiff/pkg-descr3
-rw-r--r--x11/xcalc/Makefile2
-rw-r--r--x11/xcalc/distinfo5
-rw-r--r--x11/xcalc/pkg-descr3
-rw-r--r--x11/xclipboard/pkg-descr3
-rw-r--r--x11/xcmiscproto/pkg-descr3
-rw-r--r--x11/xcmsdb/pkg-descr3
-rw-r--r--x11/xconsole/Makefile3
-rw-r--r--x11/xconsole/distinfo5
-rw-r--r--x11/xconsole/pkg-descr3
-rw-r--r--x11/xcursorgen/pkg-descr3
-rw-r--r--x11/xdbedizzy/pkg-descr3
-rw-r--r--x11/xditview/pkg-descr3
-rw-r--r--x11/xdm/Makefile4
-rw-r--r--x11/xdm/pkg-plist6
-rw-r--r--x11/xdpyinfo/pkg-descr3
-rw-r--r--x11/xdriinfo/pkg-descr3
-rw-r--r--x11/xedit/Makefile2
-rw-r--r--x11/xedit/distinfo5
-rw-r--r--x11/xedit/pkg-descr2
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xev/distinfo5
-rw-r--r--x11/xev/pkg-descr3
-rw-r--r--x11/xextproto/pkg-descr3
-rw-r--r--x11/xeyes/Makefile2
-rw-r--r--x11/xeyes/distinfo5
-rw-r--r--x11/xeyes/pkg-descr3
-rw-r--r--x11/xf86dga/pkg-descr3
-rw-r--r--x11/xf86dgaproto/pkg-descr3
-rw-r--r--x11/xf86driproto/pkg-descr3
-rw-r--r--x11/xf86miscproto/pkg-descr3
-rw-r--r--x11/xf86rushproto/pkg-descr3
-rw-r--r--x11/xf86vidmodeproto/pkg-descr3
-rw-r--r--x11/xfd/pkg-descr3
-rw-r--r--x11/xfindproxy/pkg-descr3
-rw-r--r--x11/xfwp/pkg-descr3
-rw-r--r--x11/xgamma/Makefile2
-rw-r--r--x11/xgamma/distinfo5
-rw-r--r--x11/xgamma/pkg-descr3
-rw-r--r--x11/xgc/pkg-descr3
-rw-r--r--x11/xhost/Makefile2
-rw-r--r--x11/xhost/distinfo5
-rw-r--r--x11/xhost/pkg-descr3
-rw-r--r--x11/xineramaproto/pkg-descr3
-rw-r--r--x11/xinit/pkg-descr3
-rw-r--r--x11/xinput/Makefile2
-rw-r--r--x11/xinput/distinfo5
-rw-r--r--x11/xkbcomp/pkg-descr3
-rw-r--r--x11/xkbevd/pkg-descr3
-rw-r--r--x11/xkbprint/pkg-descr3
-rw-r--r--x11/xkeyboard-config/pkg-descr3
-rw-r--r--x11/xkill/Makefile2
-rw-r--r--x11/xkill/distinfo5
-rw-r--r--x11/xkill/pkg-descr3
-rw-r--r--x11/xload/pkg-descr3
-rw-r--r--x11/xlogo/pkg-descr3
-rw-r--r--x11/xlsatoms/pkg-descr3
-rw-r--r--x11/xlsclients/pkg-descr3
-rw-r--r--x11/xmag/pkg-descr3
-rw-r--r--x11/xman/pkg-descr3
-rw-r--r--x11/xmessage/pkg-descr3
-rw-r--r--x11/xmh/pkg-descr3
-rw-r--r--x11/xmodmap/pkg-descr3
-rw-r--r--x11/xmore/Makefile3
-rw-r--r--x11/xmore/distinfo5
-rw-r--r--x11/xmore/pkg-descr3
-rw-r--r--x11/xorg-apps/Makefile5
-rw-r--r--x11/xorg-apps/pkg-descr3
-rw-r--r--x11/xorg-libraries/Makefile2
-rw-r--r--x11/xorg-libraries/pkg-descr3
-rw-r--r--x11/xorg/Makefile2
-rw-r--r--x11/xorg/pkg-descr3
-rw-r--r--x11/xplsprinters/pkg-descr3
-rw-r--r--x11/xpr/pkg-descr3
-rw-r--r--x11/xprehashprinterlist/pkg-descr3
-rw-r--r--x11/xprop/pkg-descr3
-rw-r--r--x11/xproto/pkg-descr3
-rw-r--r--x11/xproxymanagementprotocol/pkg-descr3
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo5
-rw-r--r--x11/xrandr/pkg-descr3
-rw-r--r--x11/xrdb/pkg-descr3
-rw-r--r--x11/xrefresh/pkg-descr3
-rw-r--r--x11/xrx/pkg-descr3
-rw-r--r--x11/xset/Makefile2
-rw-r--r--x11/xset/distinfo5
-rw-r--r--x11/xset/pkg-descr2
-rw-r--r--x11/xsetmode/pkg-descr3
-rw-r--r--x11/xsetpointer/pkg-descr3
-rw-r--r--x11/xsetroot/pkg-descr3
-rw-r--r--x11/xsm/pkg-descr3
-rw-r--r--x11/xstdcmap/pkg-descr3
-rw-r--r--x11/xtrans/pkg-descr3
-rw-r--r--x11/xtrap/pkg-descr3
-rw-r--r--x11/xvinfo/pkg-descr3
-rw-r--r--x11/xwd/pkg-descr3
-rw-r--r--x11/xwininfo/pkg-descr3
-rw-r--r--x11/xwud/pkg-descr3
234 files changed, 358 insertions, 692 deletions
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index 858078de1123..382115f9b107 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= appres
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
index ba6193bd920d..8759c7eb608f 100644
--- a/x11/appres/distinfo
+++ b/x11/appres/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/appres-1.0.3.tar.bz2) = 93f475046a8c5055131c5551d5a36ff62aa138a7b2f17ac1bf6393cde8dc640a
+SIZE (xorg/app/appres-1.0.3.tar.bz2) = 104807
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 67e9593b9548..0ce0d9312286 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= beforelight
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo
index 358c03298561..a01024dc6ffa 100644
--- a/x11/beforelight/distinfo
+++ b/x11/beforelight/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/beforelight-1.0.3.tar.bz2) = d55b0e7196dafcfeb4db3886af2e1969
-SHA256 (xorg/app/beforelight-1.0.3.tar.bz2) = cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e
-SIZE (xorg/app/beforelight-1.0.3.tar.bz2) = 85067
+SHA256 (xorg/app/beforelight-1.0.4.tar.bz2) = 38f1d5380704234a37306ee13ea53be6eed4a1c6eb2c8ebdacca181465da56bb
+SIZE (xorg/app/beforelight-1.0.4.tar.bz2) = 108254
diff --git a/x11/beforelight/pkg-descr b/x11/beforelight/pkg-descr
index 75c2de6b27ab..e57387823539 100644
--- a/x11/beforelight/pkg-descr
+++ b/x11/beforelight/pkg-descr
@@ -1,5 +1,2 @@
This package contains a sample screen saver for the X Window System called
"beforelight".
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index 587c2e9eece7..011b51c5ddb9 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bigreqsproto
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
index f339e050ddf1..585c66bdae49 100644
--- a/x11/bigreqsproto/distinfo
+++ b/x11/bigreqsproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
+SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
diff --git a/x11/bigreqsproto/pkg-descr b/x11/bigreqsproto/pkg-descr
index 8d54a8f300f0..bf5a7b3c73fa 100644
--- a/x11/bigreqsproto/pkg-descr
+++ b/x11/bigreqsproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org BigReqs extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
index 8244fb5a8137..3d95422af10c 100644
--- a/x11/bigreqsproto/pkg-plist
+++ b/x11/bigreqsproto/pkg-plist
@@ -1,4 +1,6 @@
include/X11/extensions/bigreqsproto.h
include/X11/extensions/bigreqstr.h
libdata/pkgconfig/bigreqsproto.pc
+%%DOCSDIR%%/bigreq.xml
+@dirrm %%DOCSDIR%%
@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 558a99c8bc15..93acca9fcc90 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bitmap
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
index b8a5dbb0b638..bc3712be5268 100644
--- a/x11/bitmap/distinfo
+++ b/x11/bitmap/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/bitmap-1.0.5.tar.bz2) = aa51b522fb2579042b1a7f1a5cea8b5582f2f88ea19459469fc19d61714a031e
+SIZE (xorg/app/bitmap-1.0.5.tar.bz2) = 153430
diff --git a/x11/bitmap/pkg-descr b/x11/bitmap/pkg-descr
index fcb5245535ce..1650a445a600 100644
--- a/x11/bitmap/pkg-descr
+++ b/x11/bitmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains bitmap, which is a tool for creating or editing
rectangual images made up of 1's and 0's.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index 495fb0b93553..a5cd8627df29 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= compositeproto
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index 716ffd452d31..dc5679054c8d 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/compositeproto-0.4.2.tar.bz2) = 049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc
+SIZE (xorg/proto/compositeproto-0.4.2.tar.bz2) = 101208
diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr
index 9ce26903ea4d..db7f06d1c3d3 100644
--- a/x11/compositeproto/pkg-descr
+++ b/x11/compositeproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Composite extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 779e955b278f..6073e83bdacd 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= damageproto
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
index 03253db8dc6e..0cd77b87edb0 100644
--- a/x11/damageproto/distinfo
+++ b/x11/damageproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/damageproto-1.2.1.tar.bz2) = 5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b
+SIZE (xorg/proto/damageproto-1.2.1.tar.bz2) = 98392
diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr
index 9ba4ce9c9d65..66bb20e11ea6 100644
--- a/x11/damageproto/pkg-descr
+++ b/x11/damageproto/pkg-descr
@@ -1,5 +1,2 @@
This package contains X.Org Damage extension protocol specification
and header files.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr
index 32c1fea20bec..690700f953eb 100644
--- a/x11/dmxproto/pkg-descr
+++ b/x11/dmxproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org DMXProto protocol headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
index 98accdce0c96..217d1f5f509f 100644
--- a/x11/dmxproto/pkg-plist
+++ b/x11/dmxproto/pkg-plist
@@ -1,4 +1,4 @@
include/X11/extensions/dmx.h
include/X11/extensions/dmxproto.h
libdata/pkgconfig/dmxproto.pc
-@dirrmtry include/X11/extensions
+@dirrm include/X11/extensions
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 638ff0f2f76d..5709b1c2ae1f 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dri2proto
-PORTVERSION= 2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index 71dc2fb3621b..eb210316420d 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/dri2proto-2.3.tar.bz2) = b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677
+SIZE (xorg/proto/dri2proto-2.3.tar.bz2) = 95466
diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr
index 1e57ddbf8fb2..668bcfc97708 100644
--- a/x11/dri2proto/pkg-descr
+++ b/x11/dri2proto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org DRI2 prototype headers.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 245843f9092c..5e7ad5a6d849 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= editres
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
index a5b442702ae9..ff572e4b01f2 100644
--- a/x11/editres/distinfo
+++ b/x11/editres/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/editres-1.0.5.tar.bz2) = fd97a3522e97b8b7ead7b5cddeb79bfabe44769d144ac9ae5595c25c41afa33d
+SIZE (xorg/app/editres-1.0.5.tar.bz2) = 145578
diff --git a/x11/editres/pkg-descr b/x11/editres/pkg-descr
index 484a780e362f..dbea285b5c32 100644
--- a/x11/editres/pkg-descr
+++ b/x11/editres/pkg-descr
@@ -1,5 +1,2 @@
This package contains editres, a dynamic resource editor for X Toolkit
Applications.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/evieext/pkg-descr b/x11/evieext/pkg-descr
index 6ddfde63eccd..0521a1e729a8 100644
--- a/x11/evieext/pkg-descr
+++ b/x11/evieext/pkg-descr
@@ -1,4 +1,3 @@
This package contains evieext, a collection of XEVIE extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs \ No newline at end of file
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 45350f54ecab..ea13101353fc 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fixesproto
-PORTVERSION= 4.1.1
+PORTVERSION= 4.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
index fa215cec2baf..0bfc4ee598db 100644
--- a/x11/fixesproto/distinfo
+++ b/x11/fixesproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/fixesproto-4.1.2.tar.bz2) = de4cbfccb533c190073445eb2a891d997e89f6fb58204f68ae82871de044f857
+SIZE (xorg/proto/fixesproto-4.1.2.tar.bz2) = 103043
diff --git a/x11/fixesproto/pkg-descr b/x11/fixesproto/pkg-descr
index 5e2d9367eadd..306320b73cbd 100644
--- a/x11/fixesproto/pkg-descr
+++ b/x11/fixesproto/pkg-descr
@@ -1,5 +1,4 @@
This package contains X.Org Fixes extension protocol specification
and header files.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index a265ea6075ce..7fc569a44f96 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fstobdf
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
index 9216579332e9..97b066dc8d1f 100644
--- a/x11/fstobdf/distinfo
+++ b/x11/fstobdf/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/fstobdf-1.0.3.tar.bz2) = 49a6225380f6c18fff664a043cd569b1
-SHA256 (xorg/app/fstobdf-1.0.3.tar.bz2) = f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0
-SIZE (xorg/app/fstobdf-1.0.3.tar.bz2) = 90507
+SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
+SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
diff --git a/x11/fstobdf/pkg-descr b/x11/fstobdf/pkg-descr
index 5c95299bfed0..e5adf2a0fc75 100644
--- a/x11/fstobdf/pkg-descr
+++ b/x11/fstobdf/pkg-descr
@@ -1,5 +1,2 @@
This package contains fstobdf, a program for generating BDF fonts from
an X font server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 5b82b42dd78b..e7a1804122d4 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glproto
-PORTVERSION= 1.4.11
+PORTVERSION= 1.4.12
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index a4adc7a86fff..73bbc435bcb0 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/glproto-1.4.12.tar.bz2) = 48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de
+SIZE (xorg/proto/glproto-1.4.12.tar.bz2) = 106968
diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr
index 489e9639f47e..07573ef97474 100644
--- a/x11/glproto/pkg-descr
+++ b/x11/glproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org GLX extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 4699ed3e42cf..afa9632f9978 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= iceauth
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
index 201ac6b8f701..374adcd1cdad 100644
--- a/x11/iceauth/distinfo
+++ b/x11/iceauth/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/iceauth-1.0.4.tar.bz2) = 0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d
+SIZE (xorg/app/iceauth-1.0.4.tar.bz2) = 115722
diff --git a/x11/iceauth/pkg-descr b/x11/iceauth/pkg-descr
index e412c393288f..ae475980c9f5 100644
--- a/x11/iceauth/pkg-descr
+++ b/x11/iceauth/pkg-descr
@@ -1,5 +1,2 @@
This package contains iceauth, an ICE authority file utility for the X
Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index b612fb930351..6cb55d34efbf 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ico
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/ico/distinfo b/x11/ico/distinfo
index 10a83d0d9913..25cc6a38a7f4 100644
--- a/x11/ico/distinfo
+++ b/x11/ico/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/ico-1.0.2.tar.bz2) = 5711827c5c2563620b56c33aababbc63
-SHA256 (xorg/app/ico-1.0.2.tar.bz2) = db2e96e18a2bcc29b91b9de7b758a7c67cebee27772fb540c44c7bc2c2218aa5
-SIZE (xorg/app/ico-1.0.2.tar.bz2) = 97445
+SHA256 (xorg/app/ico-1.0.3.tar.bz2) = db00f97a19e7ff87065f70df0a347a4924815cba7bceef801456d9180a3fd896
+SIZE (xorg/app/ico-1.0.3.tar.bz2) = 116202
diff --git a/x11/ico/pkg-descr b/x11/ico/pkg-descr
index cdef9f01c8d6..591943b22fd1 100644
--- a/x11/ico/pkg-descr
+++ b/x11/ico/pkg-descr
@@ -1,5 +1,2 @@
This package contains ico, an appliction used for displaying wire-framed
rotating polyhedrons.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index d64ee328b583..28959ee80de9 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= inputproto
-PORTVERSION= 2.0
+PORTVERSION= 2.0.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index 3ca4f2ab2ddd..7b3f03bba653 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/inputproto-2.0.1.tar.bz2) = 63663dd88df812738e0efdc52a18868c0756128f09748cbe89c8ec6d17124a44
+SIZE (xorg/proto/inputproto-2.0.1.tar.bz2) = 152547
diff --git a/x11/inputproto/pkg-descr b/x11/inputproto/pkg-descr
index 56ac85360439..d851f442f923 100644
--- a/x11/inputproto/pkg-descr
+++ b/x11/inputproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Input extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
index 8ed21c47ef29..a08637eae856 100644
--- a/x11/inputproto/pkg-plist
+++ b/x11/inputproto/pkg-plist
@@ -3,4 +3,7 @@ include/X11/extensions/XI2.h
include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
libdata/pkgconfig/inputproto.pc
-@dirrmtry include/X11/extensions \ No newline at end of file
+%%DOCSDIR%%/XI2proto.txt
+%%DOCSDIR%%/XIproto.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index c9bbfc0d25f9..460e113a8f9c 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kbproto
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
index 30c2135b94e9..98d94c36c8f4 100644
--- a/x11/kbproto/distinfo
+++ b/x11/kbproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
+SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
diff --git a/x11/kbproto/pkg-descr b/x11/kbproto/pkg-descr
index fe7caeb39b70..b8e64b19ba52 100644
--- a/x11/kbproto/pkg-descr
+++ b/x11/kbproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org KB extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index d2051d568cb0..ed3c6056c4dd 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libICE
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.7
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index a83bf7400aeb..efdbf210e5da 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
+SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
diff --git a/x11/libICE/pkg-descr b/x11/libICE/pkg-descr
index 8a75f1bb6efb..718008bed3b4 100644
--- a/x11/libICE/pkg-descr
+++ b/x11/libICE/pkg-descr
@@ -1,6 +1,3 @@
This package contains the Inter Client Exchange library for X11.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 465b985306fb..4083e3aa8080 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -9,4 +9,7 @@ lib/libICE.la
lib/libICE.so
lib/libICE.so.6
libdata/pkgconfig/ice.pc
+%%DOCSDIR%%/ICElib.xml
+%%DOCSDIR%%/ice.xml
+@dirrm %%DOCSDIR%%
@dirrm include/X11/ICE
diff --git a/x11/libSM/pkg-descr b/x11/libSM/pkg-descr
index 104904279f9c..de641164288d 100644
--- a/x11/libSM/pkg-descr
+++ b/x11/libSM/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X11 Session Management library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d49a86212a9c..323348967f89 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libX11
-PORTVERSION= 1.3.3
-PORTREVISION= 1
+PORTVERSION= 1.3.6
PORTEPOCH= 1
CATEGORIES= x11
@@ -21,11 +20,9 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
-USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
-ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
- --with-xcb=yes
+ --with-xcb=yes \
+ --disable-specs
CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index f45af2697f1e..318dab8004d5 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libX11-1.3.6.tar.bz2) = 599826765c59a98b1e58b4f6c4ad50dca69eeb0e7bd78aea736ca815f45bea40
+SIZE (xorg/lib/libX11-1.3.6.tar.bz2) = 2084047
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index 57f14cdff6e6..ec4bab81931c 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -180,6 +180,8 @@ XDrawText16.3 \
XEmptyRegion.3 \
XEnableAccessControl.3 \
XEqualRegion.3 \
+XkbGetDetectableAutoRepeat.3 \
+XkbSetDetectableAutoRepeat.3 \
XErrorEvent.3 \
XEvent.3 \
XEventsQueued.3 \
@@ -634,7 +636,6 @@ XkbGetBounceKeysDelay.3 \
XkbGetCompatMap.3 \
XkbGetControlsChanges.3 \
XkbGetControls.3 \
-XkbGetDetectableAutorepeat.3 \
XkbGetDeviceButtonActions.3 \
XkbGetDeviceInfoChanges.3 \
XkbGetDeviceInfo.3 \
@@ -734,7 +735,6 @@ XkbSetBounceKeysDelay.3 \
XkbSetCompatMap.3 \
XkbSetControls.3 \
XkbSetDebuggingFlags.3 \
-XkbSetDetectableAutorepeat.3 \
XkbSetDeviceButtonActions.3 \
XkbSetDeviceInfo.3 \
XkbSetIgnoreLockMods.3 \
@@ -817,3 +817,4 @@ XwcTextPerCharExtents.3 \
XwcTextPropertyToTextList.3
MAN5= \
Compose.5 \
+XCompose.5 \ No newline at end of file
diff --git a/x11/libX11/pkg-descr b/x11/libX11/pkg-descr
index b79c61eb5c33..2cbd6519c263 100644
--- a/x11/libX11/pkg-descr
+++ b/x11/libX11/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X11 library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index d304d0ab3c7c..30a0fa6103b6 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -1,23 +1,8 @@
-%%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
-include/X11/Xlib.h
include/X11/Xlib-xcb.h
+include/X11/Xlib.h
include/X11/XlibConf.h
include/X11/Xlibint.h
include/X11/Xlocale.h
@@ -25,212 +10,210 @@ include/X11/Xregion.h
include/X11/Xresource.h
include/X11/Xutil.h
include/X11/cursorfont.h
-lib/X11/Xcms.txt
-lib/libX11.a
-lib/libX11.la
-lib/libX11.so
-lib/libX11.so.6
-lib/libX11-xcb.a
-lib/libX11-xcb.la
-lib/libX11-xcb.so
-lib/libX11-xcb.so.1
-libdata/pkgconfig/x11.pc
-libdata/pkgconfig/x11-xcb.pc
lib/X11/XErrorDB
-lib/X11/XKeysymDB
+lib/X11/Xcms.txt
+lib/X11/locale/C/Compose
+lib/X11/locale/C/XI18N_OBJS
+lib/X11/locale/C/XLC_LOCALE
+lib/X11/locale/am_ET.UTF-8/Compose
lib/X11/locale/am_ET.UTF-8/XI18N_OBJS
lib/X11/locale/am_ET.UTF-8/XLC_LOCALE
-lib/X11/locale/am_ET.UTF-8/Compose
+lib/X11/locale/armscii-8/Compose
lib/X11/locale/armscii-8/XI18N_OBJS
lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/C/Compose
+lib/X11/locale/compose.dir
+lib/X11/locale/el_GR.UTF-8/Compose
lib/X11/locale/el_GR.UTF-8/XI18N_OBJS
lib/X11/locale/el_GR.UTF-8/XLC_LOCALE
-lib/X11/locale/el_GR.UTF-8/Compose
+lib/X11/locale/en_US.UTF-8/Compose
lib/X11/locale/en_US.UTF-8/XI18N_OBJS
lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/en_US.UTF-8/Compose
+lib/X11/locale/fi_FI.UTF-8/Compose
lib/X11/locale/fi_FI.UTF-8/XI18N_OBJS
lib/X11/locale/fi_FI.UTF-8/XLC_LOCALE
-lib/X11/locale/fi_FI.UTF-8/Compose
+lib/X11/locale/georgian-academy/Compose
lib/X11/locale/georgian-academy/XI18N_OBJS
lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
+lib/X11/locale/georgian-ps/Compose
lib/X11/locale/georgian-ps/XI18N_OBJS
lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
+lib/X11/locale/ibm-cp1133/Compose
lib/X11/locale/ibm-cp1133/XI18N_OBJS
lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
+lib/X11/locale/iscii-dev/Compose
lib/X11/locale/iscii-dev/XI18N_OBJS
lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/iscii-dev/Compose
+lib/X11/locale/isiri-3342/Compose
lib/X11/locale/isiri-3342/XI18N_OBJS
lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/isiri-3342/Compose
+lib/X11/locale/iso8859-1/Compose
lib/X11/locale/iso8859-1/XI18N_OBJS
lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
+lib/X11/locale/iso8859-10/Compose
lib/X11/locale/iso8859-10/XI18N_OBJS
lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
+lib/X11/locale/iso8859-11/Compose
lib/X11/locale/iso8859-11/XI18N_OBJS
lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-11/Compose
+lib/X11/locale/iso8859-13/Compose
lib/X11/locale/iso8859-13/XI18N_OBJS
lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
+lib/X11/locale/iso8859-14/Compose
lib/X11/locale/iso8859-14/XI18N_OBJS
lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
+lib/X11/locale/iso8859-15/Compose
lib/X11/locale/iso8859-15/XI18N_OBJS
lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
+lib/X11/locale/iso8859-2/Compose
lib/X11/locale/iso8859-2/XI18N_OBJS
lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
+lib/X11/locale/iso8859-3/Compose
lib/X11/locale/iso8859-3/XI18N_OBJS
lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
+lib/X11/locale/iso8859-4/Compose
lib/X11/locale/iso8859-4/XI18N_OBJS
lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
+lib/X11/locale/iso8859-5/Compose
lib/X11/locale/iso8859-5/XI18N_OBJS
lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
+lib/X11/locale/iso8859-6/Compose
lib/X11/locale/iso8859-6/XI18N_OBJS
lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
+lib/X11/locale/iso8859-7/Compose
lib/X11/locale/iso8859-7/XI18N_OBJS
lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
+lib/X11/locale/iso8859-8/Compose
lib/X11/locale/iso8859-8/XI18N_OBJS
lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
+lib/X11/locale/iso8859-9/Compose
lib/X11/locale/iso8859-9/XI18N_OBJS
lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
+lib/X11/locale/iso8859-9e/Compose
lib/X11/locale/iso8859-9e/XI18N_OBJS
lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja/Compose
+lib/X11/locale/ja.JIS/Compose
lib/X11/locale/ja.JIS/XI18N_OBJS
lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/Compose
+lib/X11/locale/ja.S90/Compose
lib/X11/locale/ja.S90/XI18N_OBJS
lib/X11/locale/ja.S90/XLC_LOCALE
-lib/X11/locale/ja.S90/Compose
+lib/X11/locale/ja.SJIS/Compose
lib/X11/locale/ja.SJIS/XI18N_OBJS
lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
+lib/X11/locale/ja.U90/Compose
lib/X11/locale/ja.U90/XI18N_OBJS
lib/X11/locale/ja.U90/XLC_LOCALE
-lib/X11/locale/ja.U90/Compose
+lib/X11/locale/ja/Compose
+lib/X11/locale/ja/XI18N_OBJS
+lib/X11/locale/ja/XLC_LOCALE
+lib/X11/locale/ja_JP.UTF-8/Compose
+lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+lib/X11/locale/ko/Compose
lib/X11/locale/ko/XI18N_OBJS
lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko/Compose
+lib/X11/locale/ko_KR.UTF-8/Compose
+lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+lib/X11/locale/koi8-c/Compose
lib/X11/locale/koi8-c/XI18N_OBJS
lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
+lib/X11/locale/koi8-r/Compose
lib/X11/locale/koi8-r/XI18N_OBJS
lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
+lib/X11/locale/koi8-u/Compose
lib/X11/locale/koi8-u/XI18N_OBJS
lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/Compose
+lib/X11/locale/locale.alias
+lib/X11/locale/locale.dir
+lib/X11/locale/microsoft-cp1251/Compose
lib/X11/locale/microsoft-cp1251/XI18N_OBJS
lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1251/Compose
+lib/X11/locale/microsoft-cp1255/Compose
lib/X11/locale/microsoft-cp1255/XI18N_OBJS
lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/Compose
+lib/X11/locale/microsoft-cp1256/Compose
lib/X11/locale/microsoft-cp1256/XI18N_OBJS
lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/Compose
+lib/X11/locale/mulelao-1/Compose
lib/X11/locale/mulelao-1/XI18N_OBJS
lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
+lib/X11/locale/nokhchi-1/Compose
lib/X11/locale/nokhchi-1/XI18N_OBJS
lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/Compose
+lib/X11/locale/pt_BR.UTF-8/Compose
lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-lib/X11/locale/pt_BR.UTF-8/Compose
+lib/X11/locale/ru_RU.UTF-8/Compose
lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
-lib/X11/locale/ru_RU.UTF-8/Compose
+lib/X11/locale/tatar-cyr/Compose
lib/X11/locale/tatar-cyr/XI18N_OBJS
lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/tatar-cyr/Compose
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/th_TH/Compose
+lib/X11/locale/th_TH.UTF-8/Compose
lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/Compose
+lib/X11/locale/th_TH/Compose
+lib/X11/locale/th_TH/XI18N_OBJS
+lib/X11/locale/th_TH/XLC_LOCALE
+lib/X11/locale/tscii-0/Compose
lib/X11/locale/tscii-0/XI18N_OBJS
lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/tscii-0/Compose
+lib/X11/locale/vi_VN.tcvn/Compose
lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
+lib/X11/locale/vi_VN.viscii/Compose
lib/X11/locale/vi_VN.viscii/XI18N_OBJS
lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
+lib/X11/locale/zh_CN.UTF-8/Compose
+lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_CN.gb18030/Compose
lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
-lib/X11/locale/zh_CN.gb18030/Compose
+lib/X11/locale/zh_CN.gbk/Compose
lib/X11/locale/zh_CN.gbk/XI18N_OBJS
lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_CN.UTF-8/Compose
+lib/X11/locale/zh_CN/Compose
+lib/X11/locale/zh_CN/XI18N_OBJS
+lib/X11/locale/zh_CN/XLC_LOCALE
+lib/X11/locale/zh_HK.UTF-8/Compose
+lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_HK.big5/Compose
lib/X11/locale/zh_HK.big5/XI18N_OBJS
lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/Compose
+lib/X11/locale/zh_HK.big5hkscs/Compose
lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/Compose
-lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_HK.UTF-8/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.UTF-8/Compose
lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-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
+lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.big5/XI18N_OBJS
+lib/X11/locale/zh_TW.big5/XLC_LOCALE
+lib/X11/locale/zh_TW/Compose
+lib/X11/locale/zh_TW/XI18N_OBJS
+lib/X11/locale/zh_TW/XLC_LOCALE
+lib/libX11-xcb.a
+lib/libX11-xcb.la
+lib/libX11-xcb.so
+lib/libX11-xcb.so.1
+lib/libX11.a
+lib/libX11.la
+lib/libX11.so
+lib/libX11.so.6
+libdata/pkgconfig/x11-xcb.pc
+libdata/pkgconfig/x11.pc
@dirrm lib/X11/locale/zh_TW.big5
-@dirrm lib/X11/locale/zh_HK.UTF-8
+@dirrm lib/X11/locale/zh_TW.UTF-8
+@dirrm lib/X11/locale/zh_TW
@dirrm lib/X11/locale/zh_HK.big5hkscs
@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_CN.UTF-8
-@dirrm lib/X11/locale/zh_TW
+@dirrm lib/X11/locale/zh_HK.UTF-8
@dirrm lib/X11/locale/zh_CN.gbk
@dirrm lib/X11/locale/zh_CN.gb18030
+@dirrm lib/X11/locale/zh_CN.UTF-8
@dirrm lib/X11/locale/zh_CN
@dirrm lib/X11/locale/vi_VN.viscii
@dirrm lib/X11/locale/vi_VN.tcvn
@@ -245,15 +228,15 @@ lib/X11/locale/compose.dir
@dirrm lib/X11/locale/microsoft-cp1256
@dirrm lib/X11/locale/microsoft-cp1255
@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/ko_KR.UTF-8
@dirrm lib/X11/locale/koi8-u
@dirrm lib/X11/locale/koi8-r
@dirrm lib/X11/locale/koi8-c
+@dirrm lib/X11/locale/ko_KR.UTF-8
@dirrm lib/X11/locale/ko
+@dirrm lib/X11/locale/ja_JP.UTF-8
@dirrm lib/X11/locale/ja.U90
@dirrm lib/X11/locale/ja.SJIS
@dirrm lib/X11/locale/ja.S90
-@dirrm lib/X11/locale/ja_JP.UTF-8
@dirrm lib/X11/locale/ja.JIS
@dirrm lib/X11/locale/ja
@dirrm lib/X11/locale/iso8859-9e
@@ -279,7 +262,7 @@ lib/X11/locale/compose.dir
@dirrm lib/X11/locale/fi_FI.UTF-8
@dirrm lib/X11/locale/en_US.UTF-8
@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrm lib/X11/locale/C
@dirrm lib/X11/locale/armscii-8
@dirrm lib/X11/locale/am_ET.UTF-8
+@dirrm lib/X11/locale/C
@dirrm lib/X11/locale
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 028d7174a5ad..8a206ab25518 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXScrnSaver
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 63ce298845b5..5b98617f6ef9 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
+SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
diff --git a/x11/libXScrnSaver/pkg-descr b/x11/libXScrnSaver/pkg-descr
index 3e2398c91789..16760d1366d4 100644
--- a/x11/libXScrnSaver/pkg-descr
+++ b/x11/libXScrnSaver/pkg-descr
@@ -1,5 +1,4 @@
This package contains libXScrnSaver, the X11 Screen Saver extension
client library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 40543be06354..73ddb55609bf 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXau
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 9befc51bb79e..73f4bc42de9e 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
+SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
diff --git a/x11/libXau/pkg-descr b/x11/libXau/pkg-descr
index 83a3d8fbfcb5..39775c09a06a 100644
--- a/x11/libXau/pkg-descr
+++ b/x11/libXau/pkg-descr
@@ -1,6 +1,3 @@
This package contains a library for the Authorization Protocol for X11.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 0fa753492499..effee3169f91 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 6285cb28bddd..48b4eb0d8986 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
+SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
diff --git a/x11/libXcomposite/pkg-descr b/x11/libXcomposite/pkg-descr
index 312a9789080d..fd273ca8fe72 100644
--- a/x11/libXcomposite/pkg-descr
+++ b/x11/libXcomposite/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Composite extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 4101cf19b9eb..f43ef79f768a 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcursor
-PORTVERSION= 1.1.10
+PORTVERSION= 1.1.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index b2154aac90d6..f01f8cc67b72 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXcursor-1.1.11.tar.bz2) = a06ef74579e2c06f9490e682b8e7ac915cb5280ee47bb071a2b850637a2bf6fe
+SIZE (xorg/lib/libXcursor-1.1.11.tar.bz2) = 272680
diff --git a/x11/libXcursor/pkg-descr b/x11/libXcursor/pkg-descr
index b8a320199cc3..7d58ee4ec0fa 100644
--- a/x11/libXcursor/pkg-descr
+++ b/x11/libXcursor/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X client-side cursor loading library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 0b3799832d35..f27b13611b89 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXdamage
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index b36c4fc3495f..dfea034c4fcf 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
+SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
diff --git a/x11/libXdamage/pkg-descr b/x11/libXdamage/pkg-descr
index 3fd9a91201af..b6ad8c195995 100644
--- a/x11/libXdamage/pkg-descr
+++ b/x11/libXdamage/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Damage extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXdmcp/pkg-descr b/x11/libXdmcp/pkg-descr
index cf8ee61e890f..aa366294c69e 100644
--- a/x11/libXdmcp/pkg-descr
+++ b/x11/libXdmcp/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Display Manager Control Protocol library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXevie/pkg-descr b/x11/libXevie/pkg-descr
index a43d9c9d6a03..3e93203c7e25 100644
--- a/x11/libXevie/pkg-descr
+++ b/x11/libXevie/pkg-descr
@@ -1,4 +1,3 @@
This package contains libXevie, the X.Org Xevie library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index afed4dc10da7..a3a434bbcc6d 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXext
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 2c515cd352d8..cecc9d497106 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXext-1.1.2.tar.bz2) = ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74
+SIZE (xorg/lib/libXext-1.1.2.tar.bz2) = 318937
diff --git a/x11/libXext/pkg-descr b/x11/libXext/pkg-descr
index 08abe8d424fe..a587eb8e51f1 100644
--- a/x11/libXext/pkg-descr
+++ b/x11/libXext/pkg-descr
@@ -1,6 +1,4 @@
+
This package contains the X Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index d25c0db798c7..2a164981cbe0 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -22,4 +22,5 @@ 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
+@dirrmtry include/X11/extensions
+
diff --git a/x11/libXfixes/pkg-descr b/x11/libXfixes/pkg-descr
index 3dbcfe29afb1..b6ab2203dca5 100644
--- a/x11/libXfixes/pkg-descr
+++ b/x11/libXfixes/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Fixes extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 9b81e4cd7ea4..763c84d64d2c 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXi
-PORTVERSION= 1.3
+PORTVERSION= 1.3.2
PORTEPOCH= 1
CATEGORIES= x11
@@ -16,4 +16,74 @@ 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\
+ XGetDeviceButtonMapping.3\
+ XGetDeviceControl.3\
+ XGetDeviceDontPropagateList.3\
+ XGetDeviceFocus.3\
+ XGetDeviceKeyMapping.3 \
+ XGetDeviceModifierMapping.3\
+ XGetDeviceMotionEvents.3\
+ XGetDeviceProperty.3\
+ XGetExtensionVersion.3\
+ XGetFeedbackControl.3\
+ XGetSelectedExtensionEvents.3\
+ XGrabDevice.3\
+ XGrabDeviceButton.3\
+ XGrabDeviceKey.3\
+ XIChangeHierarchy.3\
+ XIChangeProperty.3\
+ XIDefineCursor.3\
+ XIDeleteProperty.3\
+ XIFreeDeviceInfo.3\
+ XIGetClientPointer.3\
+ XIGetFocus.3\
+ XIGetProperty.3\
+ XIGetSelectedEvents.3\
+ XIGrabButton.3 \
+ XIGrabDevice.3\
+ XIGrabEnter.3\
+ XIGrabFocusIn.3\
+ XIGrabKeycode.3\
+ XIListProperties.3\
+ XIQueryDevice.3\
+ XIQueryPointer.3\
+ XIQueryVersion.3\
+ XISelectEvents.3\
+ XISetClientPointer.3\
+ XISetFocus.3\
+ XIUndefineCursor.3\
+ XIUngrabButton.3\
+ XIUngrabDevice.3 \
+ XIUngrabEnter.3 \
+ XIUngrabFocusIn.3 \
+ XIUngrabKeycode.3 \
+ XIWarpPointer.3 \
+ XListDeviceProperties.3 \
+ XListInputDevices.3 \
+ XOpenDevice.3 \
+ XQueryDeviceState.3 \
+ XSelectExtensionEvent.3\
+ XSendExtensionEvent.3\
+ XSetDeviceButtonMapping.3\
+ XSetDeviceFocus.3\
+ XSetDeviceMode.3\
+ XSetDeviceModifierMapping.3 \
+ XSetDeviceValuators.3 \
+ XUngrabDevice.3 \
+ XUngrabDeviceButton.3 \
+ XUngrabDeviceKey.3
+
.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 02a33ca8c6ae..b19bf15a8ed5 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXi-1.3.2.tar.bz2) = a6034b57ab65fd89584d23403f613c1e1ad1679614fa8562b7438880596ddc3a
+SIZE (xorg/lib/libXi-1.3.2.tar.bz2) = 362340
diff --git a/x11/libXi/pkg-descr b/x11/libXi/pkg-descr
index 418974d6b783..99e89d8db0b2 100644
--- a/x11/libXi/pkg-descr
+++ b/x11/libXi/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Input extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXinerama/pkg-descr b/x11/libXinerama/pkg-descr
index 08abe8d424fe..b6967f6c07d8 100644
--- a/x11/libXinerama/pkg-descr
+++ b/x11/libXinerama/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXprintAppUtil/pkg-descr b/x11/libXprintAppUtil/pkg-descr
index 39649db329d0..15ffa49b4198 100644
--- a/x11/libXprintAppUtil/pkg-descr
+++ b/x11/libXprintAppUtil/pkg-descr
@@ -1,5 +1,2 @@
This package contains libXprintAppUtil, a group of Xprint application
utility routines for X.Org.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/libXprintUtil/pkg-descr b/x11/libXprintUtil/pkg-descr
index 0f4ee01be5e7..36c09eb2e4e7 100644
--- a/x11/libXprintUtil/pkg-descr
+++ b/x11/libXprintUtil/pkg-descr
@@ -1,5 +1,4 @@
This package contains libXprintUtil, a group of Xprint application utility
routines for X.Org.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXrandr/pkg-descr b/x11/libXrandr/pkg-descr
index a33730683f80..17b598b784a4 100644
--- a/x11/libXrandr/pkg-descr
+++ b/x11/libXrandr/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Resize and Rotate extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXres/pkg-descr b/x11/libXres/pkg-descr
index 69153de5975b..5d166772eb00 100644
--- a/x11/libXres/pkg-descr
+++ b/x11/libXres/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Resource usage library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXtrans/pkg-descr b/x11/libXtrans/pkg-descr
index 5c55568029db..2c579436443c 100644
--- a/x11/libXtrans/pkg-descr
+++ b/x11/libXtrans/pkg-descr
@@ -2,6 +2,3 @@ This package contains the code for a network API translation layer to insulate X
applications and libraries from OS network vagaries
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXtst/pkg-descr b/x11/libXtst/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXtst/pkg-descr
+++ b/x11/libXtst/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXv/pkg-descr b/x11/libXv/pkg-descr
index cbd30172204a..684ef90fbfad 100644
--- a/x11/libXv/pkg-descr
+++ b/x11/libXv/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Video Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXvMC/pkg-descr b/x11/libXvMC/pkg-descr
index cbd30172204a..684ef90fbfad 100644
--- a/x11/libXvMC/pkg-descr
+++ b/x11/libXvMC/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Video Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-descr b/x11/libXxf86dga/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86dga/pkg-descr
+++ b/x11/libXxf86dga/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-descr b/x11/libXxf86misc/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86misc/pkg-descr
+++ b/x11/libXxf86misc/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86vm/pkg-descr b/x11/libXxf86vm/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86vm/pkg-descr
+++ b/x11/libXxf86vm/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 8870929611ef..5ec77e3ad23d 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libdmx
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
index bbe5bd0072b1..2d59bf47f7b1 100644
--- a/x11/libdmx/distinfo
+++ b/x11/libdmx/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
+SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
diff --git a/x11/libdmx/pkg-descr b/x11/libdmx/pkg-descr
index 4859ea880b7c..8a6f1e8aafa7 100644
--- a/x11/libdmx/pkg-descr
+++ b/x11/libdmx/pkg-descr
@@ -1,6 +1,3 @@
This package contains Distributed Multihead X extension library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/liboldX/pkg-descr b/x11/liboldX/pkg-descr
index 76f5a9c988ea..5db771e85328 100644
--- a/x11/liboldX/pkg-descr
+++ b/x11/liboldX/pkg-descr
@@ -1,6 +1,3 @@
This package contains the old X library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/libxkbfile/pkg-descr b/x11/libxkbfile/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libxkbfile/pkg-descr
+++ b/x11/libxkbfile/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libxkbui/pkg-descr b/x11/libxkbui/pkg-descr
index bb040797feab..17905a8f40b7 100644
--- a/x11/libxkbui/pkg-descr
+++ b/x11/libxkbui/pkg-descr
@@ -1,6 +1,3 @@
This package contains the xkbui library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/listres/pkg-descr b/x11/listres/pkg-descr
index 3a73d2ec5909..0333ad743df5 100644
--- a/x11/listres/pkg-descr
+++ b/x11/listres/pkg-descr
@@ -1,5 +1,2 @@
This package contains listres, a program that generates a list of a
widget's resource database.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/luit/pkg-descr b/x11/luit/pkg-descr
index 0bed19e2c820..c6c4c4cbc656 100644
--- a/x11/luit/pkg-descr
+++ b/x11/luit/pkg-descr
@@ -1,5 +1,2 @@
This package contains luit, a filter than can be run between an arbitrary
application and a UTF-8 terminal emulator.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index c3e8bf42b8ef..62d05747f7e7 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pixman
-PORTVERSION= 0.18.4
+PORTVERSION= 0.21.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index f655c448011e..938922784d3d 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/pixman-0.18.4.tar.bz2) = c1d69aaddba8c1e046d26ac125da95bf
-SHA256 (xorg/lib/pixman-0.18.4.tar.bz2) = 399d2084f9f94cf51950a6a34edf8badd43f96f48039ff7a2e9193628eae30f1
-SIZE (xorg/lib/pixman-0.18.4.tar.bz2) = 421626
+SHA256 (xorg/lib/pixman-0.21.4.tar.bz2) = 7809f8aa7dcd99bc0e3a12eef65266d34e1f2988df4c814e5f747ddceed22ddf
+SIZE (xorg/lib/pixman-0.21.4.tar.bz2) = 453663
diff --git a/x11/pixman/pkg-descr b/x11/pixman/pkg-descr
index a2150dc2411f..20e94617b65d 100644
--- a/x11/pixman/pkg-descr
+++ b/x11/pixman/pkg-descr
@@ -1,6 +1,3 @@
This package contains the pixman library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/printproto/pkg-descr b/x11/printproto/pkg-descr
index c363d52f32fc..354acca045a8 100644
--- a/x11/printproto/pkg-descr
+++ b/x11/printproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Print extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index 19af07408460..532c6da5e1ee 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= randrproto
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 66c3ba96f463..52245621dee0 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
+SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
diff --git a/x11/randrproto/pkg-descr b/x11/randrproto/pkg-descr
index 3b5914edab2a..84d2dc167f91 100644
--- a/x11/randrproto/pkg-descr
+++ b/x11/randrproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Randr extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/recordproto/pkg-descr b/x11/recordproto/pkg-descr
index 129d2324260c..6687a1c2f1c0 100644
--- a/x11/recordproto/pkg-descr
+++ b/x11/recordproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org RECORD extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/renderproto/pkg-descr b/x11/renderproto/pkg-descr
index 813b21cb5def..d8c290078607 100644
--- a/x11/renderproto/pkg-descr
+++ b/x11/renderproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org RenderProto protocol headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index a0ffa9062a10..fc1b1b080703 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rgb
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
index aa594a1f8330..5a882ca16fcd 100644
--- a/x11/rgb/distinfo
+++ b/x11/rgb/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/rgb-1.0.4.tar.bz2) = 80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1
+SIZE (xorg/app/rgb-1.0.4.tar.bz2) = 121558
diff --git a/x11/rgb/pkg-descr b/x11/rgb/pkg-descr
index 949c3fd4e280..2692c544f6cd 100644
--- a/x11/rgb/pkg-descr
+++ b/x11/rgb/pkg-descr
@@ -1,6 +1,3 @@
This package contains showrgb, a program that reads an rgb color-name
database compiled for use with the dbm database routines and converts it
back to source form, printing the result to standard output.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/rstart/pkg-descr b/x11/rstart/pkg-descr
index 15df1d2064c3..169ca1986f38 100644
--- a/x11/rstart/pkg-descr
+++ b/x11/rstart/pkg-descr
@@ -1,5 +1,2 @@
This package contains rstart, a sample implementation of a Remote Start
client.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/scrnsaverproto/pkg-descr b/x11/scrnsaverproto/pkg-descr
index 1c4a92a44911..a5019d65d5f6 100644
--- a/x11/scrnsaverproto/pkg-descr
+++ b/x11/scrnsaverproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org ScrnSaver extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index cfef4d698b20..61fd06101552 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= sessreg
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index 226ac2586014..a1ff089d362b 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/sessreg-1.0.6.tar.bz2) = 73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190
+SIZE (xorg/app/sessreg-1.0.6.tar.bz2) = 113033
diff --git a/x11/sessreg/pkg-descr b/x11/sessreg/pkg-descr
index 64ada8d0511a..b61ec06c753a 100644
--- a/x11/sessreg/pkg-descr
+++ b/x11/sessreg/pkg-descr
@@ -1,5 +1,2 @@
This package contains sessreg, which is a simple program for managing
utmp/wtmp entries for xdm sessions.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index c45ae6aa94a4..a30a178e971a 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= setxkbmap
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
index a3456a7036f7..89801d49b7ec 100644
--- a/x11/setxkbmap/distinfo
+++ b/x11/setxkbmap/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/setxkbmap-1.2.0.tar.bz2) = 999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
+SIZE (xorg/app/setxkbmap-1.2.0.tar.bz2) = 112465
diff --git a/x11/setxkbmap/pkg-descr b/x11/setxkbmap/pkg-descr
index b4016ffb56c1..ee02809c99e3 100644
--- a/x11/setxkbmap/pkg-descr
+++ b/x11/setxkbmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains setxkbmp, a program for setting the keyboard using
the X Keyboard Extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/smproxy/pkg-descr b/x11/smproxy/pkg-descr
index 98f9ecdcda45..26f328c6b8d8 100644
--- a/x11/smproxy/pkg-descr
+++ b/x11/smproxy/pkg-descr
@@ -1,5 +1,2 @@
This package contains smproxy, a Session Manager Proxy for the X Window
System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/videoproto/pkg-descr b/x11/videoproto/pkg-descr
index 94edb581eb84..0e4175a2ef6a 100644
--- a/x11/videoproto/pkg-descr
+++ b/x11/videoproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Video extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/viewres/pkg-descr b/x11/viewres/pkg-descr
index b447f4e61a28..d334bb9e5464 100644
--- a/x11/viewres/pkg-descr
+++ b/x11/viewres/pkg-descr
@@ -1,5 +1,2 @@
This package contains viewres, a graphical class browser that displays
a tree showing the widget class hierarchy of the Athena Widget Set.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/wrapper/pkg-descr b/x11/wrapper/pkg-descr
index fb36c27e2ecc..735a58d1b123 100644
--- a/x11/wrapper/pkg-descr
+++ b/x11/wrapper/pkg-descr
@@ -1,6 +1,6 @@
This program runs an X server after sanity-checking the environment
and any options passed to it. It is meant to enhance security on
-multi-user systems running XFree86 4 or the X11 server from X.Org,
+multi-user systems running XFree86 4 or the X11 server from x.org,
where the ability to use a startx script is needed. If you have
XFree86 3, do not install this: you do not need it and it will not
work. If you have no untrusted users or always run the X server
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index f77321245bf2..ccc60ea2f134 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x11perf
-PORTVERSION= 1.5.1
+PORTVERSION= 1.5.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
index 6563d4ec7c86..19afb3e2534b 100644
--- a/x11/x11perf/distinfo
+++ b/x11/x11perf/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/x11perf-1.5.3.tar.bz2) = 394d7355afe7f3b054ce6f30db78794c6305c6593d48b7fb86a9c89d9d9e21bd
+SIZE (xorg/app/x11perf-1.5.3.tar.bz2) = 161309
diff --git a/x11/x11perf/pkg-descr b/x11/x11perf/pkg-descr
index af297f6ae226..9e994ca2dc03 100644
--- a/x11/x11perf/pkg-descr
+++ b/x11/x11perf/pkg-descr
@@ -1,4 +1 @@
This package contains x11perf, an X11 server performance test program.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 802701e66748..5d8cb777915d 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xauth
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
index 015228ddeacb..719ce87477e9 100644
--- a/x11/xauth/distinfo
+++ b/x11/xauth/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xauth-1.0.5.tar.bz2) = 6d139500ff1daf806525adf071f8c1778ad138a0378c73ea831ad18847ad746c
+SIZE (xorg/app/xauth-1.0.5.tar.bz2) = 129568
diff --git a/x11/xauth/pkg-descr b/x11/xauth/pkg-descr
index 5d60b7db4126..9346a76dc0fe 100644
--- a/x11/xauth/pkg-descr
+++ b/x11/xauth/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org X authority file utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 3b9f4d1c56d3..b62dabda66b1 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbiff
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
index 5e3c46290e31..c344463238e7 100644
--- a/x11/xbiff/distinfo
+++ b/x11/xbiff/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xbiff-1.0.3.tar.bz2) = aa1db4f31f7afcfe131bda7ff6e380ff7de41cf1a7009464783043c817c47ce8
+SIZE (xorg/app/xbiff-1.0.3.tar.bz2) = 116043
diff --git a/x11/xbiff/pkg-descr b/x11/xbiff/pkg-descr
index ad2c037510bc..917fe929b8ce 100644
--- a/x11/xbiff/pkg-descr
+++ b/x11/xbiff/pkg-descr
@@ -1,6 +1,3 @@
This package contains xbiff, which displays a little image of a mailbox in
the X Window System. The flag on the mailbox is down when there is no mail,
and the flag goes up when new mail arrives.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index c8c770ae7117..dc00dbc218d4 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcalc
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
index 7103d0cdb4a5..3205cea89ad8 100644
--- a/x11/xcalc/distinfo
+++ b/x11/xcalc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xcalc-1.0.4.1.tar.bz2) = e21f3b09a5ffdaafced32fdccd94d48351c95e5f8a2d7cb036d61dd18f4e26b6
+SIZE (xorg/app/xcalc-1.0.4.1.tar.bz2) = 124184
diff --git a/x11/xcalc/pkg-descr b/x11/xcalc/pkg-descr
index 8183cbf9c0b9..0204b95ad523 100644
--- a/x11/xcalc/pkg-descr
+++ b/x11/xcalc/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcalc, a scientific calculator desktop accessory
for the X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xclipboard/pkg-descr b/x11/xclipboard/pkg-descr
index 3dbd7590b489..58e411e2c0f6 100644
--- a/x11/xclipboard/pkg-descr
+++ b/x11/xclipboard/pkg-descr
@@ -1,4 +1 @@
This package contains xclipboard, an X clipboard client.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcmiscproto/pkg-descr b/x11/xcmiscproto/pkg-descr
index 2eb54f046456..77202a272594 100644
--- a/x11/xcmiscproto/pkg-descr
+++ b/x11/xcmiscproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XCMisc extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xcmsdb/pkg-descr b/x11/xcmsdb/pkg-descr
index 4c1b31bb4e62..44cf0d1adbcf 100644
--- a/x11/xcmsdb/pkg-descr
+++ b/x11/xcmsdb/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcmsdb, a Device Color Characterization utility
for the X Color Management System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index 9be64372edb3..55d3ccad6181 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xconsole
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xconsole/distinfo b/x11/xconsole/distinfo
index ee19b97a57da..451c17b472f2 100644
--- a/x11/xconsole/distinfo
+++ b/x11/xconsole/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xconsole-1.0.3.tar.bz2) = 0e1a3110bebabecc2897d67a973526b0
-SHA256 (xorg/app/xconsole-1.0.3.tar.bz2) = 1b1ec25fefad34f5c33c74474358c1f5a8702d8c04defc854826bccb7a46bc45
-SIZE (xorg/app/xconsole-1.0.3.tar.bz2) = 98733
+SHA256 (xorg/app/xconsole-1.0.4.tar.bz2) = 5643e90bf7bf77369e67f3a0a982a4809b5bd2d9a36f02a59c79de77c9d6648e
+SIZE (xorg/app/xconsole-1.0.4.tar.bz2) = 115082
diff --git a/x11/xconsole/pkg-descr b/x11/xconsole/pkg-descr
index 119267f85533..a4c5f6038fc0 100644
--- a/x11/xconsole/pkg-descr
+++ b/x11/xconsole/pkg-descr
@@ -1,5 +1,2 @@
This package contains xconsole, a utility for monitoring system console
messages with X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcursorgen/pkg-descr b/x11/xcursorgen/pkg-descr
index 47fbf37de9a0..be67a1b6c50b 100644
--- a/x11/xcursorgen/pkg-descr
+++ b/x11/xcursorgen/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcursorgen, a program for creating an X cursor file
from a collection of PNG images.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdbedizzy/pkg-descr b/x11/xdbedizzy/pkg-descr
index 686fb0ee2f75..d930d33ae80f 100644
--- a/x11/xdbedizzy/pkg-descr
+++ b/x11/xdbedizzy/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdbedizzy, a demo of DBE creating a double buffered
spinning scene.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xditview/pkg-descr b/x11/xditview/pkg-descr
index 325a228281ca..2048ef4f12bf 100644
--- a/x11/xditview/pkg-descr
+++ b/x11/xditview/pkg-descr
@@ -1,5 +1,2 @@
This package contains xditview, a program for displaying ditroff output
on an X display.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 091bba4eebf8..f6c623c39ed7 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -39,5 +39,7 @@ post-install:
.for f in ${CFFILES}
${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
.endfor
+ ${MKDIR} /var/lib/xdm/authdir
+ ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
.include <bsd.port.mk>
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index ba384c60115a..dcdc249da93b 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -1,5 +1,6 @@
bin/xdm
bin/xdmshell
+lib/X11/xdm/authdir
lib/X11/xdm/chooser
lib/X11/xdm/libXdmGreet.a
lib/X11/xdm/libXdmGreet.la
@@ -40,8 +41,13 @@ share/X11/app-defaults/Chooser
@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
+@exec mkdir -p /var/lib/xdm/authdir
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
+@unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir 2>/dev/null
+@unexec rmdir /var/lib/xdm 2>/dev/null
@dirrm lib/X11/xdm/pixmaps
@dirrm lib/X11/xdm
@dirrm %%EXAMPLESDIR%%
diff --git a/x11/xdpyinfo/pkg-descr b/x11/xdpyinfo/pkg-descr
index 6e6c88be7042..1ab1193022b3 100644
--- a/x11/xdpyinfo/pkg-descr
+++ b/x11/xdpyinfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdpyinfo, which is a utility for displaying
information about an X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdriinfo/pkg-descr b/x11/xdriinfo/pkg-descr
index 933072d04bc2..2330f01cb6d0 100644
--- a/x11/xdriinfo/pkg-descr
+++ b/x11/xdriinfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdriinfo, an utility that can be used to query
configuration information of direct rendering devices.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 784daadd393a..d588e03f1458 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xedit
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
index f73ad9bcdea3..49032ae2b25c 100644
--- a/x11/xedit/distinfo
+++ b/x11/xedit/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xedit-1.1.2.tar.bz2) = 67193be728414d45a1922911e6437991
-SHA256 (xorg/app/xedit-1.1.2.tar.bz2) = a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
-SIZE (xorg/app/xedit-1.1.2.tar.bz2) = 484563
+SHA256 (xorg/app/xedit-1.2.0.tar.bz2) = 6cfe022c2ba42cd3f1acc64ead49f302f766b77f44a01ce3842ad25f62f65d8a
+SIZE (xorg/app/xedit-1.2.0.tar.bz2) = 498383
diff --git a/x11/xedit/pkg-descr b/x11/xedit/pkg-descr
index fb8c2034c470..2b8ff8f26ea6 100644
--- a/x11/xedit/pkg-descr
+++ b/x11/xedit/pkg-descr
@@ -1,4 +1,2 @@
This package contains xedit, a simple text editor for the X Window System.
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 256d130881f4..6556622cce0f 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xev
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
index 97da9d85d17b..99e8860a89ad 100644
--- a/x11/xev/distinfo
+++ b/x11/xev/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xev-1.1.0.tar.bz2) = 3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6
+SIZE (xorg/app/xev-1.1.0.tar.bz2) = 110850
diff --git a/x11/xev/pkg-descr b/x11/xev/pkg-descr
index eddd0caccffc..ab0c0cbe84f6 100644
--- a/x11/xev/pkg-descr
+++ b/x11/xev/pkg-descr
@@ -1,4 +1 @@
This package contains xev, which is a application that monitors X events.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xextproto/pkg-descr b/x11/xextproto/pkg-descr
index f9c9a9995397..237adba33dfd 100644
--- a/x11/xextproto/pkg-descr
+++ b/x11/xextproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XExt extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 3ec4359bd1e5..2054a22b8386 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xeyes
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
index e27d47e38cc2..cf1560098824 100644
--- a/x11/xeyes/distinfo
+++ b/x11/xeyes/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xeyes-1.1.1.tar.bz2) = 975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521
+SIZE (xorg/app/xeyes-1.1.1.tar.bz2) = 113757
diff --git a/x11/xeyes/pkg-descr b/x11/xeyes/pkg-descr
index e7d7d4fd56a4..093fcda4e6e5 100644
--- a/x11/xeyes/pkg-descr
+++ b/x11/xeyes/pkg-descr
@@ -1,4 +1 @@
This package contains xeyes, which is a "follow the mouse" X demo application.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86dga/pkg-descr b/x11/xf86dga/pkg-descr
index 2f3628cea264..0c4b098b7f26 100644
--- a/x11/xf86dga/pkg-descr
+++ b/x11/xf86dga/pkg-descr
@@ -1,5 +1,2 @@
This package contains dga, a simple test client for the XFree86-DGA
extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/pkg-descr b/x11/xf86dgaproto/pkg-descr
index 0d54abac204b..b7174fdf2905 100644
--- a/x11/xf86dgaproto/pkg-descr
+++ b/x11/xf86dgaproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-DGA extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xf86driproto/pkg-descr b/x11/xf86driproto/pkg-descr
index 8ccf4c7141ff..d8418631cb7c 100644
--- a/x11/xf86driproto/pkg-descr
+++ b/x11/xf86driproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-DRI extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xf86miscproto/pkg-descr b/x11/xf86miscproto/pkg-descr
index 59d4ff755432..ec2ddfeb1023 100644
--- a/x11/xf86miscproto/pkg-descr
+++ b/x11/xf86miscproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org XFree86-Misc extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86rushproto/pkg-descr b/x11/xf86rushproto/pkg-descr
index 4add51bc469c..802b9e51f153 100644
--- a/x11/xf86rushproto/pkg-descr
+++ b/x11/xf86rushproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org XFree86-Rush extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/pkg-descr b/x11/xf86vidmodeproto/pkg-descr
index 872e3328e990..27fc696e6120 100644
--- a/x11/xf86vidmodeproto/pkg-descr
+++ b/x11/xf86vidmodeproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-VidModeExtension extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xfd/pkg-descr b/x11/xfd/pkg-descr
index 9c764d197c92..6d30b6ba8d4f 100644
--- a/x11/xfd/pkg-descr
+++ b/x11/xfd/pkg-descr
@@ -1,5 +1,2 @@
This package contains xfd, an applications used for displying all
characters in an X font.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xfindproxy/pkg-descr b/x11/xfindproxy/pkg-descr
index 63e6fd154be7..1108dff9ecf8 100644
--- a/x11/xfindproxy/pkg-descr
+++ b/x11/xfindproxy/pkg-descr
@@ -1,5 +1,2 @@
This package contains xfindproxy, a program for locating available
proxy services.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xfwp/pkg-descr b/x11/xfwp/pkg-descr
index e2cda8002b11..edbaf1a987f5 100644
--- a/x11/xfwp/pkg-descr
+++ b/x11/xfwp/pkg-descr
@@ -1,4 +1 @@
This package contains the X firewall proxy (xfwp).
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 4a4d44108d33..c8233aba0309 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xgamma
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
index 8b728ea30b72..2674a528fc94 100644
--- a/x11/xgamma/distinfo
+++ b/x11/xgamma/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xgamma-1.0.4.tar.bz2) = 7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16
+SIZE (xorg/app/xgamma-1.0.4.tar.bz2) = 104836
diff --git a/x11/xgamma/pkg-descr b/x11/xgamma/pkg-descr
index 9f19276b41cc..d016cfc2f608 100644
--- a/x11/xgamma/pkg-descr
+++ b/x11/xgamma/pkg-descr
@@ -1,5 +1,2 @@
This package contains xgamma, a tool for altering the gamma correction
through the X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xgc/pkg-descr b/x11/xgc/pkg-descr
index 9d294688031a..9a64a07f94aa 100644
--- a/x11/xgc/pkg-descr
+++ b/x11/xgc/pkg-descr
@@ -1,5 +1,2 @@
This package contains xgc, which is a program that demonstrates various
features of the X graphics primitives.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index ce9c24e93e4d..0f192b8b9bb6 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xhost
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
index ee8a79ac98df..55e9b2c92393 100644
--- a/x11/xhost/distinfo
+++ b/x11/xhost/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xhost-1.0.4.tar.bz2) = 5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594
+SIZE (xorg/app/xhost-1.0.4.tar.bz2) = 114826
diff --git a/x11/xhost/pkg-descr b/x11/xhost/pkg-descr
index 7ef86f82225d..4053e3e2f91a 100644
--- a/x11/xhost/pkg-descr
+++ b/x11/xhost/pkg-descr
@@ -1,5 +1,2 @@
This package contains xhost, a server access control program for the
X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xineramaproto/pkg-descr b/x11/xineramaproto/pkg-descr
index 2ef9ec7ac930..bbaba369a5e0 100644
--- a/x11/xineramaproto/pkg-descr
+++ b/x11/xineramaproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Xinerama extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xinit/pkg-descr b/x11/xinit/pkg-descr
index 495f443cc3b3..2676f6a4a1fd 100644
--- a/x11/xinit/pkg-descr
+++ b/x11/xinit/pkg-descr
@@ -1,4 +1 @@
This package contains xinit, the X Window System initializer.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 37386c365a1f..99d36910096f 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinput
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index 9dcf0b7a37ef..8a27efadce2a 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xinput-1.5.3.tar.bz2) = 6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76
+SIZE (xorg/app/xinput-1.5.3.tar.bz2) = 131585
diff --git a/x11/xkbcomp/pkg-descr b/x11/xkbcomp/pkg-descr
index fce557314593..074524733411 100644
--- a/x11/xkbcomp/pkg-descr
+++ b/x11/xkbcomp/pkg-descr
@@ -1,4 +1 @@
This package contains xkbcomp, the X.Org keymap compiler.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkbevd/pkg-descr b/x11/xkbevd/pkg-descr
index d93652d67c0f..70ed918dff06 100644
--- a/x11/xkbevd/pkg-descr
+++ b/x11/xkbevd/pkg-descr
@@ -1,4 +1 @@
This package contains xkbevd, the XKB event daemon.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkbprint/pkg-descr b/x11/xkbprint/pkg-descr
index ce84f5663f3d..c4595ec511a1 100644
--- a/x11/xkbprint/pkg-descr
+++ b/x11/xkbprint/pkg-descr
@@ -1,5 +1,2 @@
This package contains xkbprint, an utility for printing an XKB keyboard
description.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkeyboard-config/pkg-descr b/x11/xkeyboard-config/pkg-descr
index e1b900241aa0..ad19d12034ec 100644
--- a/x11/xkeyboard-config/pkg-descr
+++ b/x11/xkeyboard-config/pkg-descr
@@ -5,6 +5,3 @@ data for X Window System implementations (free, open source
and commercial). The project is targetted to XKB-based systems.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 758b6f66fe91..812062cc824b 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkill
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
index 65e83cbf40ad..12e544ce2075 100644
--- a/x11/xkill/distinfo
+++ b/x11/xkill/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xkill-1.0.3.tar.bz2) = bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9
+SIZE (xorg/app/xkill-1.0.3.tar.bz2) = 107790
diff --git a/x11/xkill/pkg-descr b/x11/xkill/pkg-descr
index 38143a4052c7..ceee5338e887 100644
--- a/x11/xkill/pkg-descr
+++ b/x11/xkill/pkg-descr
@@ -1,5 +1,2 @@
This package contians xkill, which is a utility for forcing the X server
to close connections to clients.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xload/pkg-descr b/x11/xload/pkg-descr
index 800b8523dcf0..61da84f2a4f9 100644
--- a/x11/xload/pkg-descr
+++ b/x11/xload/pkg-descr
@@ -1,5 +1,2 @@
This pckage contains xload, the X Window System system load average
display application.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlogo/pkg-descr b/x11/xlogo/pkg-descr
index c93a929dc517..dca5fe283b84 100644
--- a/x11/xlogo/pkg-descr
+++ b/x11/xlogo/pkg-descr
@@ -1,4 +1 @@
This package contains xlogo, which displays the X Window System logo.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlsatoms/pkg-descr b/x11/xlsatoms/pkg-descr
index 7f7540df4f4d..7c0ba5fc62ff 100644
--- a/x11/xlsatoms/pkg-descr
+++ b/x11/xlsatoms/pkg-descr
@@ -1,5 +1,2 @@
This package contains xlsatoms, an application for listing interned
atoms defined on server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlsclients/pkg-descr b/x11/xlsclients/pkg-descr
index ea77ec583455..4260e2348c1e 100644
--- a/x11/xlsclients/pkg-descr
+++ b/x11/xlsclients/pkg-descr
@@ -1,5 +1,2 @@
This package contains xlsclients, which is a utility for listing information
about the client applications running on a display.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmag/pkg-descr b/x11/xmag/pkg-descr
index 585549a3d1b2..ae86ccc48fe0 100644
--- a/x11/xmag/pkg-descr
+++ b/x11/xmag/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmag, a screen magnifying application for the
X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xman/pkg-descr b/x11/xman/pkg-descr
index ca408e1c319e..610bc23acda6 100644
--- a/x11/xman/pkg-descr
+++ b/x11/xman/pkg-descr
@@ -1,5 +1,2 @@
This package contains xman, a manual page display program for the X
Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmessage/pkg-descr b/x11/xmessage/pkg-descr
index 965f1f9264a3..e4651571fc37 100644
--- a/x11/xmessage/pkg-descr
+++ b/x11/xmessage/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmessage, an application for displaying messages
or queries in a X window.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmh/pkg-descr b/x11/xmh/pkg-descr
index a7c2f0ee184c..3b0d5f0390da 100644
--- a/x11/xmh/pkg-descr
+++ b/x11/xmh/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmh, a graphical user interface to the MH Message
Handling System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmodmap/pkg-descr b/x11/xmodmap/pkg-descr
index 45ddab88b0bd..b4ee30821975 100644
--- a/x11/xmodmap/pkg-descr
+++ b/x11/xmodmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmodmap, which is a program for editing and displaying
the keyboard modifier map and keymap table in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 34199cc2900e..5b1a7c3cd96e 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmore
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmore/distinfo b/x11/xmore/distinfo
index eedec05a47fb..793dd72629c6 100644
--- a/x11/xmore/distinfo
+++ b/x11/xmore/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xmore-1.0.1.tar.bz2) = d36e918dce779a9d207b7a266f4e87c8
-SHA256 (xorg/app/xmore-1.0.1.tar.bz2) = 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
-SIZE (xorg/app/xmore-1.0.1.tar.bz2) = 92060
+SHA256 (xorg/app/xmore-1.0.2.tar.bz2) = 2a13f97891a3fd497074acc8ac8069f8583add5db4d3bf34a5da6a92bd61b9e2
+SIZE (xorg/app/xmore-1.0.2.tar.bz2) = 107340
diff --git a/x11/xmore/pkg-descr b/x11/xmore/pkg-descr
index 6c19ace2cbb3..e4aef5933c86 100644
--- a/x11/xmore/pkg-descr
+++ b/x11/xmore/pkg-descr
@@ -1,5 +1,2 @@
This package contains the xmore plain text display program for the X Window
System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index c9a62097a2ca..b54bfac28427 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-apps
-PORTVERSION= 7.5
-PORTREVISION= 1
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -24,7 +23,7 @@ COMPONENTS= appres bitmap xf86dga:dga iceauth luit \
xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \
xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \
xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \
- xwud
+ xwud xmessage
# These three are added for convenience purposes only.
COMPONENTS+= x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm
diff --git a/x11/xorg-apps/pkg-descr b/x11/xorg-apps/pkg-descr
index bbe7fcfb5556..4026a75c33bc 100644
--- a/x11/xorg-apps/pkg-descr
+++ b/x11/xorg-apps/pkg-descr
@@ -1,6 +1,3 @@
This meta-package installs all X.Org applications.
WWW: http://www.x.org/
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 05c3301dbb56..ded7612f038f 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg-libraries/pkg-descr b/x11/xorg-libraries/pkg-descr
index dcd8e1cf3595..0f06964c6ebe 100644
--- a/x11/xorg-libraries/pkg-descr
+++ b/x11/xorg-libraries/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org shared libraries, headers, and related files.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index ef934294dbea..9e00d67ad043 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg/pkg-descr b/x11/xorg/pkg-descr
index 50409e3f70d5..03af7ed8e6ec 100644
--- a/x11/xorg/pkg-descr
+++ b/x11/xorg/pkg-descr
@@ -1,6 +1,3 @@
This is a metaport for all the X.Org packages available in the ports tree.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xplsprinters/pkg-descr b/x11/xplsprinters/pkg-descr
index f12de05c9af6..7df0d8fadfa8 100644
--- a/x11/xplsprinters/pkg-descr
+++ b/x11/xplsprinters/pkg-descr
@@ -1,5 +1,2 @@
This package contains xplsprinters, a program for showing a list of Xprint
printers and it's attributes.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xpr/pkg-descr b/x11/xpr/pkg-descr
index 759cb9d1eb9f..8b0ea4129fed 100644
--- a/x11/xpr/pkg-descr
+++ b/x11/xpr/pkg-descr
@@ -1,4 +1 @@
This package contains xpr, an utility for printing an X window dump.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xprehashprinterlist/pkg-descr b/x11/xprehashprinterlist/pkg-descr
index 02941e073eaf..698bed3b818f 100644
--- a/x11/xprehashprinterlist/pkg-descr
+++ b/x11/xprehashprinterlist/pkg-descr
@@ -1,5 +1,2 @@
This package contains xprehashprinterlist, a program that recomputes the
list of available printers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xprop/pkg-descr b/x11/xprop/pkg-descr
index a8f57ccded0d..c5c0f971dac2 100644
--- a/x11/xprop/pkg-descr
+++ b/x11/xprop/pkg-descr
@@ -1,5 +1,2 @@
This package contains the xprop utility, which is for displaying window
and font properties in an X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xproto/pkg-descr b/x11/xproto/pkg-descr
index 421daff8585b..9889653a82e7 100644
--- a/x11/xproto/pkg-descr
+++ b/x11/xproto/pkg-descr
@@ -1,6 +1,3 @@
This package contains X protocol and ancillary headers.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/pkg-descr b/x11/xproxymanagementprotocol/pkg-descr
index 4a2f4dd1c837..3155c23dc099 100644
--- a/x11/xproxymanagementprotocol/pkg-descr
+++ b/x11/xproxymanagementprotocol/pkg-descr
@@ -1,6 +1,3 @@
This package contains X Proxy Management Protocol headers.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 50fa56d2d19d..8a841f878397 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index be89f342d3a4..464c369043f2 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xrandr-1.3.4.tar.bz2) = 5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb
+SIZE (xorg/app/xrandr-1.3.4.tar.bz2) = 146919
diff --git a/x11/xrandr/pkg-descr b/x11/xrandr/pkg-descr
index ef0f6e48a64e..25be87c3d20b 100644
--- a/x11/xrandr/pkg-descr
+++ b/x11/xrandr/pkg-descr
@@ -1,5 +1,2 @@
This package contains xrandr, a primitive command line interface to
the RandR extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrdb/pkg-descr b/x11/xrdb/pkg-descr
index fadb6f4194a0..51829b16b5f7 100644
--- a/x11/xrdb/pkg-descr
+++ b/x11/xrdb/pkg-descr
@@ -1,4 +1 @@
This package contains xrdb, a X server resource database utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrefresh/pkg-descr b/x11/xrefresh/pkg-descr
index da1d4e7969ed..b130b10abb36 100644
--- a/x11/xrefresh/pkg-descr
+++ b/x11/xrefresh/pkg-descr
@@ -1,5 +1,2 @@
This package contains xrefresh, which is a simple X program that causes
all or part of your screen to be repainted.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrx/pkg-descr b/x11/xrx/pkg-descr
index d1065916a218..20fe836aa763 100644
--- a/x11/xrx/pkg-descr
+++ b/x11/xrx/pkg-descr
@@ -1,6 +1,3 @@
This package contains xrx, an RX helper program which can be used with
any web browser to interpret documents in the RX MIME type format and
start remote applications.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index df112ad4c363..1197835a18bf 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xset
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
index ed7e109af19a..cdbf436b128d 100644
--- a/x11/xset/distinfo
+++ b/x11/xset/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xset-1.2.1.tar.bz2) = ec995f7d23109cfa6420ae87c38158f29a2a6f9d0b7df0a1be34e69e165292a1
+SIZE (xorg/app/xset-1.2.1.tar.bz2) = 124237
diff --git a/x11/xset/pkg-descr b/x11/xset/pkg-descr
index bdbb142c16df..87e3a4acb85d 100644
--- a/x11/xset/pkg-descr
+++ b/x11/xset/pkg-descr
@@ -1,5 +1,3 @@
This package contains xset, an application used to set various user preference
options related to the display in the X Window System.
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetmode/pkg-descr b/x11/xsetmode/pkg-descr
index 83bdd9a4f63f..ae58f8837d0c 100644
--- a/x11/xsetmode/pkg-descr
+++ b/x11/xsetmode/pkg-descr
@@ -1,5 +1,2 @@
This package contains xsetmode, which is a program for setting the mode
of an X Input device to either absolute och relative.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetpointer/pkg-descr b/x11/xsetpointer/pkg-descr
index e755bb22bf9c..ebcd3e9f3a1e 100644
--- a/x11/xsetpointer/pkg-descr
+++ b/x11/xsetpointer/pkg-descr
@@ -1,5 +1,2 @@
This package contains xsetpointer, which sets an X Input device
as the main pointer.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetroot/pkg-descr b/x11/xsetroot/pkg-descr
index d09e4b06de32..95e81dd81d45 100644
--- a/x11/xsetroot/pkg-descr
+++ b/x11/xsetroot/pkg-descr
@@ -1,6 +1,3 @@
This package contains xsetroot, a root window paramteter setting utility
for the X Window System, which allows you to change the appearance of the
background ("root") window in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsm/pkg-descr b/x11/xsm/pkg-descr
index 9b70d0df901c..7934bf3047db 100644
--- a/x11/xsm/pkg-descr
+++ b/x11/xsm/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org X Session Manager (xsm).
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xstdcmap/pkg-descr b/x11/xstdcmap/pkg-descr
index 9383874205a6..8588fc68c96c 100644
--- a/x11/xstdcmap/pkg-descr
+++ b/x11/xstdcmap/pkg-descr
@@ -1,4 +1 @@
This package contains xstdcmap, an X standard colormap utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xtrans/pkg-descr b/x11/xtrans/pkg-descr
index 90b6ad875d03..8d57a05259f4 100644
--- a/x11/xtrans/pkg-descr
+++ b/x11/xtrans/pkg-descr
@@ -1,6 +1,3 @@
This package contains xtrans, a library of code that is shared among X
packages to handle network protocol transport in a modular fashion,
allowing a single place to add new transport types.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xtrap/pkg-descr b/x11/xtrap/pkg-descr
index fae5d2a9e846..d617a9b7f542 100644
--- a/x11/xtrap/pkg-descr
+++ b/x11/xtrap/pkg-descr
@@ -1,6 +1,3 @@
This package contains a set of XTrap sample clients. XTrap is an X Server
extension which facilitates the capturing of server protocol and
synthesizing core input events.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xvinfo/pkg-descr b/x11/xvinfo/pkg-descr
index cf1f2dd785d1..bc48f8c25001 100644
--- a/x11/xvinfo/pkg-descr
+++ b/x11/xvinfo/pkg-descr
@@ -1,6 +1,3 @@
This package contains xvinfo, an application for printing out the
capabilities of any video adaptors associated with the display that
are accessible through the X-Video extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwd/pkg-descr b/x11/xwd/pkg-descr
index 235d83ffbc47..2741facba11b 100644
--- a/x11/xwd/pkg-descr
+++ b/x11/xwd/pkg-descr
@@ -1,4 +1 @@
This package contains xwd, which is an X Window System window dumping utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwininfo/pkg-descr b/x11/xwininfo/pkg-descr
index ec1faf4f16d4..a3c96a30550d 100644
--- a/x11/xwininfo/pkg-descr
+++ b/x11/xwininfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xwininfo, which is a utility for displaying
information about windows in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwud/pkg-descr b/x11/xwud/pkg-descr
index 61d21c52571c..544f59909884 100644
--- a/x11/xwud/pkg-descr
+++ b/x11/xwud/pkg-descr
@@ -1,4 +1 @@
This package contains xwud, an image displayer for the X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org