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]

1 files changed, 10 insertions, 10 deletions

diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 951f092a2df1..7d585780987d 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -56,21 +56,15 @@ USE_XORG+=      xorg-macros
 . endif
 
 . if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xproto randrproto xi
+USE_XORG+=	xorg-server xproto randrproto xi renderproto xextproto \
+			inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
+			glproto xineramaproto resourceproto scrnsaverproto
 # work around a llvm bug on i386, llvm bug #15806 
 # reproduced with clang 3.2 (current release) and 3.1
 .  if ${ARCH} == i386
 CFLAGS+=	-fno-optimize-sibling-calls
 .  endif
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-.  if ${PORTNAME:M*input*}x != x
-USE_XORG+=	inputproto videoproto fontsproto renderproto xextproto \
-		dri2proto
-.  elif ${PORTNAME:M*video*}x != x
-USE_XORG+=	videoproto fontsproto renderproto xextproto dri2proto
-.  else
-IGNORE=		doesn't contain either "video" or "input"
-.  endif
 . endif
 
 . if ${XORG_CAT} == "font"
@@ -147,7 +141,7 @@ USES+=	pathfix
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
 
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
-USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto
+USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
 . endif
 
 .endif
@@ -171,6 +165,7 @@ XORG_MODULES=	bigreqsproto \
 				dmx \
 				dmxproto \
 				dri2proto \
+				dri3proto \
 				evieproto \
 				fixesproto \
 				fontcacheproto \
@@ -185,6 +180,7 @@ XORG_MODULES=	bigreqsproto \
 				oldx \
 				pciaccess \
 				pixman \
+				presentproto \
 				printproto \
 				randrproto \
 				recordproto \
@@ -238,6 +234,7 @@ XORG_MODULES=	bigreqsproto \
 				xrender \
 				xres \
 				xscrnsaver \
+				xshmfence \
 				xt \
 				xtrans \
 				xtrap \
@@ -254,6 +251,7 @@ damageproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTS
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
 dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
 dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
+dri3proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto
 evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
 fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
 fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
@@ -268,6 +266,7 @@ libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-f
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
 pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
 pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+presentproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto
 printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
 randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
 recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
@@ -322,6 +321,7 @@ xrender_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x
 xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
 xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
 xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
+xshmfence_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence
 xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
 xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
 xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst