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)

29 files changed, 45 insertions, 29 deletions

diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile
index 6feaab7860b9..8cac9f4c649a 100644
--- a/x11-toolkits/fltk-devel/Makefile
+++ b/x11-toolkits/fltk-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fltk
 DISTVERSION=	1.3.x-r${SNAPSHOT_VERS}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/snapshots/
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 3d80027adf35..afbee6c6ca89 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.7.46
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
    		ftp://ftp.fox-toolkit.org/pub/
diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index dfe7ff4c51f1..6a73da78b556 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gigi
 PORTVERSION=	0.8.0.1074
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 05e2cdd31220..15f41a250636 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnustep-back
 PORTVERSION=	0.24.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 9a3bc264b0ff..76844506c8f0 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.24.22
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 49aa44a16f48..a5a243bc6f58 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 54fb767bcd42..d9e8e072a7e3 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkmathview
 PORTVERSION=	0.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index c86748bf19f1..9597e695b82f 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtksourceview2
 PORTVERSION=	2.10.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 1de5f30b7a50..2aae0031a6a3 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	3.4.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 72b5db205d14..a59785ea00b6 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	GLUT
 PORTVERSION=	2.4.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index 993c7e20d2b8..9877f41667b1 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	OpenGLRaw
 PORTVERSION=	1.3.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index b666586a77fd..220f1212db40 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lesstif
 PORTVERSION=	0.95.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 2dd6999454b1..24f4e9d75eec 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libXaw
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index 1d6a6c3040bb..b6890d781e29 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -76,10 +76,12 @@ lib/libXaw6.a
 lib/libXaw6.la
 lib/libXaw6.so
 lib/libXaw6.so.6
+lib/libXaw6.so.6.0.1
 lib/libXaw7.a
 lib/libXaw7.la
 lib/libXaw7.so
 lib/libXaw7.so.7
+lib/libXaw7.so.7.0.0
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
 man/man3/Xaw.3.gz
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index e0c0383510fa..6463fa5537ab 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libXmu
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
diff --git a/x11-toolkits/libXmu/pkg-plist b/x11-toolkits/libXmu/pkg-plist
index a19fba0b3bc4..1017da6ee9ed 100644
--- a/x11-toolkits/libXmu/pkg-plist
+++ b/x11-toolkits/libXmu/pkg-plist
@@ -25,10 +25,12 @@ lib/libXmu.a
 lib/libXmu.la
 lib/libXmu.so
 lib/libXmu.so.6
+lib/libXmu.so.6.2.0
 lib/libXmuu.a
 lib/libXmuu.la
 lib/libXmuu.so
 lib/libXmuu.so.1
+lib/libXmuu.so.1.0.0
 libdata/pkgconfig/xmu.pc
 libdata/pkgconfig/xmuu.pc
 %%DOCSDIR%%/Xmu.xml
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 9b09cf61aee6..5fe8f304528d 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libXt
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 1f049a9bf633..09fd7ff69cc6 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -35,6 +35,7 @@ lib/libXt.a
 lib/libXt.la
 lib/libXt.so
 lib/libXt.so.6
+lib/libXt.so.6.0.0
 libdata/pkgconfig/xt.pc
 man/man3/MenuPopdown.3.gz
 man/man3/MenuPopup.3.gz
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index b8fde37824b4..84971b4f0cde 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libsexy
 PORTVERSION=	0.1.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexy/
 
diff --git a/x11-toolkits/libxaw3dxft/Makefile b/x11-toolkits/libxaw3dxft/Makefile
index d8f72062cf4f..b9076ca79eb9 100644
--- a/x11-toolkits/libxaw3dxft/Makefile
+++ b/x11-toolkits/libxaw3dxft/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libxaw3dxft
 DISTVERSION=	1.6.2c
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/sf-xpaint/${PORTNAME}
 DISTNAME=	libXaw3dXft-${DISTVERSION}
diff --git a/x11-toolkits/mygui/Makefile b/x11-toolkits/mygui/Makefile
index 30b8898a0c81..21ef33f0ca99 100644
--- a/x11-toolkits/mygui/Makefile
+++ b/x11-toolkits/mygui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mygui
 PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits graphics devel
 MASTER_SITES=	SF/my-gui/MyGUI/MyGUI_${PORTVERSION}
 DISTNAME=	MyGUI_${PORTVERSION}
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 1f14dd78b904..1960b855e548 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nucleo
 PORTVERSION=	0.7.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 7d171323fd94..ebbc9edc7fb1 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	otk
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	${PORTNAME}_lib_${PORTVERSION}
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 27e77132e5bb..2f4961dc972d 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.34.1
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 2e9e5dd7bb66..90d538a943ee 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.1.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Cross-platform high-level application framework and GUI library(devel)
 
 LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		freetype.9:${PORTSDIR}/print/freetype2 \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 
 CONFLICTS=	paragui-[0-9]*
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index 22985578a450..9a7f4ce2c721 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -44,16 +44,6 @@ OPTIONS_GROUP_CAMERA=	OPENCV GSTREAMER
 OPTIONS_GROUP_SPELLING=	ENCHANT
 OPTIONS_GROUP_CLIPBOARD=	PYGAME
 
-.if !defined(ARCH)
-ARCH!=		uname -p
-.endif
-.if ${ARCH} == i386
-OPTIONS_GROUP_VIDEO+=	PYGLET
-.if !defined(WITH_NEW_XORG)
-BROKEN=		Does not compile with old libGL on i386: Undefined symbol glBlendEquationSeparate
-.endif
-.endif
-
 CAMERA_DESC=	Camera support
 CLIPBOARD_DESC=	Clipboard support
 IMAGE_DESC=	Image support
@@ -84,8 +74,22 @@ TEST_USES=		display:build
 X11_MAKE_ENV=		USE_X11=1
 X11_USE=		XORG=x11
 
+.if !defined(ARCH)
+ARCH!=		uname -p
+.endif
+
+.if ${ARCH} == i386
+OPTIONS_GROUP_VIDEO+=	PYGLET
+.endif
+
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == i386
+.if !defined(WITH_NEW_XORG)
+BROKEN=		Does not compile with old libGL on i386: Undefined symbol glBlendEquationSeparate
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MPDF}
 .if empty(PORT_OPTIONS:MDOCS)
 IGNORE=		option PDF requires DOCS
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index 2bd257d8bc82..ce78280bb958 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmdockapps
 PORTVERSION=	1.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python windowmaker
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 9b9eacb1503c..7ab71cd4d493 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gui
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index ae25ededba80..f25596492e21 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v
 PORTVERSION=	1.90
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	SF/${PORTNAME}gui/V%20GUI/${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \