Introduce several changes so that package builds successfully on

alpha--netbsd1.6.2:
1) Rename the baseline_symbols.txt files that define abi and implement
   logic in Makefile that uses these according to architecture and
   NetBSD version (1.x versus 2.x)
2) Add several patches that allow code to compile on alpha--netbsd1.6.2
3) Revise Makefile so that libiconv is found under NetBSD 1.6.2

6 files changed, 67 insertions, 2 deletions

diff --git a/lang/gcc34/patches/patch-ai b/lang/gcc34/patches/patch-ai
new file mode 100644
index 00000000000..2901fe746c2
--- /dev/null
+++ b/lang/gcc34/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/08/10 15:11:15 shannonjr Exp $
+
+--- gcc/c-opts.c.orig	2004-02-17 17:09:03.000000000 -0700
++++ gcc/c-opts.c
+@@ -36,7 +36,7 @@ Software Foundation, 59 Temple Place - S
+ #include "c-incpath.h"
+ #include "debug.h"		/* For debug_hooks.  */
+ #include "opts.h"
+-#include "options.h"
++#include "../../obj/gcc/options.h"
+ 
+ #ifndef DOLLARS_IN_IDENTIFIERS
+ # define DOLLARS_IN_IDENTIFIERS true
diff --git a/lang/gcc34/patches/patch-aj b/lang/gcc34/patches/patch-aj
new file mode 100644
index 00000000000..f9b9501347d
--- /dev/null
+++ b/lang/gcc34/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/08/10 15:11:15 shannonjr Exp $
+
+--- gcc/opts.c.orig	2004-02-17 17:09:04.000000000 -0700
++++ gcc/opts.c
+@@ -30,7 +30,7 @@ Software Foundation, 59 Temple Place - S
+ #include "output.h"
+ #include "langhooks.h"
+ #include "opts.h"
+-#include "options.h"
++#include "../../obj/gcc/options.h"
+ #include "flags.h"
+ #include "toplev.h"
+ #include "params.h"
diff --git a/lang/gcc34/patches/patch-ak b/lang/gcc34/patches/patch-ak
new file mode 100644
index 00000000000..9f5aea466c9
--- /dev/null
+++ b/lang/gcc34/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2004/08/10 15:11:15 shannonjr Exp $
+
+--- gcc/f/top.c.orig	2003-07-06 14:32:17.000000000 -0600
++++ gcc/f/top.c
+@@ -48,7 +48,7 @@ the Free Software Foundation, 59 Temple 
+ #include "lex.h"
+ #include "malloc.h"
+ #include "name.h"
+-#include "options.h"
++#include "../../obj/gcc/options.h"
+ #include "opts.h"
+ #include "src.h"
+ #include "st.h"
diff --git a/lang/gcc34/patches/patch-al b/lang/gcc34/patches/patch-al
new file mode 100644
index 00000000000..3b95e9cd636
--- /dev/null
+++ b/lang/gcc34/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2004/08/10 15:11:15 shannonjr Exp $
+
+--- gcc/java/lang.c.orig	2004-01-13 16:14:04.000000000 -0700
++++ gcc/java/lang.c
+@@ -46,7 +46,7 @@ The Free Software Foundation is independ
+ #include "splay-tree.h"
+ #include "tree-dump.h"
+ #include "opts.h"
+-#include "options.h"
++#include "../../obj/gcc/options.h"
+ 
+ static bool java_init (void);
+ static void java_finish (void);
diff --git a/lang/gcc34/patches/patch-am b/lang/gcc34/patches/patch-am
new file mode 100644
index 00000000000..4a2b6c1a330
--- /dev/null
+++ b/lang/gcc34/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2004/08/10 15:11:15 shannonjr Exp $
+
+--- gcc/treelang/tree1.c.orig	2003-07-27 22:39:29.000000000 -0600
++++ gcc/treelang/tree1.c
+@@ -45,7 +45,7 @@
+ #include "treelang.h"
+ #include "treetree.h"
+ #include "opts.h"
+-#include "options.h"
++#include "../../obj/gcc/options.h"
+ 
+ extern int yyparse (void);
+ 
diff --git a/lang/gcc34/patches/patch-ca b/lang/gcc34/patches/patch-ca
index bfd2df0998f..650bf9e0fe7 100644
--- a/lang/gcc34/patches/patch-ca
+++ b/lang/gcc34/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.2 2004/07/21 16:03:33 shannonjr Exp $
+$NetBSD: patch-ca,v 1.3 2004/08/10 15:11:15 shannonjr Exp $
 
 --- gcc/configure.orig	2004-04-18 17:45:10.000000000 -0600
 +++ gcc/configure
@@ -7,7 +7,7 @@ $NetBSD: patch-ca,v 1.2 2004/07/21 16:03:33 shannonjr Exp $
    LIBICONV=
    if test "$am_cv_lib_iconv" = yes; then
 -    LIBICONV="$am_cv_lib_iconv_ldpath -liconv"
-+    LIBICONV="$am_cv_lib_iconv_ldpath -liconv -Wl,-R${LOCALBASE}/lib"
++    LIBICONV="$am_cv_lib_iconv_ldpath -liconv -Wl,-R${ICONVPREFIX}/lib"
    fi