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)

39 files changed, 43 insertions, 23 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index b69eee48bb4d..36e1c3f095bc 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 4ef30108f242..9cf4bdcf6ed2 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aria2
 PORTVERSION=	1.18.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
 
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 716a4b8e5d62..09ce6dbfebc1 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bookmarkbridge
 PORTVERSION=	0.76
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	SF
 
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 9ce5120f9a24..cf26f08d52e0 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	castget
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	SAVANNAH CENKES
 
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 9cd9b9f77f2c..bfa22e029ed5 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	chimera
 PORTVERSION=	1.70p0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.rocklinux.net/people/ripclaw/projects/software/chimera/devel/
 
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 070a31dc54dc..7aea01e35e9f 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	33.0.1750.152
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index 1fd7e1553035..9fce323b1a41 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cssed
 PORTVERSION=	0.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	SF
 
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 3a2ca28e0399..651a2e0b4bd0 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flickcurl
 PORTVERSION=	1.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.dajobe.org/flickcurl/
 
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 73967428ae95..32bdbd7bcf97 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kannel
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index d14d9103f97b..97b1c30c7a0b 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdewebdev
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index d18a28bbb688..1aabb97c4638 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	lighttpd
 PORTVERSION=	1.4.35
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile
index f54fbec59604..5a12d9f37ed2 100644
--- a/www/links-hacked/Makefile
+++ b/www/links-hacked/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	links-hacked
 DISTVERSION=	101110
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	www
 MASTER_SITES=	http://xray.sai.msu.ru/~karpov/links-hacked/downloads/ http://links-hacked.nm.ru/
 
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--without-x
 .endif
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=	--with-freetype
 .else
 CONFIGURE_ARGS+=	--without-freetype
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 316661ffd084..a36bb33e2605 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	midori
 PORTVERSION=	0.5.8
+PORTREVISION=	1
 CATEGORIES=	www xfce
 MASTER_SITES=	http://www.midori-browser.org/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_all_
diff --git a/www/mod_authnz_crowd/Makefile b/www/mod_authnz_crowd/Makefile
index c0c1d01f86b9..dd3978981a8e 100644
--- a/www/mod_authnz_crowd/Makefile
+++ b/www/mod_authnz_crowd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mod_authnz_crowd
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
 DIST_SUBDIR=	apache2
diff --git a/www/mod_proxy_html/Makefile b/www/mod_proxy_html/Makefile
index da699de1a61a..96be3d431730 100644
--- a/www/mod_proxy_html/Makefile
+++ b/www/mod_proxy_html/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_proxy_html
 PORTVERSION=	3.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/${PORTNAME}/
 DISTNAME=	${PORTNAME}
diff --git a/www/mod_proxy_xml/Makefile b/www/mod_proxy_xml/Makefile
index c7b2d259b8c5..c66ecfbba610 100644
--- a/www/mod_proxy_xml/Makefile
+++ b/www/mod_proxy_xml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_proxy_xml
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/svn/apache/filters/xmlns/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 4fd840b2acfa..bd0277ef8180 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mod_security
 PORTVERSION=	2.7.7
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/tarball/${PORTVERSION}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_xml2enc/Makefile b/www/mod_xml2enc/Makefile
index b55f966fcb12..53dd53273ae7 100644
--- a/www/mod_xml2enc/Makefile
+++ b/www/mod_xml2enc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mod_xml2enc
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/mod_proxy_html/
 DISTNAME=	mod_proxy_html
diff --git a/www/mod_xmlns/Makefile b/www/mod_xmlns/Makefile
index 797288efbe4a..549cd620f180 100644
--- a/www/mod_xmlns/Makefile
+++ b/www/mod_xmlns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_xmlns
 PORTVERSION=	0.97
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/svn/apache/filters/xmlns/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index ea7c0d61e802..c993bbdce833 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	neon29
 PORTVERSION=	0.29.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 DISTNAME=	neon-${PORTVERSION}
@@ -49,7 +49,7 @@ LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 .if ${PORT_OPTIONS:MLIBXML}
 CONFIGURE_ARGS+=--with-libxml2
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+USE_GNOME+=	libxml2
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index a003ae51046d..4a667e79046e 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	newsbeuter
 PORTVERSION=	2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://newsbeuter.org/downloads/
 
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index 85966933375b..985521fa005b 100644
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nghttp2
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	www net
 MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 86a57ef889fd..0a8204b8edbd 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.5.13
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 92ba90459166..358999914809 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 5d9dc400de2a..ac02ddb77b4b 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://snapshot.opera.com/${MASTER_SITES_VER_PATH}/
@@ -14,7 +14,7 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser (Next version)
 IGNORE=		Development version is not currently active. Use www/opera instead of
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
 RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
diff --git a/www/opera/Makefile b/www/opera/Makefile
index e665bfbe5c57..365686189d99 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH}/ \
 		ftp://opera.inode.at/${MASTER_SITES_VER_PATH}/ \
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index 290de607ab9f..32fa78534006 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	solr
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/www/rssroll/Makefile b/www/rssroll/Makefile
index 18fd8143574b..e59e3aed31e2 100644
--- a/www/rssroll/Makefile
+++ b/www/rssroll/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rssroll
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://chaosophia.net/downloads/rssroll/ \
 		http://ns1.chaosophia.net/downloads/rssroll/
@@ -12,7 +13,7 @@ COMMENT=	RSS collector in C
 LICENSE=	BSD
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		xml2:${PORTSDIR}/textproc/libxml2 \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		sqlite3:${PORTSDIR}/databases/sqlite3
 
 GNU_CONFIGURE=	yes
diff --git a/www/rsstool/Makefile b/www/rsstool/Makefile
index 497d66b3c78f..b8a2e4f72783 100644
--- a/www/rsstool/Makefile
+++ b/www/rsstool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rsstool
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	www
 MASTER_SITES=	BERLIOS
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index b3be6b65cf63..a28932334f0c 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sitecopy
 PORTVERSION=	0.16.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.manyfish.co.uk/${PORTNAME}/ \
 		${MASTER_SITE_GENTOO}
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index aa2c37c9a620..1296eaf0f7cc 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snownews
 PORTVERSION=	1.5.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://kiza.kcore.de/media/software/snownews/
 
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile
index 8bb54f9f10e1..317756bea7dc 100644
--- a/www/spdylay/Makefile
+++ b/www/spdylay/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	spdylay
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	www net
 MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 0990bd36adfc..7572a7df6371 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.2.${SQUID_STABLE_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
diff --git a/www/squid33/Makefile b/www/squid33/Makefile
index 6f25fe060462..a889e5ee9180 100644
--- a/www/squid33/Makefile
+++ b/www/squid33/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.3.${SQUID_STABLE_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 0505fa82a3a3..fde08fa0dfa2 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	swish-e
 PORTVERSION=	2.4.7
+PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://swish-e.org/distribution/
 
diff --git a/www/tickr/Makefile b/www/tickr/Makefile
index 3451d5e96828..9682f9d09d71 100644
--- a/www/tickr/Makefile
+++ b/www/tickr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tickr
 PORTVERSION=	0.6.4
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.newsrssticker.com/src/ \
 		LOCAL/nivit/
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 11343343fb15..9e912026c5b3 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tinyproxy
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	https://banu.com/pub/tinyproxy/1.8/
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 10fc0c65fa06..4089d1ecf629 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trafficserver
 PORTVERSION=	4.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile
index 0c3a608f398b..74852c54616f 100644
--- a/www/webkit-qt5/Makefile
+++ b/www/webkit-qt5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	webkit
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-