Update to 4.2.3

40 files changed, 147 insertions, 120 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index a1ca16acd9dd..93c6321fa800 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	4.2.2
-PORTREVISION=	2
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMESUFFIX=	-qt4
@@ -34,7 +34,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	-fast -no-exceptions \
 		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
 		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -system-nas-sound -prefix ${PREFIX} -no-sm \
+		-system-zlib -system-nas-sound -prefix ${PREFIX}  \
 		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
 		-no-nas-sound -confirm-license
 
diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/dbus-qt4/distinfo
+++ b/devel/dbus-qt4/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/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index 7dd82f8512d4..d1b337562ef0 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -38,6 +38,6 @@ lib/libQtDBus.prl
 lib/libQtDBus.so
 lib/libQtDBus.so.4
 lib/libQtDBus.so.4.2
-lib/libQtDBus.so.4.2.2
-lib/libQtDBus.so.4.2.2.debug
+lib/libQtDBus.so.4.2.3
+lib/libQtDBus.so.4.2.3.debug
 @dirrm include/QtDBus
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 2e0fc97f24d3..46496d9d918d 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmake
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qmake4/distinfo
+++ b/devel/qmake4/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/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index fb323395a31c..2d6191f82950 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	assistant
-PORTVERSION=	4.2.2
-PORTREVISION=	2
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -28,7 +28,7 @@ LIB_DEPENDS=	Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
 		QtNetwork:${PORTSDIR}/net/qt4-network \
 		QtSql:${PORTSDIR}/databases/qt4-sql \
 		QtXml:${PORTSDIR}/textproc/qt4-xml
-RUN_DEPENDS=	qt4-doc>=4.2.2:${PORTSDIR}/misc/qt4-doc
+RUN_DEPENDS=	qt4-doc>=4.2.3:${PORTSDIR}/misc/qt4-doc
 
 CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
@@ -39,7 +39,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 -no-separate-debug-info
 
diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-assistant/distinfo
+++ b/devel/qt4-assistant/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/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 5a69dc86bedb..91592cfd02a9 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	corelib
-PORTVERSION=	4.2.2
-PORTREVISION=	2
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -32,7 +32,7 @@ USE_LDCONFIG=	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 -no-sm -confirm-license \
+		-system-zlib -no-nas-sound  -confirm-license \
 		-prefix ${PREFIX} \
 		-docdir ${PREFIX}/share/doc/qt4 \
 		-headerdir ${PREFIX}/include \
diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-corelib/distinfo
+++ b/devel/qt4-corelib/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/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index 0c22090f0250..26851fb59651 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -406,8 +406,8 @@ lib/libQtCore.prl
 lib/libQtCore.so
 lib/libQtCore.so.4
 lib/libQtCore.so.4.2
-lib/libQtCore.so.4.2.2
-lib/libQtCore.so.4.2.2.debug
+lib/libQtCore.so.4.2.3
+lib/libQtCore.so.4.2.3.debug
 lib/plugins/.keep_me
 libdata/pkgconfig/QtCore.pc
 @dirrm lib/plugins
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index f4d6937d896b..e2abe8225553 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	designer
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -40,7 +40,7 @@ USE_LDCONFIG=	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/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-designer/distinfo
+++ b/devel/qt4-designer/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/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index 6394ea063adc..0ef0b8dec4d0 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -78,14 +78,14 @@ lib/libQtDesigner.prl
 lib/libQtDesigner.so
 lib/libQtDesigner.so.4
 lib/libQtDesigner.so.4.2
-lib/libQtDesigner.so.4.2.2
-lib/libQtDesigner.so.4.2.2.debug
+lib/libQtDesigner.so.4.2.3
+lib/libQtDesigner.so.4.2.3.debug
 lib/libQtDesignerComponents.prl
 lib/libQtDesignerComponents.so
 lib/libQtDesignerComponents.so.4
 lib/libQtDesignerComponents.so.4.2
-lib/libQtDesignerComponents.so.4.2.2
-lib/libQtDesignerComponents.so.4.2.2.debug
+lib/libQtDesignerComponents.so.4.2.3
+lib/libQtDesignerComponents.so.4.2.3.debug
 lib/libQtUiTools.a
 lib/libQtUiTools.prl
 lib/plugins/libqt3supportwidgets.so
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 5728227b976b..54ac7e7a6b49 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	libQtAssistantClient
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -35,7 +35,7 @@ USE_LDCONFIG=	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/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-libqtassistantclient/distinfo
+++ b/devel/qt4-libqtassistantclient/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/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist
index e7a6a0b4284b..db1d832e3410 100644
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@@ -6,6 +6,6 @@ lib/libQtAssistantClient.prl
 lib/libQtAssistantClient.so
 lib/libQtAssistantClient.so.4
 lib/libQtAssistantClient.so.4.2
