Changes 4.2.3:

This is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.2.0.

- Configuration/Compilation
    * Fixed architecture detection on UltraSPARC-T1 systems.
    * Fixed compilation on embedded architectures when qreal is not double.
- Documentation
    * Completed documentation for "Implementing Atomic Operations",
      which is useful for people porting Qt to a new hardware architecture.
- Translations
    * Added a new unofficial Portuguese translation courtesy of Helder
      Correia.
- Qt Linguist
    * Made the columns in the phrasebook resizeable.
- lupdate
    * Fixed bug in the .pro parser of lupdate. It should accept backslashes.
    * Fixed a severe slowdown in lupdate. (~400x speedup.)
    * Fixed traversal of subdirectories.
- moc
    * Don't create trigraphs in the generated code for C++ casts.
- uic
    * Fixed a bug that generated excessive margins for Q3GroupBox.

2 files changed, 36 insertions, 26 deletions

diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 0042b9846f7..7bd3c4deb41 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/07/17 15:30:16 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2007/03/18 17:34:42 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
@@ -16,26 +15,25 @@ BUILD_QT4=		yes
 UNLIMIT_RESOURCES=	datasize
 
 post-configure:
-	${LN} -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
-	${LN} -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
-	${LN} -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
+	ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
+	ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
+	ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
 
 do-install:
-.for prog in assistant linguist lrelease lupdate qm2ts qmake qt3to4
+.for prog in assistant lrelease lupdate qmake qt3to4
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${QTPREFIX}/bin/
 .endfor
-.for prog in designer qtconfig
+.for prog in designer linguist qtconfig
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
 		${QTPREFIX}/bin
 .endfor
 	cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} \
-		${MAKE_PROGRAM} -f Makefile.Release install_assistant_headers
+		${MAKE_PROGRAM} install_assistant_headers
 	cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} \
-		${MAKE_PROGRAM} -f Makefile.Release install_designer_headers
+		${MAKE_PROGRAM} install_designer_headers
 	cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \
-		${MAKE_PROGRAM} -f Makefile install_qtestlib_headers
-	${INSTALL_LIB} ${WRKSRC}/lib/libQtAssistantClient.a ${QTPREFIX}/lib/
-.for lib in QtDesigner QtDesignerComponents QtTest
+		${MAKE_PROGRAM} install_qtestlib_headers
+.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtTest
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${QTPREFIX}/lib/
 .endfor
@@ -48,7 +46,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \
 		${QTPREFIX}/phrasebooks/
 	${INSTALL_DATA_DIR} ${QTPREFIX}/mkspecs
-	${CP} -R ${WRKSRC}/mkspecs ${QTPREFIX}
+	cp -R ${WRKSRC}/mkspecs ${QTPREFIX}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 7439821472e..9830b2205a0 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,21 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/31 19:19:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/03/18 17:34:42 adam Exp $
 lib/pkgconfig/QtTest.pc
 qt4/bin/assistant
 qt4/bin/designer
 qt4/bin/linguist
 qt4/bin/lrelease
 qt4/bin/lupdate
-qt4/bin/qm2ts
 qt4/bin/qmake
 qt4/bin/qt3to4
 qt4/bin/qtconfig
 qt4/include/QtAssistant/QAssistantClient
 qt4/include/QtAssistant/QtAssistant
 qt4/include/QtAssistant/qassistantclient.h
+qt4/include/QtAssistant/qassistantclient_global.h
 qt4/include/QtDesigner/QAbstractExtensionFactory
 qt4/include/QtDesigner/QAbstractExtensionManager
 qt4/include/QtDesigner/QAbstractFormBuilder
 qt4/include/QtDesigner/QDesignerActionEditorInterface
+qt4/include/QtDesigner/QDesignerBrushManagerInterface
 qt4/include/QtDesigner/QDesignerComponents
 qt4/include/QtDesigner/QDesignerContainerExtension
 qt4/include/QtDesigner/QDesignerCustomWidgetCollectionInterface
@@ -30,6 +31,7 @@ qt4/include/QtDesigner/QDesignerFormWindowInterface
 qt4/include/QtDesigner/QDesignerFormWindowManagerInterface
 qt4/include/QtDesigner/QDesignerFormWindowToolInterface
 qt4/include/QtDesigner/QDesignerIconCacheInterface
