Make all gcc3-* packages use a single distinfo file from gcc3/distinfo and

a single patch directory from gcc3/patches/.
Also Move gcc3-c/{Makefile.common,language.mk} into gcc3/.

5 files changed, 4 insertions, 55 deletions

diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 488dad7ac4b..ad08f67582a 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/02 14:46:33 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/10 15:47:09 seb Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
 COMMENT=	GNU Compiler Collection, v3 - C++ compiler
@@ -6,10 +6,12 @@ COMMENT=	GNU Compiler Collection, v3 - C++ compiler
 INSTLIBS=	libstdc++-v3/libsupc++/libsupc++.la			\
 		libstdc++-v3/src/libstdc++.la
 
-.include "../gcc3-c/language.mk"
+.include "../../lang/gcc3/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="c++"
 
+MAKE_ENV+=	ALL_GCC_CXX=${ALL_GCC_CXX:Q}
+
 do-build:
 	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++
 	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g++
diff --git a/lang/gcc3-c++/distinfo b/lang/gcc3-c++/distinfo
deleted file mode 100644
index c5cdf31b715..00000000000
--- a/lang/gcc3-c++/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2004/03/02 14:46:33 drochner Exp $
-
-SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
-Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
-SHA1 (patch-aa) = 93a4299e7d64b91f750ba96c75f0487cdf87abea
-SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
-SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff --git a/lang/gcc3-c++/patches/patch-aa b/lang/gcc3-c++/patches/patch-aa
deleted file mode 100644
index 494baa09f5e..00000000000
--- a/lang/gcc3-c++/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/08 15:05:00 drochner Exp $
-
---- Makefile.in.orig	2003-05-14 02:18:14.000000000 +0200
-+++ Makefile.in	2003-07-03 23:14:35.000000000 +0200
-@@ -1642,8 +1642,8 @@
- 
- install-dosrel-fake:
- 
--ALL_GCC = all-gcc
--ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
-+#ALL_GCC = all-gcc
-+#ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
- ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
- 
- # This is a list of inter-dependencies among modules.
diff --git a/lang/gcc3-c++/patches/patch-af b/lang/gcc3-c++/patches/patch-af
deleted file mode 100644
index 21ae69c85d7..00000000000
--- a/lang/gcc3-c++/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/29 09:02:51 martin Exp $
-
---- gcc/cppspec.c	Wed Jul 23 02:40:54 2003
-+++ gcc/cppspec.c	Fri Jul 25 17:57:41 2003
-@@ -85,6 +85,13 @@
- 
-   is_cpp_driver = 1;
- 
-+  /* NetBSD uses __GNUC__ and friends in header files processed with cpp
-+     regularly.  Default to old behaviour here. XXX - move me to
-+     config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC".  */
-+#ifdef DEFAULT_CPP_NEED_NO_GCC
-+  need_no_gcc = DEFAULT_CPP_NEED_NO_GCC;
-+#endif
-+
-   /* First pass.  If we see an -S or -c, barf.  If we see an input file,
-      turn off read_stdin.  If we see a second input file, it is actually
-      the output file.  If we see a third input file, barf.  */
diff --git a/lang/gcc3-c++/patches/patch-ag b/lang/gcc3-c++/patches/patch-ag
deleted file mode 100644
index 63979c02207..00000000000
--- a/lang/gcc3-c++/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/07/29 09:02:51 martin Exp $
-
-Index: gcc/config/netbsd.h
---- gcc/config/netbsd.h	Wed Jul 23 02:41:37 2003
-+++ gcc/config/netbsd.h	Fri Jul 25 17:57:43 2003
-@@ -234,3 +234,7 @@
-   /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */				\
-   (void) mprotect (page, end - page, 7);				\
- }
-+
-+/* NetBSD depends on "cpp" having GNUC semantics, and must default as if
-+   "cpp -gcc" was called. */
-+#define DEFAULT_CPP_NEED_NO_GCC 0