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."

5 files changed, 24 insertions, 24 deletions

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