update to 3.3.1

changes (among many others):

- New QLocale Class

- The ActiveQt framework, first available in Qt 3.1, has been enhanced in
  lots of ways in Qt 3.3.

- Semi-Transparent Windows

Other Improvements
- The network module now supports IPv6 in addition to IPv4.
- New 64-bit platforms are supported: Itanium on Linux (Intel compiler) and
  Windows (MSVC and Intel).
- QCursor now provides the BusyCursor shape, which combines an hourglass with
  an arrow.
- Qt's DOM classes are now reentrant when Qt is built with multithread support
  enabled.

See http://www.trolltech.com/products/qt/whatsnew.html for more details.

15 files changed, 220 insertions, 66 deletions

diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST
index 40de8d13e2d..2fcab748cbf 100644
--- a/x11/qt3-docs/PLIST
+++ b/x11/qt3-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/12/19 15:43:31 skrll Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/16 14:30:44 recht Exp $
 qt3/doc/html/3rdparty.html
 qt3/doc/html/README
 qt3/doc/html/README-QT.TXT
@@ -7,7 +7,12 @@ qt3/doc/html/abstract-connections.png
 qt3/doc/html/abstractwidgets.html
 qt3/doc/html/accelerators.html
 qt3/doc/html/aclock-example.html
+qt3/doc/html/activeqt-dotnet.html
 qt3/doc/html/activeqt-examples.html
+qt3/doc/html/activeqt-tools-dumpdoc.html
+qt3/doc/html/activeqt-tools-idc.html
+qt3/doc/html/activeqt-tools-testcon.html
+qt3/doc/html/activeqt-tools.html
 qt3/doc/html/activeqt.html
 qt3/doc/html/addressbook-example.html
 qt3/doc/html/advanced.html
@@ -387,10 +392,8 @@ qt3/doc/html/qaxbindable-h.html
 qt3/doc/html/qaxbindable-members.html
 qt3/doc/html/qaxbindable.html
 qt3/doc/html/qaxcontainer-example-qutlook.html
-qt3/doc/html/qaxcontainer-example-testcon.html
 qt3/doc/html/qaxcontainer-example-webbrowser.html
 qt3/doc/html/qaxcontainer-examples.html
-qt3/doc/html/qaxcontainer-faq.html
 qt3/doc/html/qaxcontainer.html
 qt3/doc/html/qaxfactory-h.html
 qt3/doc/html/qaxfactory-members.html
@@ -398,6 +401,13 @@ qt3/doc/html/qaxfactory.html
 qt3/doc/html/qaxobject-h.html
 qt3/doc/html/qaxobject-members.html
 qt3/doc/html/qaxobject.html
+qt3/doc/html/qaxscript-h.html
+qt3/doc/html/qaxscript-members.html
+qt3/doc/html/qaxscript.html
+qt3/doc/html/qaxscriptengine-members.html
+qt3/doc/html/qaxscriptengine.html
+qt3/doc/html/qaxscriptmanager-members.html
+qt3/doc/html/qaxscriptmanager.html
 qt3/doc/html/qaxserver-demo-hierarchy.html
 qt3/doc/html/qaxserver-demo-menus.html
 qt3/doc/html/qaxserver-demo-multiple.html
@@ -413,7 +423,6 @@ qt3/doc/html/qaxserver-example-simple.html
 qt3/doc/html/qaxserver-example-tetrax.html
 qt3/doc/html/qaxserver-example-wrapper.html
 qt3/doc/html/qaxserver-examples.html
-qt3/doc/html/qaxserver-faq.html
 qt3/doc/html/qaxserver.html
 qt3/doc/html/qaxwidget-h.html
 qt3/doc/html/qaxwidget-members.html
@@ -572,6 +581,7 @@ qt3/doc/html/qd-helptoolbuttons3.png
 qt3/doc/html/qd-mainwinwzd.png
 qt3/doc/html/qd-mainwinwzdpage2.png
 qt3/doc/html/qd-preface.png
+qt3/doc/html/qd-preferences-dlg.png
 qt3/doc/html/qdatabrowser-h.html
 qt3/doc/html/qdatabrowser-members.html
 qt3/doc/html/qdatabrowser.html
@@ -840,6 +850,8 @@ qt3/doc/html/qhttpresponseheader-members.html
 qt3/doc/html/qhttpresponseheader.html
 qt3/doc/html/qicondrag-members.html
 qt3/doc/html/qicondrag.html
