Update qt3 to 3.1.2. This update fixes a large number of bugs.

3 files changed, 34 insertions, 23 deletions

diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index b366d722c04..ba0d74b611e 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/02/18 19:16:55 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/18 08:36:25 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -16,14 +16,15 @@ ALL_TARGET=		sub-tools
 
 do-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic ${QTPREFIX}/bin
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqui.la ${QTPREFIX}/lib
-	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/designer ${QTPREFIX}/bin
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqui.la ${QTPREFIX}/lib
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/lib/libeditor.la ${QTPREFIX}/lib
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/designer ${QTPREFIX}/bin
 	${INSTALL_DATA_DIR} ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libwizards.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libcppeditor.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libdlgplugin.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/librcplugin.la ${QTPREFIX}/plugins/designer
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libkdevdlgplugin.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/assistant ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/linguist ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/qm2ts ${QTPREFIX}/bin
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index 62c57562abe..bd494c032ca 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/03/11 13:02:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/03/18 08:36:26 skrll Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -18,10 +18,10 @@ qt3/lib/libqui.so.1
 qt3/lib/libqui.so.1.0
 qt3/mkspecs/aix-g++/qmake.conf
 qt3/mkspecs/aix-g++/qplatformdefs.h
-qt3/mkspecs/aix-xlc/qmake.conf
-qt3/mkspecs/aix-xlc/qplatformdefs.h
 qt3/mkspecs/aix-xlc-64/qmake.conf
 qt3/mkspecs/aix-xlc-64/qplatformdefs.h
+qt3/mkspecs/aix-xlc/qmake.conf
+qt3/mkspecs/aix-xlc/qplatformdefs.h
 qt3/mkspecs/bsdi-g++/qmake.conf
 qt3/mkspecs/bsdi-g++/qplatformdefs.h
 qt3/mkspecs/cygwin-g++/qmake.conf
@@ -33,14 +33,16 @@ qt3/mkspecs/dgux-g++/qmake.conf
 qt3/mkspecs/dgux-g++/qplatformdefs.h
 qt3/mkspecs/freebsd-g++/qmake.conf
 qt3/mkspecs/freebsd-g++/qplatformdefs.h
-qt3/mkspecs/hpux-acc/qmake.conf
-qt3/mkspecs/hpux-acc/qplatformdefs.h
 qt3/mkspecs/hpux-acc-64/qmake.conf
 qt3/mkspecs/hpux-acc-64/qplatformdefs.h
 qt3/mkspecs/hpux-acc-o64/qmake.conf
 qt3/mkspecs/hpux-acc-o64/qplatformdefs.h
+qt3/mkspecs/hpux-acc/qmake.conf
+qt3/mkspecs/hpux-acc/qplatformdefs.h
 qt3/mkspecs/hpux-cc/qmake.conf
 qt3/mkspecs/hpux-cc/qplatformdefs.h
+qt3/mkspecs/hpux-g++-64/qmake.conf
+qt3/mkspecs/hpux-g++-64/qplatformdefs.h
 qt3/mkspecs/hpux-g++/qmake.conf
 qt3/mkspecs/hpux-g++/qplatformdefs.h
 qt3/mkspecs/hurd-g++/qmake.conf
@@ -63,6 +65,8 @@ qt3/mkspecs/linux-kcc/qmake.conf
 qt3/mkspecs/linux-kcc/qplatformdefs.h
 qt3/mkspecs/linux-pgcc/qmake.conf
 qt3/mkspecs/linux-pgcc/qplatformdefs.h
+qt3/mkspecs/lynxos-g++/qmake.conf
+qt3/mkspecs/lynxos-g++/qplatformdefs.h
 qt3/mkspecs/mac9-mwerks/mwerksapp.xml
 qt3/mkspecs/mac9-mwerks/mwerkslib.xml
 qt3/mkspecs/mac9-mwerks/qmake.conf
@@ -104,7 +108,6 @@ qt3/mkspecs/tru64-cxx/qmake.conf
 qt3/mkspecs/tru64-cxx/qplatformdefs.h
 qt3/mkspecs/tru64-g++/qmake.conf
 qt3/mkspecs/tru64-g++/qplatformdefs.h
-qt3/mkspecs/ultrix-g++/qmake.conf
 qt3/mkspecs/unixware-cc/qmake.conf
 qt3/mkspecs/unixware-cc/qplatformdefs.h
 qt3/mkspecs/unixware-g++/qmake.conf
@@ -112,19 +115,19 @@ qt3/mkspecs/unixware-g++/qplatformdefs.h
 qt3/mkspecs/win32-borland/qmake.conf
 qt3/mkspecs/win32-borland/qplatformdefs.h
 qt3/mkspecs/win32-g++/qmake.conf
+qt3/mkspecs/win32-g++/qplatformdefs.h
 qt3/mkspecs/win32-icc/qmake.conf
 qt3/mkspecs/win32-icc/qplatformdefs.h
 qt3/mkspecs/win32-icc/win32app.dsp
 qt3/mkspecs/win32-icc/win32dll.dsp
 qt3/mkspecs/win32-icc/win32lib.dsp
+qt3/mkspecs/win32-msvc.net/qmake.conf
+qt3/mkspecs/win32-msvc.net/qplatformdefs.h
 qt3/mkspecs/win32-msvc/qmake.conf
 qt3/mkspecs/win32-msvc/qplatformdefs.h
 qt3/mkspecs/win32-msvc/win32app.dsp
 qt3/mkspecs/win32-msvc/win32dll.dsp
 qt3/mkspecs/win32-msvc/win32lib.dsp