-lib/libQtAssistantClient.so.4.2.2
-lib/libQtAssistantClient.so.4.2.2.debug
+lib/libQtAssistantClient.so.4.2.3
+lib/libQtAssistantClient.so.4.2.3.debug
 @dirrm include/QtAssistant
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index f9e4261ea1f2..997031e68a79 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	linguist
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -37,7 +37,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/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-linguist/distinfo
+++ b/devel/qt4-linguist/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/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 16c9570ffba1..1de073114619 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	moc
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-moc/distinfo
+++ b/devel/qt4-moc/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/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index 952187463966..5d15ca64302f 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	porting
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-porting/distinfo
+++ b/devel/qt4-porting/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/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index da64ca3b4d76..b97dea4d9c69 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qt3support
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -37,7 +37,7 @@ USE_XLIB=	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/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-qt3support/distinfo
+++ b/devel/qt4-qt3support/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/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index 2d2582cf22f0..b1dbe4283419 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -406,7 +406,7 @@ lib/libQt3Support.prl
 lib/libQt3Support.so
 lib/libQt3Support.so.4
 lib/libQt3Support.so.4.2
-lib/libQt3Support.so.4.2.2
-lib/libQt3Support.so.4.2.2.debug
+lib/libQt3Support.so.4.2.3
+lib/libQt3Support.so.4.2.3.debug
 libdata/pkgconfig/Qt3Support.pc
 @dirrm include/Qt3Support
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index 8d4b6d1eaa87..a9f7deb12318 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qtestlib
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-qtestlib/distinfo
+++ b/devel/qt4-qtestlib/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/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist
index c2d55bf78241..6c376ae53107 100644
--- a/devel/qt4-qtestlib/pkg-plist
+++ b/devel/qt4-qtestlib/pkg-plist
@@ -33,6 +33,6 @@ lib/libQtTest.prl
 lib/libQtTest.so
 lib/libQtTest.so.4
 lib/libQtTest.so.4.2
-lib/libQtTest.so.4.2.2
-lib/libQtTest.so.4.2.2.debug
+lib/libQtTest.so.4.2.3
+lib/libQtTest.so.4.2.3.debug
 @dirrm include/QtTest
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index ac24d0a7f6dc..afde843a08d2 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qvfb
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -35,7 +35,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/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-qvfb/distinfo
+++ b/devel/qt4-qvfb/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/devel/qt4-qvfb/files/patch-qvfbmmap.cpp b/devel/qt4-qvfb/files/patch-qvfbmmap.cpp
deleted file mode 100644
index 79e482cac39f..000000000000
--- a/devel/qt4-qvfb/files/patch-qvfbmmap.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- qvfbmmap.cpp.orig	Sun Jan 14 15:51:46 2007
-+++ qvfbmmap.cpp	Sun Jan 14 15:51:59 2007
-@@ -34,7 +34,7 @@
- #include <sys/stat.h>
- #include <sys/sem.h>
- #include <sys/mman.h>
--#include <asm/page.h>
-+#include <machine/param.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <math.h>
diff --git a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp b/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
index a4ca77ab5bc9..364c289a41f5 100644
--- a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
+++ b/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp
@@ -1,5 +1,5 @@
---- qwssignalhandler.cpp.orig	Sun Jan 14 15:53:45 2007
-+++ qwssignalhandler.cpp	Sun Jan 14 15:53:52 2007
+--- qwssignalhandler.cpp.orig	Thu Mar 22 16:17:51 2007
++++ qwssignalhandler.cpp	Thu Mar 22 16:18:10 2007
 @@ -27,13 +27,6 @@
  #include <sys/ipc.h>
  #include <sys/sem.h>
@@ -11,6 +11,6 @@
 -    struct seminfo  *__buf;
 -};
 -