+qt3/doc/html/qicondragevent-members.html
+qt3/doc/html/qicondragevent.html
 qt3/doc/html/qicondragitem-members.html
 qt3/doc/html/qicondragitem.html
 qt3/doc/html/qiconfactory-members.html
@@ -957,6 +969,9 @@ qt3/doc/html/qlistviewitem.html
 qt3/doc/html/qlistviewitemiterator-members.html
 qt3/doc/html/qlistviewitemiterator.html
 qt3/doc/html/qlistviewitems.png
+qt3/doc/html/qlocale-h.html
+qt3/doc/html/qlocale-members.html
+qt3/doc/html/qlocale.html
 qt3/doc/html/qlocalfs-h.html
 qt3/doc/html/qlocalfs-members.html
 qt3/doc/html/qlocalfs.html
@@ -979,6 +994,7 @@ qt3/doc/html/qmake-manual-4.html
 qt3/doc/html/qmake-manual-5.html
 qt3/doc/html/qmake-manual-6.html
 qt3/doc/html/qmake-manual-7.html
+qt3/doc/html/qmake-manual-8.html
 qt3/doc/html/qmake-manual.html
 qt3/doc/html/qmake.dcf
 qt3/doc/html/qmap-h.html
@@ -1120,6 +1136,9 @@ qt3/doc/html/qplatinumstyle.html
 qt3/doc/html/qpngimagepacker-members.html
 qt3/doc/html/qpngimagepacker.html
 qt3/doc/html/qpngio-h.html
+qt3/doc/html/qpocketpcstyle-members.html
+qt3/doc/html/qpocketpcstyle.html
+qt3/doc/html/qpocketpcstyle_wce-h.html
 qt3/doc/html/qpoint-h.html
 qt3/doc/html/qpoint-members.html
 qt3/doc/html/qpoint.html
@@ -1399,7 +1418,7 @@ qt3/doc/html/qt-members.html
 qt3/doc/html/qt-template-lib.html
 qt3/doc/html/qt.dcf
 qt3/doc/html/qt.html
-qt3/doc/html/qt32-class-chart.png
+qt3/doc/html/qt33-class-chart.png
 qt3/doc/html/qtab-members.html
 qt3/doc/html/qtab.html
 qt3/doc/html/qtabbar-h.html
@@ -1475,6 +1494,7 @@ qt3/doc/html/qtimerevent-members.html
 qt3/doc/html/qtimerevent.html
 qt3/doc/html/qtl-qvaluelist-example.html
 qt3/doc/html/qtl.html
+qt3/doc/html/qtmac-as-native.html
 qt3/doc/html/qtoolbar-h.html
 qt3/doc/html/qtoolbar-members.html
 qt3/doc/html/qtoolbar.html
@@ -1658,7 +1678,6 @@ qt3/doc/html/rd-image.png
 qt3/doc/html/rd-open.png
 qt3/doc/html/rd-pagetitle.png
 qt3/doc/html/rd-prefedit1.png
-qt3/doc/html/rd-prefgen1.png
 qt3/doc/html/rd-projset.png
 qt3/doc/html/rd-projset2.png
 qt3/doc/html/rd-replace.png
@@ -1673,6 +1692,7 @@ qt3/doc/html/rd-template.png
 qt3/doc/html/rd-text.png
 qt3/doc/html/rd-title.png
 qt3/doc/html/rd-tunepalette.png
+qt3/doc/html/regexptester-example.html
 qt3/doc/html/removed20.html
 qt3/doc/html/richtext-example.html
 qt3/doc/html/rintersect.png
@@ -1932,6 +1952,9 @@ qt3/man/man3/QAxBase.3
 qt3/man/man3/QAxBindable.3
 qt3/man/man3/QAxFactory.3
 qt3/man/man3/QAxObject.3
+qt3/man/man3/QAxScript.3
+qt3/man/man3/QAxScriptEngine.3
+qt3/man/man3/QAxScriptManager.3
 qt3/man/man3/QAxWidget.3
 qt3/man/man3/QBig5Codec.3
 qt3/man/man3/QBig5hkscsCodec.3
@@ -2078,6 +2101,7 @@ qt3/man/man3/QHttpResponseHeader.3
 qt3/man/man3/QIMEvent.3
 qt3/man/man3/QIODevice.3
 qt3/man/man3/QIconDrag.3
