Changes 4.3.0:

- Configuration/Compilation
    * Fixed OpenBSD and NetBSD build issues.
- Legal
    * Added information about the OpenSSL exception to the GPL.
- Documentation and Examples
    * Added information about the TS file format used in Linguist.
    * Moved platform and compiler support information from
      www.trolltech.com into the documentation.
    * Added an Accessibility overview document.
    * Added new example to show usage of QCompleter with custom tree models.
- Translations
- Added support for the CP949 Korean Codec.
- [138140] The whole Qt source compiles with the QT_NO_CAST_FROM_ASCII
  and QT_NO_CAST_TO_ASCII defines and therefore is more robust when
  using codecs.
- Added support for HP-UX 11i (Itanium) with the aCC compiler
- Changed dialogs to respond much better to the LanguageChange event.
  (i.e. run time translation now works much better.)
- Signals and slots
    * [61295] Added Qt::BlockingQueuedConnection connection type, which
      waits for all slots to be called before continuing.
    * [128646] Ignore optional keywords specified in SIGNAL() and SLOT()
      signatures (struct, class, and enum).
    * Optimize emitting signals that do not have anything connected to them.
- [121629] Added support for the MinGW/MSYS platform.
- [102293] Added search path functionality (QDir::addSearchPath)
- Almost all widgets are now styleable using Qt Style Sheets.

15 files changed, 189 insertions, 235 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index d85f9997f02..9b0b1293de4 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/04/06 12:48:37 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/28 07:37:51 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	C++ X GUI toolkit
 
 BUILD_TARGET=		sub-src
@@ -32,7 +31,7 @@ do-install:
 .for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${QTPREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/lib/${lib}.pc ${PREFIX}/lib/pkgconfig/
+	${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/${lib}.pc ${PREFIX}/lib/pkgconfig/
 .endfor
 	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins
 	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/accessible
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 84e56437195..99421adbdaa 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.9 2007/04/06 12:48:42 markd Exp $
+$NetBSD: distinfo,v 1.10 2007/07/28 07:37:51 adam Exp $
 
-SHA1 (qt-x11-opensource-src-4.2.3.tar.gz) = b988aab4fa1dcce8532c36bb63947a556076e8c8
-RMD160 (qt-x11-opensource-src-4.2.3.tar.gz) = 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25
-Size (qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 bytes
-SHA1 (patch-aa) = 2ac5ba5b0a419f1a6fe63989b9734d042ccf1562
-SHA1 (patch-ab) = 726bc5f30d5eb54ec19f76be35422e3697fb1b8c
+SHA1 (qt-x11-opensource-src-4.3.0.tar.gz) = e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4
+RMD160 (qt-x11-opensource-src-4.3.0.tar.gz) = 2106dd8dda7a5b16305ba701e33c17e9349fddc3
+Size (qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 bytes
+SHA1 (patch-aa) = edfc05780c1be3588fd35a0261b3a1ca45274bc8
+SHA1 (patch-ab) = 1666aa0273b5f4cdecb5a5fd76343d33d1987d9f
 SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = 6b835687f74358999ddc89feb46c98cc36fef47b
-SHA1 (patch-ae) = 5b0d7ede053f1a792418406547280cd3352d7c47
-SHA1 (patch-af) = d3a6680553d7cd41cb9436776ee81737e3f2eb07
-SHA1 (patch-ag) = cfdc8678689089a7894d4acfee9e6a868d384b6f
+SHA1 (patch-ad) = 3567be61b6df31a65c286a5451753d8cbed9efd3
+SHA1 (patch-ae) = 468e3ae41e738d51d253c839e55e329ad7937006
+SHA1 (patch-af) = 247f9509a34eeb53201a551c8e3558451308353e
+SHA1 (patch-ag) = df4716c73748cf19bf511c5d395a8beab9d7c70a
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = cb57c340a125587f5e26f63274c090512079a41c
+SHA1 (patch-aj) = 7e8528c6ab1bad239142464b49ee073939a868b0
 SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18
-SHA1 (patch-al) = c59c6830bde43208a81cb7ba52a58c134dd40eec
-SHA1 (patch-am) = 81612b64cd5c6d57125e22be79334aabf08bda4d
+SHA1 (patch-al) = a46ad5c1236d8a63900faaca62b13827b9c1c08e
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index d6127f9f42a..f87dc5d50c1 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-aa,v 1.5 2007/07/28 07:37:51 adam Exp $
 
---- qmake/generators/unix/unixmake2.cpp.orig	2006-11-27 17:26:28.000000000 +0000
+--- qmake/generators/unix/unixmake2.cpp.orig	2007-05-25 15:24:38.000000000 +0200
 +++ qmake/generators/unix/unixmake2.cpp
-@@ -205,6 +205,8 @@ UnixMakefileGenerator::writeMakeParts(QT
-         if(!project->isEmpty("QMAKE_BUNDLE_NAME")) {
+@@ -212,6 +212,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+         if(!project->isEmpty("QMAKE_BUNDLE")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
 +	} else if(project->isActiveConfig("compile_libtool")) {
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2007/03/18 17:34:41 adam Exp $
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -946,8 +948,12 @@ void UnixMakefileGenerator::init2()
+@@ -962,8 +964,12 @@ void UnixMakefileGenerator::init2()
      } else if (project->isActiveConfig("staticlib")) {
          project->values("TARGET").first().prepend("lib");
          project->values("TARGET").first() += ".a";
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.4 2007/03/18 17:34:41 adam Exp $
      } else {
          project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
          if(project->isActiveConfig("compile_libtool"))
-@@ -1372,7 +1378,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1398,7 +1404,7 @@ UnixMakefileGenerator::writePkgConfigFil
      else
          libs << "QMAKE_LIBS"; //obvious one
      libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab
index bac054270a9..62891adff84 100644
--- a/x11/qt4-libs/patches/patch-ab
+++ b/x11/qt4-libs/patches/patch-ab
@@ -1,16 +1,76 @@
-$NetBSD: patch-ab,v 1.3 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ab,v 1.4 2007/07/28 07:37:51 adam Exp $
 
---- src/gui/painting/painting.pri.orig	2007-02-21 10:58:43.000000000 +0100
+--- src/gui/painting/painting.pri.orig	2007-05-25 15:24:11.000000000 +0200
 +++ src/gui/painting/painting.pri
-@@ -137,9 +137,9 @@ x11|embedded {
- mac {
+@@ -177,11 +177,11 @@ mac {
  
- } else:sse|win32-g++ {
--    sse_compiler.commands = $$QMAKE_CXX -c -msse $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+    sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -msse $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.o
-     sse_compiler.dependency_type = TYPE_C
--    sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+    sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
-     sse_compiler.input = SSE_SOURCES
-     sse_compiler.variable_out = OBJECTS
-     sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+     win32-g++|!win32:!*-icc* {
+         mmx {
+-            mmx_compiler.commands = $$QMAKE_CXX -c
++            mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+             mmx_compiler.commands += -mmmx
+             mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+             mmx_compiler.dependency_type = TYPE_C
+-            mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+             mmx_compiler.input = MMX_SOURCES
+             mmx_compiler.variable_out = OBJECTS
+             mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
+@@ -194,13 +194,13 @@ mac {
+             }
+         }
+         3dnow {
+-            3dnow_compiler.commands = $$QMAKE_CXX -c
++            3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+             3dnow_compiler.commands += -m3dnow
+             mmx: 3dnow_compiler.commands += -mmmx
+             sse: 3dnow_compiler.commands += -msse
+             3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+             3dnow_compiler.dependency_type = TYPE_C
+-            3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+             3dnow_compiler.input = 3DNOW_SOURCES
+             3dnow_compiler.variable_out = OBJECTS
+             3dnow_compiler.name = compiling[3dnow] ${QMAKE_FILE_IN}
+@@ -208,11 +208,11 @@ mac {
+             QMAKE_EXTRA_COMPILERS += 3dnow_compiler
+         }
+         sse {
+-            sse_compiler.commands = $$QMAKE_CXX -c
++            sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+             sse_compiler.commands += -msse
+             sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+             sse_compiler.dependency_type = TYPE_C
+-            sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+             sse_compiler.input = SSE_SOURCES
+             sse_compiler.variable_out = OBJECTS
+             sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+@@ -220,11 +220,11 @@ mac {
+             QMAKE_EXTRA_COMPILERS += sse_compiler
+         }
+         sse2 {
+-            sse2_compiler.commands = $$QMAKE_CXX -c
++            sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+             sse2_compiler.commands += -msse2
+             sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+             sse2_compiler.dependency_type = TYPE_C
+-            sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+             sse2_compiler.input = SSE2_SOURCES
+             sse2_compiler.variable_out = OBJECTS
+             sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
+@@ -232,11 +232,11 @@ mac {
+             QMAKE_EXTRA_COMPILERS += sse2_compiler
+         }
+         iwmmxt {
+-            iwmmxt_compiler.commands = $$QMAKE_CXX -c
++            iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+             iwmmxt_compiler.commands += -mcpu=iwmmxt
+             iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+             iwmmxt_compiler.dependency_type = TYPE_C
+-            iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+             iwmmxt_compiler.input = IWMMXT_SOURCES
+             iwmmxt_compiler.variable_out = OBJECTS
+             iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad
index be5ee601732..6d605a5502a 100644
--- a/x11/qt4-libs/patches/patch-ad
+++ b/x11/qt4-libs/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ad,v 1.5 2007/07/28 07:37:51 adam Exp $
 
---- src/corelib/global/qglobal.h.orig	2006-11-27 17:26:05.000000000 +0000
+--- src/corelib/global/qglobal.h.orig	2007-05-25 15:24:09.000000000 +0200
 +++ src/corelib/global/qglobal.h
-@@ -55,6 +55,7 @@
+@@ -59,6 +59,7 @@
       NETBSD   - NetBSD
       OPENBSD  - OpenBSD
       BSDI     - BSD/OS
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $
       IRIX     - SGI Irix
       OSF      - HP Tru64 UNIX
       SCO      - SCO OpenServer 5
-@@ -107,6 +108,9 @@
+@@ -116,6 +117,9 @@
  #elif defined(__NetBSD__)
  #  define Q_OS_NETBSD
  #  define Q_OS_BSD4
@@ -20,27 +20,21 @@ $NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $
  #elif defined(__OpenBSD__)
  #  define Q_OS_OPENBSD
  #  define Q_OS_BSD4
-@@ -146,11 +150,6 @@
- #  define Q_OS_WIN
+@@ -158,8 +162,6 @@
  #endif
  
--#if defined(Q_OS_DARWIN)
+ #if defined(Q_OS_DARWIN)
 -#  define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
 -#  define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
--#endif
--
- #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
- #  undef Q_OS_UNIX
- #elif !defined(Q_OS_UNIX)
-@@ -542,10 +541,7 @@
- #  define Q_WS_PM
+ #  if defined(Q_OS_DARWIN64)
+ #     define Q_OS_MAC64
+ #  elif defined(Q_OS_DARWIN32)
+@@ -569,8 +571,6 @@
  #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
  #elif defined(Q_OS_UNIX)
--#  if defined(Q_OS_DARWIN) && !defined(__USE_WS_X11__)
+ #  if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
 -#    define Q_WS_MAC
 -#    define Q_WS_MACX
--#  elif !defined(Q_WS_QWS)
-+#  if !defined(Q_WS_QWS)
- #    define Q_WS_X11
- #  endif
- #endif
+ #    if defined(Q_OS_MAC64)
+ #      define Q_WS_MAC64
+ #    elif defined(Q_OS_MAC32)
diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae
index da602e18f2d..8cb2b3c570c 100644
--- a/x11/qt4-libs/patches/patch-ae
+++ b/x11/qt4-libs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ae,v 1.3 2007/07/28 07:37:51 adam Exp $
 
---- qmake/generators/unix/unixmake.cpp.orig	2007-02-21 10:59:01.000000000 +0100
+--- qmake/generators/unix/unixmake.cpp.orig	2007-05-25 15:24:38.000000000 +0200
 +++ qmake/generators/unix/unixmake.cpp
-@@ -280,27 +280,29 @@ UnixMakefileGenerator::init()
+@@ -295,27 +295,29 @@ UnixMakefileGenerator::init()
                  if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
                      libtool_flags += " --mode=link";
                      if(project->isActiveConfig("staticlib")) {
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.2 2007/03/18 17:34:41 adam Exp $
                  } else {
                      libtool_flags += " --mode=compile";
                  }
-@@ -611,7 +613,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -643,7 +645,6 @@ UnixMakefileGenerator::defaultInstall(co
      QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
      if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
          destdir += Option::dir_sep;
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.2 2007/03/18 17:34:41 adam Exp $
      if(targetdir.right(1) != Option::dir_sep)
          targetdir += Option::dir_sep;
  
-@@ -656,10 +657,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -681,10 +682,14 @@ UnixMakefileGenerator::defaultInstall(co
          QString src_targ = target;
          if(src_targ == "$(TARGET)")
              src_targ = "$(TARGETL)";
diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af
index 0348c3bb949..c4498111bec 100644
--- a/x11/qt4-libs/patches/patch-af
+++ b/x11/qt4-libs/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-af,v 1.3 2007/07/28 07:37:51 adam Exp $
 
---- qmake/Makefile.unix.orig	2006-11-27 17:26:04.000000000 +0000
+--- qmake/Makefile.unix.orig	2007-05-25 15:24:08.000000000 +0200
 +++ qmake/Makefile.unix
 @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
  QTOBJS = @QMAKE_QTOBJS@
@@ -11,16 +11,16 @@ $NetBSD: patch-af,v 1.2 2007/03/18 17:34:41 adam Exp $
  
  #qmake code
  OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
-@@ -45,7 +45,7 @@ DEPEND_SRC=project.cpp property.cpp meta
- 	   $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/3rdparty/md5/md5.cpp \
+@@ -79,7 +79,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+ 	   $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
  	   $(QTSRCS) $(COMMERCIAL_DEPEND_SRC)
  
 -CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
 +CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
  	   -I$(SOURCE_PATH)/src/corelib/arch/generic -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
  	   -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \
- 	   -I$(SOURCE_PATH)/src/3rdparty/md5 \
-@@ -53,7 +53,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+ 	   -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
+@@ -87,7 +87,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
  	   -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
             -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
  
diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag
index e645861d1a3..1ce32c9da1f 100644
--- a/x11/qt4-libs/patches/patch-ag
+++ b/x11/qt4-libs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ag,v 1.5 2007/07/28 07:37:51 adam Exp $
 
---- qmake/project.cpp.orig	2007-02-21 10:58:40.000000000 +0100
+--- qmake/project.cpp.orig	2007-05-25 15:24:07.000000000 +0200
 +++ qmake/project.cpp
-@@ -1355,6 +1355,9 @@ QMakeProject::isActiveConfig(const QStri
+@@ -1586,6 +1586,9 @@ QMakeProject::isActiveConfig(const QStri
      else if(x == "false")
          return false;
  
diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj
index 89ef8518db3..cb8e10068fe 100644
--- a/x11/qt4-libs/patches/patch-aj
+++ b/x11/qt4-libs/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-aj,v 1.2 2007/07/28 07:37:51 adam Exp $
 
 --- mkspecs/netbsd-g++/qplatformdefs.h.orig	2006-11-27 17:26:42.000000000 +0000
 +++ mkspecs/netbsd-g++/qplatformdefs.h
@@ -26,22 +26,3 @@ $NetBSD: patch-aj,v 1.1 2007/03/18 17:34:41 adam Exp $
  
 -
  #endif // QPLATFORMDEFS_H
---- src/corelib/io/qsettings.cpp.orig	2006-11-27 17:26:06.000000000 +0000
-+++ src/corelib/io/qsettings.cpp
-@@ -105,9 +105,16 @@ inline bool qt_isEvilFsTypeName(const ch
- 
- static bool isLikelyToBeNfs(int handle)
- {
-+#ifdef QT_STATVFS
-+    struct statvfs buf;
-+    if (fstatvfs(handle, &buf) != 0)
-+        return false;
-+#else
-     struct statfs buf;
-     if (fstatfs(handle, &buf) != 0)
-         return false;
-+#endif
-+
-     return qt_isEvilFsTypeName(buf.f_fstypename);
- }
- 
diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al
index 4533276dd23..a52a7371712 100644
--- a/x11/qt4-libs/patches/patch-al
+++ b/x11/qt4-libs/patches/patch-al
@@ -1,43 +1,30 @@
-$NetBSD: patch-al,v 1.1 2007/04/06 12:48:42 markd Exp $
+$NetBSD: patch-al,v 1.2 2007/07/28 07:37:52 adam Exp $
 
---- src/corelib/tools/qstring.cpp
-+++ src/corelib/tools/qstring.cpp
-@@ -3342,6 +3342,7 @@ QString QString::fromUtf8(const char *st
-     result.resize(size); // worst case
-     ushort *qch = result.d->data;
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -3359,6 +3360,12 @@ QString QString::fromUtf8(const char *st
-                         ushort low = uc%0x400 + 0xdc00;
-                         *qch++ = high;
-                         *qch++ = low;
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = 0xdbff;
-+                        *qch++ = 0xde00 + ((uchar)str[i]);
-                     } else {
-                         *qch++ = uc;
-                     }
-@@ -3381,14 +3388,17 @@ QString QString::fromUtf8(const char *st
-                 uc = ch & 0x1f;
-                 need = 1;
-                 error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-                 error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-                 error = i;
-+                min_uc = 0x10000;
-             } else {
-                 // Error
-                 qch = addOne(qch, result);
+--- src/corelib/io/qsettings.cpp.orig	2007-05-25 15:24:10.000000000 +0200
++++ src/corelib/io/qsettings.cpp
+@@ -105,9 +105,16 @@ inline bool qt_isEvilFsTypeName(const ch
+ 
+ static bool isLikelyToBeNfs(int handle)
+ {
++#ifdef QT_STATVFS
++    struct statvfs buf;
++    if (fstatvfs(handle, &buf) != 0)
++        return false;
++#else
+     struct statfs buf;
+     if (fstatfs(handle, &buf) != 0)
+         return false;
++#endif
++
+     return qt_isEvilFsTypeName(buf.f_fstypename);
+ }
+ 
+@@ -135,7 +142,7 @@ static bool isLikelyToBeNfs(int handle)
+ 
+ #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
+       || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \
+-      || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD)
++      || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT)
+ # include <sys/statvfs.h>
+ 
+ static bool isLikelyToBeNfs(int handle)
diff --git a/x11/qt4-libs/patches/patch-am b/x11/qt4-libs/patches/patch-am
deleted file mode 100644
index 38bc89e6c45..00000000000
--- a/x11/qt4-libs/patches/patch-am
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/04/06 12:48:42 markd Exp $
-
---- src/corelib/codecs/qutfcodec.cpp
-+++ src/corelib/codecs/qutfcodec.cpp
-@@ -117,15 +117,19 @@ QString QUtf8Codec::convertToUnicode(con
-     bool headerdone = false;
-     QChar replacement = QChar::ReplacementCharacter;
-     int need = 0;
-+    int error = -1;
-     uint uc = 0;
-+    uint min_uc = 0;
-     if (state) {
-         if (state->flags & IgnoreHeader)
-             headerdone = true;
-         if (state->flags & ConvertInvalidToNull)
-             replacement = QChar::Null;
-         need = state->remainingChars;
--        if (need)
-+        if (need) {
-             uc = state->state_data[0];
-+            min_uc = state->state_data[1];
-+        }
-     }
-     if (!headerdone && len > 3
-         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -142,7 +146,7 @@ QString QUtf8Codec::convertToUnicode(con
-     int invalid = 0;
- 
-     for (int i=0; i<len; i++) {
--        ch = *chars++;
-+        ch = chars[i];
-         if (need) {
-             if ((ch&0xc0) == 0x80) {
-                 uc = (uc << 6) | (ch & 0x3f);
-@@ -153,14 +157,27 @@ QString QUtf8Codec::convertToUnicode(con
-                         uc -= 0x10000;
-                         unsigned short high = uc/0x400 + 0xd800;
-                         unsigned short low = uc%0x400 + 0xdc00;
-+
-+                        // resize if necessary
-+                        long where = qch - result.unicode();
-+                        if (where + 2 >= result.size()) {
-+                            result.resize(where + 2);
-+                            qch = result.data() + where;
-+                        }
-+
-                         *qch++ = QChar(high);
-                         *qch++ = QChar(low);
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                        // error
-+                        *qch++ = QChar::ReplacementCharacter;
-+                        ++invalid;
-                     } else {
-                         *qch++ = uc;
-                     }
-                 }
-             } else {
-                 // error
-+                i = error;
-                 *qch++ = QChar::ReplacementCharacter;
-                 ++invalid;
-                 need = 0;
-@@ -171,12 +188,22 @@ QString QUtf8Codec::convertToUnicode(con
-             } else if ((ch & 0xe0) == 0xc0) {
-                 uc = ch & 0x1f;
-                 need = 1;
-+                error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-+                error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-+                error = i;
-+                min_uc = 0x10000;
-+            } else {
-+                // error
-+                *qch++ = QChar::ReplacementCharacter;
-+                ++invalid;
-             }
-         }
-     }
-@@ -187,6 +214,7 @@ QString QUtf8Codec::convertToUnicode(con
-         if (headerdone)
-             state->flags |= IgnoreHeader;
-         state->state_data[0] = need ? uc : 0;
-+        state->state_data[1] = need ? min_uc : 0;
-     }
-     return result;
- }
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index ba8a701c6f9..42207b3d942 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/03/18 17:34:41 adam Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/28 07:40:54 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
-PKGNAME=	qt4-psql-${QTVERSION}
+PKGNAME=	qt4-pgsql-${QTVERSION}
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 7bd3c4deb41..a26c92ccebf 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/18 17:34:42 adam Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/28 07:37:52 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -33,11 +33,12 @@ do-install:
 		${MAKE_PROGRAM} install_designer_headers
 	cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} install_qtestlib_headers
-.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtTest
+.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtScript QtTest
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${QTPREFIX}/lib/
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/QtTest.pc ${PREFIX}/lib/pkgconfig/
+	${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/QtScript.pc ${PREFIX}/lib/pkgconfig/
+	${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/QtTest.pc ${PREFIX}/lib/pkgconfig/
 	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/designer
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 9830b2205a0..47c5ed72bc4 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/18 17:34:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/07/28 07:37:52 adam Exp $
+lib/pkgconfig/QtScript.pc
 lib/pkgconfig/QtTest.pc
 qt4/bin/assistant
 qt4/bin/designer
@@ -22,6 +23,7 @@ qt4/include/QtDesigner/QDesignerContainerExtension
 qt4/include/QtDesigner/QDesignerCustomWidgetCollectionInterface
 qt4/include/QtDesigner/QDesignerCustomWidgetInterface
 qt4/include/QtDesigner/QDesignerDnDItemInterface
+qt4/include/QtDesigner/QDesignerDynamicPropertySheetExtension
 qt4/include/QtDesigner/QDesignerExportWidget
 qt4/include/QtDesigner/QDesignerExtraInfoExtension
 qt4/include/QtDesigner/QDesignerFormEditorInterface
@@ -31,14 +33,17 @@ qt4/include/QtDesigner/QDesignerFormWindowInterface
 qt4/include/QtDesigner/QDesignerFormWindowManagerInterface
 qt4/include/QtDesigner/QDesignerFormWindowToolInterface
 qt4/include/QtDesigner/QDesignerIconCacheInterface
+qt4/include/QtDesigner/QDesignerIntegrationInterface
 qt4/include/QtDesigner/QDesignerLanguageExtension
 qt4/include/QtDesigner/QDesignerLayoutDecorationExtension
 qt4/include/QtDesigner/QDesignerMemberSheetExtension
 qt4/include/QtDesigner/QDesignerMetaDataBaseInterface
 qt4/include/QtDesigner/QDesignerMetaDataBaseItemInterface
 qt4/include/QtDesigner/QDesignerObjectInspectorInterface
+qt4/include/QtDesigner/QDesignerPromotionInterface
 qt4/include/QtDesigner/QDesignerPropertyEditorInterface
 qt4/include/QtDesigner/QDesignerPropertySheetExtension
+qt4/include/QtDesigner/QDesignerResourceBrowserInterface
 qt4/include/QtDesigner/QDesignerTaskMenuExtension
 qt4/include/QtDesigner/QDesignerWidgetBoxInterface
 qt4/include/QtDesigner/QDesignerWidgetDataBaseInterface
@@ -59,16 +64,20 @@ qt4/include/QtDesigner/abstractformwindowcursor.h
 qt4/include/QtDesigner/abstractformwindowmanager.h
 qt4/include/QtDesigner/abstractformwindowtool.h
 qt4/include/QtDesigner/abstracticoncache.h
+qt4/include/QtDesigner/abstractintegration.h
 qt4/include/QtDesigner/abstractlanguage.h
 qt4/include/QtDesigner/abstractmetadatabase.h
 qt4/include/QtDesigner/abstractobjectinspector.h
+qt4/include/QtDesigner/abstractpromotioninterface.h
 qt4/include/QtDesigner/abstractpropertyeditor.h
+qt4/include/QtDesigner/abstractresourcebrowser.h
 qt4/include/QtDesigner/abstractwidgetbox.h
 qt4/include/QtDesigner/abstractwidgetdatabase.h
 qt4/include/QtDesigner/abstractwidgetfactory.h
 qt4/include/QtDesigner/container.h
 qt4/include/QtDesigner/customwidget.h
 qt4/include/QtDesigner/default_extensionfactory.h
+qt4/include/QtDesigner/dynamicpropertysheet.h
 qt4/include/QtDesigner/extension.h
 qt4/include/QtDesigner/extension_global.h
 qt4/include/QtDesigner/extrainfo.h
@@ -115,6 +124,7 @@ qt4/include/QtTest/qtestsystem.h
 qt4/lib/libQtAssistantClient.la
 qt4/lib/libQtDesigner.la
 qt4/lib/libQtDesignerComponents.la
+qt4/lib/libQtScript.la
 qt4/lib/libQtTest.la
 qt4/mkspecs/aix-g++-64/qmake.conf
 qt4/mkspecs/aix-g++-64/qplatformdefs.h
@@ -126,6 +136,8 @@ qt4/mkspecs/aix-xlc/qmake.conf
 qt4/mkspecs/aix-xlc/qplatformdefs.h
 qt4/mkspecs/common/g++.conf
 qt4/mkspecs/common/linux.conf
+qt4/mkspecs/common/mac-g++.conf
+qt4/mkspecs/common/mac.conf
 qt4/mkspecs/common/qmake.conf
 qt4/mkspecs/common/unix.conf
 qt4/mkspecs/darwin-g++/qmake.conf
@@ -140,14 +152,19 @@ qt4/mkspecs/features/default_pre.prf
 qt4/mkspecs/features/designer.prf
 qt4/mkspecs/features/dll.prf
 qt4/mkspecs/features/exclusive_builds.prf
+qt4/mkspecs/features/incredibuild_xge.prf
+qt4/mkspecs/features/lex.prf
 qt4/mkspecs/features/link_pkgconfig.prf
 qt4/mkspecs/features/mac/default_post.prf
 qt4/mkspecs/features/mac/default_pre.prf
+qt4/mkspecs/features/mac/dwarf2.prf
 qt4/mkspecs/features/mac/objective_c.prf
 qt4/mkspecs/features/mac/ppc.prf
+qt4/mkspecs/features/mac/ppc64.prf
 qt4/mkspecs/features/mac/rez.prf
 qt4/mkspecs/features/mac/sdk.prf
 qt4/mkspecs/features/mac/x86.prf
+qt4/mkspecs/features/mac/x86_64.prf
 qt4/mkspecs/features/moc.prf
 qt4/mkspecs/features/qdbus.prf
 qt4/mkspecs/features/qmake.conf
@@ -167,6 +184,7 @@ qt4/mkspecs/features/static_and_shared.prf
 qt4/mkspecs/features/staticlib.prf
 qt4/mkspecs/features/uic.prf
 qt4/mkspecs/features/uitools.prf
+qt4/mkspecs/features/unix/bsymbolic_functions.prf
 qt4/mkspecs/features/unix/dylib.prf
 qt4/mkspecs/features/unix/hide_symbols.prf
 qt4/mkspecs/features/unix/largefile.prf
@@ -197,6 +215,7 @@ qt4/mkspecs/features/win32/stl_off.prf
 qt4/mkspecs/features/win32/thread.prf
 qt4/mkspecs/features/win32/thread_off.prf
 qt4/mkspecs/features/win32/windows.prf
+qt4/mkspecs/features/yacc.prf
 qt4/mkspecs/freebsd-g++/qmake.conf
 qt4/mkspecs/freebsd-g++/qplatformdefs.h
 qt4/mkspecs/freebsd-g++34/qmake.conf
@@ -241,12 +260,14 @@ qt4/mkspecs/linux-g++-64/qmake.conf
 qt4/mkspecs/linux-g++-64/qplatformdefs.h
 qt4/mkspecs/linux-g++/qmake.conf
 qt4/mkspecs/linux-g++/qplatformdefs.h
+qt4/mkspecs/linux-icc-64/qmake.conf
+qt4/mkspecs/linux-icc-64/qplatformdefs.h
 qt4/mkspecs/linux-icc/qmake.conf
 qt4/mkspecs/linux-icc/qplatformdefs.h
 qt4/mkspecs/linux-kcc/qmake.conf
 qt4/mkspecs/linux-kcc/qplatformdefs.h
-qt4/mkspecs/linux-lsb/qmake.conf
-qt4/mkspecs/linux-lsb/qplatformdefs.h
+qt4/mkspecs/linux-lsb-g++/qmake.conf
+qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
 qt4/mkspecs/linux-pgcc/qmake.conf
 qt4/mkspecs/linux-pgcc/qplatformdefs.h
 qt4/mkspecs/lynxos-g++/qmake.conf
@@ -283,6 +304,8 @@ qt4/mkspecs/qws/linux-generic-g++/qmake.conf
 qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
 qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
+qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -326,6 +349,7 @@ qt4/phrasebooks/finnish.qph
 qt4/phrasebooks/french.qph
 qt4/phrasebooks/german.qph
 qt4/phrasebooks/italian.qph
+qt4/phrasebooks/japanese.qph
 qt4/phrasebooks/norwegian.qph
 qt4/phrasebooks/russian.qph
 qt4/phrasebooks/spanish.qph
@@ -351,6 +375,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/qws/linux-x86-g++
 @dirrm qt4/mkspecs/qws/linux-sharp-g++
 @dirrm qt4/mkspecs/qws/linux-mips-g++
+@dirrm qt4/mkspecs/qws/linux-lsb-g++
 @dirrm qt4/mkspecs/qws/linux-ipaq-g++
 @dirrm qt4/mkspecs/qws/linux-generic-g++
 @dirrm qt4/mkspecs/qws/linux-generic-g++-32
@@ -367,8 +392,9 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/macx-g++
 @dirrm qt4/mkspecs/lynxos-g++
 @dirrm qt4/mkspecs/linux-pgcc
-@dirrm qt4/mkspecs/linux-lsb
+@dirrm qt4/mkspecs/linux-lsb-g++
 @dirrm qt4/mkspecs/linux-kcc
+@dirrm qt4/mkspecs/linux-icc-64
 @dirrm qt4/mkspecs/linux-icc
 @dirrm qt4/mkspecs/linux-g++-64
 @dirrm qt4/mkspecs/linux-g++-32
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index c9409202ba9..b806c8ef799 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2007/03/18 17:34:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/07/28 07:37:51 adam Exp $
 
-QTVERSION=	4.2.3
+QTVERSION=	4.3.0
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt/