author: Max Brazhnikov <makc@FreeBSD.org> 2009-01-13 20:34:49 +0000
committer: Max Brazhnikov <makc@FreeBSD.org> 2009-01-13 20:34:49 +0000
commit: 5c3471f6f048a239edecf23ee0c46e414c53d9a5 (patch)
tree: e37eb7a53d25ad3f605dca4ea6f5220114e75f65 /devel
parent: 57655bc6e2e1296e220dfc40de8209c5c64a8e4e (diff)
download: ports-5c3471f6f048a239edecf23ee0c46e414c53d9a5.tar.gz
ports-5c3471f6f048a239edecf23ee0c46e414c53d9a5.zip
38 files changed, 232 insertions, 250 deletions
diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/dbus-qt4/distinfo
+++ b/devel/dbus-qt4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index 42bc8d3cd8ad..10c9fea69c2c 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -54,8 +54,8 @@ lib/qt4/libQtDBus.prl
 lib/qt4/libQtDBus.so
 lib/qt4/libQtDBus.so.4
 lib/qt4/libQtDBus.so.4.4
-lib/qt4/libQtDBus.so.4.4.1
-%%DEBUG%%lib/qt4/libQtDBus.so.4.4.1.debug
+lib/qt4/libQtDBus.so.4.4.3
+%%DEBUG%%lib/qt4/libQtDBus.so.4.4.3.debug
 libdata/pkgconfig/QtDBus.pc
 @dirrm include/qt4/QtDBus
 @dirrmtry include/qt4/Qt
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 8b708e7baa4e..cb33da0d058e 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -51,7 +51,12 @@ post-patch:
 		-e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|uic|uic-qt4|' \
 		-e 's|moc|moc-qt4|' \
-		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf
+		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \
+		${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf \
+		${WRKSRC}/../mkspecs/freebsd-g++40/qmake.conf \
+		${WRKSRC}/../mkspecs/freebsd-icc/qmake.conf
+	@${REINPLACE_CMD} -e 's|include(../common/c++|include(../common/g++.conf)|' \
+		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf 
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 
 do-configure:
diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qmake4/distinfo
+++ b/devel/qmake4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index df6f5a72677f..a205bf82feb9 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -117,6 +117,8 @@ share/qt4/mkspecs/hpuxi-acc-32/qmake.conf
 share/qt4/mkspecs/hpuxi-acc-32/qplatformdefs.h
 share/qt4/mkspecs/hpuxi-acc-64/qmake.conf
 share/qt4/mkspecs/hpuxi-acc-64/qplatformdefs.h
+share/qt4/mkspecs/hpuxi-g++-64/qmake.conf
+share/qt4/mkspecs/hpuxi-g++-64/qplatformdefs.h
 share/qt4/mkspecs/hurd-g++/qmake.conf
 share/qt4/mkspecs/hurd-g++/qplatformdefs.h
 share/qt4/mkspecs/irix-cc-64/qmake.conf
@@ -228,8 +230,6 @@ share/qt4/mkspecs/unixware-cc/qmake.conf
 share/qt4/mkspecs/unixware-cc/qplatformdefs.h
 share/qt4/mkspecs/unixware-g++/qmake.conf
 share/qt4/mkspecs/unixware-g++/qplatformdefs.h
-share/qt4/mkspecs/win32-borland/qmake.conf
-share/qt4/mkspecs/win32-borland/qplatformdefs.h
 share/qt4/mkspecs/win32-g++/qmake.conf
 share/qt4/mkspecs/win32-g++/qplatformdefs.h
 share/qt4/mkspecs/win32-msvc.net/qmake.conf
@@ -311,7 +311,6 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/win32-msvc.net
 @dirrm share/qt4/mkspecs/win32-msvc
 @dirrm share/qt4/mkspecs/win32-g++
-@dirrm share/qt4/mkspecs/win32-borland
 @dirrm share/qt4/mkspecs/unixware-g++
 @dirrm share/qt4/mkspecs/unixware-cc
 @dirrm share/qt4/mkspecs/tru64-g++
@@ -365,6 +364,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/irix-cc-64
 @dirrm share/qt4/mkspecs/irix-cc
 @dirrm share/qt4/mkspecs/hurd-g++
+@dirrm share/qt4/mkspecs/hpuxi-g++-64
 @dirrm share/qt4/mkspecs/hpuxi-acc-64
 @dirrm share/qt4/mkspecs/hpuxi-acc-32
 @dirrm share/qt4/mkspecs/hpux-g++-64
diff --git a/devel/qt4-assistant-adp/distinfo b/devel/qt4-assistant-adp/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-assistant-adp/distinfo
+++ b/devel/qt4-assistant-adp/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-assistant/distinfo
+++ b/devel/qt4-assistant/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index fbe033da3d51..417f4f220adf 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -28,7 +28,6 @@ QT_DIST=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
 
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-corelib/distinfo
+++ b/devel/qt4-corelib/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index afa4f19cdc63..6d0f8697965d 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -504,8 +504,8 @@ lib/qt4/libQtCore.prl
 lib/qt4/libQtCore.so
 lib/qt4/libQtCore.so.4
 lib/qt4/libQtCore.so.4.4
-%%DEBUG%%lib/qt4/libQtCore.so.4.4.1.debug
-lib/qt4/libQtCore.so.4.4.1
+%%DEBUG%%lib/qt4/libQtCore.so.4.4.3.debug
+lib/qt4/libQtCore.so.4.4.3
 lib/qt4/plugins/.keep_me
 libdata/pkgconfig/QtCore.pc
 share/qt4/mkspecs/qconfig.pri
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index d6735b7c3bbf..e6b38e04e12a 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -49,21 +49,22 @@ pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \
 		${WRKSRC}/src/designer/${PORTNAME}.pro
+# fix build when previous version is installed
+	${REINPLACE_CMD} -e '/^CONFIG/s|depend_prl||' \
+		${WRKSRC}/src/components/lib/lib.pro
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
 	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
 
-post-configure:
+pre-install:
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
 		${WRKSRC}/../../lib/pkgconfig/QtUiTools.pc \
 		${WRKSRC}/../../lib/pkgconfig/QtDesigner.pc \
 		${WRKSRC}/../../lib/pkgconfig/QtDesignerComponents.pc
-
-pre-install:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/src/lib/Makefile \
 		${WRKSRC}/src/uitools/Makefile \
diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-designer/distinfo
+++ b/devel/qt4-designer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index 374e962bdb71..595394706758 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -86,14 +86,14 @@ lib/qt4/libQtDesigner.prl
 lib/qt4/libQtDesigner.so
 lib/qt4/libQtDesigner.so.4
 lib/qt4/libQtDesigner.so.4.4
-lib/qt4/libQtDesigner.so.4.4.1
-%%DEBUG%%lib/qt4/libQtDesigner.so.4.4.1.debug
+lib/qt4/libQtDesigner.so.4.4.3
+%%DEBUG%%lib/qt4/libQtDesigner.so.4.4.3.debug
 lib/qt4/libQtDesignerComponents.prl
 lib/qt4/libQtDesignerComponents.so
 lib/qt4/libQtDesignerComponents.so.4
 lib/qt4/libQtDesignerComponents.so.4.4
-lib/qt4/libQtDesignerComponents.so.4.4.1
-%%DEBUG%%lib/qt4/libQtDesignerComponents.so.4.4.1.debug
+lib/qt4/libQtDesignerComponents.so.4.4.3
+%%DEBUG%%lib/qt4/libQtDesignerComponents.so.4.4.3.debug
 lib/qt4/libQtUiTools.a
 lib/qt4/libQtUiTools.prl
 lib/qt4/plugins/designer/libqt3supportwidgets.so
diff --git a/devel/qt4-help-tools/distinfo b/devel/qt4-help-tools/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-help-tools/distinfo
+++ b/devel/qt4-help-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 82fa4e3eee76..11ee4f9c5e58 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QtHelp module provides QHelpEngine API and is used by Assistant
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib clucene gui sql xml
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib clucene gui sql xml network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -32,7 +32,7 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
-		src/dbus src/network src/opengl src/phonon \
+		src/dbus src/opengl src/phonon \
 		src/qt3support src/script src/svg src/testlib \
 		src/tools src/xmlpatterns src/3rdparty/clucene \
 		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
diff --git a/devel/qt4-help/distinfo b/devel/qt4-help/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-help/distinfo
+++ b/devel/qt4-help/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist
index a4ac2d3881e6..d239d1bef055 100644
--- a/devel/qt4-help/pkg-plist
+++ b/devel/qt4-help/pkg-plist
@@ -10,6 +10,7 @@ include/qt4/Qt/qhelpsearchresultwidget.h
 include/qt4/QtHelp/QHelpContentItem
 include/qt4/QtHelp/QHelpContentModel
 include/qt4/QtHelp/QHelpContentWidget
+include/qt4/QtHelp/QHelpGlobal
 include/qt4/QtHelp/QHelpEngine
 include/qt4/QtHelp/QHelpEngineCore
 include/qt4/QtHelp/QHelpIndexModel
@@ -32,8 +33,8 @@ lib/qt4/libQtHelp.prl
 lib/qt4/libQtHelp.so
 lib/qt4/libQtHelp.so.4
 lib/qt4/libQtHelp.so.4.4
-lib/qt4/libQtHelp.so.4.4.1
-%%DEBUG%%lib/qt4/libQtHelp.so.4.4.1.debug
+lib/qt4/libQtHelp.so.4.4.3
+%%DEBUG%%lib/qt4/libQtHelp.so.4.4.3.debug
 libdata/pkgconfig/QtHelp.pc
 @dirrm include/qt4/QtHelp
 @dirrmtry include/qt4/Qt
diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-libqtassistantclient/distinfo
+++ b/devel/qt4-libqtassistantclient/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist
index be0fb7f73230..beef7b55f9bb 100644
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@@ -6,7 +6,7 @@ lib/qt4/libQtAssistantClient.prl
 lib/qt4/libQtAssistantClient.so
 lib/qt4/libQtAssistantClient.so.4
 lib/qt4/libQtAssistantClient.so.4.4
-lib/qt4/libQtAssistantClient.so.4.4.1
-%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.4.1.debug
+lib/qt4/libQtAssistantClient.so.4.4.3
+%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.4.3.debug
 libdata/pkgconfig/QtAssistantClient.pc
 @dirrm include/qt4/QtAssistant
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 0ae577b10cef..863946643ceb 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	linguist
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -19,8 +19,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt localisation tool
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build designer moc_build rcc_build uic_build \
-		assistantclient gui network xml
+QT_COMPONENTS=	qmake_build designer_build moc_build rcc_build uic_build \
+		assistant_run gui network xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -30,25 +30,24 @@ ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
-	--exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
-	--exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \
-	--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
-	--exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
-	--exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/tools/moc' \
-	--exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic' \
-	--exclude '${DISTNAME}/src/tools/uic3' --exclude '${DISTNAME}/tools/porting' \
-	--exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb'
+
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake \
+		src/dbus src/opengl src/phonon \
+		src/qt3support src/script src/sql src/svg src/testlib \
+		src/tools src/xmlpatterns src/3rdparty/clucene \
+		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
+.for dne in ${DO_NOT_EXTRACT}
+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
+.endfor
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 PATCH_WRKSRC=${CONFIGURE_WRKSRC}
 
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-		-e 's|phrasebooks.path.*|phrasebooks.path=${PREFIX}/share/qt4/phrasebooks|g' \
-		-e 's|linguisttranslations.path.*|linguisttranslations.path=${PREFIX}/share/qt4/translations|g' \
-		-E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
+	${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
 		${WRKSRC}/lrelease/lrelease.pro ${WRKSRC}/lupdate/lupdate.pro
 	${MKDIR} ${WRKSRC}/../../mkspecs
diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-linguist/distinfo
+++ b/devel/qt4-linguist/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-makeqpf/distinfo
+++ b/devel/qt4-makeqpf/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-moc/distinfo
+++ b/devel/qt4-moc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-porting/distinfo
+++ b/devel/qt4-porting/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-qdbusviewer/distinfo
+++ b/devel/qt4-qdbusviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-qt3support/distinfo
+++ b/devel/qt4-qt3support/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index 1b7e0bc482b5..03571e2b578c 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -406,8 +406,8 @@ lib/qt4/libQt3Support.prl
 lib/qt4/libQt3Support.so
 lib/qt4/libQt3Support.so.4
 lib/qt4/libQt3Support.so.4.4
-lib/qt4/libQt3Support.so.4.4.1
-%%DEBUG%%lib/qt4/libQt3Support.so.4.4.1.debug
+lib/qt4/libQt3Support.so.4.4.3
+%%DEBUG%%lib/qt4/libQt3Support.so.4.4.3.debug
 libdata/pkgconfig/Qt3Support.pc
 @dirrm include/qt4/Qt3Support
 @dirrmtry include/qt4/Qt
diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-qtestlib/distinfo
+++ b/devel/qt4-qtestlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist
index 1ab63429a642..8ef2d46a6c74 100644
--- a/devel/qt4-qtestlib/pkg-plist
+++ b/devel/qt4-qtestlib/pkg-plist
@@ -47,8 +47,8 @@ lib/qt4/libQtTest.prl
 lib/qt4/libQtTest.so
 lib/qt4/libQtTest.so.4
 lib/qt4/libQtTest.so.4.4
-lib/qt4/libQtTest.so.4.4.1
-%%DEBUG%%lib/qt4/libQtTest.so.4.4.1.debug
+lib/qt4/libQtTest.so.4.4.3
+%%DEBUG%%lib/qt4/libQtTest.so.4.4.3.debug
 libdata/pkgconfig/QtTest.pc
 @dirrm include/qt4/QtTest
 @dirrmtry include/qt4/Qt
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index d804975bdd4b..c9af06021cdf 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qvfb
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-qvfb/distinfo
+++ b/devel/qt4-qvfb/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-rcc/distinfo
+++ b/devel/qt4-rcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-script/distinfo
+++ b/devel/qt4-script/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist
index 878bd738a0ef..4f129d024ae8 100644
--- a/devel/qt4-script/pkg-plist
+++ b/devel/qt4-script/pkg-plist
@@ -43,8 +43,8 @@ lib/qt4/libQtScript.prl
 lib/qt4/libQtScript.so
 lib/qt4/libQtScript.so.4
 lib/qt4/libQtScript.so.4.4
-lib/qt4/libQtScript.so.4.4.1
-%%DEBUG%%lib/qt4/libQtScript.so.4.4.1.debug
+lib/qt4/libQtScript.so.4.4.3
+%%DEBUG%%lib/qt4/libQtScript.so.4.4.3.debug
 libdata/pkgconfig/QtScript.pc
 @dirrm include/qt4/QtScript
 @dirrmtry include/qt4/Qt
diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-uic/distinfo
+++ b/devel/qt4-uic/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo
index 0c630f09baf6..1756af8b04d9 100644
--- a/devel/qt4-uic3/distinfo
+++ b/devel/qt4-uic3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = b09decad252b5181f300135e3122481d
-SHA256 (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-SIZE (KDE/qt-x11-opensource-src-4.4.1.tar.gz) = 108774120
+MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
+SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
+SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 4cda337a34da..b39d06fb8179 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qt4
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=0
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -33,6 +33,10 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_NLS)
+RUN_DEPENDS+=	qt4-l10n>=${QT4_VERSION}:${PORTSDIR}/misc/qt4-l10n
+.endif
+
 .if defined(WITH_TOOLS)
 QT_COMPONENTS+=	help-tools linguist makeqpf moc pixeltool \
 		porting qmake rcc uic uic3
diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure
index d0db1cecc72c..8fc340ed7963 100644
--- a/devel/qt4/files/configure
+++ b/devel/qt4/files/configure
@@ -2,7 +2,8 @@
 #
 # Configures to build the Qt library
 #
-# Copyright (C) 1999-2008 Trolltech ASA. All rights reserved.
+# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Contact: Qt Software Information (qt-info@nokia.com)
 #
 # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -170,34 +171,13 @@ elif [ -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ]; then
     Edition="OpenSource"
     EditionString="Open Source"
     QT_EDITION="QT_EDITION_OPENSOURCE"
-elif [ -f "$relpath"/LICENSE.PREVIEW.OPENSOURCE ]; then
-    # tech preview - opensource
+elif [ -f "$relpath"/.LICENSE ]; then
+    # Generic, non final license
     [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
     [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
-    Licensee="Preview"
-    Edition="Preview"
-    QT_EDITION="QT_EDITION_OPENSOURCE"
-elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ]; then
-    # tech preview - commercial
-    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
-    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
-    Licensee="Preview"
-    Edition="Preview"
-    QT_EDITION="QT_EDITION_DESKTOP"
-elif [ -f "$relpath"/LICENSE.SNAPSHOT.COMMERCIAL ]; then
-    # snapshot - commercial
-    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
-    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
-    Licensee="Snapshot"
-    Edition="Snapshot"
+    Edition=`sed 's/ LICENSE AGREEMENT//;q' .LICENSE`
+    Licensee="$Edition"
     QT_EDITION="QT_EDITION_DESKTOP"
-elif [ -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE.GPL2 -o -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE.GPL3 ]; then
-    # snapshot - opensource
-    [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
-    [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
-    Licensee="Snapshot"
-    Edition="Snapshot"
-    QT_EDITION="QT_EDITION_OPENSOURCE"
 elif [ -f "$relpath"/LICENSE.TROLL ]; then
     # internal Trolltech edition
     [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
@@ -263,18 +243,15 @@ else
             QT_EDITION="QT_EDITION_UNIVERSAL"
             ;;
         B)
-            Edition="Desktop"
+            Edition="FullFramework"
+            EditionString="Full Framework"
             QT_EDITION="QT_EDITION_DESKTOP"
             ;;
         L)
-            Edition="DesktopLight"
-            EditionString="Desktop Light"
+            Edition="GUIFramework"
+            EditionString="GUI Framework"
             QT_EDITION="QT_EDITION_DESKTOPLIGHT"
             ;;
-        R)
-            Edition="Console"
-            QT_EDITION="QT_EDITION_CONSOLE"
-            ;;
         esac
         ;;
     Z4M|R4M|Q4M)
@@ -286,24 +263,6 @@ else
             ;;
         esac
         ;;
-    34M)
-        LicenseType="Academic"
-        case $ProductCode in
-        B)
-            Edition="Academic"
-            QT_EDITION="QT_EDITION_ACADEMIC"
-            ;;
-        esac
-        ;;
-    TBM)
-        LicenseType="Educational"
-        case $ProductCode in
-        B)
-            Edition="Educational"
-            QT_EDITION="QT_EDITION_EDUCATIONAL"
-            ;;
-        esac
-        ;;
     esac
     if [ -z "$LicenseType" -o -z "$Edition" -o -z "$QT_EDITION" ]; then
         echo
