From ecda38b0a51979110b18b1bcd5f03f5b6a55e13a Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 13 Oct 2013 23:15:50 +0000
Subject: 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
---
 misc/qt4-doc/Makefile  | 8 ++++----
 misc/qt4-doc/pkg-plist | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'misc/qt4-doc')

diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 6c1898724114..fddae4486db0 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -17,10 +17,10 @@ EXTRACT_AFTER_ARGS=	'${DISTNAME}/doc'
 
 DOCSDIR=	${PREFIX}/share/doc/qt4
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DOCSDIR} && \
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR} && \
-	${COPYTREE_SHARE} qch ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+	cd ${WRKSRC}/doc && \
+	${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} && \
+	${COPYTREE_SHARE} qch ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 019444ff3693..c1be84253418 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -3078,7 +3078,6 @@
 %%DOCSDIR%%/html/images/qvbox-m.png
 %%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png
 %%DOCSDIR%%/html/images/qwebview-diagram.png
-%%DOCSDIR%%/html/images/qwebview-url.png
 %%DOCSDIR%%/html/images/qwindowsstyle.png
 %%DOCSDIR%%/html/images/qwindowsxpstyle.png
 %%DOCSDIR%%/html/images/qwsserver_keyboardfilter.png
@@ -7364,7 +7363,6 @@
 %%DOCSDIR%%/html/stylesheet.html
 %%DOCSDIR%%/html/supported-platforms.html
 %%DOCSDIR%%/html/symbian-platform-security-requirements.html
-%%DOCSDIR%%/html/symbian-support.html
 %%DOCSDIR%%/html/symbian-with-qt-introduction.html
 %%DOCSDIR%%/html/symbianexceptionsafety.html
 %%DOCSDIR%%/html/technology-apis.html
@@ -8148,7 +8146,6 @@
 %%DOCSDIR%%/qch/qt.qch
 @dirrm %%DOCSDIR%%/qch
 @dirrm %%DOCSDIR%%/html/style
-@exec mkdir -p %D/%%DOCSDIR%%/html/scripts
 @dirrm %%DOCSDIR%%/html/scripts
 @dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images
 @dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips
-- 
cgit v1.2.3