From:  grant beattie <grant@NetBSD.org>
	Date:  Wed, 21 Jan 2004 13:24:32 +1100


> as fredb pointed out, lang/gcc3 should be updated to 3.3.2.

I've actually done this in my tree (trivial patches below) but this does mean
that the location of libstdc++.so.5 and libgcc_s.so.1 moves (to
/usr/pkg/gcc-3.3.2/lib) so any package using them will need rebuilding, which
may not actually be a problem as the relevant packages should have USE_GCC_SHLIB
set so will have a dependency on gcc3 registered.

cheers
mark

also rm lang/gcc3/patches/patch-aa

Index: lang/gcc3/Makefile
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/lang/gcc3/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- lang/gcc3/Makefile	13 Jan 2004 09:53:35 -0000	1.46
+++ lang/gcc3/Makefile	14 Jan 2004 00:51:24 -0000
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.46 2004/01/13 09:53:35 grant Exp $
 #
 
-DISTNAME=		gcc-3.3
-PKGREVISION=		5
+DISTNAME=		gcc-3.3.2
 PKGNAME=		${DISTNAME:S/gcc/gcc3/}
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3/}
+MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
Index: lang/gcc3/distinfo
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/lang/gcc3/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- lang/gcc3/distinfo	26 Jul 2003 17:37:04 -0000	1.12
+++ lang/gcc3/distinfo	16 Dec 2003 12:06:11 -0000
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.12 2003/07/26 17:37:04 martin Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
-SHA1 (patch-aa) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
+SHA1 (gcc-3.3.2.tar.bz2) = 8750024a3e5a79d17a610d93cb5f171097e3ffee
+Size (gcc-3.3.2.tar.bz2) = 23585904 bytes
 SHA1 (patch-ab) = 8e899db69149894e737e1f68372f3eef9c403635
 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515

Index: mk/compiler.mk
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/mk/compiler.mk,v
retrieving revision 1.24
diff -u -r1.24 compiler.mk
--- mk/compiler.mk	10 Dec 2003 09:08:24 -0000	1.24
+++ mk/compiler.mk	22 Dec 2003 04:10:47 -0000
@@ -170,10 +170,10 @@
 .  endif
 
 .elif defined(USE_GCC3) && empty(_PKGSRC_DEPS:Mgcc-3*)
-GCC_REQD=		3.3
+GCC_REQD=		3.3.2
 
 # we need to define these early, as they are used by gcc3/buildlink2.mk.
-_GCC_SUBPREFIX=		gcc-3.3/
+_GCC_SUBPREFIX=		gcc-3.3.2/
 _GCC_ARCHDIR=		${_GCC_PREFIX}${_GCC_ARCHSUBDIR}
 _GCC_PREFIX=		${LOCALBASE}/${_GCC_SUBPREFIX}