The KDE on FreeBSD team presents Qt 4.8.6.

This is a minor bugfix release that fortunately contains quite a few patches
that we have upstreamed in the past months.

See http://blog.qt.digia.com/blog/2014/04/24/qt-4-8-6-released/ for a
summary of changes, and
http://download.qt-project.org/official_releases/qt/4.8/4.8.6/changes-4.8.6
for a detailed list of changes.

This patch contains commits by me, makc@ and Schaich Alonso.

PR:		ports/189213

5 files changed, 21 insertions, 15 deletions

diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index c1be84253418..c788fdfac87f 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -229,8 +229,8 @@
 %%DOCSDIR%%/html/declarative-cppextensions-networkaccessmanagerfactory-networkaccessmanagerfactory-qrc.html
 %%DOCSDIR%%/html/declarative-cppextensions-networkaccessmanagerfactory-qml-networkaccessmanagerfactory-view-qml.html
 %%DOCSDIR%%/html/declarative-cppextensions-networkaccessmanagerfactory.html
-%%DOCSDIR%%/html/declarative-cppextensions-plugins-com-nokia-timeexample-clock-qml.html
-%%DOCSDIR%%/html/declarative-cppextensions-plugins-com-nokia-timeexample-qmldir.html
+%%DOCSDIR%%/html/declarative-cppextensions-plugins-org-qtproject-timeexample-clock-qml.html
+%%DOCSDIR%%/html/declarative-cppextensions-plugins-org-qtproject-timeexample-qmldir.html
 %%DOCSDIR%%/html/declarative-cppextensions-plugins-plugin-cpp.html
 %%DOCSDIR%%/html/declarative-cppextensions-plugins-plugins-pro.html
 %%DOCSDIR%%/html/declarative-cppextensions-plugins-plugins-qml.html
diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist
index 09b0ecfda907..5da777507796 100644
--- a/misc/qt4-l10n/pkg-plist
+++ b/misc/qt4-l10n/pkg-plist
@@ -1,6 +1,7 @@
 %%QT_L10NDIR%%/assistant_cs.qm
 %%QT_L10NDIR%%/assistant_da.qm
 %%QT_L10NDIR%%/assistant_de.qm
+%%QT_L10NDIR%%/assistant_eu.qm
 %%QT_L10NDIR%%/assistant_fr.qm
 %%QT_L10NDIR%%/assistant_hu.qm
 %%QT_L10NDIR%%/assistant_ja.qm
@@ -25,6 +26,7 @@
 %%QT_L10NDIR%%/designer_zh_TW.qm
 %%QT_L10NDIR%%/linguist_cs.qm
 %%QT_L10NDIR%%/linguist_de.qm
+%%QT_L10NDIR%%/linguist_eu.qm
 %%QT_L10NDIR%%/linguist_fr.qm
 %%QT_L10NDIR%%/linguist_hu.qm
 %%QT_L10NDIR%%/linguist_ja.qm
@@ -40,6 +42,7 @@
 %%QT_L10NDIR%%/qt_da.qm
 %%QT_L10NDIR%%/qt_de.qm
 %%QT_L10NDIR%%/qt_es.qm
+%%QT_L10NDIR%%/qt_eu.qm
 %%QT_L10NDIR%%/qt_fa.qm
 %%QT_L10NDIR%%/qt_fr.qm
 %%QT_L10NDIR%%/qt_gl.qm
@@ -47,6 +50,7 @@
 %%QT_L10NDIR%%/qt_help_cs.qm
 %%QT_L10NDIR%%/qt_help_da.qm
 %%QT_L10NDIR%%/qt_help_de.qm
+%%QT_L10NDIR%%/qt_help_eu.qm
 %%QT_L10NDIR%%/qt_help_fr.qm
 %%QT_L10NDIR%%/qt_help_gl.qm
 %%QT_L10NDIR%%/qt_help_hu.qm
@@ -71,6 +75,8 @@
 %%QT_L10NDIR%%/qt_uk.qm
 %%QT_L10NDIR%%/qt_zh_CN.qm
 %%QT_L10NDIR%%/qt_zh_TW.qm
+%%QT_L10NDIR%%/qtconfig_eu.qm
+%%QT_L10NDIR%%/qtconfig_he.qm
 %%QT_L10NDIR%%/qtconfig_hu.qm
 %%QT_L10NDIR%%/qtconfig_ja.qm
 %%QT_L10NDIR%%/qtconfig_ko.qm
@@ -80,6 +86,8 @@
 %%QT_L10NDIR%%/qtconfig_uk.qm
 %%QT_L10NDIR%%/qtconfig_zh_CN.qm
 %%QT_L10NDIR%%/qtconfig_zh_TW.qm
+%%QT_L10NDIR%%/qtscript_eu.qm
+%%QT_L10NDIR%%/qvfb_eu.qm
 %%QT_L10NDIR%%/qvfb_hu.qm
 %%QT_L10NDIR%%/qvfb_ja.qm
 %%QT_L10NDIR%%/qvfb_ko.qm
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index a3ae6b248eb4..9341ba0cc61c 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	qtconfig
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index c2ffa15f705a..b7cb781152b0 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	qtdemo
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index b42ab42807c1..c80f65efa92a 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -1032,16 +1032,16 @@
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/Makefile
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/README
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/libqmlqtimeexampleplugin.so
-%%DEBUG%%%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/libqmlqtimeexampleplugin.so.debug
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
-%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/libqmlqwidgetsplugin.so
 %%DEBUG%%%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/libqmlqwidgetsplugin.so.debug
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/Clock.qml
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/libqmlqtimeexampleplugin.so
+%%DEBUG%%%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/libqmlqtimeexampleplugin.so.debug
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png
+%%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/plugin.cpp
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/plugins.pro
 %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/plugins.qml
@@ -4831,9 +4831,9 @@
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/qgraphicslayouts/layoutitem
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/qgraphicslayouts
-@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia/TimeExample
-@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com/nokia
-@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/com
+@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample
+@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org/qtproject
+@dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins/org
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/plugins
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory
 @dirrm %%QT_EXAMPLEDIR%%/examples/declarative/cppextensions/networkaccessmanagerfactory/qml