-qt3/mkspecs/win32-msvc.net/qmake.conf
-qt3/mkspecs/win32-msvc.net/qplatformdefs.h
-qt3/mkspecs/win32-visage/qmake.conf
 qt3/mkspecs/win32-watcom/qmake.conf
 qt3/plugins/designer/libcppeditor.a
 qt3/plugins/designer/libcppeditor.la
@@ -132,6 +135,9 @@ qt3/plugins/designer/libcppeditor.so
 qt3/plugins/designer/libdlgplugin.a
 qt3/plugins/designer/libdlgplugin.la
 qt3/plugins/designer/libdlgplugin.so
+qt3/plugins/designer/libkdevdlgplugin.a
+qt3/plugins/designer/libkdevdlgplugin.la
+qt3/plugins/designer/libkdevdlgplugin.so
 qt3/plugins/designer/librcplugin.a
 qt3/plugins/designer/librcplugin.la
 qt3/plugins/designer/librcplugin.so
@@ -139,27 +145,26 @@ qt3/plugins/designer/libwizards.a
 qt3/plugins/designer/libwizards.la
 qt3/plugins/designer/libwizards.so
 @dirrm qt3/plugins/designer
+@comment dirrm qt3/plugins
 @dirrm qt3/mkspecs/win32-watcom
-@dirrm qt3/mkspecs/win32-visage
 @dirrm qt3/mkspecs/win32-msvc.net
 @dirrm qt3/mkspecs/win32-msvc
 @dirrm qt3/mkspecs/win32-icc
 @dirrm qt3/mkspecs/win32-g++
 @dirrm qt3/mkspecs/win32-borland
-@dirrm qt3/mkspecs/unixware-cc
 @dirrm qt3/mkspecs/unixware-g++
-@dirrm qt3/mkspecs/ultrix-g++
+@dirrm qt3/mkspecs/unixware-cc
 @dirrm qt3/mkspecs/tru64-g++
 @dirrm qt3/mkspecs/tru64-cxx
 @dirrm qt3/mkspecs/solaris-kcc
 @dirrm qt3/mkspecs/solaris-g++-64
 @dirrm qt3/mkspecs/solaris-g++
-@dirrm qt3/mkspecs/solaris-cc
 @dirrm qt3/mkspecs/solaris-cc-64
+@dirrm qt3/mkspecs/solaris-cc
 @dirrm qt3/mkspecs/sco-g++
 @dirrm qt3/mkspecs/sco-cc
-@dirrm qt3/mkspecs/reliant-cds
 @dirrm qt3/mkspecs/reliant-cds-64
+@dirrm qt3/mkspecs/reliant-cds
 @dirrm qt3/mkspecs/qnx-g++
 @dirrm qt3/mkspecs/openbsd-g++
 @dirrm qt3/mkspecs/netbsd-g++
@@ -167,27 +172,32 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/mkspecs/macx-mwerks
 @dirrm qt3/mkspecs/macx-g++
 @dirrm qt3/mkspecs/mac9-mwerks
+@dirrm qt3/mkspecs/lynxos-g++
 @dirrm qt3/mkspecs/linux-pgcc
 @dirrm qt3/mkspecs/linux-kcc
 @dirrm qt3/mkspecs/linux-icc
 @dirrm qt3/mkspecs/linux-g++
 @dirrm qt3/mkspecs/linux-cxx
-@dirrm qt3/mkspecs/irix-cc-o32
-@dirrm qt3/mkspecs/irix-cc
 @dirrm qt3/mkspecs/irix-g++
+@dirrm qt3/mkspecs/irix-cc-o32
 @dirrm qt3/mkspecs/irix-cc-64
+@dirrm qt3/mkspecs/irix-cc
 @dirrm qt3/mkspecs/hurd-g++
+@dirrm qt3/mkspecs/hpux-g++-64
 @dirrm qt3/mkspecs/hpux-g++
 @dirrm qt3/mkspecs/hpux-cc
-@dirrm qt3/mkspecs/hpux-acc
 @dirrm qt3/mkspecs/hpux-acc-o64
 @dirrm qt3/mkspecs/hpux-acc-64
+@dirrm qt3/mkspecs/hpux-acc
 @dirrm qt3/mkspecs/freebsd-g++
 @dirrm qt3/mkspecs/dgux-g++
 @dirrm qt3/mkspecs/darwin-g++
 @dirrm qt3/mkspecs/cygwin-g++
 @dirrm qt3/mkspecs/bsdi-g++
-@dirrm qt3/mkspecs/aix-xlc
 @dirrm qt3/mkspecs/aix-xlc-64
+@dirrm qt3/mkspecs/aix-xlc
 @dirrm qt3/mkspecs/aix-g++
 @dirrm qt3/mkspecs
+@comment dirrm qt3/lib
+@comment dirrm qt3/bin
+@comment dirrm qt3
diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
index 80fefec3df8..720b30adf9c 100644
--- a/x11/qt3-tools/buildlink2.mk
+++ b/x11/qt3-tools/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/03/11 13:02:09 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/03/18 08:36:26 skrll Exp $
 
 .if !defined(QT3_TOOLS_BUILDLINK2_MK)
 QT3_TOOLS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-tools
-BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.1.1
+BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.1.2
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools