Replace patch-ae with a better patches/patch-gcc_ginclude_stddef.h,

provided by Kai-Uwe Eckhardt for fixing PR 43131 (Linux build).

While here, add RCS Ids to a few patches, and regen one.

9 files changed, 46 insertions, 27 deletions

diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 910c51afadb..26a9a0de469 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/03/16 14:53:49 hans Exp $
+$NetBSD: distinfo,v 1.8 2011/05/14 18:00:24 wiz Exp $
 
 SHA1 (gcc-4.4.5.tar.bz2) = 2b1427a932a620c909d74f1e4821ed90c90fd350
 RMD160 (gcc-4.4.5.tar.bz2) = 87d6fa77d50f23a3359e24bf5b0ddfafa7088478
@@ -7,12 +7,12 @@ SHA1 (patch-aa) = b90dbd935aa105b86a7dd0f3f5f76727bd2d55fb
 SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
 SHA1 (patch-ad) = 86dc05e6ea977ad869e5d63beb493750ab01a807
-SHA1 (patch-ae) = 831481496b5b5f246f51d9a4fe9314f07f81a842
 SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
-SHA1 (patch-ag) = 077bed181ee4bad36eb23c817a1708950b69a1ad
-SHA1 (patch-ah) = f931e56bdc9aac160d5320f33c3af3b0d76c6d22
-SHA1 (patch-ai) = a7329ed9f8bb533c4bf0c2f4cc97b6c49d737148
-SHA1 (patch-aj) = 65ba5e1160a3c5934a7098db2f870fa5db63a267
-SHA1 (patch-ak) = 891dab9be4f76fef17027c70daee3afcfb720fee
-SHA1 (patch-al) = 7b21a8968302a3da1c4cfd881cfe8eac1341fa11
+SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b
+SHA1 (patch-ah) = 979d091d5d3026c9db2d91de26aeaa44e9183fe8
+SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7
+SHA1 (patch-aj) = cde99b36f7f7dcf220ef4451108ad1ff7410a6a6
+SHA1 (patch-ak) = 08da661b8b19fdd9fa086f67b185266c1d378658
+SHA1 (patch-al) = 462059744f7f057f13d6c472d0aff9d012546082
 SHA1 (patch-am) = fcfabcec9e6d0b8e9ada348dc65e8ddb890f96ca
+SHA1 (patch-gcc_ginclude_stddef.h) = 867e3ff87f0b8865b37823c42c9b01935b94e5fb
diff --git a/lang/gcc44/patches/patch-ae b/lang/gcc44/patches/patch-ae
deleted file mode 100644
index a7318e0e137..00000000000
--- a/lang/gcc44/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/09/18 11:24:50 dmcmahill Exp $
-
---- gcc/Makefile.in.orig	2009-05-27 00:57:20 +0200
-+++ gcc/Makefile.in
-@@ -310,7 +310,6 @@ USER_H = $(srcdir)/ginclude/float.h \
- 	 $(srcdir)/ginclude/iso646.h \
- 	 $(srcdir)/ginclude/stdarg.h \
- 	 $(srcdir)/ginclude/stdbool.h \
--	 $(srcdir)/ginclude/stddef.h \
- 	 $(srcdir)/ginclude/varargs.h \
- 	 $(srcdir)/ginclude/stdfix.h \
- 	 $(EXTRA_HEADERS)
diff --git a/lang/gcc44/patches/patch-ag b/lang/gcc44/patches/patch-ag
index 4c4d0e1e83b..61e41ef3df1 100644
--- a/lang/gcc44/patches/patch-ag
+++ b/lang/gcc44/patches/patch-ag
@@ -1,24 +1,26 @@
-$NetBSD: patch-ag,v 1.1 2009/09/24 11:50:57 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2011/05/14 18:00:24 wiz Exp $
 
 No need to use bash for this small script.
 
 Also -print0 is not portable to solaris and perhaps others.
 
 --- libjava/contrib/rebuild-gcj-db.in.orig	2008-07-02 13:17:54.000000000 +0000
-+++ libjava/contrib/rebuild-gcj-db.in	2009-09-23 12:53:18.000000000 +0000
-@@ -1,3 +1,3 @@
++++ libjava/contrib/rebuild-gcj-db.in
+@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  # rebuild-gcj-db
  
-@@ -17,5 +17,5 @@
+ ## Copyright (C) 2000, 2002, 2003, 2008 Free Software Foundation
+@@ -16,12 +16,12 @@ for i in `@prefix@/bin/gcc --print-multi
+    base=@prefix@/lib/$dirname
     dbLocation=`@prefix@/bin/gcj-dbtool -p $base`
     libdir=$base/gcj
 -   if ! test -d $libdir; then
 +   if test ! -d $libdir; then
        # No shared libraries here.
        continue
-@@ -23,5 +23,5 @@
+    fi
     dirname $dbLocation | xargs mkdir -p
     @prefix@/bin/gcj-dbtool -n $dbLocation 64
 -   find $libdir -follow -name '*.db' -print0 | \
diff --git a/lang/gcc44/patches/patch-ah b/lang/gcc44/patches/patch-ah
index 211cd315125..d81b2ad481b 100644
--- a/lang/gcc44/patches/patch-ah
+++ b/lang/gcc44/patches/patch-ah
@@ -1,3 +1,5 @@
+$NetBSD: patch-ah,v 1.2 2011/05/14 18:00:24 wiz Exp $
+
 --- libgfortran/intrinsics/c99_functions.c.orig	2009-04-10 01:23:07.000000000 +0200
 +++ libgfortran/intrinsics/c99_functions.c
 @@ -538,7 +538,7 @@
diff --git a/lang/gcc44/patches/patch-ai b/lang/gcc44/patches/patch-ai
index dacbe969345..31a32a6ea1f 100644
--- a/lang/gcc44/patches/patch-ai
+++ b/lang/gcc44/patches/patch-ai
@@ -1,3 +1,5 @@
+$NetBSD: patch-ai,v 1.2 2011/05/14 18:00:24 wiz Exp $
+
 --- gcc/fortran/f95-lang.c.orig	2010-04-21 23:26:11.000000000 +0200
 +++ gcc/fortran/f95-lang.c
 @@ -871,10 +871,17 @@
diff --git a/lang/gcc44/patches/patch-aj b/lang/gcc44/patches/patch-aj
index df99ab51b12..09eb78211ea 100644
--- a/lang/gcc44/patches/patch-aj
+++ b/lang/gcc44/patches/patch-aj
@@ -1,5 +1,7 @@
---- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2009-04-10 01:23:07.000000000 +0200
-+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h	2011-03-03 13:57:27.000000000 +0100
+$NetBSD: patch-aj,v 1.2 2011/05/14 18:00:24 wiz Exp $
+
+--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2009-04-09 23:23:07.000000000 +0000
++++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
 @@ -30,6 +30,8 @@
  // Full details can be found from the CVS files at:
  //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
diff --git a/lang/gcc44/patches/patch-ak b/lang/gcc44/patches/patch-ak
index 391ef4bf04c..eb821ad6cfe 100644
--- a/lang/gcc44/patches/patch-ak
+++ b/lang/gcc44/patches/patch-ak
@@ -1,3 +1,5 @@
+$NetBSD: patch-ak,v 1.2 2011/05/14 18:00:24 wiz Exp $
+
 --- libjava/configure.host.orig	2011-02-25 16:07:42.000000000 +0100
 +++ libjava/configure.host
 @@ -310,6 +310,9 @@
diff --git a/lang/gcc44/patches/patch-al b/lang/gcc44/patches/patch-al
index b6174a620f8..954a526e542 100644
--- a/lang/gcc44/patches/patch-al
+++ b/lang/gcc44/patches/patch-al
@@ -1,3 +1,5 @@
+$NetBSD: patch-al,v 1.2 2011/05/14 18:00:24 wiz Exp $
+
 --- libjava/configure.ac.orig	2011-02-25 16:08:27.000000000 +0100
 +++ libjava/configure.ac
 @@ -1011,6 +1011,11 @@
diff --git a/lang/gcc44/patches/patch-gcc_ginclude_stddef.h b/lang/gcc44/patches/patch-gcc_ginclude_stddef.h
new file mode 100644
index 00000000000..b38a808633e
--- /dev/null
+++ b/lang/gcc44/patches/patch-gcc_ginclude_stddef.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-gcc_ginclude_stddef.h,v 1.1 2011/05/14 18:00:24 wiz Exp $
+
+Fix build on NetBSD i386/amd64 after the ansi.h header include protection
+name change.
+
+--- gcc/ginclude/stddef.h.orig	2009-04-09 23:23:07.000000000 +0000
++++ gcc/ginclude/stddef.h
+@@ -53,6 +53,11 @@ see the files COPYING3 and COPYING.RUNTI
+    one less case to deal with in the following.  */
+ #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
+ #include <machine/ansi.h>
++#if !defined(_MACHINE_ANSI_H_)
++#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
++#define _MACHINE_ANSI_H_
++#endif
++#endif
+ #endif
+ /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
+ #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)