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]

2 files changed, 31 insertions, 24 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 4a41c94af50a..05bdbb9555b1 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	xorg-server-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT?=	X.Org X server and related programs
 
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
 RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
@@ -74,24 +74,12 @@ CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
 
 .if ${SLAVE_PORT} == "no"
 SUB_FILES=	pkg-install pkg-deinstall
-MAN1=		Xorg.1 \
-		Xserver.1 \
-		cvt.1 \
-		gtf.1
-MAN4=		exa.4 \
-		fbdevhw.4
-MAN5=		xorg.conf.5
-
-.if defined(WITH_NEW_XORG)
-MAN5+=		xorg.conf.d.5
-.endif
 .else
 # for slave ports we need to overwrite PLIST, so it doesn't overwrite
 # PLIST_FILES, with the masterport plist.
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENSSL_BASE)
@@ -102,7 +90,7 @@ CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 CONFIGURE_ARGS+=	--enable-config-hal=yes
 .else
 CONFIGURE_ARGS+=	--enable-config-hal=no
@@ -120,8 +108,10 @@ CONFIGURE_ARGS+=	--enable-aiglx=no
 
 .if ${PORT_OPTIONS:MSUID}
 CONFIGURE_ARGS+=--enable-install-setuid=yes
+PLIST_SUB+=	SUID=""
 .else
 CONFIGURE_ARGS+=--enable-install-setuid=no
+PLIST_SUB+=	SUID="@comment"
 .endif
 
 .if ${ARCH} == i386
@@ -199,18 +189,21 @@ post-configure:
 .endif
 
 .if ${SLAVE_PORT} == "no"
-pre-su-install:
+post-install:
 # The .xorg dir because else the xorg-server might not load the correct 
 # libglx module.
-	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
-		${PREFIX}/lib/xorg/modules/extensions/.xorg/
+		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/*.so
+.if !defined(WITH_NEW_XORG)
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/*.so
+.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/multimedia/*.so
 
-post-install:
 .if defined(WITH_NEW_XORG)
-	@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
-.endif
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 .endif
+.endif # ! SLAVE_PORT
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index bee307f57e51..e9667478ffde 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -1,5 +1,11 @@
 bin/X
+%%SUID%%@owner root
+%%SUID%%@group wheel
+%%SUID%%@mode 4555
 bin/Xorg
+%%SUID%%@owner
+%%SUID%%@group
+%%SUID%%@mode
 bin/cvt
 bin/gtf
 include/xorg/BT.h
@@ -226,8 +232,16 @@ lib/xorg/modules/multimedia/uda1380_drv.la
 lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
+man/man1/Xorg.1.gz
+man/man1/Xserver.1.gz
+man/man1/cvt.1.gz
+man/man1/gtf.1.gz
+man/man4/exa.4.gz
+man/man4/fbdevhw.4.gz
+man/man5/xorg.conf.5.gz
+%%NEW%%man/man5/xorg.conf.d.5.gz
 share/aclocal/xorg-server.m4
-%%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
+%%NEW%%@exec /bin/mkdir -p %D/etc/X11/xorg.conf.d
 @comment %%NEW%%@dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions/.xorg
@@ -236,5 +250,5 @@ share/aclocal/xorg-server.m4
 %%OLD%%@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
-%%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry share/X11
+%%NEW%%@dirrmtry etc/X11/xorg.conf.d
+%%NEW%%@dirrmtry etc/X11