KDE/FreeBSD team presents Qt 4.8.4 and QtCreator 2.6.1 ports.

The area51 repository features commits by Alonso Schaich, avilla, fluffy,
jhale, makc and rakuco.

Common changes:
- Trim Makefile header
- Convert to new option framework
- Add/improve desktop entries
- Remove upstreamed patches

Mk/bsd.qt.mk:
- Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1]

devel/qmake:
- Fix crash due to off-by one error [2]

multimedia/qt4-phonon*:
- Deprecate in favour of multimedia/phonon*

www/qt4-webkit:
- Make dependence on GStreamer optional [3]

devel/qtcreator:
- Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4]

Reported by:	avg via irc [1]
Submitted by:	avg via maillist [2]
PR:		ports/175644 [3]
Submitted by:	danfe [3]
PR:		ports/169809 [4]
Reported by:	tcb <tcberner at gmail.com> [4]

2 files changed, 25 insertions, 16 deletions

diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index badacdac78f3..cf8941749986 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	qt40
-# Date created:				Wed Jun 29 11:49:42 CEST 2005
-# Whom:					lofi@freebsd.org
-#
+# Created by: lofi@freebsd.org
 # $FreeBSD$
-#
 
 PORTNAME=	doc
 DISTVERSION=	${QT4_VERSION}
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 17ce1bc873bb..019444ff3693 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -820,6 +820,7 @@
 %%DOCSDIR%%/html/declarative-ui-components-slideswitch-slideswitch-svg.html
 %%DOCSDIR%%/html/declarative-ui-components-slideswitch.html
 %%DOCSDIR%%/html/declarative-ui-components-spinner-main-cpp.html
+%%DOCSDIR%%/html/declarative-ui-components-spinner-qml-spinner-content-spinner-qml.html
 %%DOCSDIR%%/html/declarative-ui-components-spinner-qml-spinner-main-qml.html
 %%DOCSDIR%%/html/declarative-ui-components-spinner-spinner-pro.html
 %%DOCSDIR%%/html/declarative-ui-components-spinner-spinner-qmlproject.html
@@ -1894,7 +1895,6 @@
 %%DOCSDIR%%/html/images/appicon_screenshot.png
 %%DOCSDIR%%/html/images/application-menus.png
 %%DOCSDIR%%/html/images/application.png
-%%DOCSDIR%%/html/images/arrow_bc.png
 %%DOCSDIR%%/html/images/arrow_down.png
 %%DOCSDIR%%/html/images/arthurplugin-demo.png
 %%DOCSDIR%%/html/images/assistant-address-toolbar.png
@@ -1920,12 +1920,16 @@
 %%DOCSDIR%%/html/images/bearercloud-example.png
 %%DOCSDIR%%/html/images/bearermonitor-example.png
 %%DOCSDIR%%/html/images/bearings.png
-%%DOCSDIR%%/html/images/bgrContent.png
+%%DOCSDIR%%/html/images/bg_l.png
+%%DOCSDIR%%/html/images/bg_l_blank.png
+%%DOCSDIR%%/html/images/bg_ll_blank.png
+%%DOCSDIR%%/html/images/bg_r.png
+%%DOCSDIR%%/html/images/bg_ul_blank.png
 %%DOCSDIR%%/html/images/blockingfortuneclient-example.png
-%%DOCSDIR%%/html/images/blu_dot.png
 %%DOCSDIR%%/html/images/blurpickereffect-example.png
 %%DOCSDIR%%/html/images/books-demo.png
 %%DOCSDIR%%/html/images/borderlayout-example.png
+%%DOCSDIR%%/html/images/box_bg.png
 %%DOCSDIR%%/html/images/boxes-demo.png
 %%DOCSDIR%%/html/images/branchindicatorimage.png
 %%DOCSDIR%%/html/images/breadcrumb.png
@@ -1934,8 +1938,8 @@
 %%DOCSDIR%%/html/images/browser-demo.png
 %%DOCSDIR%%/html/images/brush-outline.png
 %%DOCSDIR%%/html/images/brush-styles.png
-%%DOCSDIR%%/html/images/btn_next.png
-%%DOCSDIR%%/html/images/btn_prev.png
+%%DOCSDIR%%/html/images/btn_next_green.png
+%%DOCSDIR%%/html/images/btn_prev_green.png
 %%DOCSDIR%%/html/images/bullet_dn.png
 %%DOCSDIR%%/html/images/bullet_gt.png
 %%DOCSDIR%%/html/images/bullet_sq.png