+qt4/include/QtDesigner/QDesignerLanguageExtension
 qt4/include/QtDesigner/QDesignerLayoutDecorationExtension
 qt4/include/QtDesigner/QDesignerMemberSheetExtension
 qt4/include/QtDesigner/QDesignerMetaDataBaseInterface
@@ -47,6 +49,7 @@ qt4/include/QtDesigner/QExtensionManager
 qt4/include/QtDesigner/QFormBuilder
 qt4/include/QtDesigner/QtDesigner
 qt4/include/QtDesigner/abstractactioneditor.h
+qt4/include/QtDesigner/abstractbrushmanager.h
 qt4/include/QtDesigner/abstractdnditem.h
 qt4/include/QtDesigner/abstractformbuilder.h
 qt4/include/QtDesigner/abstractformeditor.h
@@ -56,6 +59,7 @@ qt4/include/QtDesigner/abstractformwindowcursor.h
 qt4/include/QtDesigner/abstractformwindowmanager.h
 qt4/include/QtDesigner/abstractformwindowtool.h
 qt4/include/QtDesigner/abstracticoncache.h
+qt4/include/QtDesigner/abstractlanguage.h
 qt4/include/QtDesigner/abstractmetadatabase.h
 qt4/include/QtDesigner/abstractobjectinspector.h
 qt4/include/QtDesigner/abstractpropertyeditor.h
@@ -78,11 +82,11 @@ qt4/include/QtDesigner/qdesignerexportwidget.h
 qt4/include/QtDesigner/qextensionmanager.h
 qt4/include/QtDesigner/sdk_global.h
 qt4/include/QtDesigner/taskmenu.h
-qt4/include/QtDesigner/ui4.h
 qt4/include/QtDesigner/uilib_global.h
 qt4/include/QtTest/QEventSizeOfChecker
 qt4/include/QtTest/QSignalSpy
 qt4/include/QtTest/QSpontaneKeyEvent
+qt4/include/QtTest/QTest
 qt4/include/QtTest/QTestAccessibility
 qt4/include/QtTest/QTestAccessibilityEvent
 qt4/include/QtTest/QTestData
@@ -108,7 +112,7 @@ qt4/include/QtTest/qtestkeyboard.h
 qt4/include/QtTest/qtestmouse.h
 qt4/include/QtTest/qtestspontaneevent.h
 qt4/include/QtTest/qtestsystem.h
-qt4/lib/libQtAssistantClient.a
+qt4/lib/libQtAssistantClient.la
 qt4/lib/libQtDesigner.la
 qt4/lib/libQtDesignerComponents.la
 qt4/lib/libQtTest.la
@@ -120,6 +124,10 @@ qt4/mkspecs/aix-xlc-64/qmake.conf
 qt4/mkspecs/aix-xlc-64/qplatformdefs.h
 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/qmake.conf
+qt4/mkspecs/common/unix.conf
 qt4/mkspecs/darwin-g++/qmake.conf
 qt4/mkspecs/darwin-g++/qplatformdefs.h
 qt4/mkspecs/default
@@ -133,14 +141,19 @@ qt4/mkspecs/features/designer.prf
 qt4/mkspecs/features/dll.prf
 qt4/mkspecs/features/exclusive_builds.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/objective_c.prf
+qt4/mkspecs/features/mac/ppc.prf
+qt4/mkspecs/features/mac/rez.prf
 qt4/mkspecs/features/mac/sdk.prf
-qt4/mkspecs/features/macx/ppc.prf
-qt4/mkspecs/features/macx/x86.prf
+qt4/mkspecs/features/mac/x86.prf
 qt4/mkspecs/features/moc.prf
+qt4/mkspecs/features/qdbus.prf
 qt4/mkspecs/features/qmake.conf
 qt4/mkspecs/features/qt.prf
 qt4/mkspecs/features/qt_config.prf
+qt4/mkspecs/features/qt_functions.prf
 qt4/mkspecs/features/qtestlib.prf
 qt4/mkspecs/features/qtopia.prf
 qt4/mkspecs/features/qtopiainc.prf
