16 files changed, 222 insertions, 185 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 3aaeb5d9c01..e3e94d47b2a 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1680 2003/03/18 07:22:26 grant Exp $
+$NetBSD: CHANGES,v 1.1681 2003/03/18 08:36:22 skrll Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -1184,3 +1184,9 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated cvsync to 0.15.0 [gehenna 2003-03-18]
 	Updated galeon to 1.3 [taya 2003-03-18]
 	Updated mozilla-linux to 1.3 [grant 2003-03-18]
+	Updated qt3-libs to 3.1.2 [skrll 2003-03-18]
+	Updated qt3-tools to 3.1.2 [skrll 2003-03-18]
+	Updated qt3-docs to 3.1.2 [skrll 2003-03-18]
+	Updated qt3-psql to 3.1.2 [skrll 2003-03-18]
+	Updated qt3-mysql to 3.1.2 [skrll 2003-03-18]
+	Updated qt3 to 3.1.2 [skrll 2003-03-18]
diff --git a/doc/TODO b/doc/TODO
index 2297c19ba43..eda8f8d90e1 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.380 2003/03/17 18:36:56 wiz Exp $
+$NetBSD: TODO,v 1.381 2003/03/18 08:36:23 skrll Exp $
 
 Suggested new packages
 ======================
@@ -200,7 +200,6 @@ Suggested package updates
 	o py-mysqldb-0.9.2 [pkg/19056]
 	o py-wxWindows-2.4.0.2
 	o pygtk-0.6.11
-	o qt3-3.1.2 [skrll]
 	o rdiff-backup-0.10.2 [pkg/20268]
 	o rep-gtk-0.17
 	o rocksndiamonds-2.2.0rc3
diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST
index 8626e407c49..0c1668f58a7 100644
--- a/x11/qt3-docs/PLIST
+++ b/x11/qt3-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/11 13:02:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/03/18 08:36:24 skrll Exp $
 qt3/doc/html/README
 qt3/doc/html/README.QT
 qt3/doc/html/aboutqt.html
@@ -6,9 +6,6 @@ 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/actiongroup.png
-qt3/doc/html/addmainwidg.png
-qt3/doc/html/addmenuitem.png
 qt3/doc/html/addressbook-example.html
 qt3/doc/html/advanced.html
 qt3/doc/html/annotated.html
@@ -33,7 +30,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/buttons.png
 qt3/doc/html/buyhowto.html
 qt3/doc/html/canvas-chart-example.html
 qt3/doc/html/canvas-example.html
@@ -63,11 +59,8 @@ qt3/doc/html/classchart.html
 qt3/doc/html/classes.html
 qt3/doc/html/clientserver-example.html
 qt3/doc/html/collection.html
-qt3/doc/html/coloriconv.png
-qt3/doc/html/colortable.png
 qt3/doc/html/commonproblems.html
 qt3/doc/html/concrete-connections.png
-qt3/doc/html/containers.png
 qt3/doc/html/coordsys.html
 qt3/doc/html/coordsys.png
 qt3/doc/html/credits.html
@@ -78,7 +71,6 @@ qt3/doc/html/customlayout.html
 qt3/doc/html/customstyles.html
 qt3/doc/html/database-connections.png
 qt3/doc/html/database.html
-qt3/doc/html/database.png
 qt3/doc/html/datastreamformat.html
 qt3/doc/html/datetimewidgets.png
 qt3/doc/html/dclock-example.html
@@ -124,29 +116,21 @@ qt3/doc/html/dialog3layout.png
 qt3/doc/html/dialog3sample.png
 qt3/doc/html/dialogs.html
 qt3/doc/html/dirview-example.html
-qt3/doc/html/display.png
 qt3/doc/html/distributingqt.html
 qt3/doc/html/dnd.html
 qt3/doc/html/doneandnext.png
-qt3/doc/html/dragaction.png
 qt3/doc/html/draganddrop.html
 qt3/doc/html/dragdrop-example.html
 qt3/doc/html/drawdemo-example.html
 qt3/doc/html/drawlines-example.html
 qt3/doc/html/edit-dbtable-dialog.png
-qt3/doc/html/editconn.png
-qt3/doc/html/editconn1.png
-qt3/doc/html/editconn2.png
-qt3/doc/html/editconn3.png
 qt3/doc/html/editcopy.png
 qt3/doc/html/editcut.png
 qt3/doc/html/editfind.png
-qt3/doc/html/editfunc.png
 qt3/doc/html/editions.html
 qt3/doc/html/editpaste.png
 qt3/doc/html/editredo.png
 qt3/doc/html/editundo.png
-qt3/doc/html/editvar.png
 qt3/doc/html/emb-accel.html
 qt3/doc/html/emb-charinput.html
 qt3/doc/html/emb-classes.html
@@ -175,8 +159,6 @@ qt3/doc/html/filesave.png
 qt3/doc/html/finddialog.png
 qt3/doc/html/focus.html
 qt3/doc/html/forever-example.html
-qt3/doc/html/formsettings.png
-qt3/doc/html/forwdec.png
 qt3/doc/html/frames.png
 qt3/doc/html/ftpclient-example.html
 qt3/doc/html/functions.html
@@ -184,6 +166,8 @@ qt3/doc/html/geomanagement.html
 qt3/doc/html/geometry.html
 qt3/doc/html/geometry.png
 qt3/doc/html/gpl.html
+qt3/doc/html/graph.g1n
+qt3/doc/html/grapher-nsplugin-example.html
 qt3/doc/html/graphics.html
 qt3/doc/html/gridlayout.png
 qt3/doc/html/groupbox-w.png
@@ -205,19 +189,14 @@ qt3/doc/html/iconview-simple_dd-main-cpp.html
 qt3/doc/html/iconview-simple_dd-main-h.html
 qt3/doc/html/iconview.html
 qt3/doc/html/images.html
-qt3/doc/html/incimp.png
 qt3/doc/html/index
 qt3/doc/html/index.html
-qt3/doc/html/input.png
 qt3/doc/html/inputdialogs.png
 qt3/doc/html/install-win.html
 qt3/doc/html/install-x11.html
 qt3/doc/html/installation.html
 qt3/doc/html/io.html
 qt3/doc/html/keyfeatures30.html
-qt3/doc/html/laycoloriconv.png
-qt3/doc/html/laycolortable.png
-qt3/doc/html/laymainwidg.png
 qt3/doc/html/layout-example.html
 qt3/doc/html/layout.html
 qt3/doc/html/layout1.png
@@ -250,25 +229,46 @@ 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/movies-example.html
 qt3/doc/html/multimedia.html
-qt3/doc/html/mwwiz.png
-qt3/doc/html/mwwiz2.png
+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
+qt3/doc/html/mw-colortool2.png
+qt3/doc/html/mw-conn1.png
+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-editforw.png
+qt3/doc/html/mw-editfunc.png
+qt3/doc/html/mw-editincimp.png
+qt3/doc/html/mw-editvar.png
+qt3/doc/html/mw-laycoloriconv.png
+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-objexplor.png
+qt3/doc/html/mw-previewform.png
+qt3/doc/html/mw-projset.png
+qt3/doc/html/mw-propedit.png
+qt3/doc/html/mw-settoolwiz.png
+qt3/doc/html/mw-startdesign.png
+qt3/doc/html/mw-toolbarpits.png
+qt3/doc/html/netscape-plugin.html
 qt3/doc/html/network-examples.html
 qt3/doc/html/network.html
 qt3/doc/html/networkprotocol-example.html
-qt3/doc/html/newfiledialog.png
-qt3/doc/html/newopendialog.png
 qt3/doc/html/next.png
 qt3/doc/html/nextunfinished.png
+qt3/doc/html/nsplugin-examples.html
 qt3/doc/html/object.html
 qt3/doc/html/objectmodel.html
 qt3/doc/html/objecttrees.html
-qt3/doc/html/objexplor.png
 qt3/doc/html/opengl-box-example.html
 qt3/doc/html/opengl-examples.html
 qt3/doc/html/opengl-gear-example.html
@@ -297,14 +297,11 @@ qt3/doc/html/popup-example.html
 qt3/doc/html/porting.html
 qt3/doc/html/porting2.html
 qt3/doc/html/prev.png
-qt3/doc/html/previewform.png
 qt3/doc/html/prevunfinished.png
 qt3/doc/html/primes.html
 qt3/doc/html/process-example.html
 qt3/doc/html/progress-example.html
 qt3/doc/html/progressbar-example.html
-qt3/doc/html/projset.png
-qt3/doc/html/propedit.png
 qt3/doc/html/properties.html
 qt3/doc/html/propertydocs
 qt3/doc/html/propertyindex
@@ -484,21 +481,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-buttonstoolbuttons3.png
-qt3/doc/html/qd-chooseanimage.png
-qt3/doc/html/qd-chooseapixmap.png
-qt3/doc/html/qd-chooseimages.png
 qt3/doc/html/qd-colortool-name.png
-qt3/doc/html/qd-colortool1.png
-qt3/doc/html/qd-colortool2.png
-qt3/doc/html/qd-configmainfile.png
-qt3/doc/html/qd-containertoolbuttons3.png
-qt3/doc/html/qd-createtemplate.png
-qt3/doc/html/qd-customwidgettoolbutton.png
-qt3/doc/html/qd-custwiddeftab.png
-qt3/doc/html/qd-custwidproptab.png
-qt3/doc/html/qd-custwidslotstab.png
-qt3/doc/html/qd-databasetoolbuttons3.png
 qt3/doc/html/qd-databrowserwzd.png
 qt3/doc/html/qd-databrowserwzdpage2.png
 qt3/doc/html/qd-databrowserwzdpage3.png
@@ -514,66 +497,10 @@ qt3/doc/html/qd-dataviewwzd.png
 qt3/doc/html/qd-dataviewwzdpage2.png
 qt3/doc/html/qd-dataviewwzdpage3.png
 qt3/doc/html/qd-dataviewwzdpage4.png
-qt3/doc/html/qd-displaytoolbuttons3.png
-qt3/doc/html/qd-editclassvariables.png
-qt3/doc/html/qd-editcustwidsigtab.png
-qt3/doc/html/qd-editforwarddeclarations.png
-qt3/doc/html/qd-editiconview.png
-qt3/doc/html/qd-editincludesindeclaration.png
-qt3/doc/html/qd-editincludesinimplementation.png
-qt3/doc/html/qd-editlistbox.png
-qt3/doc/html/qd-editlistview.png
-qt3/doc/html/qd-editlistviewcolumns.png
-qt3/doc/html/qd-editmenu1.png
-qt3/doc/html/qd-editpalettedialog.png
-qt3/doc/html/qd-editpreferencesc++.png
-qt3/doc/html/qd-editpreferencesgeneral.png
-qt3/doc/html/qd-edittablecolumns.png
-qt3/doc/html/qd-edittablerows.png
-qt3/doc/html/qd-edittoolbuttons3.png
-qt3/doc/html/qd-filemenu1.png
-qt3/doc/html/qd-filenew2.png
-qt3/doc/html/qd-fileopen.png
-qt3/doc/html/qd-fileoverviewwindow.png
-qt3/doc/html/qd-filesaveasdialog.png
-qt3/doc/html/qd-filesaveformasdialog.png
-qt3/doc/html/qd-filesaveformdialog.png
-qt3/doc/html/qd-filesaveprojectsettingsdialog.png
-qt3/doc/html/qd-filetoolbuttons3.png
-qt3/doc/html/qd-finddirectorydialog.png
-qt3/doc/html/qd-helpmenu.png
 qt3/doc/html/qd-helptoolbuttons3.png
-qt3/doc/html/qd-inputtoolbuttons3.png
-qt3/doc/html/qd-layoutmenu1.png
-qt3/doc/html/qd-layouttoolbuttons3.png
 qt3/doc/html/qd-mainwinwzd.png
 qt3/doc/html/qd-mainwinwzdpage2.png
-qt3/doc/html/qd-objexpwindowwidgettab.png
-qt3/doc/html/qd-objexpwinsourcetab.png
-qt3/doc/html/qd-pagetitle.png
-qt3/doc/html/qd-previewmenu.png
-qt3/doc/html/qd-projectaddfile.png
-qt3/doc/html/qd-projectdbaseconnections.png
-qt3/doc/html/qd-projectimages.png
-qt3/doc/html/qd-projectmenu.png
-qt3/doc/html/qd-projectsettingsc++tabdialog.png
-qt3/doc/html/qd-projectsettingsdialog.png
-qt3/doc/html/qd-propedsigtab.png
-qt3/doc/html/qd-propedwinproptab.png
-qt3/doc/html/qd-searchfindtextdialog.png
-qt3/doc/html/qd-searchgotoline.png
-qt3/doc/html/qd-searchmenu.png
-qt3/doc/html/qd-searchreplacetext.png
-qt3/doc/html/qd-searchttoolbuttons3.png
-qt3/doc/html/qd-selectcolordialog.png
-qt3/doc/html/qd-selectfontdialog.png
-qt3/doc/html/qd-textdialog.png
-qt3/doc/html/qd-title.png
-qt3/doc/html/qd-toolsmenu.png
-qt3/doc/html/qd-toolstoolbuttons4.png
-qt3/doc/html/qd-tunepalettedialog.png
-qt3/doc/html/qd-viewstoolbuttons5.png
-qt3/doc/html/qd-windowmenu1.png
+qt3/doc/html/qd-preface.png
 qt3/doc/html/qdatabrowser-h.html
 qt3/doc/html/qdatabrowser-members.html
 qt3/doc/html/qdatabrowser.html
@@ -1015,21 +942,12 @@ 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
@@ -1062,6 +980,15 @@ qt3/doc/html/qnetworkoperation.html
 qt3/doc/html/qnetworkprotocol-h.html
 qt3/doc/html/qnetworkprotocol-members.html
 qt3/doc/html/qnetworkprotocol.html
+qt3/doc/html/qnp-h.html
+qt3/doc/html/qnpinstance-members.html
+qt3/doc/html/qnpinstance.html
+qt3/doc/html/qnplugin-members.html
+qt3/doc/html/qnplugin.html
+qt3/doc/html/qnpstream-members.html
+qt3/doc/html/qnpstream.html
+qt3/doc/html/qnpwidget-members.html
+qt3/doc/html/qnpwidget.html
 qt3/doc/html/qobject-h.html
 qt3/doc/html/qobject-members.html
 qt3/doc/html/qobject.html
@@ -1186,6 +1113,20 @@ qt3/doc/html/qregion.html
 qt3/doc/html/qresizeevent-members.html
 qt3/doc/html/qresizeevent.html
 qt3/doc/html/qrtlcodec-h.html
+qt3/doc/html/qs-addwidg.png
+qt3/doc/html/qs-editconn1.png
+qt3/doc/html/qs-editconn2.png
+qt3/doc/html/qs-editfunc.png
+qt3/doc/html/qs-editlistbox1.png
+qt3/doc/html/qs-laygrid.png
+qt3/doc/html/qs-layhoriz.png
+qt3/doc/html/qs-layvert.png
+qt3/doc/html/qs-newdlg.png
+qt3/doc/html/qs-projset.png
+qt3/doc/html/qs-pushbutt.png
+qt3/doc/html/qs-spacers.png
+qt3/doc/html/qs-taborder.png
+qt3/doc/html/qs-txtlbl.png
 qt3/doc/html/qscrbar-m.png
 qt3/doc/html/qscrbar-w.png
 qt3/doc/html/qscreen-members.html
@@ -1246,6 +1187,7 @@ qt3/doc/html/qslider-m.png
 qt3/doc/html/qslider-members.html
 qt3/doc/html/qslider-w.png
 qt3/doc/html/qslider.html
+qt3/doc/html/qsmetric.png
 qt3/doc/html/qsocket-h.html
 qt3/doc/html/qsocket-members.html
 qt3/doc/html/qsocket.html
@@ -1585,15 +1527,76 @@ 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
+qt3/doc/html/rd-chooseapixmap.png
+qt3/doc/html/rd-configmf.png
+qt3/doc/html/rd-configtb.png
+qt3/doc/html/rd-cwidgdef.png
+qt3/doc/html/rd-cwidgprop.png
+qt3/doc/html/rd-cwidgsig.png
+qt3/doc/html/rd-cwidgslot.png
+qt3/doc/html/rd-dbconn.png
+qt3/doc/html/rd-ediconview.png
+qt3/doc/html/rd-editincdec.png
+qt3/doc/html/rd-edittext1.png
+qt3/doc/html/rd-edittext2.png
+qt3/doc/html/rd-edlistbox.png
+qt3/doc/html/rd-edlistview.png
+qt3/doc/html/rd-edlistview2.png
+qt3/doc/html/rd-edpalette.png
+qt3/doc/html/rd-edtablecol.png
+qt3/doc/html/rd-edtablerow.png
+qt3/doc/html/rd-find.png
+qt3/doc/html/rd-formset.png
+qt3/doc/html/rd-goto.png
+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
+qt3/doc/html/rd-saveas.png
+qt3/doc/html/rd-saveform.png
+qt3/doc/html/rd-saveformas.png
+qt3/doc/html/rd-saveprojset.png
+qt3/doc/html/rd-selcolor.png
+qt3/doc/html/rd-selfont.png
+qt3/doc/html/rd-startdesigntab2.png
+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/removed20.html
 qt3/doc/html/richtext-example.html
 qt3/doc/html/rintersect.png
+qt3/doc/html/rmo-editmenu.png
+qt3/doc/html/rmo-filemenu.png
+qt3/doc/html/rmo-helpmenu.png
+qt3/doc/html/rmo-layoutmenu.png
+qt3/doc/html/rmo-previewmenu.png
+qt3/doc/html/rmo-projectmenu.png
+qt3/doc/html/rmo-searchmenu.png
+qt3/doc/html/rmo-toolsmenu.png
+qt3/doc/html/rmo-windowmenu.png
 qt3/doc/html/rot-example.html
 qt3/doc/html/rsubtract.png
+qt3/doc/html/rtb-edit.png
+qt3/doc/html/rtb-file.png
+qt3/doc/html/rtb-layout.png
+qt3/doc/html/rtb-search.png
+qt3/doc/html/rtb-tbbuttons.png
+qt3/doc/html/rtb-tbcontain.png
+qt3/doc/html/rtb-tbcustom.png
+qt3/doc/html/rtb-tbdatabase.png
+qt3/doc/html/rtb-tbdisplay.png
+qt3/doc/html/rtb-tbinput.png
+qt3/doc/html/rtb-tbviews.png
+qt3/doc/html/rtb-toolbox.png
+qt3/doc/html/rtb-tools.png
 qt3/doc/html/runion.png
 qt3/doc/html/rxor.png
 qt3/doc/html/scaling.png
@@ -1734,11 +1737,10 @@ qt3/doc/html/timers.html
 qt3/doc/html/titleindex
 qt3/doc/html/toggleaction-example.html
 qt3/doc/html/toolbar.png
-qt3/doc/html/toolbarpits.png
-qt3/doc/html/toolbox.png
 qt3/doc/html/tools-list.html
 qt3/doc/html/tools.html
 qt3/doc/html/tooltip-example.html
+qt3/doc/html/trivial-nsplugin-example.html
 qt3/doc/html/troll.html
 qt3/doc/html/tt1_en.png
 qt3/doc/html/tt1_la.png
@@ -1784,11 +1786,14 @@ qt3/doc/html/unsmooth.png
 qt3/doc/html/validateaccelerators.png
 qt3/doc/html/validatephrases.png
 qt3/doc/html/validatepunctuation.png
-qt3/doc/html/vieweditconn.png
-qt3/doc/html/views.png
 qt3/doc/html/whatsthis
 qt3/doc/html/whatsthis.png
 qt3/doc/html/widgets-example.html
+qt3/doc/html/win-objexplor1.png
+qt3/doc/html/win-objexplor2.png
+qt3/doc/html/win-projoverview.png
+qt3/doc/html/win-propedit1.png
+qt3/doc/html/win-propedit2.png
 qt3/doc/html/winsystem.html
 qt3/doc/html/wizard-example.html
 qt3/doc/html/wizard-wizard-cpp.html
@@ -2010,11 +2015,8 @@ 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
@@ -2022,6 +2024,10 @@ qt3/man/man3/QMoveEvent.3
 qt3/man/man3/QMovie.3
 qt3/man/man3/QMutex.3
 qt3/man/man3/QMutexLocker.3
+qt3/man/man3/QNPInstance.3
+qt3/man/man3/QNPStream.3
+qt3/man/man3/QNPWidget.3
+qt3/man/man3/QNPlugin.3
 qt3/man/man3/QNetworkOperation.3
 qt3/man/man3/QNetworkProtocol.3
 qt3/man/man3/QObject.3
@@ -2194,7 +2200,6 @@ qt3/man/man3/QXmlNamespaceSupport.3
 qt3/man/man3/QXmlParseException.3
 qt3/man/man3/QXmlReader.3
 qt3/man/man3/QXmlSimpleReader.3
-qt3/man/man3/QXtWidget.3
 qt3/man/man3/Qt.3
 qt3/man/man3/qaccel.3
 qt3/man/man3/qaccessible.3
@@ -2404,11 +2409,8 @@ 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
@@ -2418,6 +2420,10 @@ qt3/man/man3/qmutex.3
 qt3/man/man3/qmutexlocker.3
 qt3/man/man3/qnetworkoperation.3
 qt3/man/man3/qnetworkprotocol.3
+qt3/man/man3/qnpinstance.3
+qt3/man/man3/qnplugin.3
+qt3/man/man3/qnpstream.3
+qt3/man/man3/qnpwidget.3
 qt3/man/man3/qobject.3
 qt3/man/man3/qobjectcleanuphandler.3
 qt3/man/man3/qobjectlist.3
@@ -2589,8 +2595,5 @@ qt3/man/man3/qxmlnamespacesupport.3
 qt3/man/man3/qxmlparseexception.3
 qt3/man/man3/qxmlreader.3
 qt3/man/man3/qxmlsimplereader.3
-qt3/man/man3/qxtwidget.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 058ee91bc52..7084ceb08d8 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/09 19:28:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/18 08:36:24 skrll Exp $
 #
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
@@ -17,7 +17,10 @@ PTHREAD_OPTS+=		require
 UNLIMIT_RESOURCES=	datasize
 
 post-extract:
-	${RM} -f ${WRKSRC}/include/qt_windows.h
+	${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}
@@ -35,6 +38,7 @@ do-install:
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats
 
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index e84c9e465e2..54bb44e31b6 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2003/03/11 13:02:07 markd Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/03/18 08:36:24 skrll Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -29,10 +29,8 @@ CONFIGURE_ARGS+=	-no-g++-exceptions
 
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
-QTPREFIX=		${PREFIX}/qt3
 LIBQT?=			-lqt-mt
 
-CONFIGURE_ENV+=         QTDIR="${WRKSRC}"
 MAKE_ENV+=		QTPREFIX=${QTPREFIX}
 MAKE_ENV+=              QTDIR="${WRKSRC}"
 