+qt3/man/man3/QIconDragEvent.3
 qt3/man/man3/QIconDragItem.3
 qt3/man/man3/QIconFactory.3
 qt3/man/man3/QIconSet.3
@@ -2117,6 +2141,7 @@ qt3/man/man3/QListView.3
 qt3/man/man3/QListViewItem.3
 qt3/man/man3/QListViewItemIterator.3
 qt3/man/man3/QLocalFs.3
+qt3/man/man3/QLocale.3
 qt3/man/man3/QMacMime.3
 qt3/man/man3/QMacStyle.3
 qt3/man/man3/QMainWindow.3
@@ -2165,6 +2190,7 @@ qt3/man/man3/QPicture.3
 qt3/man/man3/QPixmap.3
 qt3/man/man3/QPixmapCache.3
 qt3/man/man3/QPlatinumStyle.3
+qt3/man/man3/QPocketPCStyle.3
 qt3/man/man3/QPoint.3
 qt3/man/man3/QPointArray.3
 qt3/man/man3/QPopupMenu.3
@@ -2343,6 +2369,9 @@ qt3/man/man3/qaxbase.3
 qt3/man/man3/qaxbindable.3
 qt3/man/man3/qaxfactory.3
 qt3/man/man3/qaxobject.3
+qt3/man/man3/qaxscript.3
+qt3/man/man3/qaxscriptengine.3
+qt3/man/man3/qaxscriptmanager.3
 qt3/man/man3/qaxwidget.3
 qt3/man/man3/qbig5codec.3
 qt3/man/man3/qbig5hkscscodec.3
@@ -2487,6 +2516,7 @@ qt3/man/man3/qhttpheader.3
 qt3/man/man3/qhttprequestheader.3
 qt3/man/man3/qhttpresponseheader.3
 qt3/man/man3/qicondrag.3
+qt3/man/man3/qicondragevent.3
 qt3/man/man3/qicondragitem.3
 qt3/man/man3/qiconfactory.3
 qt3/man/man3/qiconset.3
@@ -2527,6 +2557,7 @@ qt3/man/man3/qlistboxtext.3
 qt3/man/man3/qlistview.3
 qt3/man/man3/qlistviewitem.3
 qt3/man/man3/qlistviewitemiterator.3
+qt3/man/man3/qlocale.3
 qt3/man/man3/qlocalfs.3
 qt3/man/man3/qmacmime.3
 qt3/man/man3/qmacstyle.3
@@ -2576,6 +2607,7 @@ qt3/man/man3/qpixmap.3
 qt3/man/man3/qpixmapcache.3
 qt3/man/man3/qplatinumstyle.3
 qt3/man/man3/qpngimagepacker.3
+qt3/man/man3/qpocketpcstyle.3
 qt3/man/man3/qpoint.3
 qt3/man/man3/qpointarray.3
 qt3/man/man3/qpopupmenu.3
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index b2afa37ad67..fbd18b727e9 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/03/29 09:27:11 recht Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/16 14:30:44 recht Exp $
 #
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
@@ -6,7 +6,6 @@ LIBQT=			${WRKSRC}/lib/libqt-mt.la
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-libs-${QTVERSION}
-PKGREVISION=		1
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK2=		yes
@@ -18,6 +17,8 @@ PTHREAD_OPTS+=		require
 
 UNLIMIT_RESOURCES=	datasize
 
+BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
+
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 2b098f516e4..3a324b07a58 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/12/19 15:43:31 skrll Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/04/16 14:30:44 recht Exp $
 qt3/bin/moc
 qt3/include/jri.h
 qt3/include/jri_md.h
@@ -9,7 +9,6 @@ qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
 qt3/include/private/qcom_p.h
 qt3/include/private/qcomlibrary_p.h
-qt3/include/private/qcomplextext_p.h
 qt3/include/private/qcomponentfactory_p.h
 qt3/include/private/qcriticalsection_p.h
 qt3/include/private/qdialogbuttons_p.h
@@ -21,13 +20,16 @@ qt3/include/private/qfontcodecs_p.h
 qt3/include/private/qfontdata_p.h
 qt3/include/private/qfontengine_p.h
 qt3/include/private/qgfxdriverinterface_p.h
+qt3/include/private/qgl_x11_p.h
 qt3/include/private/qgpluginmanager_p.h
 qt3/include/private/qimageformatinterface_p.h
 qt3/include/private/qinputcontext_p.h
 qt3/include/private/qinternal_p.h
