summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2011-09-22 13:51:54 +0000
committerEitan Adler <eadler@FreeBSD.org>2011-09-22 13:51:54 +0000
commit05a4bd4ab2a977a5598474f9c8df8e4e16b1b67f (patch)
tree901e0f3589c05a04638e25b8ea01f3e0f3eb594f
parent- Update to 1.0.0 (diff)
- updated evieext to 1.1.1
- updated libSM to 1.2.0,1 - updated libX11 to 1.4.4,1 - updated libXevie to 1.0.3 - updated libXext to 1.3.0_1,1 - updated libXfixes to 4.0.4 - updated libXi to 1.4.3,1 - updated libXinerama to 1.1.1,1 - updated libXp to 1.0.1,1 - updated libXpm to 3.5.9 - updated libXrandr to 1.3.2 - updated libXrender to 0.9.6 - updated libXres to 1.0.5 - updated libXtst to 1.2.0 - updated libXv to 1.0.6,1 - updated libXxf86dga to 1.1.2 - updated libXxf86misc to 1.0.3 - updated libXxf86vm to 1.1.1 - updated xdbedizzy to 1.1.0 - updated xdm to 1.1.10 - updated xf86dga to 1.0.3 - updated xf86driproto to 2.1.1 - updated xfd to 1.1.0 - updated xfindproxy to 1.0.2 - updated xfwp to 1.0.2 - updated xinit to 1.3.1 - updated xkbcomp to 1.2.3 - updated xkeyboard to config-2.1 - updated xlsatoms to 1.1.0 - updated xmag to 1.0.4 - updated xman to 1.1.2 - updated xorg to cf-files-1.0.4 - updated xrefresh to 1.0.4 - updated xrx to 1.0.4 - updated xsm to 1.0.2 - updated xwud to 1.0.3 - fix final line in pkg-descr - add license where appropriate - remove two patches in libX11 which are no longer required Reviewed by: kwm Approved by: bapt (mentor) Obtained from: xorg-devel repo
Notes
Notes: svn path=/head/; revision=282172
-rw-r--r--x11/evieext/Makefile4
-rw-r--r--x11/evieext/distinfo4
-rw-r--r--x11/evieext/pkg-descr2
-rw-r--r--x11/libSM/Makefile14
-rw-r--r--x11/libSM/distinfo4
-rw-r--r--x11/libSM/files/patch-sm_genid.c15
-rw-r--r--x11/libX11/Makefile11
-rw-r--r--x11/libX11/distinfo4
-rw-r--r--x11/libX11/files/patch-Makefile.am11
-rw-r--r--x11/libX11/files/patch-configure.ac10
-rw-r--r--x11/libX11/manpages5
-rw-r--r--x11/libXevie/Makefile4
-rw-r--r--x11/libXevie/distinfo4
-rw-r--r--x11/libXext/Makefile6
-rw-r--r--x11/libXext/distinfo4
-rw-r--r--x11/libXext/pkg-plist4
-rw-r--r--x11/libXfixes/Makefile4
-rw-r--r--x11/libXfixes/distinfo4
-rw-r--r--x11/libXi/Makefile6
-rw-r--r--x11/libXi/distinfo4
-rw-r--r--x11/libXinerama/Makefile4
-rw-r--r--x11/libXinerama/distinfo4
-rw-r--r--x11/libXp/Makefile4
-rw-r--r--x11/libXp/distinfo4
-rw-r--r--x11/libXpm/Makefile4
-rw-r--r--x11/libXpm/distinfo4
-rw-r--r--x11/libXrandr/Makefile4
-rw-r--r--x11/libXrandr/distinfo4
-rw-r--r--x11/libXrender/Makefile4
-rw-r--r--x11/libXrender/distinfo4
-rw-r--r--x11/libXres/Makefile4
-rw-r--r--x11/libXres/distinfo4
-rw-r--r--x11/libXtst/Makefile22
-rw-r--r--x11/libXtst/distinfo4
-rw-r--r--x11/libXtst/pkg-plist1
-rw-r--r--x11/libXv/Makefile4
-rw-r--r--x11/libXv/distinfo4
-rw-r--r--x11/libXxf86dga/Makefile4
-rw-r--r--x11/libXxf86dga/distinfo4
-rw-r--r--x11/libXxf86misc/Makefile4
-rw-r--r--x11/libXxf86misc/distinfo4
-rw-r--r--x11/libXxf86vm/Makefile4
-rw-r--r--x11/libXxf86vm/distinfo4
-rw-r--r--x11/xdbedizzy/Makefile4
-rw-r--r--x11/xdbedizzy/distinfo4
-rw-r--r--x11/xdm/Makefile5
-rw-r--r--x11/xdm/distinfo4
-rw-r--r--x11/xf86dga/Makefile5
-rw-r--r--x11/xf86dga/distinfo4
-rw-r--r--x11/xf86driproto/Makefile4
-rw-r--r--x11/xf86driproto/distinfo4
-rw-r--r--x11/xfd/Makefile5
-rw-r--r--x11/xfd/distinfo4
-rw-r--r--x11/xfindproxy/Makefile4
-rw-r--r--x11/xfindproxy/distinfo4
-rw-r--r--x11/xfwp/Makefile4
-rw-r--r--x11/xfwp/distinfo4
-rw-r--r--x11/xinit/Makefile7
-rw-r--r--x11/xinit/distinfo4
-rw-r--r--x11/xinit/files/patch-xinit.c15
-rw-r--r--x11/xkbcomp/Makefile4
-rw-r--r--x11/xkbcomp/distinfo4
-rw-r--r--x11/xkeyboard-config/Makefile14
-rw-r--r--x11/xkeyboard-config/distinfo4
-rw-r--r--x11/xkeyboard-config/pkg-plist34
-rw-r--r--x11/xlsatoms/Makefile4
-rw-r--r--x11/xlsatoms/distinfo4
-rw-r--r--x11/xmag/Makefile4
-rw-r--r--x11/xmag/distinfo4
-rw-r--r--x11/xman/Makefile4
-rw-r--r--x11/xman/distinfo4
-rw-r--r--x11/xorg-cf-files/Makefile4
-rw-r--r--x11/xorg-cf-files/distinfo4
-rw-r--r--x11/xrefresh/Makefile4
-rw-r--r--x11/xrefresh/distinfo4
-rw-r--r--x11/xrx/Makefile4
-rw-r--r--x11/xrx/distinfo4
-rw-r--r--x11/xrx/pkg-plist2
-rw-r--r--x11/xsm/Makefile3
-rw-r--r--x11/xsm/distinfo4
-rw-r--r--x11/xwud/Makefile2
-rw-r--r--x11/xwud/distinfo4
82 files changed, 266 insertions, 173 deletions
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
index f014fc23efd5..2ec1e910cf5e 100644
--- a/x11/evieext/Makefile
+++ b/x11/evieext/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= evieext
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= XEVIE extension headers
+LICENSE= MIT
+
XORG_CAT= proto
.include <bsd.port.mk>
diff --git a/x11/evieext/distinfo b/x11/evieext/distinfo
index 0c22b4264bae..6036d12b83a8 100644
--- a/x11/evieext/distinfo
+++ b/x11/evieext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/evieext-1.1.0.tar.bz2) = 47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
-SIZE (xorg/proto/evieext-1.1.0.tar.bz2) = 48997
+SHA256 (xorg/proto/evieext-1.1.1.tar.bz2) = 1cf74114436d99f56577a90b6438a32ba31b8128c9e63842bb179aba592733fe
+SIZE (xorg/proto/evieext-1.1.1.tar.bz2) = 95093
diff --git a/x11/evieext/pkg-descr b/x11/evieext/pkg-descr
index 0521a1e729a8..2df3da4e60bb 100644
--- a/x11/evieext/pkg-descr
+++ b/x11/evieext/pkg-descr
@@ -1,3 +1,3 @@
This package contains evieext, a collection of XEVIE extension headers.
-WWW: http://www.freedesktop.org/wiki/Software/xlibs \ No newline at end of file
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 0d0918b23830..05af68453f54 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,20 +6,24 @@
#
PORTNAME= libSM
-PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTVERSION= 1.2.0
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Session Management library for X11
+LICENSE= MIT
+
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
-USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
-ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS= --add-missing
XORG_CAT= lib
USE_XORG= ice xproto:both xtrans
+CONFIGURE_ARGS+=--disable-docs --without-xmlto
+
+post-patch:
+ @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \
+ s/doc//' ${WRKSRC}/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index 1d33fb28b180..f9b6a428fb55 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libSM-1.1.1.tar.bz2) = f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
-SIZE (xorg/lib/libSM-1.1.1.tar.bz2) = 262305
+SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
+SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287
diff --git a/x11/libSM/files/patch-sm_genid.c b/x11/libSM/files/patch-sm_genid.c
index 6569b69de076..24c383ca8f00 100644
--- a/x11/libSM/files/patch-sm_genid.c
+++ b/x11/libSM/files/patch-sm_genid.c
@@ -1,6 +1,6 @@
---- src/sm_genid.c.orig 2009-08-07 02:38:31.000000000 -0700
-+++ src/sm_genid.c 2010-10-11 15:00:42.000000000 -0700
-@@ -88,17 +88,21 @@
+--- src/sm_genid.c.orig 2010-06-04 20:15:04.000000000 +0200
++++ src/sm_genid.c 2011-08-06 20:15:47.000000000 +0200
+@@ -111,11 +111,13 @@ SmsGenerateClientID(SmsConn smsConn)
{
#if defined(HAVE_UUID_CREATE)
char *id;
@@ -14,13 +14,4 @@
+ return NULL;
uuid_to_string(&uuid, &temp, &status);
-+ if (status != uuid_s_ok)
-+ return NULL;
-
- if ((id = malloc (strlen (temp) + 2)) != NULL)
- {
-- id[1] = '2';
-+ id[0] = '2';
- strcpy (id+1, temp);
- }
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 323348967f89..76826561eb99 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= libX11
-PORTVERSION= 1.3.6
+PORTVERSION= 1.4.4
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
+LICENSE= MIT
+
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
@@ -21,9 +23,14 @@ XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
- --with-xcb=yes \
+ --without-xmlto \
--disable-specs
CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
+
+post-patch:
+ @${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
+ s/install-specDATA//' ${WRKSRC}/nls/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 318dab8004d5..3b414ea70805 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libX11-1.3.6.tar.bz2) = 599826765c59a98b1e58b4f6c4ad50dca69eeb0e7bd78aea736ca815f45bea40
-SIZE (xorg/lib/libX11-1.3.6.tar.bz2) = 2084047
+SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
+SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404
diff --git a/x11/libX11/files/patch-Makefile.am b/x11/libX11/files/patch-Makefile.am
deleted file mode 100644
index 767a1d400908..000000000000
--- a/x11/libX11/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2009-03-13 12:20:35.000000000 +0300
-+++ Makefile.am 2009-03-13 12:21:02.000000000 +0300
-@@ -5,7 +5,7 @@
- endif
- SUBDIRS=include $(ORDER) nls man
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = x11.pc
- if XCB
- pkgconfig_DATA += x11-xcb.pc
diff --git a/x11/libX11/files/patch-configure.ac b/x11/libX11/files/patch-configure.ac
deleted file mode 100644
index 6acb6cb18325..000000000000
--- a/x11/libX11/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig 2009-03-13 11:46:25.000000000 +0300
-+++ configure.ac 2009-03-13 11:46:56.000000000 +0300
-@@ -20,7 +20,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
-
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index ec4bab81931c..3ed4a0073cfd 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -122,6 +122,7 @@ XContextDependentDrawing.3 \
XContextualDrawing.3 \
XConvertCase.3 \
XConvertSelection.3 \
+XCompose.3 \
XCopyArea.3 \
XCopyColormapAndFree.3 \
XCopyGC.3 \
@@ -217,7 +218,7 @@ XFreeFontNames.3 \
XFreeFontPath.3 \
XFreeFontSet.3 \
XFreeGC.3 \
-XFreeModifierMap.3 \
+XFreeModifiermap.3 \
XFreePixmap.3 \
XFreeStringList.3 \
XGCValues.3 \
@@ -817,4 +818,4 @@ XwcTextPerCharExtents.3 \
XwcTextPropertyToTextList.3
MAN5= \
Compose.5 \
-XCompose.5 \ No newline at end of file
+XCompose.5
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index c57f370e6692..11d67e701b89 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXevie
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= The Xevie library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= evieproto x11 xext xextproto xproto:both
diff --git a/x11/libXevie/distinfo b/x11/libXevie/distinfo
index 157511af83bd..9fb15fe4d192 100644
--- a/x11/libXevie/distinfo
+++ b/x11/libXevie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXevie-1.0.2.tar.bz2) = ff70b81ad145932db2d206735cefcb698dadad241001df7ba6b97e8081d174da
-SIZE (xorg/lib/libXevie-1.0.2.tar.bz2) = 227721
+SHA256 (xorg/lib/libXevie-1.0.3.tar.bz2) = c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
+SIZE (xorg/lib/libXevie-1.0.3.tar.bz2) = 253286
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index a3a434bbcc6d..24f7bad8d840 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,15 +6,19 @@
#
PORTNAME= libXext
-PORTVERSION= 1.1.2
+PORTVERSION= 1.3.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 Extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xextproto:both xau
+CONFIGURE_ARGS+=--disable-specs --without-xmlto
MAN3= DBE.3 \
DPMSCapable.3 \
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index cecc9d497106..4b5594455d5e 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXext-1.1.2.tar.bz2) = ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74
-SIZE (xorg/lib/libXext-1.1.2.tar.bz2) = 318937
+SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
+SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 2a164981cbe0..61c829c6eddb 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -13,9 +13,6 @@ include/X11/extensions/Xext.h
include/X11/extensions/Xge.h
include/X11/extensions/dpms.h
include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbximage.h
include/X11/extensions/multibuf.h
include/X11/extensions/security.h
include/X11/extensions/shape.h
@@ -23,4 +20,3 @@ include/X11/extensions/sync.h
include/X11/extensions/xtestext1.h
libdata/pkgconfig/xext.pc
@dirrmtry include/X11/extensions
-
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 832b47796c86..338fe642a411 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXfixes
-PORTVERSION= 4.0.4
+PORTVERSION= 5.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Fixes extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 fixesproto:both xproto:both xextproto
diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo
index 61d34ae0dfb4..e9cd526ca9c9 100644
--- a/x11/libXfixes/distinfo
+++ b/x11/libXfixes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXfixes-4.0.4.tar.bz2) = ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
-SIZE (xorg/lib/libXfixes-4.0.4.tar.bz2) = 246305
+SHA256 (xorg/lib/libXfixes-5.0.tar.bz2) = 537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3
+SIZE (xorg/lib/libXfixes-5.0.tar.bz2) = 253777
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 763c84d64d2c..d4ab0714e8ca 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,16 +6,20 @@
#
PORTNAME= libXi
-PORTVERSION= 1.3.2
+PORTVERSION= 1.4.3
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Input extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto inputproto:both
+CONFIGURE_ARGS+=--disable-specs --without-xmlto
+
MAN3= XAllowDeviceEvents.3 \
XChangeDeviceControl.3 \
XChangeDeviceDontPropagateList.3 \
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index b19bf15a8ed5..19ae0f9ba982 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.3.2.tar.bz2) = a6034b57ab65fd89584d23403f613c1e1ad1679614fa8562b7438880596ddc3a
-SIZE (xorg/lib/libXi-1.3.2.tar.bz2) = 362340
+SHA256 (xorg/lib/libXi-1.4.3.tar.bz2) = 08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0
+SIZE (xorg/lib/libXi-1.4.3.tar.bz2) = 422637
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index ef1cf123cfe2..fef3e0aa68d0 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.1
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 Xinerama library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 xext xextproto xineramaproto:both
USE_AUTOTOOLS= libtool
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 2f4c9704fc0d..fa6d1671f99c 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXinerama-1.1.tar.bz2) = e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
-SIZE (xorg/lib/libXinerama-1.1.tar.bz2) = 245133
+SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
+SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 62d50cab86ff..6f99f71f6ec9 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= libXp
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X print library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 xext xextproto xau printproto:both
USE_AUTOTOOLS= libtool
diff --git a/x11/libXp/distinfo b/x11/libXp/distinfo
index 1626d59fd33f..760f538f4554 100644
--- a/x11/libXp/distinfo
+++ b/x11/libXp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXp-1.0.0.tar.bz2) = 7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
-SIZE (xorg/lib/libXp-1.0.0.tar.bz2) = 244470
+SHA256 (xorg/lib/libXp-1.0.1.tar.bz2) = 71d1f260005616d646b8c8788365f2b7d93911dac57bb53b65753d9f9e6443d2
+SIZE (xorg/lib/libXp-1.0.1.tar.bz2) = 300427
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 9288deb9a59f..3e44c8540793 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXpm
-PORTVERSION= 3.5.7
+PORTVERSION= 3.5.9
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Pixmap library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto xt
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index ecd3a11524b1..f6b9e4d07c04 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXpm-3.5.7.tar.bz2) = 64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa
-SIZE (xorg/lib/libXpm-3.5.7.tar.bz2) = 358241
+SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
+SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 357b3ab2ec0f..6d5e9610656d 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXrandr
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Resize and Rotate extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both
diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo
index 6edb1025c49f..e2b60e9b16b8 100644
--- a/x11/libXrandr/distinfo
+++ b/x11/libXrandr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrandr-1.3.0.tar.bz2) = 5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
-SIZE (xorg/lib/libXrandr-1.3.0.tar.bz2) = 262270
+SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81
+SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index b8c6871d7660..301d1c153ece 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXrender
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Render extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 renderproto:both xproto:both
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index c67abce19c28..708a9b26a32a 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXrender-0.9.5.tar.bz2) = bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
-SIZE (xorg/lib/libXrender-0.9.5.tar.bz2) = 261483
+SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
+SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index e67698bb6b59..a3d822122476 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXres
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Resource usage library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 xext xextproto resourceproto xproto:both
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 617dfd521f38..9f40e7f90aea 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXres-1.0.4.tar.bz2) = 457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df
-SIZE (xorg/lib/libXres-1.0.4.tar.bz2) = 249779
+SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059
+SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index c7a2f4258466..1dd0f4219c1e 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -6,15 +6,35 @@
#
PORTNAME= libXtst
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Test extension
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 xext recordproto:both xextproto inputproto:both \
xi
USE_AUTOTOOLS= libtool
+CONFIGURE_ARGS+=--disable-specs --without-xmlto
+
+MAN3= XTestCompareCurrentCursorWithWindow.3 \
+ XTestCompareCursorWithWindow.3 \
+ XTestDiscard.3 \
+ XTestFakeButtonEvent.3 \
+ XTestFakeKeyEvent.3 \
+ XTestFakeMotionEvent.3 \
+ XTestFakeRelativeMotionEvent.3 \
+ XTestGrabControl.3 \
+ XTestQueryExtension.3 \
+ XTestSetGContextOfGC.3 \
+ XTestSetVisualIDOfVisual.3
+
+post-patch:
+ @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \
+ s/specs//' ${WRKSRC}/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
index 33c425119cff..20e9e943d79a 100644
--- a/x11/libXtst/distinfo
+++ b/x11/libXtst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXtst-1.1.0.tar.bz2) = bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
-SIZE (xorg/lib/libXtst-1.1.0.tar.bz2) = 256889
+SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
+SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index 9c3e055d2f42..26d878824249 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -6,4 +6,3 @@ lib/libXtst.so
lib/libXtst.so.6
libdata/pkgconfig/xtst.pc
@dirrmtry include/X11/extensions
-
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 149117f450de..333c8d841bb2 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= libXv
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Video Extension library
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= x11 xext xextproto videoproto:both xproto:both
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 7a9179f1c522..3a0b5fc5f21f 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXv-1.0.5.tar.bz2) = d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
-SIZE (xorg/lib/libXv-1.0.5.tar.bz2) = 267466
+SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
+SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 74d1d56312e5..6404f9752524 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXxf86dga
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X DGA Extension
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86dgaproto:both
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
index 1dc4123bb546..643f927aeb1e 100644
--- a/x11/libXxf86dga/distinfo
+++ b/x11/libXxf86dga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
-SIZE (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 254317
+SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
+SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 59881e413b6b..fd15d2ab7d40 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXxf86misc
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X XF86-Misc Extension
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86miscproto:both
diff --git a/x11/libXxf86misc/distinfo b/x11/libXxf86misc/distinfo
index 00e89b45ccf8..73c8895247db 100644
--- a/x11/libXxf86misc/distinfo
+++ b/x11/libXxf86misc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
-SIZE (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 246038
+SHA256 (xorg/lib/libXxf86misc-1.0.3.tar.bz2) = 563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b
+SIZE (xorg/lib/libXxf86misc-1.0.3.tar.bz2) = 255831
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 1eed4e6f34b3..1385ced799ad 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= libXxf86vm
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Vidmode Extension
+LICENSE= MIT
+
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 744c3c72a0b7..531de86cf648 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
-SIZE (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 248769
+SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
+SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
index 6a5f604ce65e..676e3fe2c1e9 100644
--- a/x11/xdbedizzy/Makefile
+++ b/x11/xdbedizzy/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xdbedizzy
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Demo of DBE creating a double buffered spinning scene
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= xp xext xprintutil xp xau xext
diff --git a/x11/xdbedizzy/distinfo b/x11/xdbedizzy/distinfo
index 20ced6f28e33..41b00519a77c 100644
--- a/x11/xdbedizzy/distinfo
+++ b/x11/xdbedizzy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
-SIZE (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 87631
+SHA256 (xorg/app/xdbedizzy-1.1.0.tar.bz2) = 66507b359eb87a7649c9f78aadb7b11efc0a5ffacf9b259392ed54be42cc0d09
+SIZE (xorg/app/xdbedizzy-1.1.0.tar.bz2) = 110340
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index f6c623c39ed7..91d43e0a387b 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= xdm
-PORTVERSION= 1.1.8
-PORTREVISION= 3
+PORTVERSION= 1.1.10
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org X display manager
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
index f9e24f2e1e21..c7a570a0f0a3 100644
--- a/x11/xdm/distinfo
+++ b/x11/xdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdm-1.1.8.tar.bz2) = e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
-SIZE (xorg/app/xdm-1.1.8.tar.bz2) = 401712
+SHA256 (xorg/app/xdm-1.1.10.tar.bz2) = 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
+SIZE (xorg/app/xdm-1.1.10.tar.bz2) = 423578
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index ed9b8150777d..7d7525912917 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= xf86dga
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Test program for the XFree86-DGA extension
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11 xxf86dga xt xaw7 xmu
diff --git a/x11/xf86dga/distinfo b/x11/xf86dga/distinfo
index 37f8e1740ef8..c0911f636b19 100644
--- a/x11/xf86dga/distinfo
+++ b/x11/xf86dga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xf86dga-1.0.2.tar.bz2) = 650633b83796e5a24d4c5ec30adfeb3958f75d9d0785060d5c42bab55ccc1857
-SIZE (xorg/app/xf86dga-1.0.2.tar.bz2) = 80170
+SHA256 (xorg/app/xf86dga-1.0.3.tar.bz2) = b4d87411049d5edb6f33b7e57bceb5a07e41ec5c48900aef492fb0ff74e6a252
+SIZE (xorg/app/xf86dga-1.0.3.tar.bz2) = 104935
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index c81475908ec6..d1f9d2f32e25 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xf86driproto
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= XFree86-DRI extension headers
+LICENSE= MIT
+
XORG_CAT= proto
.include <bsd.port.mk>
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
index 142a6fd8a5dc..0ff0cb5d2a62 100644
--- a/x11/xf86driproto/distinfo
+++ b/x11/xf86driproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xf86driproto-2.1.0.tar.bz2) = d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
-SIZE (xorg/proto/xf86driproto-2.1.0.tar.bz2) = 50111
+SHA256 (xorg/proto/xf86driproto-2.1.1.tar.bz2) = 9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f
+SIZE (xorg/proto/xf86driproto-2.1.1.tar.bz2) = 96528
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index 10122494509b..275411bfc6eb 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= xfd
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Display all characters in an X font
+LICENSE= MIT
+
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/x11/xfd/distinfo b/x11/xfd/distinfo
index 35f81e4f2d91..ca9b01dade4d 100644
--- a/x11/xfd/distinfo
+++ b/x11/xfd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfd-1.0.1.tar.bz2) = 111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
-SIZE (xorg/app/xfd-1.0.1.tar.bz2) = 88927
+SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a
+SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
index 13deb0d448a5..82ef17733d41 100644
--- a/x11/xfindproxy/Makefile
+++ b/x11/xfindproxy/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xfindproxy
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Locate available proxy services
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11 ice xt xproxymngproto
diff --git a/x11/xfindproxy/distinfo b/x11/xfindproxy/distinfo
index af5a8da2795b..851d2074e4cd 100644
--- a/x11/xfindproxy/distinfo
+++ b/x11/xfindproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfindproxy-1.0.1.tar.bz2) = 6b585ceadd3e17b433e177d80837e485869d6704f1181b6f3457ae56ba1988ea
-SIZE (xorg/app/xfindproxy-1.0.1.tar.bz2) = 77645
+SHA256 (xorg/app/xfindproxy-1.0.2.tar.bz2) = a83b5c197ce13a52f021f0d00470e70a1c32d8e93244156c677729a7a5e15bb2
+SIZE (xorg/app/xfindproxy-1.0.2.tar.bz2) = 103429
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
index 0a7f721ef5bd..85ed265ae3fe 100644
--- a/x11/xfwp/Makefile
+++ b/x11/xfwp/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xfwp
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X firewall proxy
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11 ice xproxymngproto
diff --git a/x11/xfwp/distinfo b/x11/xfwp/distinfo
index fecb791f190c..33ce76a33959 100644
--- a/x11/xfwp/distinfo
+++ b/x11/xfwp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfwp-1.0.1.tar.bz2) = cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93
-SIZE (xorg/app/xfwp-1.0.1.tar.bz2) = 104576
+SHA256 (xorg/app/xfwp-1.0.2.tar.bz2) = 8b3df86d875d5a00743fe74f181eb4827e26a849073b5acd163677dca53de2e1
+SIZE (xorg/app/xfwp-1.0.2.tar.bz2) = 131271
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 16ec0d9dd419..7b92be23ab24 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= xinit
-PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTVERSION= 1.3.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Window System initializer
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11
@@ -23,6 +24,6 @@ MAN1= startx.1 xinit.1
post-patch:
@${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/xinit.man
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man
.include <bsd.port.mk>
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 74e631c2e139..9c363d13e8f3 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinit-1.2.0.tar.bz2) = ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
-SIZE (xorg/app/xinit-1.2.0.tar.bz2) = 136781
+SHA256 (xorg/app/xinit-1.3.1.tar.bz2) = c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
+SIZE (xorg/app/xinit-1.3.1.tar.bz2) = 147067
diff --git a/x11/xinit/files/patch-xinit.c b/x11/xinit/files/patch-xinit.c
new file mode 100644
index 000000000000..abe8803b8282
--- /dev/null
+++ b/x11/xinit/files/patch-xinit.c
@@ -0,0 +1,15 @@
+--- xinit.c.orig 2011-04-26 07:03:42.000000000 +0200
++++ xinit.c 2011-08-06 22:14:03.000000000 +0200
+@@ -49,10 +49,10 @@
+ #endif
+
+ /* For PRIO_PROCESS and setpriority() */
+-#ifdef __DragonFly__
++#if defined(__DragonFly__) || defined(__FreeBSD__)
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#endif /* __DragonFly__ */
++#endif
+
+ #include <stdlib.h>
+
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 22576101585d..3d1b9d492b28 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xkbcomp
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Compile XKB keyboard description
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11 xkbfile
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index 0a6447e4c19d..45512a857235 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xkbcomp-1.1.0.tar.bz2) = cc6714454b88b3dd8086f99b42bbca77cd76bbeaef17a81070f22a21d75a168e
-SIZE (xorg/app/xkbcomp-1.1.0.tar.bz2) = 218419
+SHA256 (xorg/app/xkbcomp-1.2.3.tar.bz2) = 7598e8f44e2643c96d2e37aa44f344f6c48f1a262fc9207154353195b760cb16
+SIZE (xorg/app/xkbcomp-1.2.3.tar.bz2) = 227566
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 33cb565e20ba..bc18185b84ca 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,20 +6,22 @@
#
PORTNAME= xkeyboard-config
-PORTVERSION= 1.8
-PORTREVISION= 2
+PORTVERSION= 2.1
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
-DISTNAME= xkeyboard-config-${PORTVERSION}
+MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
MAINTAINER= x11@FreeBSD.org
COMMENT= X Keyboard Configuration Database
+LICENSE= MIT
+
BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp
+XORG_CAT= data
+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= intlhack
+USE_GNOME= intlhack gnomehack
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
@@ -28,7 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls --with-included-gettext
+CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \
XGETTEXT="/bin/echo '(GNU '" \
MSGMERGE="/bin/echo '(GNU '"
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index eb774b6e3cd2..7ee61f2538dd 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xkeyboard-config-1.8.tar.bz2) = 7dc3e6ca00adb105f46e40f8382e83d50b3fcd626bc8654293dae8b1e80506ce
-SIZE (xkeyboard-config-1.8.tar.bz2) = 650683
+SHA256 (xorg/data/xkeyboard-config-2.1.tar.bz2) = f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
+SIZE (xorg/data/xkeyboard-config-2.1.tar.bz2) = 699368
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index a8647d1bd3d8..565c5ad4a06b 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,7 +1,9 @@
+libdata/pkgconfig/xkeyboard-config.pc
share/X11/xkb/compat.dir
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
+share/X11/xkb/compat/caps
share/X11/xkb/compat/complete
share/X11/xkb/compat/default
share/X11/xkb/compat/iso9995
@@ -41,6 +43,7 @@ share/X11/xkb/geometry/nec
share/X11/xkb/geometry/nokia
share/X11/xkb/geometry/northgate
share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sanwa
share/X11/xkb/geometry/sgi_vndr/O2
share/X11/xkb/geometry/sgi_vndr/indigo
share/X11/xkb/geometry/sgi_vndr/indy
@@ -56,6 +59,7 @@ share/X11/xkb/keycodes/amiga
share/X11/xkb/keycodes/ataritt
share/X11/xkb/keycodes/digital_vndr/lk
share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/empty
share/X11/xkb/keycodes/evdev
share/X11/xkb/keycodes/fujitsu
share/X11/xkb/keycodes/hp
@@ -137,6 +141,7 @@ share/X11/xkb/symbols/al
share/X11/xkb/symbols/altwin
share/X11/xkb/symbols/am
share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/at
share/X11/xkb/symbols/az
share/X11/xkb/symbols/ba
share/X11/xkb/symbols/bd
@@ -145,6 +150,7 @@ share/X11/xkb/symbols/bg
share/X11/xkb/symbols/br
share/X11/xkb/symbols/brai
share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/bw
share/X11/xkb/symbols/by
share/X11/xkb/symbols/ca
share/X11/xkb/symbols/capslock
@@ -161,12 +167,15 @@ share/X11/xkb/symbols/digital_vndr/us
share/X11/xkb/symbols/digital_vndr/vt
share/X11/xkb/symbols/dk
share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/empty
share/X11/xkb/symbols/epo
share/X11/xkb/symbols/es
share/X11/xkb/symbols/et
share/X11/xkb/symbols/eurosign
share/X11/xkb/symbols/extras/apl
+share/X11/xkb/symbols/extras/ir
share/X11/xkb/symbols/extras/rs
+share/X11/xkb/symbols/extras/ru
share/X11/xkb/symbols/extras/us
share/X11/xkb/symbols/fi
share/X11/xkb/symbols/fo
@@ -191,6 +200,7 @@ share/X11/xkb/symbols/ir
share/X11/xkb/symbols/is
share/X11/xkb/symbols/it
share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/ke
share/X11/xkb/symbols/keypad
share/X11/xkb/symbols/kg
share/X11/xkb/symbols/kh
@@ -215,6 +225,7 @@ share/X11/xkb/symbols/macintosh_vndr/fr
share/X11/xkb/symbols/macintosh_vndr/gb
share/X11/xkb/symbols/macintosh_vndr/is
share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/jp
share/X11/xkb/symbols/macintosh_vndr/latam
share/X11/xkb/symbols/macintosh_vndr/nl
share/X11/xkb/symbols/macintosh_vndr/no
@@ -224,6 +235,7 @@ share/X11/xkb/symbols/macintosh_vndr/us
share/X11/xkb/symbols/mao
share/X11/xkb/symbols/me
share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/ml
share/X11/xkb/symbols/mm
share/X11/xkb/symbols/mn
share/X11/xkb/symbols/mt
@@ -239,12 +251,14 @@ share/X11/xkb/symbols/nokia_vndr/su-8w
share/X11/xkb/symbols/np
share/X11/xkb/symbols/olpc
share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/ph
share/X11/xkb/symbols/pk
share/X11/xkb/symbols/pl
share/X11/xkb/symbols/pt
share/X11/xkb/symbols/ro
share/X11/xkb/symbols/rs
share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/rupeesign
share/X11/xkb/symbols/se
share/X11/xkb/symbols/sgi_vndr/jp
share/X11/xkb/symbols/shift
@@ -253,34 +267,39 @@ share/X11/xkb/symbols/sk
share/X11/xkb/symbols/sn
share/X11/xkb/symbols/sony_vndr/us
share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/ara
+share/X11/xkb/symbols/sun_vndr/be
+share/X11/xkb/symbols/sun_vndr/br
+share/X11/xkb/symbols/sun_vndr/ca
+share/X11/xkb/symbols/sun_vndr/ch
share/X11/xkb/symbols/sun_vndr/cz
share/X11/xkb/symbols/sun_vndr/de
share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/ee
share/X11/xkb/symbols/sun_vndr/es
share/X11/xkb/symbols/sun_vndr/fi
share/X11/xkb/symbols/sun_vndr/fr
share/X11/xkb/symbols/sun_vndr/gb
share/X11/xkb/symbols/sun_vndr/gr
-share/X11/xkb/symbols/sun_vndr/hu
share/X11/xkb/symbols/sun_vndr/it
share/X11/xkb/symbols/sun_vndr/jp
-share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/kr
share/X11/xkb/symbols/sun_vndr/lt
share/X11/xkb/symbols/sun_vndr/lv
share/X11/xkb/symbols/sun_vndr/nl
share/X11/xkb/symbols/sun_vndr/no
share/X11/xkb/symbols/sun_vndr/pl
share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ro
share/X11/xkb/symbols/sun_vndr/ru
share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/sk
share/X11/xkb/symbols/sun_vndr/solaris
-share/X11/xkb/symbols/sun_vndr/sw
share/X11/xkb/symbols/sun_vndr/tr
share/X11/xkb/symbols/sun_vndr/tuv
share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/ua
share/X11/xkb/symbols/sun_vndr/us
-share/X11/xkb/symbols/sun_vndr/usb
share/X11/xkb/symbols/sy
share/X11/xkb/symbols/terminate
share/X11/xkb/symbols/th
@@ -288,6 +307,7 @@ share/X11/xkb/symbols/tj
share/X11/xkb/symbols/tm
share/X11/xkb/symbols/tr
share/X11/xkb/symbols/typo
+share/X11/xkb/symbols/tz
share/X11/xkb/symbols/ua
share/X11/xkb/symbols/us
share/X11/xkb/symbols/uz
@@ -309,7 +329,6 @@ share/X11/xkb/types/mousekeys
share/X11/xkb/types/nokia
share/X11/xkb/types/numpad
share/X11/xkb/types/pc
-share/X11/xkb/xkbcomp
%%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
@@ -324,6 +343,7 @@ share/X11/xkb/xkbcomp
%%NLS%%share/locale/es/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
@@ -333,6 +353,8 @@ share/X11/xkb/xkbcomp
%%NLS%%share/locale/lt/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
index 1cfb69187258..bac21c0d1cd6 100644
--- a/x11/xlsatoms/Makefile
+++ b/x11/xlsatoms/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xlsatoms
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= List interned atoms defined on a server
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11 xmuu
diff --git a/x11/xlsatoms/distinfo b/x11/xlsatoms/distinfo
index bec9c70bf667..e94c6a4aa64e 100644
--- a/x11/xlsatoms/distinfo
+++ b/x11/xlsatoms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xlsatoms-1.0.2.tar.bz2) = d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b
-SIZE (xorg/app/xlsatoms-1.0.2.tar.bz2) = 95320
+SHA256 (xorg/app/xlsatoms-1.1.0.tar.bz2) = 4a017ada25140a71034fc0026500ebe24b81f2d185a4b2ef733de683b79dcb0d
+SIZE (xorg/app/xlsatoms-1.1.0.tar.bz2) = 103487
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index 0a0536b60086..84479d4a2dfc 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xmag
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X application for screen magnifying
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= xt xaw
diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo
index 1b4b26dd8e96..251b134a9a8f 100644
--- a/x11/xmag/distinfo
+++ b/x11/xmag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xmag-1.0.3.tar.bz2) = 0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
-SIZE (xorg/app/xmag-1.0.3.tar.bz2) = 111523
+SHA256 (xorg/app/xmag-1.0.4.tar.bz2) = 6eb02bafb5a5b1d8a92c716d37dd7698a72523cadd8ab0869f0a7eb11b4189a6
+SIZE (xorg/app/xmag-1.0.4.tar.bz2) = 125290
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index 37a00785927b..94380950d9da 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xman
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Manual page display program for X
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= xt xaw xp xprintutil
diff --git a/x11/xman/distinfo b/x11/xman/distinfo
index 3c66cc083104..c9b37831418b 100644
--- a/x11/xman/distinfo
+++ b/x11/xman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xman-1.1.0.tar.bz2) = 9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0
-SIZE (xorg/app/xman-1.1.0.tar.bz2) = 152855
+SHA256 (xorg/app/xman-1.1.2.tar.bz2) = c2f9ecab80f6d255e14b45dd4bebd64571448e337b69d888d32fc2654a00ed71
+SIZE (xorg/app/xman-1.1.2.tar.bz2) = 168211
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 935167635034..deec23b39247 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xorg-cf-files
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X.org cf files for use with imake builds
+LICENSE= MIT
+
XORG_CAT= util
post-patch:
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 722cefe6bb9b..be3d746c8311 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = bc32ded8fb8dacdbbe44012ff51e3b797da1f1199cc673bddc3028bec4e1e20b
-SIZE (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = 342708
+SHA256 (xorg/util/xorg-cf-files-1.0.4.tar.bz2) = 36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669
+SIZE (xorg/util/xorg-cf-files-1.0.4.tar.bz2) = 367380
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 23e68fed7d12..2228d6f29b26 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -6,12 +6,14 @@
#
PORTNAME= xrefresh
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Refresh all or part of an X screen
+LICENSE= MIT
+
XORG_CAT= app
USE_XORG= x11
diff --git a/x11/xrefresh/distinfo b/x11/xrefresh/distinfo
index 697cdc2ea429..5f39d3f0d533 100644
--- a/x11/xrefresh/distinfo
+++ b/x11/xrefresh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrefresh-1.0.3.tar.bz2) = 3ee0a5f7aeb14bbffbcafcff8e7806c9a59f08e1a58322a50f5fca023a7d7ed9
-SIZE (xorg/app/xrefresh-1.0.3.tar.bz2) = 96931
+SHA256 (xorg/app/xrefresh-1.0.4.tar.bz2) = 069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b
+SIZE (xorg/app/xrefresh-1.0.4.tar.bz2) = 105912
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index 47d34c9c295e..fa7768484c52 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= xrx
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= RX helper program
XORG_CAT= app
-USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw
+USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
index 2aab86db58f1..35a2505605e1 100644
--- a/x11/xrx/distinfo
+++ b/x11/xrx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrx-1.0.3.tar.bz2) = 9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
-SIZE (xorg/app/xrx-1.0.3.tar.bz2) = 323776
+SHA256 (xorg/app/xrx-1.0.4.tar.bz2) = b5eb5ecae105ed4d3b2c91193a1c2ef9fe51b1145190541a59f92645899763a4
+SIZE (xorg/app/xrx-1.0.4.tar.bz2) = 338140
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
index db6dd2cfe397..783211e4a138 100644
--- a/x11/xrx/pkg-plist
+++ b/x11/xrx/pkg-plist
@@ -5,4 +5,4 @@ lib/libxrx.so
lib/libxrxnest.a
lib/libxrxnest.la
lib/libxrxnest.so
-@dirrmtry include/X11/extensions \ No newline at end of file
+@dirrmtry include/X11/extensions
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index 90b2328abd5c..371f79745dda 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xsm
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xsm/distinfo b/x11/xsm/distinfo
index 5cc079d04dd6..972576649408 100644
--- a/x11/xsm/distinfo
+++ b/x11/xsm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xsm-1.0.1.tar.bz2) = 2f2535b5394d59be0a4bb15c12ea1b19b873a0096446ecc4c71aa81f0d99b29a
-SIZE (xorg/app/xsm-1.0.1.tar.bz2) = 116875
+SHA256 (xorg/app/xsm-1.0.2.tar.bz2) = cdb733ef2508aecdd21edf6e394ddff8c4ac99f7659f65210548b69ef54c2b57
+SIZE (xorg/app/xsm-1.0.2.tar.bz2) = 145772
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
index 24efdfee5372..2163955d8033 100644
--- a/x11/xwud/Makefile
+++ b/x11/xwud/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwud
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwud/distinfo b/x11/xwud/distinfo
index ba8c21e23d46..0363f8b74a95 100644
--- a/x11/xwud/distinfo
+++ b/x11/xwud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xwud-1.0.2.tar.bz2) = 84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1
-SIZE (xorg/app/xwud-1.0.2.tar.bz2) = 103954
+SHA256 (xorg/app/xwud-1.0.3.tar.bz2) = 88fdeae05cc3bcc35dfbf0df1606bc4ed4a420edb1abf96aececbc1bd7332c43
+SIZE (xorg/app/xwud-1.0.3.tar.bz2) = 113336