update to 3.3.6

changes:
-bugfixes
-gcc-4.1 support
-translation updates

10 files changed, 22 insertions, 24 deletions

diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index 0b896b4c40e..83f4f7cb657 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/31 14:38:02 drochner Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 BUILD_QT3=	yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 8aa098d9381..9f2c50469cc 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2006/03/03 00:53:54 minskim Exp $
+# $NetBSD: Makefile,v 1.50 2006/03/31 14:38:02 drochner Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
-PKGREVISION=	6
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 4c7b55bdbb4..d148a7d1027 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.36 2006/03/13 21:53:47 minskim Exp $
+$NetBSD: distinfo,v 1.37 2006/03/31 14:38:02 drochner Exp $
 
-SHA1 (qt-x11-free-3.3.5.tar.bz2) = 8d7c7ba0b39848ef60b3cd93fc1d33e9527694ec
-RMD160 (qt-x11-free-3.3.5.tar.bz2) = 376ae3fc36c70ec864653ca78582ba29410def7f
-Size (qt-x11-free-3.3.5.tar.bz2) = 14431679 bytes
+SHA1 (qt-x11-free-3.3.6.tar.bz2) = bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946
+RMD160 (qt-x11-free-3.3.6.tar.bz2) = 84c0b6bc6dc727d40a5a8df29a81aafc743c0161
+Size (qt-x11-free-3.3.6.tar.bz2) = 14565843 bytes
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
 SHA1 (patch-ad) = 366c411ad5cb8227d5e40165d877c627dbf9c670
 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
-SHA1 (patch-af) = 513b0419dcbe0d2e65d9912868effcf0681119ae
+SHA1 (patch-af) = 7ac1629afd6de928d35d0a410795ca45451d5b18
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
 SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce
 SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af
index 03cf90db122..fb22ea90d30 100644
--- a/x11/qt3-libs/patches/patch-af
+++ b/x11/qt3-libs/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.4 2004/10/28 10:28:49 gavan Exp $
+$NetBSD: patch-af,v 1.5 2006/03/31 14:38:02 drochner Exp $
 
---- qmake/Makefile.unix.orig	2004-06-02 23:24:30.000000000 +0100
+--- qmake/Makefile.unix.orig	2006-02-28 11:32:54.000000000 +0100
 +++ qmake/Makefile.unix
 @@ -32,12 +32,12 @@ DEPEND_SRC=project.cpp property.cpp meta
  	   @SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \
  	   @SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp
  
--CXXFLAGS= @QMAKE_CFLAGS@ \
-+CXXFLAGS+= @QMAKE_CFLAGS@ \
+-CXXFLAGS= @QMAKE_CXXFLAGS@ \
++CXXFLAGS+= @QMAKE_CXXFLAGS@ \
  	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
  	-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
  	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index accfbe27d03..184299dfd89 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/31 14:38:02 drochner Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
-PKGREVISION=		3
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index 19fc2aa3849..03315b542d6 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/31 14:38:02 drochner Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		3
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index b4e2c108b0a..de0af36ffc1 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/13 21:53:47 minskim Exp $
+# $NetBSD: Makefile,v 1.45 2006/03/31 14:38:02 drochner Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,7 +9,6 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-tools-${QTVERSION}
-PKGREVISION=	6
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index 0b8d7a393d2..82b05767ef1 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2005/09/27 07:47:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/03/31 14:38:02 drochner Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -66,6 +66,8 @@ 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++-32/qmake.conf
+qt3/mkspecs/linux-g++-32/qplatformdefs.h
 qt3/mkspecs/linux-g++-64/qmake.conf
 qt3/mkspecs/linux-g++-64/qplatformdefs.h
 qt3/mkspecs/linux-g++/qmake.conf
@@ -83,6 +85,7 @@ qt3/mkspecs/lynxos-g++/qplatformdefs.h
 qt3/mkspecs/macx-g++/Info.plist.app
 qt3/mkspecs/macx-g++/qmake.conf
 qt3/mkspecs/macx-g++/qplatformdefs.h
+qt3/mkspecs/macx-mwerks/README
 qt3/mkspecs/macx-mwerks/mwerkstmpl.xml
 qt3/mkspecs/macx-mwerks/qmake.conf
 qt3/mkspecs/macx-mwerks/qplatformdefs.h
@@ -180,6 +183,7 @@ qt3/plugins/designer/libwizards.la
 @dirrm qt3/mkspecs/linux-kcc
 @dirrm qt3/mkspecs/linux-icc
 @dirrm qt3/mkspecs/linux-g++-64
+@dirrm qt3/mkspecs/linux-g++-32
 @dirrm qt3/mkspecs/linux-g++
 @dirrm qt3/mkspecs/linux-ecc-64
 @dirrm qt3/mkspecs/linux-cxx
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 614a3543331..1ec67ca8899 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/03/31 14:38:02 drochner Exp $
 
 DISTNAME=	qt3-${QTVERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index e755226451e..7e3b6cc124d 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.18 2006/03/04 21:31:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2006/03/31 14:38:02 drochner Exp $
 
-QTVERSION=	3.3.5
+QTVERSION=	3.3.6
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html