+qt3/include/private/qisciicodec_p.h
 qt3/include/private/qkbddriverinterface_p.h
 qt3/include/private/qlayoutengine_p.h
 qt3/include/private/qlibrary_p.h
+qt3/include/private/qlocale_p.h
 qt3/include/private/qlock_p.h
 qt3/include/private/qmousedriverinterface_p.h
 qt3/include/private/qmutex_p.h
@@ -45,6 +47,7 @@ qt3/include/private/qsqlextension_p.h
 qt3/include/private/qsqlmanager_p.h
 qt3/include/private/qstyleinterface_p.h
 qt3/include/private/qsvgdevice_p.h
+qt3/include/private/qsyntaxhighlighter_p.h
 qt3/include/private/qt_x11_p.h
 qt3/include/private/qtextcodecinterface_p.h
 qt3/include/private/qtextengine_p.h
@@ -200,6 +203,7 @@ qt3/include/qlineedit.h
 qt3/include/qlist.h
 qt3/include/qlistbox.h
 qt3/include/qlistview.h
+qt3/include/qlocale.h
 qt3/include/qlocalfs.h
 qt3/include/qmainwindow.h
 qt3/include/qmap.h
@@ -396,7 +400,7 @@ qt3/lib/libqt-mt.a
 qt3/lib/libqt-mt.la
 qt3/lib/libqt-mt.so
 qt3/lib/libqt-mt.so.3
-qt3/lib/libqt-mt.so.3.2
+qt3/lib/libqt-mt.so.3.3
 qt3/plugins/imageformats/libqjpeg.a
 qt3/plugins/imageformats/libqjpeg.la
 qt3/plugins/imageformats/libqjpeg.so
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index a0fddcf1897..bd8bb22a3c8 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/30 18:58:34 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/04/16 14:30:45 recht Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
@@ -13,13 +13,14 @@ BUILDLINK_PACKAGES+=	qt3-libs
 .if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
+
+BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
+BUILDLINK_LIBDIRS.qt3-libs+=	qt3/lib
+                                                                                
 .endif	# QT3_LIBS_BUILDLINK3_MK
 
 QTDIR=	${BUILDLINK_PREFIX.qt3-libs}/qt3
-                                                                                
-BUILDLINK_INCDIRS.qt3-libs+=	${QTDIR}/include
-BUILDLINK_LIBDIRS.qt3-libs+=	${QTDIR}/lib
-                                                                                
+
 PTHREAD_OPTS+=	require
 
 .include "../../devel/zlib/buildlink3.mk"
@@ -36,7 +37,7 @@ PTHREAD_OPTS+=	require
 
 CONFIGURE_ENV+=		MOC="${QTDIR}/bin/moc"
 MAKE_ENV+=		MOC="${QTDIR}/bin/moc"
-LDFLAGS+=		-Wl,${RPATH_FLAG}${QTDIR}/lib
+#LDFLAGS+=		-Wl,${RPATH_FLAG}${QTDIR}/lib
 
 .if !defined(BUILD_QT3)
 CONFIGURE_ENV+=		QTDIR="${QTDIR}"
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index b02a8365a80..48136ec5475 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2003/12/19 15:43:31 skrll Exp $
+$NetBSD: distinfo,v 1.18 2004/04/16 14:30:45 recht Exp $
 
-SHA1 (qt-x11-free-3.2.3.tar.bz2) = 51a2532d298b24edd27b475c9de9209134c074ae
-Size (qt-x11-free-3.2.3.tar.bz2) = 13952198 bytes
+SHA1 (qt-x11-free-3.3.1.tar.bz2) = 55cefb492643dc739883d2d3073209419330c059
+Size (qt-x11-free-3.3.1.tar.bz2) = 14397600 bytes
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
-SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
-SHA1 (patch-ad) = 3d638078a207d5062d9a758d53053e85b1c22426
+SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
 SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
+SHA1 (patch-af) = cdd5e10d3ae71e288ff0de4995aef3622c1f226e
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 3615a92dc2022d4cdfe21a7068ad966dfbb09e36
-SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f
+SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 7f88f2277d2..8145d0fcf37 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $
+$NetBSD: patch-ac,v 1.5 2004/04/16 14:30:45 recht Exp $
 