@@ -313,11 +272,14 @@ else
 
     # verify that we are licensed to use Qt on this platform
     LICENSE_EXTENSION=
-    if [ "$PLATFORM_QWS" = "yes" ]; then
+    if [ "$PlatformCode" = "X" ]; then
+	# Qt All-OS
+	LICENSE_EXTENSION="-ALLOS"
+    elif [ "$PLATFORM_QWS" = "yes" ]; then
         case $PlatformCode in
-        2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W|X)
+        2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W)
+            # Qt for Embedded Linux
             LICENSE_EXTENSION="-EMBEDDED"
-            # Qt Embedded
             ;;
         *)
             echo
@@ -331,9 +293,14 @@ else
         esac
     elif [ "$PLATFORM_MAC" = "yes" ]; then
         case $PlatformCode in
-        2|4|5|7|9|B|C|E|F|G|L|M|U|W|X|Y)
+        2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y)
             # Qt/Mac
+            LICENSE_EXTENSION="-DESKTOP"
             ;;
+        3|6|8|A|D|H|J|K|P|Q|S|V)
+            # Embedded no-deploy
+            LICENSE_EXTENSION="-EMBEDDED"
+	    ;;
         *)
             echo
             echo "You are not licensed for the Qt/Mac platform."
@@ -345,8 +312,13 @@ else
         esac
      else
          case $PlatformCode in