@@ -78,6 +76,7 @@ post-patch:
 		-e 's:@SYS_LIBS@:${SYS_LIBS}:g' \
 		-e 's:@LEX@:${LEX}:g' \
 		-e 's:@YACC@:${YACC}:g' \
+		-e 's:@AR@:${AR}:g' \
 		-e 's:@LIBQT@:${LIBQT}:g' \
 		${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
 	for dir in ${WRKSRC}/mkspecs/*; do \
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 4d7bcaef9f5..6c4a6106a93 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/03/11 13:02:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/03/18 08:36:24 skrll Exp $
 qt3/bin/moc
 qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
@@ -373,11 +373,11 @@ 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
 qt3/include/qworkspace.h
 qt3/include/qxml.h
-qt3/include/qxtwidget.h
 qt3/lib/libqt-mt.a
 qt3/lib/libqt-mt.la
 qt3/lib/libqt-mt.so
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index da670f528df..fe0ccbfc643 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/03/14 19:38:07 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2003/03/18 08:36:24 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.1
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
@@ -22,6 +22,7 @@ FIX_RPATH+=			BUILDLINK_LDFLAGS.qt3-libs
 PTHREAD_OPTS+=	require
 
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 6c51c8c7909..a7761e7f576 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.12 2003/03/11 13:02:08 markd Exp $
+$NetBSD: distinfo,v 1.13 2003/03/18 08:36:25 skrll Exp $
 
-SHA1 (qt-x11-free-3.1.1.tar.bz2) = c0175a264ee60fc65b062842bf4a6be9e1618da5
-Size (qt-x11-free-3.1.1.tar.bz2) = 12393902 bytes
+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 (patch-ab) = e8c2bbb84c241df34f493fd9cf44209069f2495e
-SHA1 (patch-ac) = ea4a7e3c5cef4e366a1cea4985f0fa34efa8f34f
+SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
+SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
 SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
+SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index f05bd6f3da5..3753200b673 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
-# $Id: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
+# $NetBSD: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
+# $Id: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -83,7 +83,7 @@ QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
-QMAKE_AR		= libtool --mode=link c++ -o 
+QMAKE_AR		= @AR@ ru
 QMAKE_RANLIB		= true
 
 QMAKE_TAR		= tar -cf
diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab
index 2d501980708..5c0174f5cbf 100644
--- a/x11/qt3-libs/patches/patch-ab
+++ b/x11/qt3-libs/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.5 2003/03/11 13:02:08 markd Exp $
+$NetBSD: patch-ab,v 1.6 2003/03/18 08:36:25 skrll Exp $
 
---- tools/designer/editor/editor.pro.orig	Wed Nov 20 11:07:43 2002
+--- tools/designer/editor/editor.pro.orig	Tue Nov 19 22:07:43 2002
 +++ tools/designer/editor/editor.pro
 @@ -1,6 +1,5 @@
  TEMPLATE	= lib
 -CONFIG		+= qt warn_on staticlib
 -CONFIG		-= dll
-+CONFIG		+= qt warn_on dll
++CONFIG		+= qt warn_on
  HEADERS		= editor.h  \
  		  parenmatcher.h  \
  		  completion.h \
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 0a4598911e5..7f88f2277d2 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
+$NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $
 
 --- src/tools/qdir_unix.cpp.orig	Mon Dec  9 22:40:32 2002
 +++ src/tools/qdir_unix.cpp
@@ -39,10 +39,10 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
 +	   name.truncate( pos );
 +       }
 +    }
-     return ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
- 	== 0;
+     int status =
+ 	::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 );
  #else
-@@ -100,7 +119,24 @@
+@@ -101,7 +120,24 @@ bool QDir::mkdir( const QString &dirName
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {
diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag
new file mode 100644
index 00000000000..725dd8e0043
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ag
@@ -0,0 +1,13 @@
+$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-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
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 573e7043f8f..277e93d90f7 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.8 2003/03/11 13:02:06 markd Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/03/18 08:36:26 skrll Exp $
 #
 
-QTVERSION=	3.1.1
+QTVERSION=	3.1.2
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html