@@ -158,6 +171,7 @@ qt4/mkspecs/features/unix/dylib.prf
 qt4/mkspecs/features/unix/hide_symbols.prf
 qt4/mkspecs/features/unix/largefile.prf
 qt4/mkspecs/features/unix/opengl.prf
+qt4/mkspecs/features/unix/separate_debug_info.prf
 qt4/mkspecs/features/unix/thread.prf
 qt4/mkspecs/features/unix/x11.prf
 qt4/mkspecs/features/unix/x11inc.prf
@@ -167,6 +181,7 @@ qt4/mkspecs/features/warn_off.prf
 qt4/mkspecs/features/warn_on.prf
 qt4/mkspecs/features/win32/console.prf
 qt4/mkspecs/features/win32/default_pre.prf
+qt4/mkspecs/features/win32/dumpcpp.prf
 qt4/mkspecs/features/win32/embed_manifest_dll.prf
 qt4/mkspecs/features/win32/embed_manifest_exe.prf
 qt4/mkspecs/features/win32/exceptions.prf
@@ -230,8 +245,6 @@ 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-kylix/qmake.conf
-qt4/mkspecs/linux-kylix/qplatformdefs.h
 qt4/mkspecs/linux-lsb/qmake.conf
 qt4/mkspecs/linux-lsb/qplatformdefs.h
 qt4/mkspecs/linux-pgcc/qmake.conf
@@ -242,6 +255,8 @@ qt4/mkspecs/macx-g++/Info.plist.app
 qt4/mkspecs/macx-g++/Info.plist.lib
 qt4/mkspecs/macx-g++/qmake.conf
 qt4/mkspecs/macx-g++/qplatformdefs.h
+qt4/mkspecs/macx-icc/qmake.conf
+qt4/mkspecs/macx-icc/qplatformdefs.h
 qt4/mkspecs/macx-pbuilder/Info.plist.app
 qt4/mkspecs/macx-pbuilder/qmake.conf
 qt4/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -256,8 +271,6 @@ qt4/mkspecs/netbsd-g++/qplatformdefs.h
 qt4/mkspecs/openbsd-g++/qmake.conf
 qt4/mkspecs/openbsd-g++/qplatformdefs.h
 qt4/mkspecs/qconfig.pri
-qt4/mkspecs/qnx-g++/qmake.conf
-qt4/mkspecs/qnx-g++/qplatformdefs.h
 qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
 qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -345,17 +358,16 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/qws/linux-arm-g++
 @dirrm qt4/mkspecs/qws/freebsd-generic-g++
 @dirrm qt4/mkspecs/qws
-@dirrm qt4/mkspecs/qnx-g++
 @dirrm qt4/mkspecs/openbsd-g++
 @dirrm qt4/mkspecs/netbsd-g++
 @dirrm qt4/mkspecs/macx-xlc
 @dirrm qt4/mkspecs/macx-xcode
 @dirrm qt4/mkspecs/macx-pbuilder
+@dirrm qt4/mkspecs/macx-icc
 @dirrm qt4/mkspecs/macx-g++
 @dirrm qt4/mkspecs/lynxos-g++
 @dirrm qt4/mkspecs/linux-pgcc
 @dirrm qt4/mkspecs/linux-lsb
-@dirrm qt4/mkspecs/linux-kylix
 @dirrm qt4/mkspecs/linux-kcc
 @dirrm qt4/mkspecs/linux-icc
 @dirrm qt4/mkspecs/linux-g++-64
@@ -382,10 +394,10 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/freebsd-g++
 @dirrm qt4/mkspecs/features/win32
 @dirrm qt4/mkspecs/features/unix
-@dirrm qt4/mkspecs/features/macx
 @dirrm qt4/mkspecs/features/mac
 @dirrm qt4/mkspecs/features
 @dirrm qt4/mkspecs/darwin-g++
+@dirrm qt4/mkspecs/common
 @dirrm qt4/mkspecs/aix-xlc-64
 @dirrm qt4/mkspecs/aix-xlc
 @dirrm qt4/mkspecs/aix-g++-64