Update gcc3-* to 3.3.6. Fix build of gcc3-f77 and gcc3-java on

NetBSD-current.

12 files changed, 58 insertions, 21 deletions

diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index 71e977e9cb7..0219b5666a3 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/07 11:24:27 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
-PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - Ada compiler
 
 .include "../../lang/gcc3/language.mk"
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 0233ffa6d3b..49d59d32d26 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/03/14 20:43:23 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/07 11:24:28 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
-PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - C++ compiler
 
 INSTLIBS=	libstdc++-v3/libsupc++/libsupc++.la			\
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 29ef5503176..4e2fd9b0c9c 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2006/09/27 15:46:11 abs Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/07 11:24:28 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
-PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - C compiler
 
 INFO_FILES=	# PLIST
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index 80111be1d5f..9f2f9872972 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2006/04/09 01:11:31 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/07 11:24:28 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION}
-PKGREVISION=	2
 COMMENT=	GNU Compiler Collection, v3 - F77 compiler
 
 INFO_FILES=	# PLIST
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 1cc3750b0aa..48231277b0c 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2006/05/20 08:39:08 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/07 11:24:28 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
-PKGREVISION=	2
 COMMENT=	GNU Compiler Collection, v3 - Java compiler
 
 BUILDLINK_API_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}{,nb*}
diff --git a/lang/gcc3-objc/Makefile b/lang/gcc3-objc/Makefile
index 957311584c7..4c74486e2cd 100644
--- a/lang/gcc3-objc/Makefile
+++ b/lang/gcc3-objc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/07 11:24:28 markd Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-objc-${GCC_VERSION}
-PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - Objective C compiler
 
 INSTLIBS=	libobjc/libobjc.la
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index e959dc6f6bb..4dc773678af 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2006/12/07 11:24:27 markd Exp $
 
-GCC_VERSION=	3.3.5
+GCC_VERSION=	3.3.6
 DISTNAME=	gcc3-${GCC_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 6bbc9b5b727..05adcaebd42 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.24 2006/09/27 15:46:11 abs Exp $
+# $NetBSD: Makefile.common,v 1.25 2006/12/07 11:24:27 markd Exp $
 
-GCC_VERSION=	3.3.5
+GCC_VERSION=	3.3.6
 DISTNAME=	gcc-${GCC_VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index d73d862ba41..78738a5daa9 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.22 2005/02/24 09:03:07 agc Exp $
+$NetBSD: distinfo,v 1.23 2006/12/07 11:24:27 markd Exp $
 
-SHA1 (gcc-3.3.5.tar.bz2) = ab24a8690040de967c25a1fc8560d7ecc25bd460
-RMD160 (gcc-3.3.5.tar.bz2) = 34adf1a6f7ea302e9937c1a06ccf362711e25c58
-Size (gcc-3.3.5.tar.bz2) = 23833856 bytes
+SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb
+RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967
+Size (gcc-3.3.6.tar.bz2) = 23972413 bytes
 SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36
 SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0
+SHA1 (patch-ac) = cc44ff46579900173b24ea4c39070a8b97450ce2
+SHA1 (patch-ad) = 00d8def03bc48cde0b03331ea6b846cc0997f0fe
 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
 SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
+SHA1 (patch-ah) = bad03ed13de00bd5d677c8920dc6c1c9fdc60e71
 SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1
 SHA1 (patch-aj) = bfbf65150fd6f0eaa50af68bb8e892fff4a2051e
 SHA1 (patch-ak) = 53b91c8315e5e2ccb5d74058bdfd33c6f8431ad6
diff --git a/lang/gcc3/patches/patch-ac b/lang/gcc3/patches/patch-ac
new file mode 100644
index 00000000000..59f45f8da94
--- /dev/null
+++ b/lang/gcc3/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2006/12/07 11:24:27 markd Exp $
+
+--- gcc/f/com.h.orig	2006-12-05 23:50:53.000000000 +1300
++++ gcc/f/com.h
+@@ -233,7 +233,7 @@ void ffecom_finish_decl (tree decl, tree
+ void ffecom_finish_progunit (void);
+ tree ffecom_get_invented_identifier (const char *pattern, ...)
+   ATTRIBUTE_PRINTF_1;
+-ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt ix);
++ffeinfoBasictype ffecom_gfrt_basictype (ffecomGfrt ix);
+ ffeinfoKindtype ffecom_gfrt_kindtype (ffecomGfrt ix);
+ void ffecom_init_0 (void);
+ void ffecom_init_2 (void);
diff --git a/lang/gcc3/patches/patch-ad b/lang/gcc3/patches/patch-ad
new file mode 100644
index 00000000000..eb34cce5991
--- /dev/null
+++ b/lang/gcc3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2006/12/07 11:24:27 markd Exp $
+
+--- gcc/java/gjavah.c.orig	2006-12-07 10:24:14.000000000 +1300
++++ gcc/java/gjavah.c
+@@ -46,7 +46,7 @@ FILE *out = NULL;
+ static int found_error = 0;
+ 
+ /* Nonzero if we're generating JNI output.  */
+-static int flag_jni = 0;
++int flag_jni = 0;
+ 
+ /* When nonzero, warn when source file is newer than matching class
+    file.  */
diff --git a/lang/gcc3/patches/patch-ah b/lang/gcc3/patches/patch-ah
new file mode 100644
index 00000000000..ee18eb0f769
--- /dev/null
+++ b/lang/gcc3/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2006/12/07 11:24:27 markd Exp $
+
+--- libjava/java/net/natPlainSocketImpl.cc.orig	2006-12-07 21:55:04.000000000 +1300
++++ libjava/java/net/natPlainSocketImpl.cc
+@@ -61,6 +61,10 @@ read(int s, void *buf, int len)
+ #include <bstring.h>
+ #endif
+ 
++#ifdef TRUE
++#undef TRUE
++#undef FALSE
++#endif
+ 
+ #include <gcj/cni.h>
+ #include <gcj/javaprims.h>