update to 3.0.4

"Qt 3.0.4 is a bugfix release. It maintains both forward and backward
compatibility (source and binary) with Qt 3.0.3."

7 files changed, 56 insertions, 47 deletions

diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST
index a758f980bf6..b77c0dc9630 100644
--- a/x11/qt3-docs/PLIST
+++ b/x11/qt3-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/19 17:54:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/04 13:30:10 drochner Exp $
 qt3/doc/html/README
 qt3/doc/html/README.QT
 qt3/doc/html/aboutqt.html
@@ -147,6 +147,7 @@ qt3/doc/html/how-to-learn-qt.html
 qt3/doc/html/httpd-example.html
 qt3/doc/html/i18n-example.html
 qt3/doc/html/i18n.html
+qt3/doc/html/iconset.png
 qt3/doc/html/iconview-example.html
 qt3/doc/html/iconview-simple_dd-main-cpp.html
 qt3/doc/html/iconview-simple_dd-main-h.html
@@ -221,6 +222,9 @@ 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/pen-cap-styles.png
+qt3/doc/html/pen-join-styles.png
+qt3/doc/html/pen-styles.png
 qt3/doc/html/penstyles.png
 qt3/doc/html/phrasebookdialog.png
 qt3/doc/html/phrasebookopen.png
@@ -421,13 +425,7 @@ qt3/doc/html/qd-chapdialog-taborder.png
 qt3/doc/html/qd-chapdialogs-addingwidgets.png
 qt3/doc/html/qd-chapdialogs-creatingmulticlipform3.png
 qt3/doc/html/qd-chapdialogs-creatingnewprojects.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-part2-stepone-twogroups.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-part2-steptwo-layoutform.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-part3-stepfive-layoutform.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-part3-steptwo-addspacer.png
 qt3/doc/html/qd-chapdialogs-layoutwidgets-stepone-after.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-stepthree-groupedwidgets.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-stepthree-rubberband.png
 qt3/doc/html/qd-chapdialogs-objectexplorer.png
 qt3/doc/html/qd-chapdialogs-propertyeditor.png
 qt3/doc/html/qd-chapmainwin-actioneditor1.png
@@ -510,6 +508,12 @@ 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-layout2.1-twogroups.png
+qt3/doc/html/qd-layout2.2-layoutform.png
+qt3/doc/html/qd-layout3-groupedwidgets.png
+qt3/doc/html/qd-layout3-rubberband.png
+qt3/doc/html/qd-layout3.2-addspacer.png
+qt3/doc/html/qd-layout3.5-layoutform.png
 qt3/doc/html/qd-layoutmenu1.png
 qt3/doc/html/qd-layouttoolbuttons3.png
 qt3/doc/html/qd-mainwinwzd.png
@@ -663,6 +667,7 @@ qt3/doc/html/qembed.html
 qt3/doc/html/qerrormessage-h.html
 qt3/doc/html/qerrormessage-members.html
 qt3/doc/html/qerrormessage.html
+qt3/doc/html/qerrormessage.png
 qt3/doc/html/qeucjpcodec-h.html
 qt3/doc/html/qeucjpcodec-members.html
 qt3/doc/html/qeucjpcodec.html
@@ -720,7 +725,9 @@ qt3/doc/html/qframe.html
 qt3/doc/html/qftp-h.html
 qt3/doc/html/qftp-members.html
 qt3/doc/html/qftp.html
-qt3/doc/html/qgbkcodec-h.html
+qt3/doc/html/qgb18030codec-h.html
+qt3/doc/html/qgb18030codec-members.html
+qt3/doc/html/qgb18030codec.html
 qt3/doc/html/qgbkcodec-members.html
 qt3/doc/html/qgbkcodec.html
 qt3/doc/html/qgfx_qws-h.html
@@ -756,9 +763,6 @@ qt3/doc/html/qgroupbox.html
 qt3/doc/html/qgroupboxes.png
 qt3/doc/html/qgrpbox-m.png
 qt3/doc/html/qgrpbox-w.png
-qt3/doc/html/qguardedptr-h.html
-qt3/doc/html/qguardedptr-members.html
-qt3/doc/html/qguardedptr.html
 qt3/doc/html/qhbox-h.html
 qt3/doc/html/qhbox-m.png
 qt3/doc/html/qhbox-members.html
@@ -939,8 +943,11 @@ qt3/doc/html/qmenubar.html
 qt3/doc/html/qmenudata-h.html
 qt3/doc/html/qmenudata-members.html
 qt3/doc/html/qmenudata.html
+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-warn.png
 qt3/doc/html/qmessagebox.html
 qt3/doc/html/qmetaobject-h.html
 qt3/doc/html/qmetaobject-members.html
@@ -998,6 +1005,11 @@ qt3/doc/html/qobject.html
 qt3/doc/html/qobjectcleanuphandler-h.html
 qt3/doc/html/qobjectcleanuphandler-members.html
 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/qobjectlistit-members.html
+qt3/doc/html/qobjectlistit.html
 qt3/doc/html/qpaintdevice-h.html
 qt3/doc/html/qpaintdevice-members.html
 qt3/doc/html/qpaintdevice.html
@@ -1286,6 +1298,7 @@ qt3/doc/html/qstylesheet-members.html
 qt3/doc/html/qstylesheet.html
 qt3/doc/html/qstylesheetitem-members.html
 qt3/doc/html/qstylesheetitem.html
+qt3/doc/html/qt-colors.png
 qt3/doc/html/qt-members.html
 qt3/doc/html/qt-template-lib.html
 qt3/doc/html/qt.html
@@ -1596,7 +1609,6 @@ qt3/doc/html/statistics-example.html
 qt3/doc/html/step-by-step-examples.html
 qt3/doc/html/t1.html
 qt3/doc/html/t1.png
-qt3/doc/html/t10-Makefile.html
 qt3/doc/html/t10-cannon-cpp.html
 qt3/doc/html/t10-cannon-h.html
 qt3/doc/html/t10-lcdrange-cpp.html
@@ -1604,7 +1616,6 @@ qt3/doc/html/t10-lcdrange-h.html
 qt3/doc/html/t10-main-cpp.html
 qt3/doc/html/t10.html
 qt3/doc/html/t10.png
-qt3/doc/html/t11-Makefile.html
 qt3/doc/html/t11-cannon-cpp.html
 qt3/doc/html/t11-cannon-h.html
 qt3/doc/html/t11-lcdrange-cpp.html
@@ -1612,7 +1623,6 @@ qt3/doc/html/t11-lcdrange-h.html
 qt3/doc/html/t11-main-cpp.html
 qt3/doc/html/t11.html
 qt3/doc/html/t11.png
-qt3/doc/html/t12-Makefile.html
 qt3/doc/html/t12-cannon-cpp.html
 qt3/doc/html/t12-cannon-h.html
 qt3/doc/html/t12-lcdrange-cpp.html
@@ -1620,7 +1630,6 @@ qt3/doc/html/t12-lcdrange-h.html
 qt3/doc/html/t12-main-cpp.html
 qt3/doc/html/t12.html
 qt3/doc/html/t12.png
-qt3/doc/html/t13-Makefile.html
 qt3/doc/html/t13-cannon-cpp.html
 qt3/doc/html/t13-cannon-h.html
 qt3/doc/html/t13-gamebrd-cpp.html
@@ -1630,7 +1639,6 @@ qt3/doc/html/t13-lcdrange-h.html
 qt3/doc/html/t13-main-cpp.html
 qt3/doc/html/t13.html
 qt3/doc/html/t13.png
-qt3/doc/html/t14-Makefile.html
 qt3/doc/html/t14-cannon-cpp.html
 qt3/doc/html/t14-cannon-h.html
 qt3/doc/html/t14-gamebrd-cpp.html
@@ -1650,13 +1658,11 @@ qt3/doc/html/t5.html
 qt3/doc/html/t5.png
 qt3/doc/html/t6.html
 qt3/doc/html/t6.png
-qt3/doc/html/t7-Makefile.html
 qt3/doc/html/t7-lcdrange-cpp.html
 qt3/doc/html/t7-lcdrange-h.html
 qt3/doc/html/t7-main-cpp.html
 qt3/doc/html/t7.html
 qt3/doc/html/t7.png
-qt3/doc/html/t8-Makefile.html
 qt3/doc/html/t8-cannon-cpp.html
 qt3/doc/html/t8-cannon-h.html
 qt3/doc/html/t8-lcdrange-cpp.html
@@ -1664,7 +1670,6 @@ qt3/doc/html/t8-lcdrange-h.html
 qt3/doc/html/t8-main-cpp.html
 qt3/doc/html/t8.html
 qt3/doc/html/t8.png
-qt3/doc/html/t9-Makefile.html
 qt3/doc/html/t9-cannon-cpp.html
 qt3/doc/html/t9-cannon-h.html
 qt3/doc/html/t9-lcdrange-cpp.html
@@ -1864,12 +1869,12 @@ qt3/man/man3/QGLContext.3
 qt3/man/man3/QGLFormat.3
 qt3/man/man3/QGLWidget.3
 qt3/man/man3/QGLayoutIterator.3
+qt3/man/man3/QGb18030Codec.3
 qt3/man/man3/QGbkCodec.3
 qt3/man/man3/QGrid.3
 qt3/man/man3/QGridLayout.3
 qt3/man/man3/QGridView.3
 qt3/man/man3/QGroupBox.3
-qt3/man/man3/QGuardedPtr.3
 qt3/man/man3/QHBox.3
 qt3/man/man3/QHBoxLayout.3
 qt3/man/man3/QHButtonGroup.3
@@ -1945,6 +1950,8 @@ qt3/man/man3/QNetworkOperation.3
 qt3/man/man3/QNetworkProtocol.3
 qt3/man/man3/QObject.3
 qt3/man/man3/QObjectCleanupHandler.3
+qt3/man/man3/QObjectList.3
+qt3/man/man3/QObjectListIt.3
 qt3/man/man3/QPNGImagePacker.3
 qt3/man/man3/QPaintDevice.3
 qt3/man/man3/QPaintDeviceMetrics.3