-         2|3|4|5|7|D|E|F|J|M|Q|S|T|V|X|Z)
+         2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z)
              # Qt/X11
+             LICENSE_EXTENSION="-DESKTOP"
+             ;;
+         6|8|9|A|B|C|G|H|K|P|U|W)
+             # Embedded no-deploy
+             LICENSE_EXTENSION="-EMBEDDED"
              ;;
          *)
              echo
@@ -369,12 +341,6 @@ else
         Evaluation)
             cp -f "$relpath/.LICENSE-EVALUATION-US" "$outpath/LICENSE"
             ;;
-        Academic)
-            cp -f "$relpath/.LICENSE-ACADEMIC-US" "$outpath/LICENSE"
-            ;;
-        Educational)
-            cp -f "$relpath/.LICENSE-EDUCATIONAL-US" "$outpath/LICENSE"
-            ;;
         esac
         ;;
     2|5)
@@ -386,12 +352,6 @@ else
         Evaluation)
             cp -f "$relpath/.LICENSE-EVALUATION" "$outpath/LICENSE"
             ;;
-        Academic)
-            cp -f "$relpath/.LICENSE-ACADEMIC" "$outpath/LICENSE"
-            ;;
-        Educational)
-            cp -f "$relpath/.LICENSE-EDUCATIONAL" "$outpath/LICENSE"
-            ;;
         esac
         ;;
     *)
