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]

10 files changed, 61 insertions, 45 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 5470183de2bf..3ca0084452e7 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.10.2
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index dcf31d5dd5fd..9287d58e6dcb 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -28,7 +28,6 @@ DOCS=	download.html freeglut.html freeglut_logo.png		\
 	progress.html structure.html
 BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 pre-configure:
@@ -43,17 +42,17 @@ post-build:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${STAGEDIR}${EXAMPLESDIR}
 .for prog in ${BINS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${EXAMPLESDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index d9aa3c68d292..5df692add25e 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -17,7 +17,6 @@ USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
 OPTIONS_DEFINE=	MANPAGES
 
@@ -42,28 +41,22 @@ PLIST_SUB+=	KMS="@comment " NOUVEAU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-MAN3=		drmAvailable.3 \
-		drmHandleEvent.3 \
-		drmModeGetResources.3
-MAN7=		drm-gem.7 \
-		drm-kms.7 \
-		drm-memory.7 \
-		drm-mm.7 \
-		drm-ttm.7 \
-		drm.7
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+USE_GNOME+=	libxslt:build
+PLIST_SUB+=	MAN=""
 .else
 CONFIGURE_ARGS+=--disable-manpages
+PLIST_SUB+=	MAN="@comment "
 .endif
 
-LIBDRM_VERSION=	2.4.46
+LIBDRM_VERSION=	2.4.50
 LIBDRM_REVISION=0
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-configure \
 		${FILESDIR}/extra-tests_modetest_Makefile.in \
 		${FILESDIR}/extra-tests_modetest_modetest.c \
-		${FILESDIR}/extra-tests_modetest_strchrnul.c
+		${FILESDIR}/extra-tests_modetest_strchrnul.c \
+		${FILESDIR}/extra-tests__radeon__radeon_ttm.c
 CONFIGURE_ARGS+=--disable-vmwgfx
 .else
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
@@ -85,4 +78,7 @@ pre-patch:
 			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
 		${WRKSRC}/configure
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
+
 .include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 7a11d900452c..c020f636bd86 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,4 +1,4 @@
 SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.46.tar.bz2) = 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1
-SIZE (libdrm-2.4.46.tar.bz2) = 554190
+SHA256 (libdrm-2.4.50.tar.bz2) = 3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045
+SIZE (libdrm-2.4.50.tar.bz2) = 563613
diff --git a/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
new file mode 100644
index 000000000000..ff022a3625a7
--- /dev/null
+++ b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
@@ -0,0 +1,13 @@
+--- tests/radeon/radeon_ttm.c.orig	2013-11-07 11:34:28.207096353 +0100
++++ tests/radeon/radeon_ttm.c	2013-11-07 11:37:41.571085931 +0100
+@@ -25,6 +25,10 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
++
++#include <xf86drm.h>
++
+ #include "rbo.h"
+ 
+ /* allocate as many single page bo to try to starve the kernel
diff --git a/graphics/libdrm/files/extra-tests_modetest_Makefile.in b/graphics/libdrm/files/extra-tests_modetest_Makefile.in
index 74748e9b240a..535bd83040a3 100644
--- a/graphics/libdrm/files/extra-tests_modetest_Makefile.in
+++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in
@@ -1,6 +1,6 @@
---- tests/modetest/Makefile.in.orig	2013-04-04 15:41:48.212028807 +0200
-+++ tests/modetest/Makefile.in	2013-04-04 15:45:21.384003991 +0200
-@@ -36,8 +52,11 @@
+--- tests/modetest/Makefile.in.orig	2013-10-11 18:46:07.000000000 +0200
++++ tests/modetest/Makefile.in	2013-11-07 11:30:15.274123603 +0100
+@@ -80,8 +80,11 @@
  host_triplet = @host@
  @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT)
  @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT)
@@ -12,9 +12,9 @@
 +@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS)
 +@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS)
  subdir = tests/modetest
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,7 +72,10 @@
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/build-aux/depcomp
+@@ -98,7 +101,10 @@
  CONFIG_CLEAN_VPATH_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -26,23 +26,23 @@
  modetest_OBJECTS = $(am_modetest_OBJECTS)
  am__DEPENDENCIES_1 =
  @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@@ -229,12 +265,10 @@
- top_builddir = @top_builddir@
+@@ -306,12 +312,12 @@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
+ AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \
+ 	-I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
 -	-I$(top_srcdir) $(am__append_1)
--modetest_SOURCES = \
--	buffers.c modetest.c buffers.h
--
 +	-I$(top_srcdir) $(am__append_2)
-+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1)
+ modetest_SOURCES = \
+-	buffers.c modetest.c buffers.h
++	buffers.c modetest.c buffers.h $(am__append_1)
+ 
  modetest_LDADD = $(top_builddir)/libdrm.la \
 -	$(top_builddir)/libkms/libkms.la $(am__append_2)
 +	$(top_builddir)/libkms/libkms.la $(am__append_3)
  all: all-am
  
  .SUFFIXES:
-@@ -333,6 +370,7 @@
+@@ -417,6 +423,7 @@
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@
diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/extra-tests_modetest_modetest.c
index db62e98f2cdf..73e4e74b88c8 100644
--- a/graphics/libdrm/files/extra-tests_modetest_modetest.c
+++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c
@@ -1,6 +1,6 @@
---- tests/modetest/modetest.c.orig	2013-02-22 00:44:28.203705216 +0100
-+++ tests/modetest/modetest.c	2013-02-22 00:44:56.803699770 +0100
-@@ -57,6 +57,10 @@
+--- tests/modetest/modetest.c.orig	2013-09-16 22:56:20.000000000 +0200
++++ tests/modetest/modetest.c	2013-11-07 11:32:10.534114644 +0100
+@@ -59,6 +59,10 @@
  
  #include "buffers.h"
  
@@ -8,6 +8,6 @@
 +char *strchrnul(const char *, int);
 +#endif
 +
- drmModeRes *resources;
- int fd, modes;
- 
+ struct crtc {
+ 	drmModeCrtc *crtc;
+ 	drmModeObjectProperties *props;
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 52b736317e29..702e450ef77b 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -70,6 +70,15 @@ libdata/pkgconfig/libdrm.pc
 %%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
+%%NEW%%%%MAN%%man/man3/drmAvailable.3.gz
+%%NEW%%%%MAN%%man/man3/drmHandleEvent.3.gz
+%%NEW%%%%MAN%%man/man3/drmModeGetResources.3.gz
+%%NEW%%%%MAN%%man/man7/drm-gem.7.gz
+%%NEW%%%%MAN%%man/man7/drm-kms.7.gz
+%%NEW%%%%MAN%%man/man7/drm-memory.7.gz
+%%NEW%%%%MAN%%man/man7/drm-mm.7.gz
+%%NEW%%%%MAN%%man/man7/drm-ttm.7.gz
+%%NEW%%%%MAN%%man/man7/drm.7.gz
 %%OLD%%@dirrm include/nouveau
 %%NEW%%%%KMS%%@dirrm include/libkms
 %%NEW%%@dirrm include/libdrm
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index f73615868581..66d8717752ea 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libreatlas
 PORTVERSION=	1.0.0a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index d3dac3e97443..81d1212e3960 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -23,7 +23,6 @@ DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 OPTIONS_DEFINE=	NVIDIA
 NVIDIA_DESC=	Use NVIDIA's libraries
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
 		${WRKSRC}/configure