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/.

9 files changed, 6 insertions, 207 deletions

diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 27cb559623b..bf8fae5f398 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/10 15:47:08 seb Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 COMMENT=	GNU Compiler Collection, v3 - C compiler
 
 INFO_FILES=	cpp.info gcc.info gccint.info cppinternals.info
 
-.include "Makefile.common"
+.include "../../lang/gcc3/Makefile.common"
 
 # The "gcc" frontend knows all languages (by patch)
 CONFIGURE_ARGS+=	--enable-languages=c
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
+MAKE_ENV+=	ALL_GCC=${ALL_GCC:Q}
+MAKE_ENV+=	ALL_GCC_C=${ALL_GCC_C:Q}
+MAKE_ENV+=	ALL_GCC_CCC=${ALL_GCCXX_C:Q}
+
 .include "../../mk/compiler.mk"
 
 .if empty(CC_VERSION:Mgcc-*)
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
deleted file mode 100644
index 2dc5f510613..00000000000
--- a/lang/gcc3-c/Makefile.common
+++ /dev/null
@@ -1,117 +0,0 @@
-# $NetBSD: Makefile.common,v 1.16 2004/03/25 23:34:01 jlam Exp $
-
-GCC_VERSION=	3.3.3
-DISTNAME=	gcc-${GCC_VERSION}
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=gcc/releases/gcc-${GCC_VERSION}/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/gcc/gcc.html
-
-NOT_FOR_PLATFORM=	Darwin-*-*
-
-USE_BUILDLINK3=		yes
-USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
-MAKEFLAGS+=		GMAKE_LOCALE=no
-HAS_CONFIGURE=		yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# Make location overridable, to allow ping-pong bootstraps.
-GCC3_DEFAULT_SUBPREFIX=		gcc3
-GCC3_INSTALLTO_SUBPREFIX?=	${GCC3_DEFAULT_SUBPREFIX}
-.if ${GCC3_INSTALLTO_SUBPREFIX} != ${GCC3_DEFAULT_SUBPREFIX}
-GCC3_PKGMODIF=		_${GCC3_INSTALLTO_SUBPREFIX}
-.endif
-
-GCC_SUBPREFIX=		${GCC3_INSTALLTO_SUBPREFIX}
-GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
-CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
-PLIST_SUBST+=		GCC_SUBPREFIX=${GCC_SUBPREFIX}
-FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
-FILES_SUBST+=		PKGNAME=${PKGNAME}
-MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
-
-.if defined(INFO_FILES)
-INFO_DIR=	${GCC_SUBPREFIX}/info
-.endif
-
-# Support threads and building of crt*.o on post-1.6 -current.
-# Use buildlink to avoid a GNU pth package.
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h)
-GCC_PLATFORM=		${MACHINE_GNU_ARCH}--netbsdelf2.0
-PTHREAD_OPTS+=		require native
-.  include "../../mk/pthread.buildlink3.mk"
-.else
-GCC_PLATFORM=		${MACHINE_GNU_PLATFORM}
-.endif
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
-PLIST_SUBST+=		GCC_PLATFORM=${GCC_PLATFORM}
-
-.if ${OPSYS} == "NetBSD"
-.  if !defined(USE_BINUTILS)
-AS_PATH:=   ${AS}
-.    for _dir_ in ${PATH:C/\:/ /g}
-.      if empty(AS_PATH:M/*)
-.        if exists(${_dir_}/${AS})
-AS_PATH:=   ${_dir_}/${AS}
-.        endif
-.      endif
-.    endfor
-.    if !empty(AS_PATH:M${LOCALBASE}/*)
-USE_BINUTILS=	YES
-.    else
-AS_VERSION!=	${AS} --version | ${AWK} '{				\
-		    split($$3, v, /[.]/);				\
-		    printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4];	\
-		    exit;						\
-		}'
-USE_BINUTILS!=	${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
-.    endif
-MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
-.  endif
-.endif
-
-.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
-DEPENDS+=		binutils>=2.13.2.1:../../devel/binutils
-EVAL_PREFIX+=		BINUTILS_PREFIX=binutils
-BINUTILS_PREFIX_DEFAULT= ${LOCALBASE}
-CONFIGURE_ARGS+=	--with-as=${BINUTILS_PREFIX}/${MACHINE_GNU_PLATFORM}/bin/as
-.endif
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-shared
-.else
-CONFIGURE_ARGS+=	--disable-shared
-.endif
-
-GCC_ARCHSUBDIR=	${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
-GCC_ARCHDIR=	${PREFIX}/${GCC_ARCHSUBDIR}
-
-.if defined(INSTLIBS)
-BUILDLINK_LIBTOOL=	${BUILDLINK_DIR}/bin/libtool
-
-.PHONY: scrub-libtool-archives
-post-build: scrub-libtool-archives
-scrub-libtool-archives:
-.  for lafile in ${INSTLIBS}
-	${BUILDLINK_LIBTOOL} --fix-la ${WRKSRC}/${GCC_PLATFORM}/${lafile}
-.  endfor
-.endif
-
-# Create the directories for the build, patch the ltconfig script to
-# always use "sunos" shared library numbering (for consistent PLISTs
-# across platforms), and touch all the necessary files so that they're
-# not regenerated after the configure script is run.
-#
-pre-configure:
-	${MKDIR} ${BUILD_DIRS}
-	cd ${WRKSRC}; for file in ltconfig boehm-gc/ltconfig; do	\
-		${MV} -f $$file $$file.bak;				\
-		${SED} -e "s|\(version_type\)=linux|\1=sunos|g"		\
-			$$file.bak > $$file;				\
-		${CHMOD} +x $$file;					\
-	done
-	cd ${WRKSRC} && contrib/gcc_update --touch
diff --git a/lang/gcc3-c/distinfo b/lang/gcc3-c/distinfo
deleted file mode 100644
index 5f615189e38..00000000000
--- a/lang/gcc3-c/distinfo
+++ /dev/null
@@ -1,9 +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-ab) = f0795e3792cd5200140bc19e291a2616b7d31468
-SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
-SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
-SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
-SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1
diff --git a/lang/gcc3-c/language.mk b/lang/gcc3-c/language.mk
deleted file mode 100644
index 9ef9afb17f5..00000000000
--- a/lang/gcc3-c/language.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: language.mk,v 1.9 2004/03/22 08:26:44 jlam Exp $
-
-BUILDLINK_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.gcc3-c+=	full
-
-.include "../gcc3-c/Makefile.common"
-
-pre-build:
-	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} tconfig.h
-	${RM} -f ${WRKSRC}/libiberty/libiberty.a ${WRKSRC}/gcc/xgcc
-	${LN} -s ${GCC_PREFIX}/lib/libiberty.a ${WRKSRC}/libiberty
-	${LN} -s ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc
-
-.include "../gcc3-c/buildlink3.mk"
diff --git a/lang/gcc3-c/patches/patch-ab b/lang/gcc3-c/patches/patch-ab
deleted file mode 100644
index 89478c11654..00000000000
--- a/lang/gcc3-c/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/07/09 15:14:43 drochner Exp $
-
---- gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
-+++ gcc/Makefile.in	Sat May 24 13:01:38 2003
-@@ -1236,6 +1236,7 @@
- # Language-independent files.
- 
- DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(prefix)/lib\"" \
-   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
-   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
diff --git a/lang/gcc3-c/patches/patch-ae b/lang/gcc3-c/patches/patch-ae
deleted file mode 100644
index f3ce9f9c54b..00000000000
--- a/lang/gcc3-c/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/07/06 12:15:08 drochner Exp $
-
---- gcc/config/t-netbsd.orig	2003-06-11 19:38:33.000000000 +0200
-+++ gcc/config/t-netbsd	2003-06-11 19:38:59.000000000 +0200
-@@ -3,3 +3,4 @@
- 
- # Always build crtstuff with PIC.
- CRTSTUFF_T_CFLAGS = -fPIC
-+TARGET_LIBGCC2_CFLAGS += -fPIC
diff --git a/lang/gcc3-c/patches/patch-af b/lang/gcc3-c/patches/patch-af
deleted file mode 100644
index 2c0dc8fa1c8..00000000000
--- a/lang/gcc3-c/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/29 09:05:56 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 79946e0ebeb..00000000000
--- a/lang/gcc3-c/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/07/29 09:05:56 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
diff --git a/lang/gcc3-c/patches/patch-ai b/lang/gcc3-c/patches/patch-ai
deleted file mode 100644
index d5dc6b3d2dd..00000000000
--- a/lang/gcc3-c/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/07/06 12:15:08 drochner Exp $
-
---- gcc/configure.orig	2003-07-04 12:51:47.000000000 +0200
-+++ gcc/configure	2003-07-04 12:52:44.000000000 +0200
-@@ -8559,7 +8559,7 @@
- lang_specs_files=
- lang_options_files=
- lang_tree_files=
--for subdir in . $subdirs
-+for subdir in . cp f java objc ada
- do
- 	if test -f $srcdir/$subdir/lang-specs.h; then
- 	    lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"