Update to 4.2.3

7 files changed, 28 insertions, 17 deletions

diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 3049e8f6af03..1b098555112b 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	doc
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX= 	qt4-
diff --git a/misc/qt4-doc/distinfo b/misc/qt4-doc/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/misc/qt4-doc/distinfo
+++ b/misc/qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 19f6374fe7924e33775cb87ee02669cb
-SHA256 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
-SIZE (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 37636491
+MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
+SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
+SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 96569b7b29fb..316c7f435cf4 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -54,6 +54,7 @@
 %%DOCSDIR%%/html/assistant-simpletextviewer-mainwindow-h.html
 %%DOCSDIR%%/html/assistant-simpletextviewer.html
 %%DOCSDIR%%/html/assistant.dcf
+%%DOCSDIR%%/html/atomic-operations.html
 %%DOCSDIR%%/html/basic.html
 %%DOCSDIR%%/html/bughowto.html
 %%DOCSDIR%%/html/buildsystem.html
@@ -362,6 +363,7 @@
 %%DOCSDIR%%/html/images/2dpainting-example.png
 %%DOCSDIR%%/html/images/abstract-connections.png
 %%DOCSDIR%%/html/images/affine-demo.png
+%%DOCSDIR%%/html/images/alphachannelimage.png
 %%DOCSDIR%%/html/images/alphafill.png
 %%DOCSDIR%%/html/images/analogclock-example.png
 %%DOCSDIR%%/html/images/analogclock-viewport.png
@@ -449,6 +451,7 @@
 %%DOCSDIR%%/html/images/cleanlooks-lineedit.png
 %%DOCSDIR%%/html/images/cleanlooks-listview.png
 %%DOCSDIR%%/html/images/cleanlooks-progressbar.png
+%%DOCSDIR%%/html/images/cleanlooks-pushbutton-menu.png
 %%DOCSDIR%%/html/images/cleanlooks-pushbutton.png
 %%DOCSDIR%%/html/images/cleanlooks-radiobutton.png
 %%DOCSDIR%%/html/images/cleanlooks-slider.png
@@ -605,6 +608,7 @@
 %%DOCSDIR%%/html/images/graphicsview-shapes.png
 %%DOCSDIR%%/html/images/graphicsview-text.png
 %%DOCSDIR%%/html/images/graphicsview-view.png
+%%DOCSDIR%%/html/images/graphicsview-zorder.png
 %%DOCSDIR%%/html/images/gridlayout.png
 %%DOCSDIR%%/html/images/groupbox-example.png
 %%DOCSDIR%%/html/images/hellogl-example.png
@@ -706,10 +710,10 @@
 %%DOCSDIR%%/html/images/macintosh-toolbox.png
 %%DOCSDIR%%/html/images/macintosh-toolbutton.png
 %%DOCSDIR%%/html/images/macintosh-treeview.png
-%%DOCSDIR%%/html/images/mainwindow-contextmenu.png
 %%DOCSDIR%%/html/images/mainwindow-demo.png
 %%DOCSDIR%%/html/images/mainwindow-docks-example.png
 %%DOCSDIR%%/html/images/mainwindow-docks.png
+%%DOCSDIR%%/html/images/mainwindowlayout.png
 %%DOCSDIR%%/html/images/mandelbrot.png
 %%DOCSDIR%%/html/images/mandelbrot_scroll1.png
 %%DOCSDIR%%/html/images/mandelbrot_scroll2.png
@@ -806,6 +810,7 @@
 %%DOCSDIR%%/html/images/plastique-printdialog.png
 %%DOCSDIR%%/html/images/plastique-progressbar.png
 %%DOCSDIR%%/html/images/plastique-progressdialog.png
+%%DOCSDIR%%/html/images/plastique-pushbutton-menu.png
 %%DOCSDIR%%/html/images/plastique-pushbutton.png
 %%DOCSDIR%%/html/images/plastique-radiobutton.png
 %%DOCSDIR%%/html/images/plastique-sizegrip.png
@@ -1069,6 +1074,7 @@
 %%DOCSDIR%%/html/images/svgviewer-example.png
 %%DOCSDIR%%/html/images/syntaxhighlighter-example.png
 %%DOCSDIR%%/html/images/system-tray.png
+%%DOCSDIR%%/html/images/systemtray-editor.png
 %%DOCSDIR%%/html/images/systemtray-example.png
 %%DOCSDIR%%/html/images/t1.png
 %%DOCSDIR%%/html/images/t10.png
@@ -2297,8 +2303,12 @@
 %%DOCSDIR%%/html/qgraphicsscene.html
 %%DOCSDIR%%/html/qgraphicsscenecontextmenuevent-members.html
 %%DOCSDIR%%/html/qgraphicsscenecontextmenuevent.html
+%%DOCSDIR%%/html/qgraphicsscenedragdropevent-members.html
+%%DOCSDIR%%/html/qgraphicsscenedragdropevent.html
 %%DOCSDIR%%/html/qgraphicssceneevent-members.html
 %%DOCSDIR%%/html/qgraphicssceneevent.html
+%%DOCSDIR%%/html/qgraphicsscenehelpevent-members.html
+%%DOCSDIR%%/html/qgraphicsscenehelpevent.html
 %%DOCSDIR%%/html/qgraphicsscenehoverevent-members.html
 %%DOCSDIR%%/html/qgraphicsscenehoverevent.html
 %%DOCSDIR%%/html/qgraphicsscenemouseevent-members.html
@@ -3299,6 +3309,7 @@
 %%DOCSDIR%%/html/qxmlsimplereader.html
 %%DOCSDIR%%/html/rcc.html
 %%DOCSDIR%%/html/resources.html
+%%DOCSDIR%%/html/richtext-advanced-processing.html
 %%DOCSDIR%%/html/richtext-calendar-main-cpp.html
 %%DOCSDIR%%/html/richtext-calendar-mainwindow-cpp.html
 %%DOCSDIR%%/html/richtext-calendar-mainwindow-h.html
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index e825dee4b981..ae84f39916d2 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	qtconfig
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -33,7 +33,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
 		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
+		-system-zlib -no-nas-sound -prefix ${PREFIX}  \
 		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
 		-confirm-license
 
diff --git a/misc/qt4-qtconfig/distinfo b/misc/qt4-qtconfig/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/misc/qt4-qtconfig/distinfo
+++ b/misc/qt4-qtconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 19f6374fe7924e33775cb87ee02669cb
-SHA256 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
-SIZE (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 37636491
+MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
+SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
+SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index 68db087636b3..b9232ad885cb 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qtdemo
-PORTVERSION=	4.2.2
-PORTREVISION=	3
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -33,7 +33,7 @@ LIB_DEPENDS=	QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
 		QtSvg:${PORTSDIR}/graphics/qt4-svg \
 		QtTest:${PORTSDIR}/devel/qt4-qtestlib \
 		QtXml:${PORTSDIR}/textproc/qt4-xml
-RUN_DEPENDS=	qt4-imageformats>=4.2.2:${PORTSDIR}/graphics/qt4-imageformats
+RUN_DEPENDS=	qt4-imageformats>=4.2.3:${PORTSDIR}/graphics/qt4-imageformats
 
 CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
@@ -44,7 +44,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
 		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
+		-system-zlib -no-nas-sound -prefix ${PREFIX}  \
 		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
 		-confirm-license
 
diff --git a/misc/qt4-qtdemo/distinfo b/misc/qt4-qtdemo/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/misc/qt4-qtdemo/distinfo
+++ b/misc/qt4-qtdemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 19f6374fe7924e33775cb87ee02669cb
-SHA256 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
-SIZE (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 37636491
+MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
+SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
+SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710