@@ -2233,6 +2240,7 @@ qt3/man/man3/qfontmanager.3
 qt3/man/man3/qfontmetrics.3
 qt3/man/man3/qframe.3
 qt3/man/man3/qftp.3
+qt3/man/man3/qgb18030codec.3
 qt3/man/man3/qgbkcodec.3
 qt3/man/man3/qgl.3
 qt3/man/man3/qglayoutiterator.3
@@ -2244,7 +2252,6 @@ qt3/man/man3/qgrid.3
 qt3/man/man3/qgridlayout.3
 qt3/man/man3/qgridview.3
 qt3/man/man3/qgroupbox.3
-qt3/man/man3/qguardedptr.3
 qt3/man/man3/qhbox.3
 qt3/man/man3/qhboxlayout.3
 qt3/man/man3/qhbuttongroup.3
@@ -2320,6 +2327,8 @@ 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
+qt3/man/man3/qobjectlistit.3
 qt3/man/man3/qpaintdevice.3
 qt3/man/man3/qpaintdevicemetrics.3
 qt3/man/man3/qpainter.3
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 801368c7e63..b2a8a71201b 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.3 2002/03/19 17:54:36 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/05/04 13:30:10 drochner Exp $
 #
 DISTNAME=               qt-x11-free-${QTVERSION}
 CATEGORIES=             x11
 MASTER_SITES=   \
 	ftp://ftp.trolltech.com/qt/source/ \
-	ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
+	ftp://ftp.bero.org/pub/qt/source/
 
 .include "../qt3/Makefile.common"
 
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 70d11d8d23b..6ee9a59cdf2 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/19 17:54:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/04 13:30:10 drochner Exp $
 qt3/bin/moc
 qt3/include/jri.h
 qt3/include/jri_md.h
@@ -133,7 +133,7 @@ qt3/include/qfontmetrics.h
 qt3/include/qframe.h
 qt3/include/qftp.h
 qt3/include/qgarray.h
-qt3/include/qgbkcodec.h
+qt3/include/qgb18030codec.h
 qt3/include/qgcache.h
 qt3/include/qgdict.h
 qt3/include/qgeneric.h
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 617de053c6f..6ac071c73d8 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/03/25 22:16:40 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/05/04 13:30:10 drochner Exp $
 
-SHA1 (qt-x11-free-3.0.3.tar.gz) = b6fe7213104bda6075a7d944ab83802262470b15
-Size (qt-x11-free-3.0.3.tar.gz) = 15088462 bytes
-SHA1 (patch-aa) = aae2cb07147fdc00b008dbb89ebddb58a9ad5010
-SHA1 (patch-ab) = 17a8073304419c5a5e824cb462367463b24f7fbc
+SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb
+Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes
+SHA1 (patch-aa) = 494c78ec6f70fa656584887e289915b41a6b7245
+SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180
 SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92
diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa
index f178a29bede..062011360ef 100644
--- a/x11/qt3-libs/patches/patch-aa
+++ b/x11/qt3-libs/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2002/05/04 13:30:10 drochner Exp $
 
---- Makefile.orig	Mon Oct  8 02:44:41 2001
-+++ Makefile
-@@ -53,7 +53,7 @@
- sub-src: src-moc .qmake.cache FORCE
- 	cd src && $(MAKE)
- 
+--- Makefile.orig	Mon Mar 18 05:58:44 2002
++++ Makefile	Fri May  3 17:38:21 2002
+@@ -63,7 +63,7 @@
+ 	cd plugins/src && $(MAKE) uninstall
+ plugins-install: sub-plugins
+ 	cd plugins/src && $(MAKE) install
 -sub-plugins: sub-src .qmake.cache FORCE
 +sub-plugins: .qmake.cache FORCE
  	cd plugins/src && $(MAKE)
  
- sub-tutorial: sub-src FORCE
+ #tutorials
diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab
index 05f6ca0c7b8..73b0548ff33 100644
--- a/x11/qt3-libs/patches/patch-ab
+++ b/x11/qt3-libs/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/03/25 22:16:40 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2002/05/04 13:30:11 drochner Exp $
 
---- configure.orig	Sun Mar 10 10:59:59 2002
-+++ configure
-@@ -685,7 +685,7 @@
+--- configure.orig	Mon Apr 22 22:03:46 2002
++++ configure	Fri May  3 17:40:27 2002
+@@ -775,7 +775,7 @@
  # we may write in the build tree, let's take advantage of this
  # to test that QTDIR is correctly set to be the build tree
  touch .test.qt.
--if [ '!' -f ${QTDIR}/.test.qt. ]
-+if [ '!' -f .test.qt. ]
- then
+-if [ '!' -f ${QTDIR}/.test.qt. ]; then
++if [ '!' -f .test.qt. ]; then
      rm -f .test.qt.
      echo
+     echo
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index f89940ac693..dc09fbd851c 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2002/03/25 22:16:39 skrll Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/05/04 13:30:09 drochner Exp $
 #
 
-QTVERSION=	3.0.3
+QTVERSION=	3.0.4
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html