Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]

If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG=
to /etc/make.conf to get the old version.

Update several xorg related ports, including:
x11/libxcb 1.9.1 -> 1.9.3
graphics/libdrm 2.4.46 -> 2.4.50
x11/pixman 0.30.2 -> 0.32.4
x11/xkeyboard-config 2.9 -> 2.10.1
x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0

Fix dissapearing cursor in xf86-video-vmware [2]

Stagify all x11@-owned ports

Bump portrevisions for xf86-* ports due to xserver version change.

Fix fallout from updates where needed.

Thanks to:	all testersi, bdrewery and the FreeBSD x11@ team
exp-run by:	bdrewery [1]
PR:		ports/184684 [1], ports/181385 [2]
Submitted by:	Douglas Carmichael <dcarmich@dcarmichael.net> [2]
Approved by:	portmgr (bdrewery), core (jhb) [0]

4 files changed, 8 insertions, 42 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index ebfa770a8e7a..73c761d034ff 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.9
-PORTREVISION=	1
+PORTVERSION=	2.10.1
 CATEGORIES=	x11
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
+MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 LICENSE=	MIT
 
@@ -19,21 +18,13 @@ USE_GNOME=	intlhack libxslt:build
 USES=		gmake pathfix perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN7=		xkeyboard-config.7
-
-OPTIONS_DEFINE=	ETERSOFT
-ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
-ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/etersoft-patch-symbols-typo
-
-NO_STAGE=	yes
-#.include <bsd.port.options.mk>
+.include <bsd.port.options.mk>
 
 # !nls case doesn't work correctly, comment it out.
 #.if ${PORT_OPTIONS:MNLS}
@@ -49,7 +40,7 @@ post-patch:
 		${WRKSRC}/rules/merge.sh
 
 post-install:
-	${MKDIR} /var/lib/xkb
-	${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled
+	${MKDIR} ${STAGEDIR}/var/lib/xkb
+	${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled
 
 .include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index e147c55fd1b4..f2a7757fb8a8 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.9.tar.bz2) = 5e89bc182a10d53c3e83efc6c3546de0fe5504d91c3dbc80d55cc64ddab5643a
-SIZE (xorg/data/xkeyboard-config-2.9.tar.bz2) = 912379
+SHA256 (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b
+SIZE (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 908897
diff --git a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo b/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
deleted file mode 100644
index cf04abcf75bd..000000000000
--- a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
+++ /dev/null
@@ -1,26 +0,0 @@
-Etersoft version of typographic keyboard layout.  It removes Yen symbol `¥'
-(can be easily inserted via "Compose Y =") and adds four letters of Russian
-orthography that were removed during the reform of 1917-1918.
-
-Original upstream bugzilla request:
-
-	http://bugs.etersoft.ru/show_bug.cgi?id=5466
-
-Description (in Russian) and the picture of keyboard layout:
-
-	http://kb.etersoft.ru/Типографская_раскладка_Etersoft
-
---- symbols/typo.orig
-+++ symbols/typo
-@@ -29,7 +29,10 @@
-     key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
-     key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
-     key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
--    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
-+    key <AD06> { [NoSymbol, NoSymbol, U0463, U0462] };
-+    key <AD07> { [NoSymbol, NoSymbol, U0475, U0474] };
-+    key <AD08> { [NoSymbol, NoSymbol, U0456, U0406] };
-+    key <AD09> { [NoSymbol, NoSymbol, U0473, U0472] };
-     key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
-     key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
-     key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index bf29a8ae8293..8dc25a892d0c 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,4 +1,5 @@
 libdata/pkgconfig/xkeyboard-config.pc
+man/man7/xkeyboard-config.7.gz
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic