1) Renamed patch-libstdc++-v3_configure_host to follow naming convention

2) Removed USE_GCC33ADA option. gcc3-ada may still be used as a bootstrap
   Ada compiler by specifying ALT_GCC

3 files changed, 11 insertions, 15 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index a3bcc328dfc..b47072eeb70 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/28 07:37:19 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/28 12:14:49 shannonjr Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -103,13 +103,11 @@ PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
 
 # Ada bootstrap compiler section
-# An Ada compiler is required to build the Ada compiler. Two
-may be used:
-#USE_GCC33ADA	=# Define to use gcc-3.3.x-ada
+# An Ada compiler is required to build the Ada compiler. You
+# may specify:
 #USE_GCC34ADA	=# Define to use gcc-3.4.x-ada
-# You may also specify the path of a gcc/gnat Ada compiler
-# outside of the pkgsrc system by specifying the full path
-# of the compiler (example) below:
+# Or, you may specify the path of any gcc/gnat Ada compiler
+# by providing the full path of the compiler (example) below:
 #ALT_GCC=	prefix/bin/gcc
 .  if defined(ALT_GCC)
 .     if exists(${ALT_GCC})
@@ -120,7 +118,7 @@ RALT_GCC_RTS=	${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
 PKG_SKIP_REASON=	"Missing bootstrap Ada compiler"
 .     endif
 .  endif
-.  if !defined(USE_GCC33ADA) && !defined(USE_GCC34ADA) && !defined(ALT_GCC)
+.  if !defined(USE_GCC34ADA) && !defined(ALT_GCC)
 PKG_SKIP_REASON=	"An Ada bootstrap compiler must be specified to BUILD_ADA"
 .  endif
 .endif
@@ -216,10 +214,8 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
-.  if defined(USE_GCC33ADA)
-.include "../../lang/gcc3-ada/buildlink3.mk"
-.  elif  defined(USE_GCC34ADA)
-BUILDLINK_DEPMETHOD.gcc3-ada=build
+.  if  defined(USE_GCC34ADA)
+BUILDLINK_DEPMETHOD.gcc34-ada=build
 .include "../../lang/gcc34-ada/buildlink3.mk"
 .  endif
 .endif
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index d301438e3dc..12528968149 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2004/07/28 07:37:19 shannonjr Exp $
+$NetBSD: distinfo,v 1.6 2004/07/28 12:14:49 shannonjr Exp $
 
 SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e
 Size (gcc-3.4.1.tar.bz2) = 27182385 bytes
 SHA1 (patch-ae) = 9b9e4ec15815626c81936460ce834303381f001c
 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
 SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
+SHA1 (patch-ah) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c
 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
 SHA1 (patch-ca) = 771c14ce8cdd9e631694cd19108419f4003a6c08
-SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c
diff --git a/lang/gcc34/patches/patch-libstdc++-v3_configure_host b/lang/gcc34/patches/patch-ah
index 8f3ef05a45d..a68504fd9c1 100644
--- a/lang/gcc34/patches/patch-libstdc++-v3_configure_host
+++ b/lang/gcc34/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-libstdc++-v3_configure_host,v 1.1.1.1 2004/06/29 18:01:25 shannonjr Exp $
+$NetBSD: patch-ah,v 1.1 2004/07/28 12:14:49 shannonjr Exp $
 
 --- libstdc++-v3/configure.host.orig	2004-03-18 10:36:12.000000000 -0700
 +++ libstdc++-v3/configure.host