---- src/tools/qdir_unix.cpp.orig	Mon Dec  9 22:40:32 2002
-+++ src/tools/qdir_unix.cpp
+--- src/tools/qdir_unix.cpp.orig	2004-02-18 14:22:42.000000000 +0100
++++ src/tools/qdir_unix.cpp	2004-04-15 01:49:24.000000000 +0200
 @@ -36,6 +36,16 @@
  **********************************************************************/
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $
  #include "qdir.h"
  
  #ifndef QT_NO_DIR
-@@ -86,10 +96,19 @@
+@@ -88,10 +98,19 @@
  
  bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
  {
@@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $
      int status =
  	::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 );
  #else
-@@ -101,7 +120,24 @@ bool QDir::mkdir( const QString &dirName
+@@ -103,7 +122,24 @@
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
deleted file mode 100644
index 61bf8a8b021..00000000000
--- a/x11/qt3-libs/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/12/19 15:43:31 skrll Exp $
-
---- src/kernel/qscriptengine_x11.cpp.orig	2003-11-10 10:22:02.000000000 +0000
-+++ src/kernel/qscriptengine_x11.cpp
-@@ -2671,7 +2671,7 @@ static void hangul_shape_syllable( const
-     } else if (syllableLength == 3) {
- 	int LIndex = ch[0].unicode() - Hangul_LBase;
- 	int VIndex = ch[1].unicode() - Hangul_VBase;
--	int TIndex = ch[1].unicode() - Hangul_TBase;
-+	int TIndex = ch[2].unicode() - Hangul_TBase;
- 	if (LIndex >= 0 && LIndex < Hangul_LCount &&
- 	    VIndex >= 0 && VIndex < Hangul_VCount &&
- 	    TIndex >= 0 && TIndex < Hangul_TCount )
diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af
new file mode 100644
index 00000000000..821ca7d6df5
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-af
@@ -0,0 +1,96 @@
+$NetBSD: patch-af,v 1.1 2004/04/16 14:30:45 recht Exp $
+
+--- src/kernel/qclipboard_x11.cpp.orig	2004-02-18 14:22:48.000000000 +0100
++++ src/kernel/qclipboard_x11.cpp	2004-04-15 01:54:07.000000000 +0200
+@@ -112,10 +112,6 @@
+ 
+ // event capture mechanism for qt_xclb_wait_for_event
+ static bool waiting_for_data = FALSE;
+-static bool has_captured_event = FALSE;
+-static Window capture_event_win = None;
+-static int capture_event_type = -1;
+-static XEvent captured_event;
+ 
+ class QClipboardWatcher; // forward decl
+ static QClipboardWatcher *selection_watcher = 0;
+@@ -432,69 +428,36 @@
+ { return inSelectionMode_obsolete; }
+ 
+ 
+-// event filter function... captures interesting events while
+-// qt_xclb_wait_for_event is running the event loop
+-static int qt_xclb_event_filter(XEvent *event)
+-{
+-    if (event->xany.type == capture_event_type &&
+-	event->xany.window == capture_event_win) {
+-	VDEBUG( "QClipboard: event_filter(): caught event type %d", event->type );
+-	has_captured_event = TRUE;
+-	captured_event = *event;
+-	return 1;
+-    }
+-
+-    return 0;
+-}
+-
+ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
+ 			     int timeout )
+ {
+-    if ( waiting_for_data )
+-	qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
+-
+-    waiting_for_data = TRUE;
+-
+     QTime started = QTime::currentTime();
+     QTime now = started;
+-
+-    has_captured_event = FALSE;
+-    capture_event_win = win;
+-    capture_event_type = type;
+-
+-    QX11EventFilter old_event_filter = qt_set_x11_event_filter(qt_xclb_event_filter);
++    bool flushed = FALSE;
+ 
+     do {
+-	if ( XCheckTypedWindowEvent(dpy,win,type,event) ) {
+-	    waiting_for_data = FALSE;
+-	    qt_set_x11_event_filter(old_event_filter);
++	if ( XCheckTypedWindowEvent(dpy,win,type,event) )
+ 	    return TRUE;
+-	}
+ 
+ 	now = QTime::currentTime();
+ 	if ( started > now )			// crossed midnight
+ 	    started = now;
+ 
+-	// 0x08 == ExcludeTimers for X11 only
+-	qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput |
+-					  QEventLoop::ExcludeSocketNotifiers |
+-					  QEventLoop::WaitForMore | 0x08 );
+-
+-	if ( has_captured_event ) {
+-	    waiting_for_data = FALSE;
+-	    *event = captured_event;
+-	    qt_set_x11_event_filter(old_event_filter);
+-	    return TRUE;
++	if(!flushed) {
++	    XFlush( dpy );
++	    flushed = TRUE;
+ 	}
+-    } while ( started.msecsTo(now) < timeout );
+ 
+-    waiting_for_data = FALSE;
+-    qt_set_x11_event_filter(old_event_filter);
++	// sleep 50ms, so we don't use up CPU cycles all the time.
++	struct timeval usleep_tv;
++	usleep_tv.tv_sec = 0;
++	usleep_tv.tv_usec = 50000;
++	select(0, 0, 0, 0, &usleep_tv);
++    } while ( started.msecsTo(now) < timeout );
+ 
+     return FALSE;
+ }
+ 
+-
+ static inline int maxSelectionIncr( Display *dpy )
+ { return XMaxRequestSize(dpy) > 65536 ? 65536*4 : XMaxRequestSize(dpy)*4 - 100; }
+ 
diff --git a/x11/qt3-libs/patches/patch-bc b/x11/qt3-libs/patches/patch-bc
index dec24b6d81f..844889897c5 100644
--- a/x11/qt3-libs/patches/patch-bc
+++ b/x11/qt3-libs/patches/patch-bc
@@ -1,13 +1,13 @@
-$NetBSD: patch-bc,v 1.1 2003/07/22 17:17:20 drochner Exp $
+$NetBSD: patch-bc,v 1.2 2004/04/16 14:30:45 recht Exp $
 