@@ -517,6 +477,7 @@ CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
 CFG_PHONON=auto
+CFG_PHONON_BACKEND=yes
 CFG_SVG=yes
 CFG_WEBKIT=auto # (yes|no|auto)
 CFG_ASSISTANT_WEBKIT=no
@@ -747,7 +708,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-svg|-webkit|-assistant-webkit)
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-assistant-webkit)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -1773,6 +1734,13 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
+    phonon-backend)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_PHONON_BACKEND="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
     *)
         UNKNOWN_OPT=yes
         ;;
@@ -2836,8 +2804,8 @@ Usage:  $relconf [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir
         [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
         [-qtnamespace <namespace>] [-separate-debug-info] [-armfpa]
         [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
-        [-no-phonon] [-phonon] [-no-svg] [-svg] [-no-webkit] [-webkit]
-        [-no-assistant-webkit] [-assistant-webkit]
+        [-no-phonon] [-phonon-backend] [-no-phonon-backend] [-phonon-backend] [-no-svg] 
+        [-svg] [-no-webkit] [-webkit] [-no-assistant-webkit] [-assistant-webkit]
 
         [additional platform specific options (see below)]
 
@@ -2967,6 +2935,8 @@ fi
     -no-phonon ......... Do not build the Phonon module.
  +  -phonon ............ Build the Phonon module.
                          Phonon is built if a decent C++ compiler is used.
+    -no-phonon-backend.. Do not build the platform phonon plugin.
+ +  -phonon-backend..... Build the platform phonon plugin.
 
     -no-svg ............ Do not build the SVG module.
  +  -svg ............... Build the SVG module.
@@ -3653,29 +3623,19 @@ esac
 #-------------------------------------------------------------------------------
 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
 
-PADDING="\\0"
-
-if [ "$PLATFORM_MAC" = "yes" ]; then
-    case $UNAME_RELEASE in
-    9.*)
-        PADDING="\\\\0"
-        ;;
-    esac
-fi
-
-LICENSE_USER_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsuser=$Licensee" "$PADDING"`
-LICENSE_PRODUCTS_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsprod=$Edition" "$PADDING"`
-PREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_INSTALL_PREFIX" "$PADDING"`
-DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS" "$PADDING"`
-HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS" "$PADDING"`
-LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS" "$PADDING"`
-BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS" "$PADDING"`
-PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS" "$PADDING"`
-DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA" "$PADDING"`
-TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS" "$PADDING"`
-SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS" "$PADDING"`
-EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES" "$PADDING"`
-DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS" "$PADDING"`
+LICENSE_USER_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsuser=$Licensee"`
+LICENSE_PRODUCTS_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_lcnsprod=$Edition"`
+PREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_INSTALL_PREFIX"`
+DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
+HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
+LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
+BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
+PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
+DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA"`
+TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
+SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
 
 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 /* License Info */
@@ -3684,17 +3644,17 @@ static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PROD
 EOF
 
 if [ ! -z "$QT_HOST_PREFIX" ]; then
-    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX" "$PADDING"`
-    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc" "$PADDING"`
-    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include" "$PADDING"`
-    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib" "$PADDING"`
-    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin" "$PADDING"`
-    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins" "$PADDING"`
-    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX" "$PADDING"`
-    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations" "$PADDING"`
-    HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS" "$PADDING"`
-    HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES" "$PADDING"`
-    HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS" "$PADDING"`
+    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
+    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
+    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
+    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
+    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
+    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
+    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
+    HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+    HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+    HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
 
     cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 
@@ -4665,8 +4625,8 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
         fi
         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then
             CFG_GLIB=yes
-	    QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
-	    QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB"
+            QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
+            QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB"
         else
             if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
                 echo "Glib support cannot be enabled due to functionality tests!"
@@ -4680,43 +4640,47 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
         fi
     fi
 
-    if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" -a "$CFG_PHONON" != "no" ]; then
-        if [ -n "$PKG_CONFIG" ]; then
-            QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
-            QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
-        fi
-        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
-            CFG_GSTREAMER=yes
-	    QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
-	    QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
-        else
-            if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-                echo "Gstreamer support cannot be enabled due to functionality tests!"
-                echo " Turn on verbose messaging (-v) to $0 to see the final report."
-                echo " If you believe this message is in error you may use the continue"
-                echo " switch (-continue) to $0 to continue."
-                exit 101
-            else
+    if [ "$CFG_PHONON" != "no" ]; then
+        if [ "$CFG_PHONON_BACKEND" != "no" ]; then
+            if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
+                if [ -n "$PKG_CONFIG" ]; then
+                    QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                    QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+                fi
+                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
+                    CFG_GSTREAMER=yes
+                    QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
+                    QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
+                else
+                    if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                        echo "Gstreamer support cannot be enabled due to functionality tests!"
+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                        echo " If you believe this message is in error you may use the continue"
+                        echo " switch (-continue) to $0 to continue."
+                        exit 101
+                    else
+                        CFG_GSTREAMER=no
+                    fi
+                fi
+            elif [ "$CFG_GLIB" = "no" ]; then
                 CFG_GSTREAMER=no
             fi
-        fi
-    elif [ "$CFG_GLIB" = "no" ]; then
-	CFG_GSTREAMER=no
-    fi
 
-    if [ "$CFG_PHONON" != "no" ]; then
-        if [ "$CFG_GSTREAMER" = "yes" ]; then
-            CFG_PHONON=yes
-        else
-            if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-                echo "Phonon support cannot be enabled due to functionality tests!"
-                echo " Turn on verbose messaging (-v) to $0 to see the final report."
-                echo " If you believe this message is in error you may use the continue"
-                echo " switch (-continue) to $0 to continue."
-                exit 101
+            if [ "$CFG_GSTREAMER" = "yes" ]; then
+                CFG_PHONON=yes
             else
-                CFG_PHONON=no
+                if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "Phonon support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                else
+                    CFG_PHONON=no
+                fi
             fi
+        else
+            CFG_PHONON=yes            
         fi
     fi
 fi # X11/QWS
@@ -4893,8 +4857,14 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
         fi
     fi
 fi
+
+HAVE_STL=no
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    HAVE_STL=yes
+fi
+
 if [ "$CFG_STL" != "no" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+    if [ "$HAVE_STL" = "yes" ]; then
         CFG_STL=yes
     else
         if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -5110,6 +5080,9 @@ fi
 # enable Phonon
 if [ "$CFG_PHONON" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG phonon"
+    if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
+        QT_CONFIG="$QT_CONFIG phonon-backend"
+    fi
 else
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON"
 fi
@@ -5411,7 +5384,7 @@ fi
 # supported and on which compilers.
 #
 canBuildPatternist="yes"
-canBuildWebKit="yes"
+canBuildWebKit="$HAVE_STL"
 
 # WebKit requires stdint.h
 if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS; then
author	Max Brazhnikov <makc@FreeBSD.org>	2009-01-13 20:34:49 +0000
committer	Max Brazhnikov <makc@FreeBSD.org>	2009-01-13 20:34:49 +0000
commit	5c3471f6f048a239edecf23ee0c46e414c53d9a5 (patch)
tree	e37eb7a53d25ad3f605dca4ea6f5220114e75f65 /devel
parent	57655bc6e2e1296e220dfc40de8209c5c64a8e4e (diff)
download	ports-5c3471f6f048a239edecf23ee0c46e414c53d9a5.tar.gz ports-5c3471f6f048a239edecf23ee0c46e414c53d9a5.zip