@@ -2289,6 +2293,7 @@
 %%DOCSDIR%%/html/images/fademessageeffect-example-faded.png
 %%DOCSDIR%%/html/images/fademessageeffect-example.png
 %%DOCSDIR%%/html/images/fancybrowser-example.png
+%%DOCSDIR%%/html/images/feedbackground.png
 %%DOCSDIR%%/html/images/fetchmore-example.png
 %%DOCSDIR%%/html/images/filedialogurls.png
 %%DOCSDIR%%/html/images/filetree_1-example.png
@@ -2382,19 +2387,16 @@
 %%DOCSDIR%%/html/images/gtk-toolbutton.png
 %%DOCSDIR%%/html/images/gtk-treeview.png
 %%DOCSDIR%%/html/images/header.png
+%%DOCSDIR%%/html/images/header_bg.png
 %%DOCSDIR%%/html/images/headerimage.png
 %%DOCSDIR%%/html/images/hellogl-es-example.png
 %%DOCSDIR%%/html/images/hellogl-example.png
-%%DOCSDIR%%/html/images/home.png
 %%DOCSDIR%%/html/images/horBar.png
 %%DOCSDIR%%/html/images/horizontalpositioner_example.png
 %%DOCSDIR%%/html/images/hoverevents.png
 %%DOCSDIR%%/html/images/http-example.png
 %%DOCSDIR%%/html/images/httpstack.png
 %%DOCSDIR%%/html/images/i18n-example.png
-%%DOCSDIR%%/html/images/ico_note.png
-%%DOCSDIR%%/html/images/ico_note_attention.png
-%%DOCSDIR%%/html/images/ico_out.png
 %%DOCSDIR%%/html/images/icon.png
 %%DOCSDIR%%/html/images/icons-example.png
 %%DOCSDIR%%/html/images/icons-view-menu.png
@@ -2626,6 +2628,8 @@
 %%DOCSDIR%%/html/images/orientation-portrait.png
 %%DOCSDIR%%/html/images/overpainting-example.png
 %%DOCSDIR%%/html/images/padnavigator-example.png
+%%DOCSDIR%%/html/images/page.png
+%%DOCSDIR%%/html/images/page_bg.png
 %%DOCSDIR%%/html/images/painterpaths-example.png
 %%DOCSDIR%%/html/images/painting-examples.png
 %%DOCSDIR%%/html/images/paintsystem-antialiasing.png
@@ -3197,6 +3201,7 @@
 %%DOCSDIR%%/html/images/spinboxdelegate-example.png
 %%DOCSDIR%%/html/images/spinboxes-example.png
 %%DOCSDIR%%/html/images/spinboximage.png
+%%DOCSDIR%%/html/images/spinner.gif
 %%DOCSDIR%%/html/images/spreadsheet-demo.png
 %%DOCSDIR%%/html/images/sprites-combined.png
 %%DOCSDIR%%/html/images/sql-examples.png
@@ -7252,6 +7257,10 @@
 %%DOCSDIR%%/html/script-qstetrix.html
 %%DOCSDIR%%/html/script.html
 %%DOCSDIR%%/html/scripting.html
+%%DOCSDIR%%/html/scripts/functions.js
+%%DOCSDIR%%/html/scripts/jquery.js
+%%DOCSDIR%%/html/scripts/narrow.js
+%%DOCSDIR%%/html/scripts/superfish.js
 %%DOCSDIR%%/html/session.html
 %%DOCSDIR%%/html/shadow-builds-wince.html
 %%DOCSDIR%%/html/shared.html
@@ -7341,7 +7350,12 @@
 %%DOCSDIR%%/html/statemachine.html
 %%DOCSDIR%%/html/string-processing.html
 %%DOCSDIR%%/html/style-reference.html
-%%DOCSDIR%%/html/style/offline.css
+%%DOCSDIR%%/html/style/narrow.css
+%%DOCSDIR%%/html/style/style.css
+%%DOCSDIR%%/html/style/style_ie6.css
+%%DOCSDIR%%/html/style/style_ie7.css
+%%DOCSDIR%%/html/style/style_ie8.css
+%%DOCSDIR%%/html/style/superfish.css
 %%DOCSDIR%%/html/stylesheet-customizing.html
 %%DOCSDIR%%/html/stylesheet-designer.html
 %%DOCSDIR%%/html/stylesheet-examples.html