---- tools/assistant/lib/lib.pro.orig	2003-07-16 12:27:26.000000000 +0200
-+++ tools/assistant/lib/lib.pro	2003-07-16 12:27:47.000000000 +0200
-@@ -5,7 +5,7 @@
- SOURCES		= qassistantclient.cpp
- HEADERS         += $$QT_SOURCE_TREE/include/qassistantclient.h
+--- tools/assistant/lib/lib.pro.orig	2003-10-31 15:36:28.000000000 +0100
++++ tools/assistant/lib/lib.pro	2004-04-15 01:53:19.000000000 +0200
+@@ -3,7 +3,7 @@
+ VERSION		= 1.0
  
--CONFIG += staticlib
-+#CONFIG += staticlib
- CONFIG	-= dll
+ CONFIG		+= qt warn_on release
+-CONFIG		+= staticlib
++#CONFIG		+= staticlib
+ CONFIG		-= dll
  
- DEFINES		+= QT_INTERNAL_NETWORK
+ SOURCES		= qassistantclient.cpp
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index b199b0a347f..fdcf251128c 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:28:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/16 14:30:45 recht Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		1
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index a089c7d3257..4f3d4d3c7ce 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2003/12/23 17:50:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/16 14:30:45 recht Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
-PKGREVISION=		1
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index 744db71e578..dfb519eedd1 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2003/12/23 17:50:59 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/04/16 14:30:45 recht Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -23,6 +23,8 @@ qt3/lib/libqui.la
 qt3/lib/libqui.so
 qt3/lib/libqui.so.1
 qt3/lib/libqui.so.1.0
+qt3/mkspecs/aix-g++-64/qmake.conf
+qt3/mkspecs/aix-g++-64/qplatformdefs.h
 qt3/mkspecs/aix-g++/qmake.conf
 qt3/mkspecs/aix-g++/qplatformdefs.h
 qt3/mkspecs/aix-xlc-64/qmake.conf
@@ -40,6 +42,8 @@ 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/freebsd-icc/qmake.conf
+qt3/mkspecs/freebsd-icc/qplatformdefs.h
 qt3/mkspecs/hpux-acc-64/qmake.conf
 qt3/mkspecs/hpux-acc-64/qplatformdefs.h
 qt3/mkspecs/hpux-acc-o64/qmake.conf
@@ -68,6 +72,10 @@ qt3/mkspecs/irix-g++/qmake.conf
 qt3/mkspecs/irix-g++/qplatformdefs.h
 qt3/mkspecs/linux-cxx/qmake.conf
 qt3/mkspecs/linux-cxx/qplatformdefs.h