- QWSSignalHandler::QWSSignalHandler()
+ class QWSSignalHandlerPrivate
  {
-     const int signums[] = { SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, SIGFPE,
+ public:
diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile
index 76e2ccac11f3..555bd5655b41 100644
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rcc
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-rcc/distinfo
+++ b/devel/qt4-rcc/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/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile
index 7e4a457b1f29..c1ecff6499d3 100644
--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	uic
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-uic/distinfo
+++ b/devel/qt4-uic/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/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index 069881b5bf6b..2d05d98f01bd 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	uic3
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.2.3
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -35,7 +35,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/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo
index 5f51cf7b1256..48b91bd5d5e3 100644
--- a/devel/qt4-uic3/distinfo
+++ b/devel/qt4-uic3/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/devel/qt4/Makefile b/devel/qt4/Makefile
index 6f14375c9c4b..097c7d7f58d4 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qt4
-PORTVERSION=	4.2.2
+PORTVERSION=	4.2.3
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure
index bc33fab77af9..34921f55b6f0 100644
--- a/devel/qt4/files/configure
+++ b/devel/qt4/files/configure
@@ -2,7 +2,7 @@
 #
 # Configures to build the Qt library
 #
-# Copyright (C) 1999-2006 Trolltech ASA. All rights reserved.
+# Copyright (C) 1999-2007 Trolltech ASA. All rights reserved.
 #
 # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -535,6 +535,7 @@ CFG_USER_BUILD_KEY=
 CFG_ACCESSIBILITY=auto
 CFG_QT3SUPPORT=yes
 CFG_ENDIAN=auto
+CFG_DOUBLEFORMAT=auto
 CFG_IWMMXT=no
 CFG_GETADDRINFO=auto
 CFG_IPV6IFNAME=auto
@@ -1948,7 +1949,7 @@ else
         ;;
     SunOS:5*:*)
         case "$UNAME_MACHINE" in
-	sun4u*)
+	sun4u*|sun4v*)
             if [ "$OPT_VERBOSE" = "yes" ]; then
                 echo "    Sun SPARC (sparc)"
             fi
@@ -3165,9 +3166,9 @@ setBootstrapVariable()
 }
 END {
     if (length(var) > 0) {
-        printf "%s = ", var
+        printf "%s =", var
         for (i = 1; i <= NR; ++i)
-            printf "$(%s_%s) ", var, i
+            printf " $(%s_%s)", var, i
             printf "\n"
     }
 }' >> "$mkfile"
@@ -3891,14 +3892,11 @@ if [ "$PLATFORM_X11" = "yes" ]; then
         fi
     fi
 
-fi # X11
-
-if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     # auto-detect Glib support
     if [ "$CFG_GLIB" != "no" ]; then
         if "$WHICH" pkg-config >/dev/null 2>&1; then
-            QT_CFLAGS_GLIB=`pkg-config --cflags glib-2.0`
-            QT_LIBS_GLIB=`pkg-config --libs glib-2.0`
+            QT_CFLAGS_GLIB=`pkg-config --cflags glib-2.0 gthread-2.0`
+            QT_LIBS_GLIB=`pkg-config --libs glib-2.0 gthread-2.0`
         fi
         if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
             CFG_GLIB=yes
@@ -3916,7 +3914,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
             fi
         fi
     fi
-fi # X11/QWS
+fi # X11
 
 # QWS
 if [ "$PLATFORM_QWS" = "yes" ]; then
@@ -3968,6 +3966,35 @@ if [ "$CFG_ENDIAN" = "auto" ]; then
     fi
 fi
 
+if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
+    if [ "$PLATFORM_QWS" != "yes" ]; then
+        CFG_DOUBLEFORMAT=normal
+    else
+        "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
+	F="$?"
+        if [ "$F" -eq 10 ] && [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 11 ] && [ "$CFG_ENDIAN" = "Q_BIG_ENDIAN" ]; then
+            CFG_DOUBLEFORMAT=normal
+        elif [ "$F" -eq 10 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE"
+        elif [ "$F" -eq 11 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG"
+        elif [ "$F" -eq 12 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED"
+        elif [ "$F" -eq 13 ]; then
+            CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED"
+        else
+            echo
+	    echo "The system floating point format could not be detected."
+	    echo "This may cause data to be generated in a wrong format"
+	    echo "Turn on verbose messaging (-v) to see the final report."
+	    # we do not fail on this since this is a new test, and if it fails, 
+	    # the old behavior should be correct in most cases
+            CFG_DOUBLEFORMAT=normal
+        fi
+    fi
+fi
 if [ "$CFG_STL" != "no" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
         CFG_STL=yes
@@ -4581,6 +4608,17 @@ else
     echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new"
 fi
 
+if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then
+    cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF
+/* Non-IEEE double format */
+#define Q_DOUBLE_LITTLE "01234567"
+#define Q_DOUBLE_BIG "76543210"
+#define Q_DOUBLE_LITTLE_SWAPPED "45670123"
+#define Q_DOUBLE_BIG_SWAPPED "32107654"
+#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT
+EOF
+fi 
+
 echo '/* Machine Architecture */' >>"$outpath/src/corelib/global/qconfig.h.new"
 ARCH_STR=`echo $ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 echo "#define QT_ARCH_${ARCH_STR}" >>"$outpath/src/corelib/global/qconfig.h.new"