Update:

        gcc3 to 3.3nb5
        gcc3-c to 3.3nb1
        gcc3-c++ to 3.3nb1
In gcc3.mk set CPP to '.../cpp -gcc' rather than '.../cpp'
Ensure __GNUC__ and similar are defined.

7 files changed, 16 insertions, 11 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index a809d4aa94a..7c18ea1c76b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.2809 2003/07/17 09:02:31 adam Exp $
+$NetBSD: CHANGES,v 1.2810 2003/07/17 09:08:49 abs Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -2840,3 +2840,6 @@ Changes to the packages collection and infrastructure in 2003:
 	Added avr-gdb-5.2.1 [wennmach 2003-07-16]
 	Updated nsd to 1.2.1 [itojun 2003-07-17]
 	Updated xpaint to 2.7.0 [adam 2003-07-17]
+	Updated gcc3 to 3.3nb5 [abs 2003-07-17]
+	Updated gcc3-c to 3.3nb1 [abs 2003-07-17]
+	Updated gcc3-c++ to 3.3nb1 [abs 2003-07-17]
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index d6db0a8f95b..aa975e38cc3 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:59 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 09:07:57 abs Exp $
 #
 
 PKGNAME=		gcc3${GCC3_PKGMODIF}-c++-3.3
+PKGREVISION=		1
 COMMENT=		GNU Compiler Collection, c++ Compiler
 
 .include "../gcc3-c/buildaddon.mk"
diff --git a/lang/gcc3-c++/files/gcc3.mk b/lang/gcc3-c++/files/gcc3.mk
index e318559e0b6..d8489d93b4a 100644
--- a/lang/gcc3-c++/files/gcc3.mk
+++ b/lang/gcc3-c++/files/gcc3.mk
@@ -1,8 +1,8 @@
-# $NetBSD: gcc3.mk,v 1.2 2003/07/08 15:04:59 drochner Exp $
+# $NetBSD: gcc3.mk,v 1.3 2003/07/17 09:07:57 abs Exp $
 #
 # make configuration file for @PKGNAME@
 
 USE_GCC3=	# defined
 CC=		@GCC_PREFIX@/bin/cc
-CPP=		@GCC_PREFIX@/bin/cpp
+CPP=		@GCC_PREFIX@/bin/cpp -gcc
 CXX=		@GCC_PREFIX@/bin/c++
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 453c16fcdad..49152583bd9 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/16 20:23:59 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/17 09:07:56 abs Exp $
 #
 
 PKGNAME=		gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
+PKGREVISION=		1
 COMMENT=		GNU Compiler Collection, C compiler
 
 INFO_FILES=	cpp.info gcc.info gccint.info cppinternals.info
diff --git a/lang/gcc3-c/files/gcc3.mk b/lang/gcc3-c/files/gcc3.mk
index 1fb17b19215..e6100122af1 100644
--- a/lang/gcc3-c/files/gcc3.mk
+++ b/lang/gcc3-c/files/gcc3.mk
@@ -1,7 +1,7 @@
-# $NetBSD: gcc3.mk,v 1.2 2003/07/08 15:04:57 drochner Exp $
+# $NetBSD: gcc3.mk,v 1.3 2003/07/17 09:07:56 abs Exp $
 #
 # make configuration file for @PKGNAME@
 
 USE_GCC3=	# defined
 CC=		@GCC_PREFIX@/bin/cc
-CPP=		@GCC_PREFIX@/bin/cpp
+CPP=		@GCC_PREFIX@/bin/cpp -gcc
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index 1926bdfe61d..6072ad6db26 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2003/07/13 13:16:04 grant Exp $
+# $NetBSD: Makefile,v 1.39 2003/07/17 09:07:54 abs Exp $
 #
 
 DISTNAME=		gcc-3.3
-PKGREVISION=		4
+PKGREVISION=		5
 PKGNAME=		${DISTNAME:C|gcc|gcc3|}
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3/}
diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk
index 8f919c327b7..889609dabef 100644
--- a/lang/gcc3/files/gcc3.mk
+++ b/lang/gcc3/files/gcc3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: gcc3.mk,v 1.9 2003/07/13 13:16:05 grant Exp $
+# $NetBSD: gcc3.mk,v 1.10 2003/07/17 09:07:55 abs Exp $
 #
 # make configuration file for @DISTNAME@
 
 CC=		@GCC_PREFIX@/bin/gcc
-CPP=		@GCC_PREFIX@/bin/cpp
+CPP=		@GCC_PREFIX@/bin/cpp -gcc
 CXX=		@GCC_PREFIX@/bin/g++
 F77=		@GCC_PREFIX@/bin/g77
 PKG_FC=		@GCC_PREFIX@/bin/g77