7 files changed, 66 insertions, 37 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
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index b89658585a66..0e57ab9a581e 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	qt4-l10n
-# Date created:		2008-12-13
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	l10n
 DISTVERSION=	${QT4_VERSION}
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index 419d9d5a0ea4..eb0b30a5a24a 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -1,9 +1,5 @@
-# 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=	qtconfig
 DISTVERSION=	${QT4_VERSION}
@@ -13,10 +9,13 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical configuration utility
 
-OPTIONS=	PHONON "Add support for Phonon (implies GStreamer)" on
+OPTIONS_DEFINE=	PHONON
+OPTIONS_DEFAULT=PHONON
 
-USE_QT4=	qmake_build moc_build rcc_build uic_build qt3support corelib \
-		gui sql xml
+PHONON_DESC=	Multimedia via Phonon (implies GStreamer)
+
+USE_QT4=	qmake_build moc_build rcc_build uic_build \
+		dbus gui xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -27,6 +26,10 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
+DESKTOP_ENTRIES="Qt Configuration" "${COMMENT}" \
+		"${PREFIX}/share/pixmaps/qtconfig-qt4.png" \
+		"${PREFIX}/bin/qtconfig-qt4" "Settings;Qt;" true
+
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
 		src/openvg src/s60installs src/s60main src/script \
@@ -41,11 +44,11 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PHONON)
+.if ${PORT_OPTIONS:MPHONON}
 USE_QT4+=	phonon phonon-gst
 USE_GSTREAMER=	yes
 .else
-CONFIGURE_ARGS+=	-no-phonon -no-gstreamer
+CONFIGURE_ARGS+=-no-phonon -no-gstreamer
 .endif
 
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
@@ -63,4 +66,8 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
+post-install:
+	${INSTALL_DATA} ${BUILD_WRKSRC}/images/appicon.png \
+		${PREFIX}/share/pixmaps/qtconfig-qt4.png
+
 .include <bsd.port.mk>
diff --git a/misc/qt4-qtconfig/pkg-plist b/misc/qt4-qtconfig/pkg-plist
index 4779a9bc5a0e..c47b7dd39e55 100644
--- a/misc/qt4-qtconfig/pkg-plist
+++ b/misc/qt4-qtconfig/pkg-plist
@@ -1,2 +1,3 @@
 bin/qtconfig-qt4
 %%DEBUG%%bin/qtconfig-qt4.debug
+share/pixmaps/qtconfig-qt4.png
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index dc4903ab52cc..6b75c6550d0c 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/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=	qtdemo
 DISTVERSION=	${QT4_VERSION}
@@ -29,6 +24,11 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
+# qtlogo.png is installed by qt4-gui
+DESKTOP_ENTRIES="Qt Examples and Demos" "${COMMENT}" \
+		"${LOCALBASE}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/bin/qtdemo" "Development;Qt;" true
+
 DO_NOT_EXTRACT=	doc mkspecs qmake translations \
 		src/activeqt src/openvg src/s60installs src/s60main src/tools \
 		src/winmain src/3rdparty/clucene src/3rdparty/freetype \
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index 566add546632..e5bcaaaa1afb 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -1878,6 +1878,9 @@ share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.pr
 share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
 share/examples/qt4/examples/declarative/ui-components/slideswitch/slideswitch.svg
 share/examples/qt4/examples/declarative/ui-components/spinner/main.cpp
+share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/Spinner.qml
+share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-bg.png
+share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-select.png
 share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/main.qml
 share/examples/qt4/examples/declarative/ui-components/spinner/spinner
 %%DEBUG%%share/examples/qt4/examples/declarative/ui-components/spinner/spinner.debug
@@ -2731,6 +2734,17 @@ share/examples/qt4/examples/mainwindows/application/images/save.png
 share/examples/qt4/examples/mainwindows/application/main.cpp
 share/examples/qt4/examples/mainwindows/application/mainwindow.cpp
 share/examples/qt4/examples/mainwindows/application/mainwindow.h
+share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets
+%%DEBUG%%share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.debug
+share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.pro
+share/examples/qt4/examples/mainwindows/dockwidgets/dockwidgets.qrc
+share/examples/qt4/examples/mainwindows/dockwidgets/images/new.png
+share/examples/qt4/examples/mainwindows/dockwidgets/images/print.png
+share/examples/qt4/examples/mainwindows/dockwidgets/images/save.png
+share/examples/qt4/examples/mainwindows/dockwidgets/images/undo.png
+share/examples/qt4/examples/mainwindows/dockwidgets/main.cpp
+share/examples/qt4/examples/mainwindows/dockwidgets/mainwindow.cpp
+share/examples/qt4/examples/mainwindows/dockwidgets/mainwindow.h
 share/examples/qt4/examples/mainwindows/mainwindows.pro
 share/examples/qt4/examples/mainwindows/mdi/images/copy.png
 share/examples/qt4/examples/mainwindows/mdi/images/cut.png
@@ -4477,6 +4491,8 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
 @dirrm share/examples/qt4/examples/mainwindows/menus
 @dirrm share/examples/qt4/examples/mainwindows/mdi/images
 @dirrm share/examples/qt4/examples/mainwindows/mdi
+@dirrm share/examples/qt4/examples/mainwindows/dockwidgets/images
+@dirrm share/examples/qt4/examples/mainwindows/dockwidgets
 @dirrm share/examples/qt4/examples/mainwindows/application/images
 @dirrm share/examples/qt4/examples/mainwindows/application
 @dirrm share/examples/qt4/examples/mainwindows
@@ -4594,6 +4610,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
 @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget/qml/tabwidget
 @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget/qml
 @dirrm share/examples/qt4/examples/declarative/ui-components/tabwidget
+@dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner/content
 @dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml/spinner
 @dirrm share/examples/qt4/examples/declarative/ui-components/spinner/qml
 @dirrm share/examples/qt4/examples/declarative/ui-components/spinner