Update Qt to 4.8.5 and Qt Creator to 2.8.0.

Proudly brought to you by the KDE on FreeBSD team, with commits by makc@,
Schaich Alonso and yours truly.

Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33
(from ports), staging support in the Makefiles and dependency fixes related
to pkg-config.

Many thanks to the people who helped test the ports using our area51
repository, and also to the people who provided patches and bug reports via
GNATS!

PR:		ports/180615
	        ports/181921
		ports/182049

3 files changed, 2 insertions, 39 deletions

diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index f6f9edf1b83b..7ad6d8ae519b 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	webkit
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	www
 PKGNAMEPREFIX=	qt4-
 
@@ -40,14 +39,13 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	-I../../../../include/Qt -I../../../../include
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 OPTIONS_DEFINE=	GSTREAMER
 OPTIONS_DEFAULT=	GSTREAMER
 
 GSTREAMER_DESC=	HTML5 audio and video via GStreamer
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSTREAMER}
diff --git a/www/qt4-webkit/files/patch-git_ccd1b2ee b/www/qt4-webkit/files/patch-git_ccd1b2ee
deleted file mode 100644
index a545ee951984..000000000000
--- a/www/qt4-webkit/files/patch-git_ccd1b2ee
+++ /dev/null
@@ -1,35 +0,0 @@
-commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Fri May 10 01:40:23 2013 +0300
-
-    Check that 3DNow! instructions are supported before including mm3dnow.h.
-    
-    Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
-    instruction headers: by checking that the compiler is set to support those
-    instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
-    only means the compiler supported them when the build was being configured).
-    
-    This has not caused a problem in most cases so far because GCC protects its
-    mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
-    pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
-    and can fail if -march is set to, for example, i386 or i486.
-    
-    Not backported from qt5 because qtbase because qsimd_p.h does not include
-    the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
-    
-    Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
-    Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-
-diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
-index 87e26e1..6a32e8f 100644
---- ./src/corelib/tools/qsimd_p.h
-+++ ./src/corelib/tools/qsimd_p.h
-@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
- #endif
- 
- // 3D now intrinsics
--#if defined(QT_HAVE_3DNOW)
-+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
- #include <mm3dnow.h>
- #endif
- 
diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist
index ed6d821dd7c6..514e7e37d26e 100644
--- a/www/qt4-webkit/pkg-plist
+++ b/www/qt4-webkit/pkg-plist
@@ -64,7 +64,7 @@ lib/qt4/libQtWebKit.prl
 lib/qt4/libQtWebKit.so
 lib/qt4/libQtWebKit.so.4
 lib/qt4/libQtWebKit.so.4.9
-lib/qt4/libQtWebKit.so.4.9.3
+lib/qt4/libQtWebKit.so.4.9.4
 libdata/pkgconfig/QtWebKit.pc
 share/qt4/mkspecs/modules/qt_webkit_version.pri
 @dirrmtry share/qt4/mkspecs/modules