Update QT3 to 3.2.3.

Far too many new features and bug fixes to list here. Includes a fix for
Hangul (Korean character) handling from Bang Jun-Young <junyoung at netbsd
dot org>. Thanks.

"Better late than never"

19 files changed, 250 insertions, 145 deletions

diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index bf3b74ccf49..66315cf13fd 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/08/01 15:31:08 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/19 15:43:31 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 USE_BUILDLINK2=	yes
@@ -29,7 +28,7 @@ do-install:
 	    fi; \
 	 done)
 	${INSTALL_DATA_DIR} ${QTPREFIX}/doc/html
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${QTPREFIX}/doc/html
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-QT.TXT ${QTPREFIX}/doc/html
 	cd ${WRKSRC};  \
 	DOCDIRS="`${FIND} doc/html -type d -print | ${SORT}`"; \
 	(for d in $${DOCDIRS}; do \
diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST
index 0c1668f58a7..40de8d13e2d 100644
--- a/x11/qt3-docs/PLIST
+++ b/x11/qt3-docs/PLIST
@@ -1,25 +1,30 @@
-@comment $NetBSD: PLIST,v 1.7 2003/03/18 08:36:24 skrll Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/12/19 15:43:31 skrll Exp $
+qt3/doc/html/3rdparty.html
 qt3/doc/html/README
-qt3/doc/html/README.QT
+qt3/doc/html/README-QT.TXT
 qt3/doc/html/aboutqt.html
 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-examples.html
+qt3/doc/html/activeqt.html
 qt3/doc/html/addressbook-example.html
 qt3/doc/html/advanced.html
 qt3/doc/html/annotated.html
 qt3/doc/html/appearance.html
 qt3/doc/html/appicon.html
 qt3/doc/html/application.html
+qt3/doc/html/archivesearch-example.html
 qt3/doc/html/assistant-1.html
 qt3/doc/html/assistant-2.html
 qt3/doc/html/assistant-3.html
 qt3/doc/html/assistant-4.html
 qt3/doc/html/assistant-5.html
 qt3/doc/html/assistant-6.html
+qt3/doc/html/assistant.dcf
 qt3/doc/html/assistant.html
-qt3/doc/html/assistant.xml
+qt3/doc/html/assistant.png
 qt3/doc/html/basic.html
 qt3/doc/html/bearings.png
 qt3/doc/html/biff-example.html
@@ -30,7 +35,6 @@ qt3/doc/html/brush-styles.png
 qt3/doc/html/bughowto.html
 qt3/doc/html/buttongroup-w.png
 qt3/doc/html/buttongroups-example.html
-qt3/doc/html/buyhowto.html
 qt3/doc/html/canvas-chart-example.html
 qt3/doc/html/canvas-example.html
 qt3/doc/html/canvas.html
@@ -59,6 +63,7 @@ qt3/doc/html/classchart.html
 qt3/doc/html/classes.html
 qt3/doc/html/clientserver-example.html
 qt3/doc/html/collection.html
+qt3/doc/html/commercialeditions.html
 qt3/doc/html/commonproblems.html
 qt3/doc/html/concrete-connections.png
 qt3/doc/html/coordsys.html
@@ -69,8 +74,8 @@ qt3/doc/html/cursors.png
 qt3/doc/html/customlayout-example.html
 qt3/doc/html/customlayout.html
 qt3/doc/html/customstyles.html
-qt3/doc/html/database-connections.png
 qt3/doc/html/database.html
+qt3/doc/html/databaseconnections.png
 qt3/doc/html/datastreamformat.html
 qt3/doc/html/datetimewidgets.png
 qt3/doc/html/dclock-example.html
@@ -94,7 +99,7 @@ qt3/doc/html/designer-manual-7.html
 qt3/doc/html/designer-manual-8.html
 qt3/doc/html/designer-manual-9.html
 qt3/doc/html/designer-manual.html
-qt3/doc/html/designer.xml
+qt3/doc/html/designer.dcf
 qt3/doc/html/designer1.jpg
 qt3/doc/html/designer2.jpg
 qt3/doc/html/designer3.jpg
@@ -117,7 +122,9 @@ qt3/doc/html/dialog3sample.png
 qt3/doc/html/dialogs.html
 qt3/doc/html/dirview-example.html
 qt3/doc/html/distributingqt.html
+qt3/doc/html/distributor-example.html
 qt3/doc/html/dnd.html
+qt3/doc/html/docwindow.png
 qt3/doc/html/doneandnext.png
 qt3/doc/html/draganddrop.html
 qt3/doc/html/dragdrop-example.html
@@ -151,6 +158,7 @@ qt3/doc/html/events.html
 qt3/doc/html/eventsandfilters.html
 qt3/doc/html/examples.html
 qt3/doc/html/extension-dialog-example.html
+qt3/doc/html/faq.html
 qt3/doc/html/filechooser.png
 qt3/doc/html/fileiconview-example.html
 qt3/doc/html/fileopen.png
@@ -160,8 +168,10 @@ qt3/doc/html/finddialog.png
 qt3/doc/html/focus.html
 qt3/doc/html/forever-example.html
 qt3/doc/html/frames.png
+qt3/doc/html/freeeditions.html
 qt3/doc/html/ftpclient-example.html
 qt3/doc/html/functions.html
+qt3/doc/html/general.png
 qt3/doc/html/geomanagement.html
 qt3/doc/html/geometry.html
 qt3/doc/html/geometry.png
@@ -176,6 +186,7 @@ qt3/doc/html/guibooks.html
 qt3/doc/html/headerfilesynonyms
 qt3/doc/html/headers.html
 qt3/doc/html/hello-example.html
+qt3/doc/html/helpsystem-example.html
 qt3/doc/html/helpsystem.html
 qt3/doc/html/helpviewer-example.html
 qt3/doc/html/hierarchy.html
@@ -192,9 +203,11 @@ qt3/doc/html/images.html
 qt3/doc/html/index
 qt3/doc/html/index.html
 qt3/doc/html/inputdialogs.png
+qt3/doc/html/install-mac.html
 qt3/doc/html/install-win.html
 qt3/doc/html/install-x11.html
 qt3/doc/html/installation.html
+qt3/doc/html/integration.html
 qt3/doc/html/io.html
 qt3/doc/html/keyfeatures30.html
 qt3/doc/html/layout-example.html
@@ -210,15 +223,14 @@ qt3/doc/html/linguist-manual-2.html
 qt3/doc/html/linguist-manual-3.html
 qt3/doc/html/linguist-manual-4.html
 qt3/doc/html/linguist-manual.html
+qt3/doc/html/linguist.dcf
 qt3/doc/html/linguist.png
-qt3/doc/html/linguist.xml
 qt3/doc/html/listbox-example.html
 qt3/doc/html/listboxcombo-example.html
 qt3/doc/html/listviews-example.html
 qt3/doc/html/logo32.png
 qt3/doc/html/mac-differences.html
 qt3/doc/html/mail-example.html
-qt3/doc/html/mailinglists.html
 qt3/doc/html/mainclasses.html
 qt3/doc/html/mainwindow-w.png
 qt3/doc/html/makeqpf.html
@@ -229,11 +241,25 @@ qt3/doc/html/metaobjects.html
 qt3/doc/html/misc.html
 qt3/doc/html/moc.html
 qt3/doc/html/modules.html
+qt3/doc/html/motif-customwidget-example.html
+qt3/doc/html/motif-dialog-example.html
+qt3/doc/html/motif-examples.html
+qt3/doc/html/motif-extension.html
+qt3/doc/html/motif-todo.png
+qt3/doc/html/motif-walkthrough-1.html
+qt3/doc/html/motif-walkthrough-10.html
+qt3/doc/html/motif-walkthrough-2.html
+qt3/doc/html/motif-walkthrough-3.html
+qt3/doc/html/motif-walkthrough-4.html
+qt3/doc/html/motif-walkthrough-5.html
+qt3/doc/html/motif-walkthrough-6.html
+qt3/doc/html/motif-walkthrough-7.html
+qt3/doc/html/motif-walkthrough-8.html
+qt3/doc/html/motif-walkthrough-9.html
+qt3/doc/html/motif-walkthrough.html
 qt3/doc/html/movies-example.html
 qt3/doc/html/multimedia.html
-qt3/doc/html/mw-actiongroup.png
 qt3/doc/html/mw-addmainwidg.png
-qt3/doc/html/mw-addmenuitem.png
 qt3/doc/html/mw-coloriconv.png
 qt3/doc/html/mw-colortable.png
 qt3/doc/html/mw-colortool1.png
@@ -243,6 +269,7 @@ qt3/doc/html/mw-conn2.png
 qt3/doc/html/mw-conn3.png
 qt3/doc/html/mw-conn4.png
 qt3/doc/html/mw-dragaction.png
+qt3/doc/html/mw-dragviewitem.png
 qt3/doc/html/mw-editforw.png
 qt3/doc/html/mw-editfunc.png
 qt3/doc/html/mw-editincimp.png
@@ -252,10 +279,12 @@ qt3/doc/html/mw-laycolortable.png
 qt3/doc/html/mw-laymainwidg.png
 qt3/doc/html/mw-menuwiz.png
 qt3/doc/html/mw-newfile.png
+qt3/doc/html/mw-newmenuitem.png
 qt3/doc/html/mw-objexplor.png
 qt3/doc/html/mw-previewform.png
 qt3/doc/html/mw-projset.png
 qt3/doc/html/mw-propedit.png
+qt3/doc/html/mw-separator.png
 qt3/doc/html/mw-settoolwiz.png
 qt3/doc/html/mw-startdesign.png
 qt3/doc/html/mw-toolbarpits.png
@@ -283,6 +312,7 @@ qt3/doc/html/organizers.html
 qt3/doc/html/outliner-example.html
 qt3/doc/html/overviews-list.html
 qt3/doc/html/palette.png
+qt3/doc/html/pdf1.png
 qt3/doc/html/pen-cap-styles.png
 qt3/doc/html/pen-join-styles.png
 qt3/doc/html/pen-styles.png
@@ -348,6 +378,46 @@ qt3/doc/html/qasyncimageio-h.html
 qt3/doc/html/qasyncio-h.html
 qt3/doc/html/qasyncio-members.html
 qt3/doc/html/qasyncio.html
+qt3/doc/html/qaxaggregated-members.html
+qt3/doc/html/qaxaggregated.html
+qt3/doc/html/qaxbase-h.html
+qt3/doc/html/qaxbase-members.html
+qt3/doc/html/qaxbase.html
+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
+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/qaxserver-demo-hierarchy.html
+qt3/doc/html/qaxserver-demo-menus.html
+qt3/doc/html/qaxserver-demo-multiple.html
+qt3/doc/html/qaxserver-demo-opengl.html
+qt3/doc/html/qaxserver-demo-simple.html
+qt3/doc/html/qaxserver-demo-tetrax.html
+qt3/doc/html/qaxserver-demo-wrapper.html
+qt3/doc/html/qaxserver-example-hierarchy.html
+qt3/doc/html/qaxserver-example-menus.html
+qt3/doc/html/qaxserver-example-multiple.html
+qt3/doc/html/qaxserver-example-opengl.html
+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
+qt3/doc/html/qaxwidget.html
 qt3/doc/html/qbig5codec-h.html
 qt3/doc/html/qbig5codec-members.html
 qt3/doc/html/qbig5codec.html
@@ -481,6 +551,7 @@ qt3/doc/html/qcustomevent-members.html
 qt3/doc/html/qcustomevent.html
 qt3/doc/html/qcustommenuitem-members.html
 qt3/doc/html/qcustommenuitem.html
+qt3/doc/html/qd-actioneditor.png
 qt3/doc/html/qd-colortool-name.png
 qt3/doc/html/qd-databrowserwzd.png
 qt3/doc/html/qd-databrowserwzdpage2.png
@@ -529,6 +600,8 @@ qt3/doc/html/qdatetime.html
 qt3/doc/html/qdatetimeedit-h.html
 qt3/doc/html/qdatetimeedit-members.html
 qt3/doc/html/qdatetimeedit.html
+qt3/doc/html/qdatetimeeditbase-members.html
+qt3/doc/html/qdatetimeeditbase.html
 qt3/doc/html/qdeepcopy-h.html
 qt3/doc/html/qdeepcopy-members.html
 qt3/doc/html/qdeepcopy.html
@@ -887,6 +960,8 @@ qt3/doc/html/qlistviewitems.png
 qt3/doc/html/qlocalfs-h.html
 qt3/doc/html/qlocalfs-members.html
 qt3/doc/html/qlocalfs.html
+qt3/doc/html/qmacmime-members.html
+qt3/doc/html/qmacmime.html
 qt3/doc/html/qmacstyle-members.html
 qt3/doc/html/qmacstyle.html
 qt3/doc/html/qmacstyle_mac-h.html
@@ -905,7 +980,7 @@ 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.html
-qt3/doc/html/qmake.xml
+qt3/doc/html/qmake.dcf
 qt3/doc/html/qmap-h.html
 qt3/doc/html/qmap-members.html
 qt3/doc/html/qmap.html
@@ -928,6 +1003,7 @@ qt3/doc/html/qmessagebox-crit.png
 qt3/doc/html/qmessagebox-h.html
 qt3/doc/html/qmessagebox-info.png
 qt3/doc/html/qmessagebox-members.html
+qt3/doc/html/qmessagebox-quest.png
 qt3/doc/html/qmessagebox-warn.png
 qt3/doc/html/qmessagebox.html
 qt3/doc/html/qmetaobject-h.html
@@ -942,12 +1018,21 @@ qt3/doc/html/qmimesourcefactory-members.html
 qt3/doc/html/qmimesourcefactory.html
 qt3/doc/html/qmlined-m.png
 qt3/doc/html/qmlined-w.png
+qt3/doc/html/qmotif-h.html
+qt3/doc/html/qmotif-members.html
+qt3/doc/html/qmotif.html
+qt3/doc/html/qmotifdialog-h.html
+qt3/doc/html/qmotifdialog-members.html
+qt3/doc/html/qmotifdialog.html
 qt3/doc/html/qmotifplusstyle-h.html
 qt3/doc/html/qmotifplusstyle-members.html
 qt3/doc/html/qmotifplusstyle.html
 qt3/doc/html/qmotifstyle-h.html
 qt3/doc/html/qmotifstyle-members.html
 qt3/doc/html/qmotifstyle.html
+qt3/doc/html/qmotifwidget-h.html
+qt3/doc/html/qmotifwidget-members.html
+qt3/doc/html/qmotifwidget.html
 qt3/doc/html/qmouse_qws-h.html
 qt3/doc/html/qmousedriverfactory-members.html
 qt3/doc/html/qmousedriverfactory.html
@@ -998,6 +1083,8 @@ qt3/doc/html/qobjectcleanuphandler.html
 qt3/doc/html/qobjectlist-h.html
 qt3/doc/html/qobjectlist-members.html
 qt3/doc/html/qobjectlist.html
+qt3/doc/html/qobjectlistiterator-members.html
+qt3/doc/html/qobjectlistiterator.html
 qt3/doc/html/qpaintdevice-h.html
 qt3/doc/html/qpaintdevice-members.html
 qt3/doc/html/qpaintdevice.html
@@ -1210,6 +1297,9 @@ qt3/doc/html/qspinbox-m.png
 qt3/doc/html/qspinbox-members.html
 qt3/doc/html/qspinbox-w.png
 qt3/doc/html/qspinbox.html
+qt3/doc/html/qsplashscreen-h.html
+qt3/doc/html/qsplashscreen-members.html
+qt3/doc/html/qsplashscreen.html
 qt3/doc/html/qsplitter-h.html
 qt3/doc/html/qsplitter-m.png
 qt3/doc/html/qsplitter-members.html
@@ -1261,6 +1351,9 @@ qt3/doc/html/qsqlrecordinfo.html
 qt3/doc/html/qsqlresult-h.html
 qt3/doc/html/qsqlresult-members.html
 qt3/doc/html/qsqlresult.html
+qt3/doc/html/qsqlselectcursor-h.html
+qt3/doc/html/qsqlselectcursor-members.html
+qt3/doc/html/qsqlselectcursor.html
 qt3/doc/html/qstack.html
 qt3/doc/html/qstatusbar-h.html
 qt3/doc/html/qstatusbar-m.png
@@ -1304,9 +1397,9 @@ qt3/doc/html/qsyntaxhighlighter.html
 qt3/doc/html/qt-colors.png
 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/qt.xml
-qt3/doc/html/qt31-class-chart.png
+qt3/doc/html/qt32-class-chart.png
 qt3/doc/html/qtab-members.html
 qt3/doc/html/qtab.html
 qt3/doc/html/qtabbar-h.html
@@ -1330,8 +1423,6 @@ qt3/doc/html/qtableselection-members.html
 qt3/doc/html/qtableselection.html
 qt3/doc/html/qtabletevent-members.html
 qt3/doc/html/qtabletevent.html
-qt3/doc/html/qtablevw-m.png
-qt3/doc/html/qtablevw-w.png
 qt3/doc/html/qtabwidget-h.html
 qt3/doc/html/qtabwidget-m.png
 qt3/doc/html/qtabwidget-members.html
@@ -1370,6 +1461,9 @@ qt3/doc/html/qtextview.html
 qt3/doc/html/qthread-h.html
 qt3/doc/html/qthread-members.html
 qt3/doc/html/qthread.html
+qt3/doc/html/qthreadstorage-h.html
+qt3/doc/html/qthreadstorage-members.html
+qt3/doc/html/qthreadstorage.html
 qt3/doc/html/qtime-members.html
 qt3/doc/html/qtime.html
 qt3/doc/html/qtimeedit-members.html
@@ -1384,6 +1478,9 @@ qt3/doc/html/qtl.html
 qt3/doc/html/qtoolbar-h.html
 qt3/doc/html/qtoolbar-members.html
 qt3/doc/html/qtoolbar.html
+qt3/doc/html/qtoolbox-h.html
+qt3/doc/html/qtoolbox-members.html
+qt3/doc/html/qtoolbox.html
 qt3/doc/html/qtoolbutton-h.html
 qt3/doc/html/qtoolbutton-members.html
 qt3/doc/html/qtoolbutton.html
@@ -1411,6 +1508,9 @@ qt3/doc/html/qurlinfo.html
 qt3/doc/html/qurloperator-h.html
 qt3/doc/html/qurloperator-members.html
 qt3/doc/html/qurloperator.html
+qt3/doc/html/quuid-h.html
+qt3/doc/html/quuid-members.html
+qt3/doc/html/quuid.html
 qt3/doc/html/qvalidator-h.html
 qt3/doc/html/qvalidator-members.html
 qt3/doc/html/qvalidator.html
@@ -1527,6 +1627,9 @@ qt3/doc/html/qxmlreader-members.html
 qt3/doc/html/qxmlreader.html
 qt3/doc/html/qxmlsimplereader-members.html
 qt3/doc/html/qxmlsimplereader.html
+qt3/doc/html/qxtwidget-h.html
+qt3/doc/html/qxtwidget-members.html
+qt3/doc/html/qxtwidget.html
 qt3/doc/html/rangecontrols-example.html
 qt3/doc/html/rd-add.png
 qt3/doc/html/rd-chooseanimage.png
@@ -1601,13 +1704,14 @@ qt3/doc/html/runion.png
 qt3/doc/html/rxor.png
 qt3/doc/html/scaling.png
 qt3/doc/html/scribble-example.html
-qt3/doc/html/scripts.html
 qt3/doc/html/scrollview-example.html
+qt3/doc/html/search.png
 qt3/doc/html/session.html
 qt3/doc/html/session.png
 qt3/doc/html/shared.html
 qt3/doc/html/shclass.html
 qt3/doc/html/showimg-example.html
+qt3/doc/html/sidebar.png
 qt3/doc/html/signalsandslots.html
 qt3/doc/html/simple-application-example.html
 qt3/doc/html/simple-application.html
@@ -1737,9 +1841,12 @@ qt3/doc/html/timers.html
 qt3/doc/html/titleindex
 qt3/doc/html/toggleaction-example.html
 qt3/doc/html/toolbar.png
+qt3/doc/html/toolbar1.png
 qt3/doc/html/tools-list.html
 qt3/doc/html/tools.html
 qt3/doc/html/tooltip-example.html
+qt3/doc/html/toplevel-example.html
+qt3/doc/html/trademarks.html
 qt3/doc/html/trivial-nsplugin-example.html
 qt3/doc/html/troll.html
 qt3/doc/html/tt1_en.png
@@ -1786,6 +1893,7 @@ qt3/doc/html/unsmooth.png
 qt3/doc/html/validateaccelerators.png
 qt3/doc/html/validatephrases.png
 qt3/doc/html/validatepunctuation.png
+qt3/doc/html/web.png
 qt3/doc/html/whatsthis
 qt3/doc/html/whatsthis.png
 qt3/doc/html/widgets-example.html
@@ -1819,6 +1927,12 @@ qt3/man/man3/QAsciiCacheIterator.3
 qt3/man/man3/QAsciiDict.3
 qt3/man/man3/QAsciiDictIterator.3
 qt3/man/man3/QAssistantClient.3
+qt3/man/man3/QAxAggregated.3
+qt3/man/man3/QAxBase.3
+qt3/man/man3/QAxBindable.3
+qt3/man/man3/QAxFactory.3
+qt3/man/man3/QAxObject.3
+qt3/man/man3/QAxWidget.3
 qt3/man/man3/QBig5Codec.3
 qt3/man/man3/QBig5hkscsCodec.3
 qt3/man/man3/QBitArray.3
@@ -1877,6 +1991,7 @@ qt3/man/man3/QDate.3
 qt3/man/man3/QDateEdit.3
 qt3/man/man3/QDateTime.3
 qt3/man/man3/QDateTimeEdit.3
+qt3/man/man3/QDateTimeEditBase.3
 qt3/man/man3/QDeepCopy.3
 qt3/man/man3/QDesktopWidget.3
 qt3/man/man3/QDial.3
@@ -2002,6 +2117,7 @@ qt3/man/man3/QListView.3
 qt3/man/man3/QListViewItem.3
 qt3/man/man3/QListViewItemIterator.3
 qt3/man/man3/QLocalFs.3
+qt3/man/man3/QMacMime.3
 qt3/man/man3/QMacStyle.3
 qt3/man/man3/QMainWindow.3
 qt3/man/man3/QMap.3
@@ -2015,8 +2131,11 @@ qt3/man/man3/QMetaObject.3
 qt3/man/man3/QMetaProperty.3
 qt3/man/man3/QMimeSource.3
 qt3/man/man3/QMimeSourceFactory.3
+qt3/man/man3/QMotif.3
+qt3/man/man3/QMotifDialog.3
 qt3/man/man3/QMotifPlusStyle.3
 qt3/man/man3/QMotifStyle.3
+qt3/man/man3/QMotifWidget.3
 qt3/man/man3/QMouseDriverFactory.3
 qt3/man/man3/QMouseDriverPlugin.3
 qt3/man/man3/QMouseEvent.3
@@ -2033,6 +2152,7 @@ qt3/man/man3/QNetworkProtocol.3
 qt3/man/man3/QObject.3
 qt3/man/man3/QObjectCleanupHandler.3
 qt3/man/man3/QObjectList.3
+qt3/man/man3/QObjectListIterator.3
 qt3/man/man3/QPNGImagePacker.3
 qt3/man/man3/QPaintDevice.3
 qt3/man/man3/QPaintDeviceMetrics.3
@@ -2091,6 +2211,7 @@ qt3/man/man3/QSocketNotifier.3
 qt3/man/man3/QSound.3
 qt3/man/man3/QSpacerItem.3
 qt3/man/man3/QSpinBox.3
+qt3/man/man3/QSplashScreen.3
 qt3/man/man3/QSplitter.3
 qt3/man/man3/QSql.3
 qt3/man/man3/QSqlCursor.3
@@ -2108,6 +2229,7 @@ qt3/man/man3/QSqlQuery.3
 qt3/man/man3/QSqlRecord.3
 qt3/man/man3/QSqlRecordInfo.3
 qt3/man/man3/QSqlResult.3
+qt3/man/man3/QSqlSelectCursor.3
 qt3/man/man3/QStatusBar.3
 qt3/man/man3/QStoredDrag.3
 qt3/man/man3/QStrIList.3
@@ -2141,11 +2263,13 @@ qt3/man/man3/QTextIStream.3
 qt3/man/man3/QTextOStream.3
 qt3/man/man3/QTextStream.3
 qt3/man/man3/QThread.3
+qt3/man/man3/QThreadStorage.3
 qt3/man/man3/QTime.3
 qt3/man/man3/QTimeEdit.3
 qt3/man/man3/QTimer.3
 qt3/man/man3/QTimerEvent.3
 qt3/man/man3/QToolBar.3
+qt3/man/man3/QToolBox.3
 qt3/man/man3/QToolButton.3
 qt3/man/man3/QToolTip.3
 qt3/man/man3/QToolTipGroup.3
@@ -2156,6 +2280,7 @@ qt3/man/man3/QUriDrag.3
 qt3/man/man3/QUrl.3
 qt3/man/man3/QUrlInfo.3
 qt3/man/man3/QUrlOperator.3
+qt3/man/man3/QUuid.3
 qt3/man/man3/QVBox.3
 qt3/man/man3/QVBoxLayout.3
 qt3/man/man3/QVButtonGroup.3
@@ -2213,6 +2338,12 @@ qt3/man/man3/qasciicacheiterator.3
 qt3/man/man3/qasciidict.3
 qt3/man/man3/qasciidictiterator.3
 qt3/man/man3/qassistantclient.3
+qt3/man/man3/qaxaggregated.3
+qt3/man/man3/qaxbase.3
+qt3/man/man3/qaxbindable.3
+qt3/man/man3/qaxfactory.3
+qt3/man/man3/qaxobject.3
+qt3/man/man3/qaxwidget.3
 qt3/man/man3/qbig5codec.3
 qt3/man/man3/qbig5hkscscodec.3
 qt3/man/man3/qbitarray.3
@@ -2271,6 +2402,7 @@ qt3/man/man3/qdate.3
 qt3/man/man3/qdateedit.3
 qt3/man/man3/qdatetime.3
 qt3/man/man3/qdatetimeedit.3
+qt3/man/man3/qdatetimeeditbase.3
 qt3/man/man3/qdeepcopy.3
 qt3/man/man3/qdesktopwidget.3
 qt3/man/man3/qdial.3
@@ -2396,6 +2528,7 @@ qt3/man/man3/qlistview.3
 qt3/man/man3/qlistviewitem.3
 qt3/man/man3/qlistviewitemiterator.3
 qt3/man/man3/qlocalfs.3
+qt3/man/man3/qmacmime.3
 qt3/man/man3/qmacstyle.3
 qt3/man/man3/qmainwindow.3
 qt3/man/man3/qmap.3
@@ -2409,8 +2542,11 @@ qt3/man/man3/qmetaobject.3
 qt3/man/man3/qmetaproperty.3
 qt3/man/man3/qmimesource.3
 qt3/man/man3/qmimesourcefactory.3
+qt3/man/man3/qmotif.3
+qt3/man/man3/qmotifdialog.3
 qt3/man/man3/qmotifplusstyle.3
 qt3/man/man3/qmotifstyle.3
+qt3/man/man3/qmotifwidget.3
 qt3/man/man3/qmousedriverfactory.3
 qt3/man/man3/qmousedriverplugin.3
 qt3/man/man3/qmouseevent.3
@@ -2427,6 +2563,7 @@ qt3/man/man3/qnpwidget.3
 qt3/man/man3/qobject.3
 qt3/man/man3/qobjectcleanuphandler.3
 qt3/man/man3/qobjectlist.3
+qt3/man/man3/qobjectlistiterator.3
 qt3/man/man3/qpaintdevice.3
 qt3/man/man3/qpaintdevicemetrics.3
 qt3/man/man3/qpainter.3
@@ -2485,6 +2622,7 @@ qt3/man/man3/qsocketnotifier.3
 qt3/man/man3/qsound.3
 qt3/man/man3/qspaceritem.3
 qt3/man/man3/qspinbox.3
+qt3/man/man3/qsplashscreen.3
 qt3/man/man3/qsplitter.3
 qt3/man/man3/qsql.3
 qt3/man/man3/qsqlcursor.3
@@ -2502,6 +2640,7 @@ qt3/man/man3/qsqlquery.3
 qt3/man/man3/qsqlrecord.3
 qt3/man/man3/qsqlrecordinfo.3
 qt3/man/man3/qsqlresult.3
+qt3/man/man3/qsqlselectcursor.3
 qt3/man/man3/qstatusbar.3
 qt3/man/man3/qstoreddrag.3
 qt3/man/man3/qstrilist.3
@@ -2536,11 +2675,13 @@ qt3/man/man3/qtextistream.3
 qt3/man/man3/qtextostream.3
 qt3/man/man3/qtextstream.3
 qt3/man/man3/qthread.3
+qt3/man/man3/qthreadstorage.3
 qt3/man/man3/qtime.3
 qt3/man/man3/qtimeedit.3
 qt3/man/man3/qtimer.3
 qt3/man/man3/qtimerevent.3
 qt3/man/man3/qtoolbar.3
+qt3/man/man3/qtoolbox.3
 qt3/man/man3/qtoolbutton.3
 qt3/man/man3/qtooltip.3
 qt3/man/man3/qtooltipgroup.3
@@ -2551,6 +2692,7 @@ qt3/man/man3/quridrag.3
 qt3/man/man3/qurl.3
 qt3/man/man3/qurlinfo.3
 qt3/man/man3/qurloperator.3
+qt3/man/man3/quuid.3
 qt3/man/man3/qvalidator.3
 qt3/man/man3/qvaluelist.3
 qt3/man/man3/qvaluelistconstiterator.3
@@ -2596,4 +2738,6 @@ qt3/man/man3/qxmlparseexception.3
 qt3/man/man3/qxmlreader.3
 qt3/man/man3/qxmlsimplereader.3
 @dirrm qt3/man/man3
+@dirrm qt3/man
 @dirrm qt3/doc/html
+@dirrm qt3/doc
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 23d6e75d54f..2480bc9a8c7 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/11/30 22:58:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/12/19 15:43:31 skrll 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=		3
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK2=		yes
@@ -18,12 +17,6 @@ PTHREAD_OPTS+=		require
 
 UNLIMIT_RESOURCES=	datasize
 
-post-extract:
-	${RM} -f ${WRKSRC}/include/qmotif.h
-	${RM} -f ${WRKSRC}/include/qmotifdialog.h
-	${RM} -f ${WRKSRC}/include/qmotifwidget.h
-	${RM} -f ${WRKSRC}/include/qxtwidget.h
-
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index ff5b7b6ab8a..2b098f516e4 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2003/03/19 17:29:50 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2003/12/19 15:43:31 skrll Exp $
 qt3/bin/moc
+qt3/include/jri.h
+qt3/include/jri_md.h
+qt3/include/jritypes.h
+qt3/include/npapi.h
+qt3/include/npupp.h
 qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
 qt3/include/private/qcom_p.h
@@ -7,12 +12,14 @@ 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
 qt3/include/private/qdir_p.h
 qt3/include/private/qeffects_p.h
 qt3/include/private/qeventloop_p.h
 qt3/include/private/qfiledefs_p.h
 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/qgpluginmanager_p.h
 qt3/include/private/qimageformatinterface_p.h
@@ -27,8 +34,10 @@ qt3/include/private/qmutex_p.h
 qt3/include/private/qmutexpool_p.h
 qt3/include/private/qpainter_p.h
 qt3/include/private/qpluginmanager_p.h
+qt3/include/private/qprinter_p.h
 qt3/include/private/qpsprinter_p.h
 qt3/include/private/qrichtext_p.h
+qt3/include/private/qscriptengine_p.h
 qt3/include/private/qsettings_p.h
 qt3/include/private/qsharedmemory_p.h
 qt3/include/private/qsqldriverinterface_p.h
@@ -36,19 +45,18 @@ 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/qt_x11_p.h
 qt3/include/private/qtextcodecinterface_p.h
+qt3/include/private/qtextengine_p.h
+qt3/include/private/qtextlayout_p.h
+qt3/include/private/qthreadinstance_p.h
 qt3/include/private/qtitlebar_p.h
 qt3/include/private/qucom_p.h
 qt3/include/private/qucomextra_p.h
+qt3/include/private/qunicodetables_p.h
 qt3/include/private/qwidget_p.h
 qt3/include/private/qwidgetinterface_p.h
 qt3/include/private/qwidgetresizehandler_p.h
-qt3/include/jri.h
-qt3/include/jri_md.h
-qt3/include/jritypes.h
-qt3/include/npapi.h
-qt3/include/npupp.h
-qt3/include/qnp.h
 qt3/include/q1xcompatibility.h
 qt3/include/qabstractlayout.h
 qt3/include/qaccel.h
@@ -216,6 +224,7 @@ qt3/include/qmutex.h
 qt3/include/qnamespace.h
 qt3/include/qnetwork.h
 qt3/include/qnetworkprotocol.h
+qt3/include/qnp.h
 qt3/include/qobjcoll.h
 qt3/include/qobjdefs.h
 qt3/include/qobject.h
@@ -298,6 +307,7 @@ qt3/include/qsocknot.h
 qt3/include/qsortedlist.h
 qt3/include/qsound.h
 qt3/include/qspinbox.h
+qt3/include/qsplashscreen.h
 qt3/include/qsplitter.h
 qt3/include/qsql.h
 qt3/include/qsqlcursor.h
@@ -313,6 +323,7 @@ qt3/include/qsqlpropertymap.h
 qt3/include/qsqlquery.h
 qt3/include/qsqlrecord.h
 qt3/include/qsqlresult.h
+qt3/include/qsqlselectcursor.h
 qt3/include/qstack.h
 qt3/include/qstatusbar.h
 qt3/include/qstring.h
@@ -325,7 +336,6 @@ qt3/include/qstyleplugin.h
 qt3/include/qstylesheet.h
 qt3/include/qsyntaxhighlighter.h
 qt3/include/qt.h
-qt3/include/qt_x11.h
 qt3/include/qtabbar.h
 qt3/include/qtabdialog.h
 qt3/include/qtabdlg.h
@@ -339,9 +349,11 @@ qt3/include/qtextedit.h
 qt3/include/qtextstream.h
 qt3/include/qtextview.h
 qt3/include/qthread.h
+qt3/include/qthreadstorage.h
 qt3/include/qtimer.h
 qt3/include/qtl.h
 qt3/include/qtoolbar.h
+qt3/include/qtoolbox.h
 qt3/include/qtoolbutton.h
 qt3/include/qtooltip.h
 qt3/include/qtranslator.h
@@ -375,7 +387,6 @@ qt3/include/qwindefs.h
 qt3/include/qwindow.h
 qt3/include/qwindowdefs.h
 qt3/include/qwindowsstyle.h
-qt3/include/qwindowsxpstyle.h
 qt3/include/qwinexport.h
 qt3/include/qwizard.h
 qt3/include/qwmatrix.h
@@ -385,7 +396,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.1
+qt3/lib/libqt-mt.so.3.2
 qt3/plugins/imageformats/libqjpeg.a
 qt3/plugins/imageformats/libqjpeg.la
 qt3/plugins/imageformats/libqjpeg.so
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index ae5678c97d8..5023f0af9be 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.16 2003/08/06 10:45:02 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.17 2003/12/19 15:43:31 skrll Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2nb2
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.2.3
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 4319e298fa7..b02a8365a80 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.16 2003/10/23 07:48:21 junyoung Exp $
+$NetBSD: distinfo,v 1.17 2003/12/19 15:43:31 skrll Exp $
 
-SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5
-Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes
-SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
+SHA1 (qt-x11-free-3.2.3.tar.bz2) = 51a2532d298b24edd27b475c9de9209134c074ae
+Size (qt-x11-free-3.2.3.tar.bz2) = 13952198 bytes
+SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
-SHA1 (patch-ad) = f201ded67a3ae2001d5d66df43222b6ee7bd33c0
-SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
-SHA1 (patch-ah) = 4f608169d9b2fa190844bf2ab5efaae2ed28e7b2
+SHA1 (patch-ad) = 3d638078a207d5062d9a758d53053e85b1c22426
+SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
-SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
+SHA1 (patch-bb) = 3615a92dc2022d4cdfe21a7068ad966dfbb09e36
 SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f
-SHA1 (patch-bd) = 06ac1c48f91887d8414df8f69dc79e023da0f6f1
diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa
index 3983e6e2cab..5748b72bd53 100644
--- a/x11/qt3-libs/patches/patch-aa
+++ b/x11/qt3-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2003/12/19 15:43:31 skrll Exp $
 
---- Makefile.orig	Thu May 30 09:42:36 2002
+--- Makefile.orig	2003-08-03 12:45:14.000000000 +0100
 +++ Makefile
-@@ -47,7 +47,7 @@
+@@ -52,7 +52,7 @@ tools-uninstall: .qmake.cache
  	cd tools && $(MAKE) uninstall
  tools-install: sub-tools
  	cd tools && $(MAKE) install
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $
 +sub-tools: FORCE
  	cd tools && $(MAKE)
  
- #qmake
+ #plugins
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index 2eabcb34035..61bf8a8b021 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,22 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2003/10/23 07:48:21 junyoung Exp $
+$NetBSD: patch-ad,v 1.5 2003/12/19 15:43:31 skrll Exp $
 
---- src/kernel/qthread_unix.cpp.orig	2002-12-09 09:40:39.000000000 +0000
-+++ src/kernel/qthread_unix.cpp
-@@ -378,10 +378,17 @@ void QThread::start()
-     int ret;
-     pthread_attr_t attr;
-     pthread_attr_init( &attr );
-+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-     pthread_attr_setinheritsched( &attr, PTHREAD_INHERIT_SCHED );
-+#endif
-     pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
-     if ( d->stacksize > 0 ) {
-+#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
- 	ret = pthread_attr_setstacksize( &attr, d->stacksize );
-+#else
-+	ret = 1;
-+#endif
-+
- 	if ( ret ) {
- #ifdef QT_CHECK_STATE
- 	    qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
+--- 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-ae b/x11/qt3-libs/patches/patch-ae
new file mode 100644
index 00000000000..e6eb20c93aa
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2003/12/19 15:43:31 skrll Exp $
+
+--- src/kernel/qinputcontext_x11.cpp.orig	2003-10-10 10:47:35.000000000 +0900
++++ src/kernel/qinputcontext_x11.cpp	2003-12-15 23:15:04.000000000 +0900
+@@ -255,9 +255,8 @@
+ 		qDebug( "compose emptied" );
+ #endif // QT_XIM_DEBUG
+ 
+-		// don't send an empty compose, since we will send an IMEnd with
+-		// either the correct compose text (or null text if the user has
+-		// cancelled the compose or deleted all chars).
++		QIMComposeEvent event( QEvent::IMCompose, qic->text, 0, 0 );
++		QApplication::sendEvent(qic->focusWidget, &event);
+ 		return 0;
+ 	    }
+ 	}
diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag
deleted file mode 100644
index 725dd8e0043..00000000000
--- a/x11/qt3-libs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/03/18 08:36:25 skrll Exp $
-
---- tools/designer/plugins/cppeditor/cppeditor.pro.orig	2003-01-14 17:56:20.000000000 +0000
-+++ tools/designer/plugins/cppeditor/cppeditor.pro
-@@ -13,7 +13,7 @@ INCLUDEPATH	+= ../../interfaces ../../ed
- win32{
-     LIBS	+= $$QT_BUILD_TREE/lib/editor.lib
- } else {
--    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.a
-+    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.la
- }
- 
- target.path += $$plugins.path/designer
diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah
deleted file mode 100644
index 112b3064beb..00000000000
--- a/x11/qt3-libs/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/09/28 05:27:30 grant Exp $
-
---- configure.orig	2003-02-11 14:19:48.000000000 +1100
-+++ configure
-@@ -501,7 +501,6 @@ while [ "$#" -gt 0 ]; do
- 	    CFG_EXCEPTION_SUPPORT=no
- 	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-fno-exceptions\""
- 	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fno-exceptions\""
--	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\""
- 	else
- 	    UNKNOWN_OPT=yes
- 	fi
diff --git a/x11/qt3-libs/patches/patch-bb b/x11/qt3-libs/patches/patch-bb
index e41fcc06c68..814cdbe24e6 100644
--- a/x11/qt3-libs/patches/patch-bb
+++ b/x11/qt3-libs/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2003/02/04 18:09:16 skrll Exp $
+$NetBSD: patch-bb,v 1.3 2003/12/19 15:43:31 skrll Exp $
 
---- src/sql/drivers/psql/qsql_psql.cpp.orig	Wed Jan  8 14:24:52 2003
+--- src/sql/drivers/psql/qsql_psql.cpp.orig	2003-05-27 16:34:03.000000000 +0100
 +++ src/sql/drivers/psql/qsql_psql.cpp
-@@ -44,14 +44,14 @@
+@@ -47,14 +47,14 @@
  #if defined(DEBUG)
  # undef DEBUG
  #endif
@@ -18,5 +18,5 @@ $NetBSD: patch-bb,v 1.2 2003/02/04 18:09:16 skrll Exp $
 -#include <catalog/pg_type.h>
 +#include <pgsql/server/catalog/pg_type.h>
  #undef errno
- #include <math.h>
  
+ QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
diff --git a/x11/qt3-libs/patches/patch-bd b/x11/qt3-libs/patches/patch-bd
deleted file mode 100644
index adb5df4620c..00000000000
--- a/x11/qt3-libs/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2003/07/22 17:17:20 drochner Exp $
-
---- tools/designer/designer/designer.pro.orig	2003-07-16 13:13:29.000000000 +0200
-+++ tools/designer/designer/designer.pro	2003-07-16 13:14:48.000000000 +0200
-@@ -416,7 +416,7 @@
- 
- INCLUDEPATH	+= ../shared ../uilib
- win32:LIBS	+= $$QT_BUILD_TREE/lib/qui.lib $$QT_BUILD_TREE/lib/qassistantclient.lib
--unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui $$QT_BUILD_TREE/lib/libqassistantclient.a
-+unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui -lqassistantclient
- 
- TRANSLATIONS	= designer_de.ts designer_fr.ts
- 
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 78900d00118..52580ee9f03 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/08/01 15:31:09 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/19 15:43:31 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
-PKGREVISION=		2
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index 378364f231f..5763e430721 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/08/01 15:31:09 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/19 15:43:31 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		2
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index a0678e8c519..f9282c6a2c4 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/08/01 15:31:10 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2003/12/19 15:43:31 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
-PKGREVISION=		3
 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 35db00c3567..ff053e8a5d5 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/07/23 09:41:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/12/19 15:43:31 skrll Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -8,16 +8,16 @@ qt3/bin/qm2ts
 qt3/bin/qmake
 qt3/bin/qtconfig
 qt3/bin/uic
-qt3/lib/libqassistantclient.a
-qt3/lib/libqassistantclient.la
-qt3/lib/libqassistantclient.so
-qt3/lib/libqassistantclient.so.1
-qt3/lib/libqassistantclient.so.1.0
 qt3/lib/libeditor.a
 qt3/lib/libeditor.la
 qt3/lib/libeditor.so
 qt3/lib/libeditor.so.1
 qt3/lib/libeditor.so.1.0
+qt3/lib/libqassistantclient.a
+qt3/lib/libqassistantclient.la
+qt3/lib/libqassistantclient.so
+qt3/lib/libqassistantclient.so.1
+qt3/lib/libqassistantclient.so.1.0
 qt3/lib/libqui.a
 qt3/lib/libqui.la
 qt3/lib/libqui.so
@@ -52,6 +52,10 @@ 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/hpuxi-acc-32/qmake.conf
+qt3/mkspecs/hpuxi-acc-32/qplatformdefs.h
+qt3/mkspecs/hpuxi-acc-64/qmake.conf
+qt3/mkspecs/hpuxi-acc-64/qplatformdefs.h
 qt3/mkspecs/hurd-g++/qmake.conf
 qt3/mkspecs/hurd-g++/qplatformdefs.h
 qt3/mkspecs/irix-cc-64/qmake.conf
@@ -70,14 +74,12 @@ qt3/mkspecs/linux-icc/qmake.conf
 qt3/mkspecs/linux-icc/qplatformdefs.h
 qt3/mkspecs/linux-kcc/qmake.conf
 qt3/mkspecs/linux-kcc/qplatformdefs.h
+qt3/mkspecs/linux-kylix/qmake.conf
+qt3/mkspecs/linux-kylix/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
-qt3/mkspecs/mac9-mwerks/qplatformdefs.h
 qt3/mkspecs/macx-g++/Info.plist.app
 qt3/mkspecs/macx-g++/qmake.conf
 qt3/mkspecs/macx-g++/qplatformdefs.h
@@ -109,8 +111,6 @@ qt3/mkspecs/solaris-g++-64/qmake.conf
 qt3/mkspecs/solaris-g++-64/qplatformdefs.h
 qt3/mkspecs/solaris-g++/qmake.conf
 qt3/mkspecs/solaris-g++/qplatformdefs.h
-qt3/mkspecs/solaris-kcc/qmake.conf
-qt3/mkspecs/solaris-kcc/qplatformdefs.h
 qt3/mkspecs/tru64-cxx/qmake.conf
 qt3/mkspecs/tru64-cxx/qplatformdefs.h
 qt3/mkspecs/tru64-g++/qmake.conf
@@ -163,7 +163,6 @@ qt3/plugins/designer/libwizards.so
 @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-64
@@ -178,7 +177,6 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/mkspecs/macx-pbuilder
 @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
@@ -205,6 +203,3 @@ qt3/plugins/designer/libwizards.so
 @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/Makefile b/x11/qt3/Makefile
index 556c082746c..b56715ceb45 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2003/12/01 11:51:34 tron Exp $
+# $NetBSD: Makefile,v 1.21 2003/12/19 15:43:31 skrll Exp $
 
 DISTNAME=	qt3-${QTVERSION}
-PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,9 +9,9 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "./Makefile.common"
 
-DEPENDS+=	qt3-libs-${QTVERSION}nb3:../../x11/qt3-libs
-DEPENDS+=	qt3-tools-${QTVERSION}nb3:../../x11/qt3-tools
-DEPENDS+=	qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs
+DEPENDS+=	qt3-libs-${QTVERSION}:../../x11/qt3-libs
+DEPENDS+=	qt3-tools-${QTVERSION}:../../x11/qt3-tools
+DEPENDS+=	qt3-docs-${QTVERSION}:../../x11/qt3-docs
 
 USE_BUILDLINK2=	yes
 USE_X11=	yes
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index fc53e67f09d..6e5f8bb1793 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.10 2003/07/17 22:56:42 grant Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/12/19 15:43:31 skrll Exp $
 #
 
-QTVERSION=	3.1.2
+QTVERSION=	3.2.3
 
 MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html