+qt3/mkspecs/linux-ecc-64/qmake.conf
+qt3/mkspecs/linux-ecc-64/qplatformdefs.h
+qt3/mkspecs/linux-g++-64/qmake.conf
+qt3/mkspecs/linux-g++-64/qplatformdefs.h
 qt3/mkspecs/linux-g++/qmake.conf
 qt3/mkspecs/linux-g++/qplatformdefs.h
 qt3/mkspecs/linux-icc/qmake.conf
@@ -123,6 +131,7 @@ 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-g++/qtcrtentrypoint.cpp
 qt3/mkspecs/win32-icc/qmake.conf
 qt3/mkspecs/win32-icc/qplatformdefs.h
 qt3/mkspecs/win32-icc/win32app.dsp
@@ -152,7 +161,7 @@ qt3/plugins/designer/libwizards.a
 qt3/plugins/designer/libwizards.la
 qt3/plugins/designer/libwizards.so
 @dirrm qt3/plugins/designer
-@comment dirrm qt3/plugins
+@comment @dirrm qt3/plugins
 @dirrm qt3/mkspecs/win32-watcom
 @dirrm qt3/mkspecs/win32-msvc.net
 @dirrm qt3/mkspecs/win32-msvc
@@ -179,24 +188,27 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/mkspecs/macx-g++
 @dirrm qt3/mkspecs/lynxos-g++
 @dirrm qt3/mkspecs/linux-pgcc
-@dirrm qt3/mkspecs/linux-kcc
 @dirrm qt3/mkspecs/linux-kylix
+@dirrm qt3/mkspecs/linux-kcc
 @dirrm qt3/mkspecs/linux-icc
+@dirrm qt3/mkspecs/linux-g++-64
 @dirrm qt3/mkspecs/linux-g++
+@dirrm qt3/mkspecs/linux-ecc-64
 @dirrm qt3/mkspecs/linux-cxx
 @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/hpuxi-acc-64
+@dirrm qt3/mkspecs/hpuxi-acc-32
 @dirrm qt3/mkspecs/hpux-g++-64
 @dirrm qt3/mkspecs/hpux-g++
 @dirrm qt3/mkspecs/hpux-cc
 @dirrm qt3/mkspecs/hpux-acc-o64
 @dirrm qt3/mkspecs/hpux-acc-64
 @dirrm qt3/mkspecs/hpux-acc
-@dirrm qt3/mkspecs/hpuxi-acc-32
-@dirrm qt3/mkspecs/hpuxi-acc-64
+@dirrm qt3/mkspecs/freebsd-icc
 @dirrm qt3/mkspecs/freebsd-g++
 @dirrm qt3/mkspecs/dgux-g++
 @dirrm qt3/mkspecs/darwin-g++
@@ -204,5 +216,6 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/mkspecs/bsdi-g++
 @dirrm qt3/mkspecs/aix-xlc-64
 @dirrm qt3/mkspecs/aix-xlc
+@dirrm qt3/mkspecs/aix-g++-64
 @dirrm qt3/mkspecs/aix-g++
 @dirrm qt3/mkspecs
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
new file mode 100644
index 00000000000..d85f9fd0693
--- /dev/null
+++ b/x11/qt3-tools/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/16 14:30:45 recht Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	qt3-tools
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-tools}
+BUILDLINK_PACKAGES+=	qt3-tools
+
+.if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
+BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
+.endif	# QT3_TOOLS_BUILDLINK3_MK
+
+.include "../../x11/qt3-libs/buildlink3.mk"
+
+CONFIGURE_ENV+=			UIC="${QTDIR}/bin/uic"
+MAKE_ENV+=			UIC="${QTDIR}/bin/uic"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 44130fdf7f6..2663cc571fc 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2004/04/01 11:43:56 tron Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/16 14:30:44 recht Exp $
 
 DISTNAME=	qt3-${QTVERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,8 +9,8 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "./Makefile.common"
 
-DEPENDS+=	qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs
-DEPENDS+=	qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools
+DEPENDS+=	qt3-libs-${QTVERSION}:../../x11/qt3-libs
+DEPENDS+=	qt3-tools-${QTVERSION}:../../x11/qt3-tools
 DEPENDS+=	qt3-docs-${QTVERSION}:../../x11/qt3-docs
 
 USE_BUILDLINK2=	yes
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 0dcf6fb196d..d7bf27c7ce2 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.12 2004/03/09 21:00:09 skrll Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/04/16 14:30:44 recht Exp $
 #
 
-QTVERSION=	3.2.3
+QTVERSION=	3.3.1
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html