aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorzeising <zeising@FreeBSD.org>2014-04-17 02:28:47 +0800
committerzeising <zeising@FreeBSD.org>2014-04-17 02:28:47 +0800
commit0d308966c11339773e9f09cdd69a8b5876b4f04e (patch)
treefc8323f5d400038235fda42a6096107239789049 /x11
parent2ff2f3dac9805ec42de1b5cab42db4952b63bb93 (diff)
downloadfreebsd-ports-graphics-0d308966c11339773e9f09cdd69a8b5876b4f04e.tar.gz
freebsd-ports-graphics-0d308966c11339773e9f09cdd69a8b5876b4f04e.tar.zst
freebsd-ports-graphics-0d308966c11339773e9f09cdd69a8b5876b4f04e.zip
The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery: NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE This update switches over to use the new xorg stack by default on FreeBSD 9 and 10 stable, on osversions where vt(9) is available. It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in /etc/make.conf . FreeBSD 8-STABLE and released versions of FreeBSD still use the old version. A package repository with binary packages for new xorg will be available soon. This patch also contains updates of libxcb and related ports, pixman, as well as some drivers and utilities. Bump portrevisions for xf86-* ports, as well as virtualbox-ose-additions due to xserver version change. Apart from these updates, the way shared libraries are handled has been changed for all xorg ports, as well as libxml2 and freetype, which means ltverhack is gone and as a consequence shared libraries have been bumped. The plan is that this change will make library bumps less likely in the future. All affected ports have had their portrevisions bumped as a consequence of this. Fix some issues where WITH_NEW_XORG weren't detected properly on CURRENT. Update instructions, hardware support, and more notes can be found on https://wiki.freebsd.org/Graphics Thanks to: all testers, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/187602 [1] Approved by: portmgr (bdrewery), core (jhb)
Diffstat (limited to 'x11')
-rw-r--r--x11/3ddesktop/Makefile2
-rw-r--r--x11/apwal/Makefile2
-rw-r--r--x11/beforelight/Makefile1
-rw-r--r--x11/blast/Makefile2
-rw-r--r--x11/eaglemode/Makefile2
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/i3lock/Makefile2
-rw-r--r--x11/kde4-workspace/Makefile1
-rw-r--r--x11/kdelibs4/Makefile1
-rw-r--r--x11/libICE/Makefile1
-rw-r--r--x11/libICE/pkg-plist1
-rw-r--r--x11/libSM/Makefile1
-rw-r--r--x11/libSM/pkg-plist1
-rw-r--r--x11/libX11/Makefile1
-rw-r--r--x11/libX11/pkg-plist2
-rw-r--r--x11/libXScrnSaver/Makefile1
-rw-r--r--x11/libXScrnSaver/pkg-plist7
-rw-r--r--x11/libXTrap/Makefile2
-rw-r--r--x11/libXTrap/pkg-plist7
-rw-r--r--x11/libXau/Makefile4
-rw-r--r--x11/libXau/pkg-plist2
-rw-r--r--x11/libXcm/Makefile1
-rw-r--r--x11/libXcm/pkg-plist4
-rw-r--r--x11/libXcomposite/Makefile1
-rw-r--r--x11/libXcomposite/pkg-plist1
-rw-r--r--x11/libXcursor/Makefile1
-rw-r--r--x11/libXcursor/pkg-plist1
-rw-r--r--x11/libXdamage/Makefile1
-rw-r--r--x11/libXdamage/pkg-plist1
-rw-r--r--x11/libXdmcp/Makefile1
-rw-r--r--x11/libXdmcp/pkg-plist1
-rw-r--r--x11/libXevie/Makefile1
-rw-r--r--x11/libXevie/pkg-plist7
-rw-r--r--x11/libXext/Makefile1
-rw-r--r--x11/libXext/pkg-plist1
-rw-r--r--x11/libXfixes/Makefile1
-rw-r--r--x11/libXfixes/pkg-plist1
-rw-r--r--x11/libXi/Makefile1
-rw-r--r--x11/libXi/pkg-plist1
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXinerama/pkg-plist1
-rw-r--r--x11/libXp/Makefile2
-rw-r--r--x11/libXp/pkg-plist1
-rw-r--r--x11/libXpm/Makefile1
-rw-r--r--x11/libXpm/pkg-plist1
-rw-r--r--x11/libXprintAppUtil/Makefile3
-rw-r--r--x11/libXprintAppUtil/pkg-plist7
-rw-r--r--x11/libXprintUtil/Makefile3
-rw-r--r--x11/libXprintUtil/pkg-plist1
-rw-r--r--x11/libXrandr/Makefile1
-rw-r--r--x11/libXrandr/pkg-plist1
-rw-r--r--x11/libXrender/Makefile1
-rw-r--r--x11/libXrender/pkg-plist1
-rw-r--r--x11/libXres/Makefile1
-rw-r--r--x11/libXres/pkg-plist1
-rw-r--r--x11/libXtst/Makefile2
-rw-r--r--x11/libXtst/pkg-plist1
-rw-r--r--x11/libXv/Makefile1
-rw-r--r--x11/libXv/pkg-plist1
-rw-r--r--x11/libXvMC/Makefile1
-rw-r--r--x11/libXvMC/pkg-plist2
-rw-r--r--x11/libXxf86dga/Makefile1
-rw-r--r--x11/libXxf86dga/pkg-plist1
-rw-r--r--x11/libXxf86misc/Makefile1
-rw-r--r--x11/libXxf86misc/pkg-plist1
-rw-r--r--x11/libXxf86vm/Makefile1
-rw-r--r--x11/libXxf86vm/pkg-plist1
-rw-r--r--x11/libdmx/Makefile1
-rw-r--r--x11/libdmx/pkg-plist1
-rw-r--r--x11/liboldX/Makefile3
-rw-r--r--x11/liboldX/pkg-plist1
-rw-r--r--x11/libxcb/Makefile10
-rw-r--r--x11/libxcb/distinfo4
-rw-r--r--x11/libxcb/files/patch-64bit-packed102
-rw-r--r--x11/libxcb/files/patch-src__c_client.py34
-rw-r--r--x11/libxcb/pkg-plist55
-rw-r--r--x11/libxkbcommon/Makefile7
-rw-r--r--x11/libxkbcommon/distinfo4
-rw-r--r--x11/libxkbcommon/pkg-plist10
-rw-r--r--x11/libxkbfile/Makefile1
-rw-r--r--x11/libxkbfile/pkg-plist1
-rw-r--r--x11/libxkbui/Makefile2
-rw-r--r--x11/libxkbui/pkg-plist1
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/libxshmfence/Makefile1
-rw-r--r--x11/libxshmfence/pkg-plist1
-rw-r--r--x11/mate-applets/Makefile2
-rw-r--r--x11/mate-panel/Makefile1
-rw-r--r--x11/mate-session-manager/Makefile1
-rw-r--r--x11/ooxcb/Makefile1
-rw-r--r--x11/pixman/Makefile20
-rw-r--r--x11/pixman/pkg-plist3
-rw-r--r--x11/slim/Makefile2
-rw-r--r--x11/sterm/Makefile1
-rw-r--r--x11/xauth/Makefile1
-rw-r--r--x11/xbacklight/Makefile1
-rw-r--r--x11/xbitmaps/Makefile2
-rw-r--r--x11/xcb-proto/Makefile8
-rw-r--r--x11/xcb-proto/distinfo4
-rw-r--r--x11/xcb-proto/files/patch-src_sync.xml50
-rw-r--r--x11/xcb-util-cursor/Makefile9
-rw-r--r--x11/xcb-util-cursor/distinfo4
-rw-r--r--x11/xcb-util-cursor/pkg-plist1
-rw-r--r--x11/xcb-util-image/Makefile10
-rw-r--r--x11/xcb-util-image/distinfo4
-rw-r--r--x11/xcb-util-image/pkg-plist7
-rw-r--r--x11/xcb-util-keysyms/Makefile10
-rw-r--r--x11/xcb-util-keysyms/distinfo4
-rw-r--r--x11/xcb-util-keysyms/pkg-plist7
-rw-r--r--x11/xcb-util-renderutil/Makefile10
-rw-r--r--x11/xcb-util-renderutil/distinfo4
-rw-r--r--x11/xcb-util-renderutil/pkg-plist7
-rw-r--r--x11/xcb-util-wm/Makefile10
-rw-r--r--x11/xcb-util-wm/distinfo4
-rw-r--r--x11/xcb-util-wm/pkg-plist14
-rw-r--r--x11/xcb-util/Makefile11
-rw-r--r--x11/xcb-util/distinfo4
-rw-r--r--x11/xcb-util/pkg-plist7
-rw-r--r--x11/xconsole/Makefile1
-rw-r--r--x11/xdbedizzy/Makefile1
-rw-r--r--x11/xdm/Makefile1
-rw-r--r--x11/xdpyinfo/Makefile1
-rw-r--r--x11/xextproto/Makefile2
-rw-r--r--x11/xextproto/distinfo4
-rw-r--r--x11/xf86dga/Makefile1
-rw-r--r--x11/xfce4-terminal/Makefile1
-rw-r--r--x11/xfd/Makefile3
-rw-r--r--x11/xhost/Makefile1
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xkeyboard-config/distinfo4
-rw-r--r--x11/xlockmore/Makefile1
-rw-r--r--x11/xlogo/Makefile1
-rw-r--r--x11/xorg-minimal/Makefile2
-rw-r--r--x11/xpyb/Makefile1
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo4
-rw-r--r--x11/xrx/Makefile3
-rw-r--r--x11/xscreensaver/Makefile1
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xtrans/distinfo4
-rw-r--r--x11/xtrans/files/patch-Xtransint.h11
-rw-r--r--x11/xwininfo/Makefile1
143 files changed, 362 insertions, 274 deletions
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 3ab5129a108..7a564ff3584 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -3,7 +3,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= SF/desk3d/${PORTNAME}/${PORTVERSION}
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 1f0773a707a..53065a0aa06 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apwal
PORTVERSION= 0.4.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://apwal.free.fr/download/
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 54666d6edbb..14386a0d420 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -2,6 +2,7 @@
PORTNAME= beforelight
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index abfd12fac2a..0238b90f4af 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blast
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/b/blast
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index 755ac00969f..c17f47eaee7 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= eaglemode
PORTVERSION= 0.84.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 0a62a764a65..045735b5062 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-panel
PORTVERSION= 2.32.1
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 83ef5670c39..0194f743764 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-session
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index 296735f856c..b9f8f76e6f3 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -3,7 +3,7 @@
PORTNAME= i3lock
PORTVERSION= 2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://i3wm.org/${PORTNAME}/
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 90ff4c9b3ca..38b54e10858 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index de61f8a8f4a..ea528049d45 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 4c0e454448a..5120976ed56 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libICE
PORTVERSION= 1.0.8
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 4083e3aa808..48c95dce4ea 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -8,6 +8,7 @@ lib/libICE.a
lib/libICE.la
lib/libICE.so
lib/libICE.so.6
+lib/libICE.so.6.3.0
libdata/pkgconfig/ice.pc
%%DOCSDIR%%/ICElib.xml
%%DOCSDIR%%/ice.xml
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index e832ad113b0..01233f126c6 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libSM
PORTVERSION= 1.2.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/pkg-plist b/x11/libSM/pkg-plist
index ccb0046d833..34d28dfd0b1 100644
--- a/x11/libSM/pkg-plist
+++ b/x11/libSM/pkg-plist
@@ -5,5 +5,6 @@ lib/libSM.a
lib/libSM.la
lib/libSM.so
lib/libSM.so.6
+lib/libSM.so.6.0.1
libdata/pkgconfig/sm.pc
@dirrm include/X11/SM
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 9fd30c59ded..3df2bb76336 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libX11
PORTVERSION= 1.6.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index be8f6313e2f..884c63882a4 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -199,10 +199,12 @@ lib/libX11-xcb.a
lib/libX11-xcb.la
lib/libX11-xcb.so
lib/libX11-xcb.so.1
+lib/libX11-xcb.so.1.0.0
lib/libX11.a
lib/libX11.la
lib/libX11.so
lib/libX11.so.6
+lib/libX11.so.6.3.0
libdata/pkgconfig/x11-xcb.pc
libdata/pkgconfig/x11.pc
man/man3/AllPlanes.3.gz
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 5676b8cc922..be2f48a4f9e 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXScrnSaver
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
index 01aed874935..d056b869e48 100644
--- a/x11/libXScrnSaver/pkg-plist
+++ b/x11/libXScrnSaver/pkg-plist
@@ -1,8 +1,9 @@
include/X11/extensions/scrnsaver.h
-lib/libXss.so.1
-lib/libXss.so
-lib/libXss.la
lib/libXss.a
+lib/libXss.la
+lib/libXss.so
+lib/libXss.so.1
+lib/libXss.so.1.0.0
libdata/pkgconfig/xscrnsaver.pc
man/man3/Xss.3.gz
man/man3/XScreenSaverAllocInfo.3.gz
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index 5192edac2d8..b54c61e0d9e 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXTrap
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,6 +10,5 @@ COMMENT= The XTrap library
XORG_CAT= lib
USE_XORG= trapproto:both x11 xext xextproto xt
-USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXTrap/pkg-plist b/x11/libXTrap/pkg-plist
index 0822c92809f..e7974e19e43 100644
--- a/x11/libXTrap/pkg-plist
+++ b/x11/libXTrap/pkg-plist
@@ -1,5 +1,6 @@
-lib/libXTrap.so.6
-lib/libXTrap.so
-lib/libXTrap.la
lib/libXTrap.a
+lib/libXTrap.la
+lib/libXTrap.so
+lib/libXTrap.so.6
+lib/libXTrap.so.6.4.0
libdata/pkgconfig/xtrap.pc
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 45781339770..addf5113b98 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXau
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -11,7 +12,4 @@ COMMENT= Authentication Protocol library for X11
XORG_CAT= lib
USE_XORG= xproto:both
-post-install:
- ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${STAGEDIR}${PREFIX}/lib/libXau.so.0
-
.include <bsd.port.mk>
diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist
index 38e98d07ebc..6d3b5383dbd 100644
--- a/x11/libXau/pkg-plist
+++ b/x11/libXau/pkg-plist
@@ -2,8 +2,8 @@ include/X11/Xauth.h
lib/libXau.a
lib/libXau.la
lib/libXau.so
-lib/libXau.so.0
lib/libXau.so.6
+lib/libXau.so.6.0.0
libdata/pkgconfig/xau.pc
man/man3/Xau.3.gz
man/man3/XauDisposeAuth.3.gz
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index ffe23a7ff39..2638fb10ae8 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXcm
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/oyranos/${PORTNAME}/${PORTNAME}-${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
diff --git a/x11/libXcm/pkg-plist b/x11/libXcm/pkg-plist
index 15018e19af4..447bbee1b7d 100644
--- a/x11/libXcm/pkg-plist
+++ b/x11/libXcm/pkg-plist
@@ -7,15 +7,19 @@ lib/cmake/Xcm/XcmConfig.cmake
lib/libXcm.la
lib/libXcm.so
lib/libXcm.so.0
+lib/libXcm.so.0.0.5
lib/libXcmDDC.la
lib/libXcmDDC.so
lib/libXcmDDC.so.0
+lib/libXcmDDC.so.0.0.5
lib/libXcmEDID.la
lib/libXcmEDID.so
lib/libXcmEDID.so.0
+lib/libXcmEDID.so.0.0.5
lib/libXcmX11.la
lib/libXcmX11.so
lib/libXcmX11.so.0
+lib/libXcmX11.so.0.0.5
libdata/pkgconfig/xcm-ddc.pc
libdata/pkgconfig/xcm-edid.pc
libdata/pkgconfig/xcm-x11.pc
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 932a189b253..6c81c9edb85 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXcomposite
PORTVERSION= 0.4.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist
index 42f12278c58..7be1532fe65 100644
--- a/x11/libXcomposite/pkg-plist
+++ b/x11/libXcomposite/pkg-plist
@@ -3,6 +3,7 @@ lib/libXcomposite.a
lib/libXcomposite.la
lib/libXcomposite.so
lib/libXcomposite.so.1
+lib/libXcomposite.so.1.0.0
libdata/pkgconfig/xcomposite.pc
man/man3/Xcomposite.3.gz
man/man3/XCompositeQueryExtension.3.gz
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 7d4c122d42d..63f4ab49b91 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXcursor
PORTVERSION= 1.1.14
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist
index 786b7aa4c61..abeb917f76d 100644
--- a/x11/libXcursor/pkg-plist
+++ b/x11/libXcursor/pkg-plist
@@ -3,6 +3,7 @@ lib/libXcursor.a
lib/libXcursor.la
lib/libXcursor.so
lib/libXcursor.so.1
+lib/libXcursor.so.1.0.2
libdata/pkgconfig/xcursor.pc
man/man3/Xcursor.3.gz
man/man3/XcursorImageCreate.3.gz
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 0f23abbea8d..24c1dfcd849 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXdamage
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/pkg-plist b/x11/libXdamage/pkg-plist
index 0db2e1e8fce..577451cb704 100644
--- a/x11/libXdamage/pkg-plist
+++ b/x11/libXdamage/pkg-plist
@@ -3,5 +3,6 @@ lib/libXdamage.a
lib/libXdamage.la
lib/libXdamage.so
lib/libXdamage.so.1
+lib/libXdamage.so.1.1.0
libdata/pkgconfig/xdamage.pc
@dirrmtry include/X11/extensions
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 3e3c7d21eb7..602ff5685d9 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXdmcp
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/pkg-plist b/x11/libXdmcp/pkg-plist
index bb8bf3bf2f6..2303160def2 100644
--- a/x11/libXdmcp/pkg-plist
+++ b/x11/libXdmcp/pkg-plist
@@ -3,4 +3,5 @@ lib/libXdmcp.a
lib/libXdmcp.la
lib/libXdmcp.so
lib/libXdmcp.so.6
+lib/libXdmcp.so.6.0.0
libdata/pkgconfig/xdmcp.pc
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 36c324553b0..9e1b46677b8 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXevie
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist
index ca7920ee0c8..bff99fce922 100644
--- a/x11/libXevie/pkg-plist
+++ b/x11/libXevie/pkg-plist
@@ -1,8 +1,9 @@
include/X11/extensions/Xevie.h
-lib/libXevie.so.1
-lib/libXevie.so
-lib/libXevie.la
lib/libXevie.a
+lib/libXevie.la
+lib/libXevie.so
+lib/libXevie.so.1
+lib/libXevie.so.1.0.0
libdata/pkgconfig/xevie.pc
man/man3/Xevie.3.gz
man/man3/XevieEnd.3.gz
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 48ec2feff1e..adf905fbc0e 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXext
PORTVERSION= 1.3.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 023b27aa5d9..7bc69cf2a8f 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -2,6 +2,7 @@ lib/libXext.a
lib/libXext.la
lib/libXext.so
lib/libXext.so.6
+lib/libXext.so.6.4.0
include/X11/extensions/MITMisc.h
include/X11/extensions/XEVI.h
include/X11/extensions/XLbx.h
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index a2df62bb131..f08c43afa74 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXfixes
PORTVERSION= 5.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist
index 43f539b2f03..13ff3a02fe6 100644
--- a/x11/libXfixes/pkg-plist
+++ b/x11/libXfixes/pkg-plist
@@ -3,5 +3,6 @@ lib/libXfixes.a
lib/libXfixes.la
lib/libXfixes.so
lib/libXfixes.so.3
+lib/libXfixes.so.3.1.0
libdata/pkgconfig/xfixes.pc
man/man3/Xfixes.3.gz
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index d83f968496a..6a6e2ec8a08 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXi
PORTVERSION= 1.7.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
index 51bbd1da2e4..008d85f7631 100644
--- a/x11/libXi/pkg-plist
+++ b/x11/libXi/pkg-plist
@@ -4,6 +4,7 @@ lib/libXi.a
lib/libXi.la
lib/libXi.so
lib/libXi.so.6
+lib/libXi.so.6.1.0
libdata/pkgconfig/xi.pc
man/man3/XAllowDeviceEvents.3.gz
man/man3/XChangeDeviceControl.3.gz
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index e17c983a0fa..c8d3f33cdd3 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXinerama
PORTVERSION= 1.1.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -13,6 +14,5 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext xextproto xineramaproto:both
-USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index 5e7b01258d3..21df9532527 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -4,6 +4,7 @@ lib/libXinerama.a
lib/libXinerama.la
lib/libXinerama.so
lib/libXinerama.so.1
+lib/libXinerama.so.1.0.0
libdata/pkgconfig/xinerama.pc
man/man3/Xinerama.3.gz
man/man3/XineramaQueryExtension.3.gz
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 21e92caa49a..4aaa1a51af4 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXp
PORTVERSION= 1.0.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -13,6 +14,5 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext xextproto xau printproto:both
-USE_AUTOTOOLS= libtool
.include <bsd.port.mk>
diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist
index 0c120ff02f4..022aae957df 100644
--- a/x11/libXp/pkg-plist
+++ b/x11/libXp/pkg-plist
@@ -2,6 +2,7 @@ lib/libXp.a
lib/libXp.la
lib/libXp.so
lib/libXp.so.6
+lib/libXp.so.6.2.0
libdata/pkgconfig/xp.pc
man/man3/XpCancelDoc.3.gz
man/man3/XpCancelJob.3.gz
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 13ca108b986..b522c7f368a 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXpm
PORTVERSION= 3.5.11
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index aa4d1743fa3..3c207b0b0d9 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -5,6 +5,7 @@ lib/libXpm.a
lib/libXpm.la
lib/libXpm.so
lib/libXpm.so.4
+lib/libXpm.so.4.11.0
libdata/pkgconfig/xpm.pc
man/man1/cxpm.1.gz
man/man1/sxpm.1.gz
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index 4162dd6d703..d659d4e7755 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXprintAppUtil
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,5 +10,5 @@ COMMENT= The XprintAppUtil library
XORG_CAT= lib
USE_XORG= printproto x11 xau xp xprintutil xproto:both
-USE_AUTOTOOLS= libtool
+
.include <bsd.port.mk>
diff --git a/x11/libXprintAppUtil/pkg-plist b/x11/libXprintAppUtil/pkg-plist
index ccbbd7595df..596751506e3 100644
--- a/x11/libXprintAppUtil/pkg-plist
+++ b/x11/libXprintAppUtil/pkg-plist
@@ -1,7 +1,8 @@
include/X11/XprintAppUtil/xpapputil.h
-lib/libXprintAppUtil.so.1
-lib/libXprintAppUtil.so
-lib/libXprintAppUtil.la
lib/libXprintAppUtil.a
+lib/libXprintAppUtil.la
+lib/libXprintAppUtil.so
+lib/libXprintAppUtil.so.1
+lib/libXprintAppUtil.so.1.0.0
libdata/pkgconfig/xprintapputil.pc
@dirrm include/X11/XprintAppUtil
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 69d38398538..5f9c05d3ecc 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXprintUtil
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,5 +10,5 @@ COMMENT= The XprintUtil library
XORG_CAT= lib
USE_XORG= printproto:both x11 xau xp xt
-USE_AUTOTOOLS= libtool
+
.include <bsd.port.mk>
diff --git a/x11/libXprintUtil/pkg-plist b/x11/libXprintUtil/pkg-plist
index c7663f7937b..09385f92d8a 100644
--- a/x11/libXprintUtil/pkg-plist
+++ b/x11/libXprintUtil/pkg-plist
@@ -3,5 +3,6 @@ lib/libXprintUtil.a
lib/libXprintUtil.la
lib/libXprintUtil.so
lib/libXprintUtil.so.1
+lib/libXprintUtil.so.1.0.0
libdata/pkgconfig/xprintutil.pc
@dirrm include/X11/XprintUtil
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 4dee0f8ec9f..976773363c1 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXrandr
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrandr/pkg-plist b/x11/libXrandr/pkg-plist
index cd6f3dfa8fa..ba615ccde6c 100644
--- a/x11/libXrandr/pkg-plist
+++ b/x11/libXrandr/pkg-plist
@@ -3,6 +3,7 @@ lib/libXrandr.a
lib/libXrandr.la
lib/libXrandr.so
lib/libXrandr.so.2
+lib/libXrandr.so.2.2.0
libdata/pkgconfig/xrandr.pc
man/man3/Xrandr.3.gz
man/man3/XRRConfigCurrentConfiguration.3.gz
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 3866a0f87db..a7aaf8d08b9 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXrender
PORTVERSION= 0.9.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/pkg-plist b/x11/libXrender/pkg-plist
index ea82f6f4977..080b88e8a37 100644
--- a/x11/libXrender/pkg-plist
+++ b/x11/libXrender/pkg-plist
@@ -3,6 +3,7 @@ lib/libXrender.a
lib/libXrender.la
lib/libXrender.so
lib/libXrender.so.1
+lib/libXrender.so.1.3.0
libdata/pkgconfig/xrender.pc
%%DOCSDIR%%/libXrender.txt
@dirrm %%DOCSDIR%%
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 96f8f088b12..0eef9908dea 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXres
PORTVERSION= 1.0.7
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist
index 1a5b78065af..274c23b9bbc 100644
--- a/x11/libXres/pkg-plist
+++ b/x11/libXres/pkg-plist
@@ -3,6 +3,7 @@ lib/libXRes.a
lib/libXRes.la
lib/libXRes.so
lib/libXRes.so.1
+lib/libXRes.so.1.0.0
libdata/pkgconfig/xres.pc
man/man3/XRes.3.gz
man/man3/XResQueryClients.3.gz
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index c3c1cadf5de..ac4c59a1347 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXtst
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -13,7 +14,6 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext recordproto:both xextproto inputproto:both \
xi
-USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--disable-specs --without-xmlto
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index e6ad93863a1..55b193564ae 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -4,6 +4,7 @@ lib/libXtst.a
lib/libXtst.la
lib/libXtst.so
lib/libXtst.so.6
+lib/libXtst.so.6.1.0
libdata/pkgconfig/xtst.pc
man/man3/XTestCompareCurrentCursorWithWindow.3.gz
man/man3/XTestCompareCursorWithWindow.3.gz
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 2c21649f3db..1555c8dcf3f 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXv
PORTVERSION= 1.0.10
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist
index 9465ee2fe1e..7c813bc7cf3 100644
--- a/x11/libXv/pkg-plist
+++ b/x11/libXv/pkg-plist
@@ -3,6 +3,7 @@ lib/libXv.a
lib/libXv.la
lib/libXv.so
lib/libXv.so.1
+lib/libXv.so.1.0.0
libdata/pkgconfig/xv.pc
man/man3/Xv.3.gz
man/man3/XvFreeAdaptorInfo.3.gz
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index d370e052f94..407966ee772 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXvMC
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
index b22d278a216..58531bb7415 100644
--- a/x11/libXvMC/pkg-plist
+++ b/x11/libXvMC/pkg-plist
@@ -3,10 +3,12 @@ lib/libXvMC.a
lib/libXvMC.la
lib/libXvMC.so
lib/libXvMC.so.1
+lib/libXvMC.so.1.0.0
lib/libXvMCW.a
lib/libXvMCW.la
lib/libXvMCW.so
lib/libXvMCW.so.1
+lib/libXvMCW.so.1.0.0
libdata/pkgconfig/xvmc.pc
%%DOCSDIR%%/XvMC_API.txt
@dirrm %%DOCSDIR%%
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index f46f39662d3..cb6fe45a8b7 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXxf86dga
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
index 23fb304bb49..50d284b68a2 100644
--- a/x11/libXxf86dga/pkg-plist
+++ b/x11/libXxf86dga/pkg-plist
@@ -4,6 +4,7 @@ lib/libXxf86dga.a
lib/libXxf86dga.la
lib/libXxf86dga.so
lib/libXxf86dga.so.1
+lib/libXxf86dga.so.1.0.0
libdata/pkgconfig/xxf86dga.pc
man/man3/XDGA.3.gz
man/man3/XDGAOpenFramebuffer.3.gz
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 43f39b9c7cc..5031242190a 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXxf86misc
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist
index 3b8091f49ec..893a2ff7345 100644
--- a/x11/libXxf86misc/pkg-plist
+++ b/x11/libXxf86misc/pkg-plist
@@ -2,6 +2,7 @@ lib/libXxf86misc.a
lib/libXxf86misc.la
lib/libXxf86misc.so
lib/libXxf86misc.so.1
+lib/libXxf86misc.so.1.1.0
libdata/pkgconfig/xxf86misc.pc
man/man3/XF86Misc.3.gz
man/man3/XF86MiscGetKbdSettings.3.gz
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 4593ad541d8..acd2f95c14f 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXxf86vm
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
index 050fb6c9066..ec81c2d7bb7 100644
--- a/x11/libXxf86vm/pkg-plist
+++ b/x11/libXxf86vm/pkg-plist
@@ -3,6 +3,7 @@ lib/libXxf86vm.a
lib/libXxf86vm.la
lib/libXxf86vm.so
lib/libXxf86vm.so.1
+lib/libXxf86vm.so.1.0.0
libdata/pkgconfig/xxf86vm.pc
man/man3/XF86VM.3.gz
man/man3/XF86VidModeLockModeSwitch.3.gz
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 2c209dd9258..4ffb3ebe480 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libdmx
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
index f6cbd331919..229594c9111 100644
--- a/x11/libdmx/pkg-plist
+++ b/x11/libdmx/pkg-plist
@@ -3,6 +3,7 @@ lib/libdmx.a
lib/libdmx.la
lib/libdmx.so
lib/libdmx.so.1
+lib/libdmx.so.1.0.0
libdata/pkgconfig/dmx.pc
man/man3/DMX.3.gz
man/man3/DMXAddInput.3.gz
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index 4edd444c1c9..f1b615773d3 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -2,6 +2,7 @@
PORTNAME= liboldX
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,5 +10,5 @@ COMMENT= Old X library
XORG_CAT= lib
USE_XORG= x11
-USE_AUTOTOOLS= libtool
+
.include <bsd.port.mk>
diff --git a/x11/liboldX/pkg-plist b/x11/liboldX/pkg-plist
index aa4938cc0f2..c9ceec94ea3 100644
--- a/x11/liboldX/pkg-plist
+++ b/x11/liboldX/pkg-plist
@@ -3,4 +3,5 @@ lib/liboldX.a
lib/liboldX.la
lib/liboldX.so
lib/liboldX.so.6
+lib/liboldX.so.6.0.0
libdata/pkgconfig/oldx.pc
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index f204cf2de9e..86f35e57ecd 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libxcb
-PORTVERSION= 1.9.3
+PORTVERSION= 1.10
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -19,14 +19,12 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/l
CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput
-USE_BZIP2= yes
-USES= gmake pathfix pkgconfig
+XORG_CAT= lib
+USES= gmake
USE_GNOME= libxslt:build
-USE_LDCONFIG= yes
USE_XORG= xau xdmcp
-USE_PYTHON_BUILD= yes
+USE_PYTHON_BUILD=YES
-GNU_CONFIGURE= yes
.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
CONFIGURE_ARGS+=${f}="${${f}}"
.endfor
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index a5aff8e252c..333e256967e 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxcb-1.9.3.tar.bz2) = aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b
-SIZE (libxcb-1.9.3.tar.bz2) = 400283
+SHA256 (xorg/lib/libxcb-1.10.tar.bz2) = 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5
+SIZE (xorg/lib/libxcb-1.10.tar.bz2) = 475211
diff --git a/x11/libxcb/files/patch-64bit-packed b/x11/libxcb/files/patch-64bit-packed
new file mode 100644
index 00000000000..467c9d95fa0
--- /dev/null
+++ b/x11/libxcb/files/patch-64bit-packed
@@ -0,0 +1,102 @@
+From 3b72a2c9d1d656c74c691a45689e1d637f669e3a Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth@whitecape.org>
+Date: Fri, 03 Jan 2014 23:08:33 +0000
+Subject: Force XCB event structures with 64-bit extended fields to be packed.
+
+With the advent of the Present extension, some events (such as
+PresentCompleteNotify) now use native 64-bit types on the wire.
+
+For XGE events, we insert an extra "uint32_t full_sequence" field
+immediately after the first 32 bytes of data. Normally, this causes
+the subsequent fields to be shifted over by 4 bytes, and the structure
+to grow in size by 4 bytes. Everything works fine.
+
+However, if event contains 64-bit extended fields, this may result in
+the compiler adding an extra 4 bytes of padding so that those fields
+remain aligned on 64-bit boundaries. This causes the structure to grow
+by 8 bytes, not 4. Unfortunately, XCB doesn't realize this, and
+always believes that the length only increased by 4. read_packet()
+then fails to malloc enough memory to hold the event, and the event
+processing code uses the wrong offsets.
+
+To fix this, mark any event structures containing 64-bit extended
+fields with __attribute__((__packed__)).
+
+v2: Use any(...) instead of True in (...), as suggested by
+ Daniel Martin.
+
+v3 (Alan Coopersmith): Fix build with Solaris Studio 12.3 by moving the
+attribute to after the structure definition.
+
+Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+Reviewed-by: Keith Packard <keithp@keithp.com> [v1]
+Reviewed-by: Josh Triplett <josh@joshtriplett.org> [v1]
+Reviewed-by: Daniel Martin <consume.noise@gmail.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/src/c_client.py b/src/c_client.py
+index 99fd307..45de544 100644
+--- src/c_client.py
++++ src/c_client.py
+@@ -1762,7 +1762,7 @@ def c_simple(self, name):
+ # Iterator
+ _c_iterator(self, name)
+
+-def _c_complex(self):
++def _c_complex(self, force_packed = False):
+ '''
+ Helper function for handling all structure types.
+ Called for all structs, requests, replies, events, errors.
+@@ -1817,7 +1817,7 @@ def _c_complex(self):
+ if b.type.has_name:
+ _h(' } %s;', b.c_field_name)
+
+- _h('} %s;', self.c_type)
++ _h('} %s%s;', 'XCB_PACKED ' if force_packed else '', self.c_type)
+
+ def c_struct(self, name):
+ '''
+@@ -2902,6 +2902,7 @@ def c_event(self, name):
+ # events while generating the structure for them. Otherwise we would read
+ # garbage (the internal full_sequence) when accessing normal event fields
+ # there.
++ force_packed = False
+ if hasattr(self, 'is_ge_event') and self.is_ge_event and self.name == name:
+ event_size = 0
+ for field in self.fields:
+@@ -2911,6 +2912,11 @@ def c_event(self, name):
+ full_sequence = Field(tcard32, tcard32.name, 'full_sequence', False, True, True)
+ idx = self.fields.index(field)
+ self.fields.insert(idx + 1, full_sequence)
++
++ # If the event contains any 64-bit extended fields, they need
++ # to remain aligned on a 64-bit boundary. Adding full_sequence
++ # would normally break that; force the struct to be packed.
++ force_packed = any(f.type.size == 8 and f.type.is_simple for f in self.fields[(idx+1):])
+ break
+
+ _c_type_setup(self, name, ('event',))
+@@ -2920,7 +2926,7 @@ def c_event(self, name):
+
+ if self.name == name:
+ # Structure definition
+- _c_complex(self)
++ _c_complex(self, force_packed)
+ else:
+ # Typedef
+ _h('')
+diff --git a/src/xcb.h b/src/xcb.h
+index e62c985..73c77a3 100644
+--- src/xcb.h
++++ src/xcb.h
+@@ -51,6 +51,8 @@ extern "C" {
+ * @file xcb.h
+ */
+
++#define XCB_PACKED __attribute__((__packed__))
++
+ /**
+ * @defgroup XCB_Core_API XCB Core API
+ * @brief Core API of the XCB library.
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11/libxcb/files/patch-src__c_client.py b/x11/libxcb/files/patch-src__c_client.py
deleted file mode 100644
index bfd9524ac69..00000000000
--- a/x11/libxcb/files/patch-src__c_client.py
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/c_client.py.orig 2013-11-11 14:30:55.471622828 +0100
-+++ src/c_client.py 2013-11-11 14:32:05.334624142 +0100
-@@ -1133,11 +1133,11 @@
- _c(' %s *xcb_out = *_buffer;', self.c_type)
- _c(' unsigned int xcb_out_pad = -sizeof(%s) & 3;', self.c_type)
- _c(' unsigned int xcb_buffer_len = sizeof(%s) + xcb_out_pad;', self.c_type)
-- _c(' unsigned int xcb_align_to;')
-+ _c(' unsigned int xcb_align_to = 0;')
- else:
- _c(' char *xcb_out = *_buffer;')
- _c(' unsigned int xcb_buffer_len = 0;')
-- _c(' unsigned int xcb_align_to;')
-+ _c(' unsigned int xcb_align_to = 0;')
- prefix = [('_aux', '->', self)]
- aux_ptr = 'xcb_out'
-
-@@ -1160,7 +1160,7 @@
- _c(' unsigned int xcb_buffer_len = 0;')
- _c(' unsigned int xcb_block_len = 0;')
- _c(' unsigned int xcb_pad = 0;')
-- _c(' unsigned int xcb_align_to;')
-+ _c(' unsigned int xcb_align_to = 0;')
-
- elif 'sizeof' == context:
- param_names = [p[2] for p in params]
-@@ -1205,7 +1205,7 @@
- _c(' unsigned int xcb_buffer_len = 0;')
- _c(' unsigned int xcb_block_len = 0;')
- _c(' unsigned int xcb_pad = 0;')
-- _c(' unsigned int xcb_align_to;')
-+ _c(' unsigned int xcb_align_to = 0;')
-
- _c('')
- for t in temp_vars:
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index c40714c6464..73bba0157c0 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -33,106 +33,132 @@ lib/libxcb-composite.a
lib/libxcb-composite.la
lib/libxcb-composite.so
lib/libxcb-composite.so.0
+lib/libxcb-composite.so.0.0.0
lib/libxcb-damage.a
lib/libxcb-damage.la
lib/libxcb-damage.so
lib/libxcb-damage.so.0
+lib/libxcb-damage.so.0.0.0
lib/libxcb-dpms.a
lib/libxcb-dpms.la
lib/libxcb-dpms.so
lib/libxcb-dpms.so.0
+lib/libxcb-dpms.so.0.0.0
lib/libxcb-dri2.a
lib/libxcb-dri2.la
lib/libxcb-dri2.so
lib/libxcb-dri2.so.0
+lib/libxcb-dri2.so.0.0.0
lib/libxcb-dri3.a
lib/libxcb-dri3.la
lib/libxcb-dri3.so
lib/libxcb-dri3.so.0
+lib/libxcb-dri3.so.0.0.0
lib/libxcb-glx.a
lib/libxcb-glx.la
lib/libxcb-glx.so
lib/libxcb-glx.so.0
+lib/libxcb-glx.so.0.0.0
lib/libxcb-present.a
lib/libxcb-present.la
lib/libxcb-present.so
lib/libxcb-present.so.0
+lib/libxcb-present.so.0.0.0
lib/libxcb-randr.a
lib/libxcb-randr.la
lib/libxcb-randr.so
-lib/libxcb-randr.so.1
+lib/libxcb-randr.so.0
+lib/libxcb-randr.so.0.1.0
lib/libxcb-record.a
lib/libxcb-record.la
lib/libxcb-record.so
lib/libxcb-record.so.0
+lib/libxcb-record.so.0.0.0
lib/libxcb-render.a
lib/libxcb-render.la
lib/libxcb-render.so
lib/libxcb-render.so.0
+lib/libxcb-render.so.0.0.0
lib/libxcb-res.a
lib/libxcb-res.la
lib/libxcb-res.so
lib/libxcb-res.so.0
+lib/libxcb-res.so.0.0.0
lib/libxcb-screensaver.a
lib/libxcb-screensaver.la
lib/libxcb-screensaver.so
lib/libxcb-screensaver.so.0
+lib/libxcb-screensaver.so.0.0.0
lib/libxcb-shape.a
lib/libxcb-shape.la
lib/libxcb-shape.so
lib/libxcb-shape.so.0
+lib/libxcb-shape.so.0.0.0
lib/libxcb-shm.a
lib/libxcb-shm.la
lib/libxcb-shm.so
lib/libxcb-shm.so.0
+lib/libxcb-shm.so.0.0.0
lib/libxcb-sync.a
lib/libxcb-sync.la
lib/libxcb-sync.so
-lib/libxcb-sync.so.0
+lib/libxcb-sync.so.1
+lib/libxcb-sync.so.1.0.0
lib/libxcb-xevie.a
lib/libxcb-xevie.la
lib/libxcb-xevie.so
lib/libxcb-xevie.so.0
+lib/libxcb-xevie.so.0.0.0
lib/libxcb-xf86dri.a
lib/libxcb-xf86dri.la
lib/libxcb-xf86dri.so
lib/libxcb-xf86dri.so.0
+lib/libxcb-xf86dri.so.0.0.0
lib/libxcb-xfixes.a
lib/libxcb-xfixes.la
lib/libxcb-xfixes.so
lib/libxcb-xfixes.so.0
+lib/libxcb-xfixes.so.0.0.0
lib/libxcb-xinerama.a
lib/libxcb-xinerama.la
lib/libxcb-xinerama.so
lib/libxcb-xinerama.so.0
+lib/libxcb-xinerama.so.0.0.0
lib/libxcb-xinput.a
lib/libxcb-xinput.la
lib/libxcb-xinput.so
lib/libxcb-xinput.so.0
+lib/libxcb-xinput.so.0.1.0
lib/libxcb-xkb.a
lib/libxcb-xkb.la
lib/libxcb-xkb.so
-lib/libxcb-xkb.so.0
+lib/libxcb-xkb.so.1
+lib/libxcb-xkb.so.1.0.0
lib/libxcb-xprint.a
lib/libxcb-xprint.la
lib/libxcb-xprint.so
lib/libxcb-xprint.so.0
+lib/libxcb-xprint.so.0.0.0
lib/libxcb-xtest.a
lib/libxcb-xtest.la
lib/libxcb-xtest.so
lib/libxcb-xtest.so.0
+lib/libxcb-xtest.so.0.0.0
lib/libxcb-xv.a
lib/libxcb-xv.la
lib/libxcb-xv.so
lib/libxcb-xv.so.0
+lib/libxcb-xv.so.0.0.0
lib/libxcb-xvmc.a
lib/libxcb-xvmc.la
lib/libxcb-xvmc.so
lib/libxcb-xvmc.so.0
+lib/libxcb-xvmc.so.0.0.0
lib/libxcb.a
lib/libxcb.la
lib/libxcb.so
-lib/libxcb.so.2
+lib/libxcb.so.1
+lib/libxcb.so.1.1.0
libdata/pkgconfig/xcb-composite.pc
libdata/pkgconfig/xcb-damage.pc
libdata/pkgconfig/xcb-dpms.pc
@@ -395,7 +421,7 @@ man/man3/xcb_free_gc.3.gz
man/man3/xcb_free_gc_checked.3.gz
man/man3/xcb_free_pixmap.3.gz
man/man3/xcb_free_pixmap_checked.3.gz
-man/man3/xcb_ge_event_t.3.gz
+man/man3/xcb_ge_generic_event_t.3.gz
man/man3/xcb_get_atom_name.3.gz
man/man3/xcb_get_atom_name_name.3.gz
man/man3/xcb_get_atom_name_name_end.3.gz
@@ -2225,23 +2251,6 @@ man/man3/xcb_xkb_get_device_info_name_end.3.gz
man/man3/xcb_xkb_get_device_info_name_length.3.gz
man/man3/xcb_xkb_get_device_info_reply.3.gz
man/man3/xcb_xkb_get_device_info_unchecked.3.gz
-man/man3/xcb_xkb_get_geometry.3.gz
-man/man3/xcb_xkb_get_geometry_colors_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_colors_length.3.gz
-man/man3/xcb_xkb_get_geometry_doodads_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_doodads_length.3.gz
-man/man3/xcb_xkb_get_geometry_key_aliases.3.gz
-man/man3/xcb_xkb_get_geometry_key_aliases_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_key_aliases_length.3.gz
-man/man3/xcb_xkb_get_geometry_label_font.3.gz
-man/man3/xcb_xkb_get_geometry_properties_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_properties_length.3.gz
-man/man3/xcb_xkb_get_geometry_reply.3.gz
-man/man3/xcb_xkb_get_geometry_sections_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_sections_length.3.gz
-man/man3/xcb_xkb_get_geometry_shapes_iterator.3.gz
-man/man3/xcb_xkb_get_geometry_shapes_length.3.gz
-man/man3/xcb_xkb_get_geometry_unchecked.3.gz
man/man3/xcb_xkb_get_indicator_map.3.gz
man/man3/xcb_xkb_get_indicator_map_maps.3.gz
man/man3/xcb_xkb_get_indicator_map_maps_iterator.3.gz
@@ -2305,8 +2314,6 @@ man/man3/xcb_xkb_set_debugging_flags_reply.3.gz
man/man3/xcb_xkb_set_debugging_flags_unchecked.3.gz
man/man3/xcb_xkb_set_device_info.3.gz
man/man3/xcb_xkb_set_device_info_checked.3.gz
-man/man3/xcb_xkb_set_geometry.3.gz
-man/man3/xcb_xkb_set_geometry_checked.3.gz
man/man3/xcb_xkb_set_indicator_map.3.gz
man/man3/xcb_xkb_set_indicator_map_checked.3.gz
man/man3/xcb_xkb_set_map.3.gz
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 520048dca88..9abb9a67f07 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libxkbcommon
-PORTVERSION= 0.3.1
+PORTVERSION= 0.4.1
CATEGORIES= x11
MASTER_SITES= http://xkbcommon.org/download/
@@ -10,10 +10,11 @@ COMMENT= Keymap handling library for toolkits and window systems
LICENSE= MIT
-USES= gmake bison pathfix
+XORG_CAT= lib
+USES= gmake bison
-GNU_CONFIGURE= yes
USE_XZ= yes
+USE_XORG= xcb
MAKE_JOBS_UNSAFE= yes
CONFIGURE_ARGS= --without-default-layout \
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index cf2a1aa5884..77004c83901 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxkbcommon-0.3.1.tar.xz) = 9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e
-SIZE (libxkbcommon-0.3.1.tar.xz) = 605756
+SHA256 (xorg/lib/libxkbcommon-0.4.1.tar.xz) = 90ee502ec919814533c65e74c208212854f5bae9b9b87932eeb96fb3876b8ff6
+SIZE (xorg/lib/libxkbcommon-0.4.1.tar.xz) = 551424
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 07d175218be..820d355c8cb 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,10 +1,18 @@
+include/xkbcommon/xkbcommon.h
include/xkbcommon/xkbcommon-compat.h
include/xkbcommon/xkbcommon-keysyms.h
include/xkbcommon/xkbcommon-names.h
-include/xkbcommon/xkbcommon.h
+include/xkbcommon/xkbcommon-x11.h
lib/libxkbcommon.a
lib/libxkbcommon.la
lib/libxkbcommon.so
lib/libxkbcommon.so.0
+lib/libxkbcommon.so.0.0.0
libdata/pkgconfig/xkbcommon.pc
+libdata/pkgconfig/xkbcommon-x11.pc
+lib/libxkbcommon-x11.a
+lib/libxkbcommon-x11.la
+lib/libxkbcommon-x11.so
+lib/libxkbcommon-x11.so.0
+lib/libxkbcommon-x11.so.0.0.0
@dirrm include/xkbcommon
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 304bde7c769..99c4946809b 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libxkbfile
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbfile/pkg-plist b/x11/libxkbfile/pkg-plist
index cf9ae09cec7..64a56470fe1 100644
--- a/x11/libxkbfile/pkg-plist
+++ b/x11/libxkbfile/pkg-plist
@@ -8,5 +8,6 @@ lib/libxkbfile.a
lib/libxkbfile.la
lib/libxkbfile.so
lib/libxkbfile.so.1
+lib/libxkbfile.so.1.0.2
libdata/pkgconfig/xkbfile.pc
@dirrmtry include/X11/extensions
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index 1217ed3cdc5..a928f8162a9 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbui
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbui/pkg-plist b/x11/libxkbui/pkg-plist
index e614a475159..39d17970119 100644
--- a/x11/libxkbui/pkg-plist
+++ b/x11/libxkbui/pkg-plist
@@ -3,5 +3,6 @@ lib/libxkbui.a
lib/libxkbui.la
lib/libxkbui.so
lib/libxkbui.so.1
+lib/libxkbui.so.1.0.0
libdata/pkgconfig/xkbui.pc
@dirrmtry include/X11/extensions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 183d3f310db..2d1602d77ad 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libxklavier
PORTVERSION= 5.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 84bfdd3c44d..3acdac95ad6 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libxshmfence
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxshmfence/pkg-plist b/x11/libxshmfence/pkg-plist
index 462fda09126..54519a91811 100644
--- a/x11/libxshmfence/pkg-plist
+++ b/x11/libxshmfence/pkg-plist
@@ -3,4 +3,5 @@ lib/libxshmfence.a
lib/libxshmfence.la
lib/libxshmfence.so
lib/libxshmfence.so.1
+lib/libxshmfence.so.1.0.0
libdata/pkgconfig/xshmfence.pc
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 6a37596b807..a96fa39863d 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mate-applets
PORTVERSION= 1.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index 30ba3dc46ec..cf1f5acbee7 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mate-panel
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 225753401ff..14ee5ca22df 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mate-session-manager
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index 923d7396e40..aa86cc80671 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ooxcb
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://samurai-x.org/downloads/
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index cd32755053a..43d7a1cf120 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pixman
PORTVERSION= 0.32.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -10,24 +11,7 @@ COMMENT= Low-level pixel manipulation library
USES= perl5
USE_PERL5= build
XORG_CAT= lib
-USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk
-USE_GNOME= ltverhack:30
-
-OPTIONS_DEFINE= SIMD
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MSIMD}
-CONFIGURE_ARGS= --disable-vmx --disable-arm-simd
-. if defined(MACHINE_CPU)
-. if ! ${MACHINE_CPU:Mmmx}
-CONFIGURE_ARGS+= --disable-mmx
-. endif
-. if ! ${MACHINE_CPU:Msse2}
-CONFIGURE_ARGS+= --disable-sse2
-. endif
-. endif
-.endif
+INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
index 139159fa07c..f7fddfe1655 100644
--- a/x11/pixman/pkg-plist
+++ b/x11/pixman/pkg-plist
@@ -3,6 +3,7 @@ include/pixman-1/pixman.h
lib/libpixman-1.a
lib/libpixman-1.la
lib/libpixman-1.so
-lib/libpixman-1.so.30
+lib/libpixman-1.so.0
+lib/libpixman-1.so.0.32.4
libdata/pkgconfig/pixman-1.pc
@dirrm include/pixman-1
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 411a95fd365..b041381563c 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= slim
PORTVERSION= 1.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \
SF/slim.berlios
diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index a6ce8855afe..750bcdc49c9 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sterm
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/st/
DISTNAME= st-${PORTVERSION}
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 094e1083d15..a988624e67a 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= xauth
+PORTREVISION= 1
PORTVERSION= 1.0.8
CATEGORIES= x11
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 09829b4fe91..9b13f8c308d 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xbacklight
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 872fb52a1f3..56f314be6ac 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -10,7 +10,7 @@ COMMENT= X.Org bitmaps data
LICENSE= MIT
-USES= pathfix
+USES= pathfix
XORG_CAT= data
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 4c3e79f2f7e..728fb8cd933 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xcb-proto
-PORTVERSION= 1.9
+PORTVERSION= 1.10
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -11,10 +11,8 @@ COMMENT= The X protocol C-language Binding (XCB) protocol
BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2
-USE_BZIP2= yes
-USES= pathfix
-USE_PYTHON= yes
-GNU_CONFIGURE= yes
+XORG_CAT= proto
+USE_PYTHON= 2.5+
DATADIR= ${PREFIX}/share/xcb
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index 27738e9c05c..e844ae79827 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.9.tar.bz2) = 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c
-SIZE (xcb-proto-1.9.tar.bz2) = 136421
+SHA256 (xorg/proto/xcb-proto-1.10.tar.bz2) = 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05
+SIZE (xorg/proto/xcb-proto-1.10.tar.bz2) = 138834
diff --git a/x11/xcb-proto/files/patch-src_sync.xml b/x11/xcb-proto/files/patch-src_sync.xml
deleted file mode 100644
index cc530683cab..00000000000
--- a/x11/xcb-proto/files/patch-src_sync.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9c343995eacdc39db2ec7f93cbeab00c88a55026 Mon Sep 17 00:00:00 2001
-From: Peter Harris <pharris@opentext.com>
-Date: Fri, 15 Nov 2013 16:07:39 +0000
-Subject: sync: Add missing namespace for the INT64 struct
-
-Signed-off-by: Peter Harris <pharris@opentext.com>
-Reviewed-By: Daniel Martin <consume.noise@gmail.com>
----
-diff --git a/src/sync.xml b/src/sync.xml
-index bc07c5b..dd70a08 100644
---- src/sync.xml
-+++ src/sync.xml
-@@ -147,7 +147,7 @@ for licensing information.
- </bitcase>
- <bitcase>
- <enumref ref="CA">Value</enumref>
-- <field type="INT64" name="value" />
-+ <field type="sync:INT64" name="value" />
- </bitcase>
- <bitcase>
- <enumref ref="CA">TestType</enumref>
-@@ -155,7 +155,7 @@ for licensing information.
- </bitcase>
- <bitcase>
- <enumref ref="CA">Delta</enumref>
-- <field type="INT64" name="delta" />
-+ <field type="sync:INT64" name="delta" />
- </bitcase>
- <bitcase>
- <enumref ref="CA">Events</enumref>
-@@ -179,7 +179,7 @@ for licensing information.
- </bitcase>
- <bitcase>
- <enumref ref="CA">Value</enumref>
-- <field type="INT64" name="value" />
-+ <field type="sync:INT64" name="value" />
- </bitcase>
- <bitcase>
- <enumref ref="CA">TestType</enumref>
-@@ -187,7 +187,7 @@ for licensing information.
- </bitcase>
- <bitcase>
- <enumref ref="CA">Delta</enumref>
-- <field type="INT64" name="delta" />
-+ <field type="sync:INT64" name="delta" />
- </bitcase>
- <bitcase>
- <enumref ref="CA">Events</enumref>
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index ca52e702e93..82ba070f8f9 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-cursor
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -17,12 +18,10 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util
${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image
-USE_BZIP2= yes
-USE_LDCONFIG= yes
-USE_XORG= xcb xorg-macros
-USES= gmake pkgconfig
+XORG_CAT= lib
+USE_XORG= xcb
+USES= gmake
-GNU_CONFIGURE= yes
CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf"
post-patch:
diff --git a/x11/xcb-util-cursor/distinfo b/x11/xcb-util-cursor/distinfo
index 6219f95324b..49fa1c37ba5 100644
--- a/x11/xcb-util-cursor/distinfo
+++ b/x11/xcb-util-cursor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-cursor-0.1.1.tar.bz2) = 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652
-SIZE (xcb-util-cursor-0.1.1.tar.bz2) = 280852
+SHA256 (xorg/lib/xcb-util-cursor-0.1.1.tar.bz2) = 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652
+SIZE (xorg/lib/xcb-util-cursor-0.1.1.tar.bz2) = 280852
diff --git a/x11/xcb-util-cursor/pkg-plist b/x11/xcb-util-cursor/pkg-plist
index 0d66af35be0..766ca4820b8 100644
--- a/x11/xcb-util-cursor/pkg-plist
+++ b/x11/xcb-util-cursor/pkg-plist
@@ -3,5 +3,6 @@ lib/libxcb-cursor.a
lib/libxcb-cursor.la
lib/libxcb-cursor.so
lib/libxcb-cursor.so.0
+lib/libxcb-cursor.so.0.0.0
libdata/pkgconfig/xcb-cursor.pc
@dirrmtry include/xcb
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index e493432e80d..2649b6b0d42 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-image
PORTVERSION= 0.3.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -10,12 +11,9 @@ COMMENT= A port of Xlib's XImage and XShmImage functions
LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
-USE_BZIP2= yes
-USES= gmake pkgconfig
-USE_LDCONFIG= yes
-USE_XORG= xcb xorg-macros
-
-GNU_CONFIGURE= yes
+XORG_CAT= lib
+USES= gmake
+USE_XORG= xcb
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-image/distinfo b/x11/xcb-util-image/distinfo
index af941adf27d..461b24eed52 100644
--- a/x11/xcb-util-image/distinfo
+++ b/x11/xcb-util-image/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-image-0.3.9.tar.bz2) = d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df
-SIZE (xcb-util-image-0.3.9.tar.bz2) = 310947
+SHA256 (xorg/lib/xcb-util-image-0.3.9.tar.bz2) = d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df
+SIZE (xorg/lib/xcb-util-image-0.3.9.tar.bz2) = 310947
diff --git a/x11/xcb-util-image/pkg-plist b/x11/xcb-util-image/pkg-plist
index 6f96343d39a..d26f27c7bf6 100644
--- a/x11/xcb-util-image/pkg-plist
+++ b/x11/xcb-util-image/pkg-plist
@@ -1,8 +1,9 @@
include/xcb/xcb_bitops.h
include/xcb/xcb_image.h
include/xcb/xcb_pixel.h
-lib/libxcb-image.so.0
-lib/libxcb-image.so
-lib/libxcb-image.la
lib/libxcb-image.a
+lib/libxcb-image.la
+lib/libxcb-image.so
+lib/libxcb-image.so.0
+lib/libxcb-image.so.0.0.0
libdata/pkgconfig/xcb-image.pc
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 6875146d29e..3bc01bd4622 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-keysyms
PORTVERSION= 0.3.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -10,12 +11,9 @@ COMMENT= Standard X key constants and conversion to/from keycodes
LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
-USES= gmake pkgconfig
-USE_BZIP2= yes
-USE_LDCONFIG= yes
-USE_XORG= xcb xorg-macros
-
-GNU_CONFIGURE= yes
+XORG_CAT= lib
+USES= gmake
+USE_XORG= xcb
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-keysyms/distinfo b/x11/xcb-util-keysyms/distinfo
index 2cc20a4fe7b..25ccde26137 100644
--- a/x11/xcb-util-keysyms/distinfo
+++ b/x11/xcb-util-keysyms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-keysyms-0.3.9.tar.bz2) = 7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e
-SIZE (xcb-util-keysyms-0.3.9.tar.bz2) = 286075
+SHA256 (xorg/lib/xcb-util-keysyms-0.3.9.tar.bz2) = 7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e
+SIZE (xorg/lib/xcb-util-keysyms-0.3.9.tar.bz2) = 286075
diff --git a/x11/xcb-util-keysyms/pkg-plist b/x11/xcb-util-keysyms/pkg-plist
index 11a78258b5c..12c7565145a 100644
--- a/x11/xcb-util-keysyms/pkg-plist
+++ b/x11/xcb-util-keysyms/pkg-plist
@@ -1,6 +1,7 @@
include/xcb/xcb_keysyms.h
-lib/libxcb-keysyms.so.1
-lib/libxcb-keysyms.so
-lib/libxcb-keysyms.la
lib/libxcb-keysyms.a
+lib/libxcb-keysyms.la
+lib/libxcb-keysyms.so
+lib/libxcb-keysyms.so.1
+lib/libxcb-keysyms.so.1.0.0
libdata/pkgconfig/xcb-keysyms.pc
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index d864e058384..98c3d78b671 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-renderutil
PORTVERSION= 0.3.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -10,12 +11,9 @@ COMMENT= Convenience functions for the Render extension
LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
-USE_BZIP2= yes
-USES= gmake pkgconfig
-USE_XORG= xcb xorg-macros
-USE_LDCONFIG= yes
-
-GNU_CONFIGURE= yes
+XORG_CAT= lib
+USES= gmake
+USE_XORG= xcb
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-renderutil/distinfo b/x11/xcb-util-renderutil/distinfo
index 17e452dfc8e..55439af6259 100644
--- a/x11/xcb-util-renderutil/distinfo
+++ b/x11/xcb-util-renderutil/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-renderutil-0.3.8.tar.bz2) = 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452
-SIZE (xcb-util-renderutil-0.3.8.tar.bz2) = 257492
+SHA256 (xorg/lib/xcb-util-renderutil-0.3.8.tar.bz2) = 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452
+SIZE (xorg/lib/xcb-util-renderutil-0.3.8.tar.bz2) = 257492
diff --git a/x11/xcb-util-renderutil/pkg-plist b/x11/xcb-util-renderutil/pkg-plist
index ed7f372fe4e..4fa985ebfa3 100644
--- a/x11/xcb-util-renderutil/pkg-plist
+++ b/x11/xcb-util-renderutil/pkg-plist
@@ -1,6 +1,7 @@
include/xcb/xcb_renderutil.h
-lib/libxcb-render-util.so.0
-lib/libxcb-render-util.so
-lib/libxcb-render-util.la
lib/libxcb-render-util.a
+lib/libxcb-render-util.la
+lib/libxcb-render-util.so
+lib/libxcb-render-util.so.0
+lib/libxcb-render-util.so.0.0.0
libdata/pkgconfig/xcb-renderutil.pc
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index 75483bb8b8a..eaed5195ed0 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-wm
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -12,12 +13,9 @@ LICNESE= MIT
LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
-USE_BZIP2= yes
-USES= gmake pkgconfig
-USE_LDCONFIG= yes
-USE_XORG= xcb xorg-macros
-
-GNU_CONFIGURE= yes
+XORG_CAT= lib
+USES= gmake
+USE_XORG= xcb
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-wm/distinfo b/x11/xcb-util-wm/distinfo
index e613efdb941..6eea8739d3c 100644
--- a/x11/xcb-util-wm/distinfo
+++ b/x11/xcb-util-wm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-wm-0.4.1.tar.bz2) = 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
-SIZE (xcb-util-wm-0.4.1.tar.bz2) = 321855
+SHA256 (xorg/lib/xcb-util-wm-0.4.1.tar.bz2) = 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
+SIZE (xorg/lib/xcb-util-wm-0.4.1.tar.bz2) = 321855
diff --git a/x11/xcb-util-wm/pkg-plist b/x11/xcb-util-wm/pkg-plist
index e7703022215..b4997da93a4 100644
--- a/x11/xcb-util-wm/pkg-plist
+++ b/x11/xcb-util-wm/pkg-plist
@@ -1,13 +1,15 @@
include/xcb/xcb_icccm.h
include/xcb/xcb_ewmh.h
-lib/libxcb-icccm.so.4
-lib/libxcb-icccm.so
-lib/libxcb-icccm.la
lib/libxcb-icccm.a
-lib/libxcb-ewmh.so.2
-lib/libxcb-ewmh.so
-lib/libxcb-ewmh.la
+lib/libxcb-icccm.la
+lib/libxcb-icccm.so
+lib/libxcb-icccm.so.4
+lib/libxcb-icccm.so.4.0.0
lib/libxcb-ewmh.a
+lib/libxcb-ewmh.la
+lib/libxcb-ewmh.so
+lib/libxcb-ewmh.so.2
+lib/libxcb-ewmh.so.2.0.0
libdata/pkgconfig/xcb-icccm.pc
libdata/pkgconfig/xcb-ewmh.pc
@dirrmtry include/xcb
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 70ccdfd9249..cf6bd9a3894 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xcb-util
PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -11,13 +11,10 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/
MAINTAINER= garga@FreeBSD.org
COMMENT= A module with libxcb/libX11 extension/replacement libraries
+XORG_CAT= lib
USE_BZIP2= yes
-USES= gmake pathfix pkgconfig
-USE_LDCONFIG= yes
-USE_XORG= xau xcb xdmcp xorg-macros
-USE_AUTOTOOLS= libtool
-
-GNU_CONFIGURE= yes
+USES= gmake
+USE_XORG= xau xcb xdmcp
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo
index 73e5a11c3b5..24eee66a69a 100644
--- a/x11/xcb-util/distinfo
+++ b/x11/xcb-util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-0.3.9.tar.bz2) = c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4
-SIZE (xcb-util-0.3.9.tar.bz2) = 287855
+SHA256 (xorg/lib/xcb-util-0.3.9.tar.bz2) = c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4
+SIZE (xorg/lib/xcb-util-0.3.9.tar.bz2) = 287855
diff --git a/x11/xcb-util/pkg-plist b/x11/xcb-util/pkg-plist
index b60db5a337a..472ca54ef30 100644
--- a/x11/xcb-util/pkg-plist
+++ b/x11/xcb-util/pkg-plist
@@ -1,7 +1,8 @@
-lib/libxcb-util.so.1
-lib/libxcb-util.so
-lib/libxcb-util.la
lib/libxcb-util.a
+lib/libxcb-util.la
+lib/libxcb-util.so
+lib/libxcb-util.so.1
+lib/libxcb-util.so.1.0.0
libdata/pkgconfig/xcb-atom.pc
libdata/pkgconfig/xcb-aux.pc
libdata/pkgconfig/xcb-event.pc
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index c0a8299e0c8..9546ebe3a59 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xconsole
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
index ab970b405a4..f4171b3d46b 100644
--- a/x11/xdbedizzy/Makefile
+++ b/x11/xdbedizzy/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xdbedizzy
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 938efb90a03..96653cd9bef 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.11
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index 17da952314c..339069cf3d6 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xdpyinfo
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index 2777cf8a643..52708ad808e 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xextproto
-PORTVERSION= 7.2.1
+PORTVERSION= 7.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index cadb3dbd540..ec6b5fe8358 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
-SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282
+SHA256 (xorg/proto/xextproto-7.3.0.tar.bz2) = f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0
+SIZE (xorg/proto/xextproto-7.3.0.tar.bz2) = 229310
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index 719a4b1724b..b3ac0450083 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86dga
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 2493f92129a..d3c3e5e4397 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-terminal
PORTVERSION= 0.6.3
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index bd2ba44e377..0d8bcf37fb1 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfd
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,7 +10,7 @@ COMMENT= Display all characters in an X font
LICENSE= MIT
-LIB_DEPENDS= libfreetype.so.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 0038cd1aa4b..a30ad552123 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xhost
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 73c761d034f..c0ed58ee161 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xkeyboard-config
-PORTVERSION= 2.10.1
+PORTVERSION= 2.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index f2a7757fb8a..8d1bcb13a83 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b
-SIZE (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 908897
+SHA256 (xorg/data/xkeyboard-config-2.11.tar.bz2) = e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76
+SIZE (xorg/data/xkeyboard-config-2.11.tar.bz2) = 920222
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 7fca883d244..bd2a99dcafe 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xlockmore
PORTVERSION= 5.43
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 13b340dc89f..e8abffcec97 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xlogo
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile
index 4b588aca1a6..bc1e727d0e4 100644
--- a/x11/xorg-minimal/Makefile
+++ b/x11/xorg-minimal/Makefile
@@ -14,6 +14,8 @@ COMMENT= X.Org minimal distribution metaport
NO_BUILD= yes
NO_MTREE= yes
+.include <bsd.port.options.mk>
+
VIDEO_DRIVER?= vesa
RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server \
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index e1c9a22a650..695285f1243 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xpyb
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/%SUBDIR%/
MASTER_SITE_SUBDIR= dist
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 8d067fa30d7..7916db846b5 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xrandr
-PORTVERSION= 1.4.1
+PORTVERSION= 1.4.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index 6fa0135d9fd..dc42f129674 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xrandr-1.4.1.tar.bz2) = 67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50
-SIZE (xorg/app/xrandr-1.4.1.tar.bz2) = 171963
+SHA256 (xorg/app/xrandr-1.4.2.tar.bz2) = b2e76ee92ff827f1c52ded7c666fe6f2704ca81cdeef882397da4e3e8ab490bc
+SIZE (xorg/app/xrandr-1.4.2.tar.bz2) = 174654
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index db83c048f31..7c8a3907493 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xrx
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -9,8 +10,8 @@ COMMENT= RX helper program
XORG_CAT= app
USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice
+USES= libtool
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
post-patch:
@${REINPLACE_CMD} -e 's|mozilla-plugin|disabled-libxul-plugin|g' \
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index f8e2e24bd63..a0e849dc637 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.26
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index f70ecdd1dc2..ccfde005795 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xtrans
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index 59088e2cd73..3f1861d2c24 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.3.2.tar.bz2) = 94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87
-SIZE (xorg/lib/xtrans-1.3.2.tar.bz2) = 177812
+SHA256 (xorg/lib/xtrans-1.3.4.tar.bz2) = 054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a
+SIZE (xorg/lib/xtrans-1.3.4.tar.bz2) = 182341
diff --git a/x11/xtrans/files/patch-Xtransint.h b/x11/xtrans/files/patch-Xtransint.h
deleted file mode 100644
index dad28948454..00000000000
--- a/x11/xtrans/files/patch-Xtransint.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Xtransint.h.orig 2013-11-08 10:46:59.086340096 +0100
-+++ Xtransint.h 2013-11-08 11:02:02.275278727 +0100
-@@ -72,7 +72,7 @@
- # define XTRANSDEBUG 1
- #endif
-
--#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun))
-+#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun) || defined(__FreeBSD__))
- #error "FD passing support only on Linux & Solaris"
- #endif
-
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 4feb9999127..c20c0aee92f 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xwininfo
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org