Split the gcc3 pkg into per-language pieces.

Needs some cleanup and integration; eventually lang/gcc3 can turn into
a meta-pkg.

8 files changed, 397 insertions, 0 deletions

diff --git a/lang/gcc3-c++/DESCR b/lang/gcc3-c++/DESCR
new file mode 100644
index 00000000000..bef410282ba
--- /dev/null
+++ b/lang/gcc3-c++/DESCR
@@ -0,0 +1,14 @@
+This directory contains the GNU Compiler Collection (GCC) version 3.3.
+It includes all of the support for compiling C, C++, Objective C, Fortran,
+Java, and Chill.
+
+The GNU Compiler Collection is free software.  See the file COPYING for copying
+permission.
+
+See the file gcc.texi (together with other files that it includes) for
+installation and porting information.  The file INSTALL contains a
+copy of the installation information, as plain ASCII.
+
+See the Bugs chapter of the GCC Manual for how to report bugs
+usefully.  An online readable version of the manual is in the files
+gcc.info*.
diff --git a/lang/gcc3-c++/MESSAGE b/lang/gcc3-c++/MESSAGE
new file mode 100644
index 00000000000..32e2157ca64
--- /dev/null
+++ b/lang/gcc3-c++/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/07/06 12:15:09 drochner Exp $
+
+To use ${PKGNAME} include "${PREFIX}/share/examples/gcc/mk.conf" in your
+BSD style makefile.
+
+===========================================================================
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
new file mode 100644
index 00000000000..9ac773d08bc
--- /dev/null
+++ b/lang/gcc3-c++/Makefile
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:09 drochner Exp $
+#
+
+DISTNAME=		gcc-3.3
+PKGNAME=		gcc3-c++-3.3
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		tech-pkg@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
+COMMENT=		GNU Compiler Collection
+
+NOT_FOR_PLATFORM=	Darwin-*-*
+
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+USE_GMAKE=		YES
+
+HAS_CONFIGURE=		YES
+
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--enable-languages="c++"
+
+# as this is named gcc3, use DISTNAME instead.
+FILES_SUBST+=		PKGNAME_NOREV=${DISTNAME} GCC_PREFIX=${GCC_PREFIX}
+MESSAGE_SUBST+=		PKGNAME_NOREV=${DISTNAME}
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h)
+GCC_PLATFORM=	${MACHINE_GNU_ARCH}--netbsdelf2.0
+PTHREAD_OPTS+=		require native
+.include "../../mk/pthread.buildlink2.mk"
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include
+CFLAGS+=	-I${BUILDLINK_DIR}/include
+.else
+GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
+.endif
+CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
+PLIST_SUBST+=	GCC_PLATFORM=${GCC_PLATFORM}
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--enable-shared
+.else
+.  if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--enable-shared
+.  else
+CONFIGURE_ARGS+=	--disable-shared
+.  endif
+.  if ${CC:M*gcc*} == ""
+ALL_TARGET=		bootstrap
+.  endif
+.endif
+
+# as this is named gcc3, use DISTNAME instead.
+GCC_PREFIX=	${PREFIX}/gcc3
+GCC_ARCHDIR=	${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+
+pre-configure:
+	${MKDIR} ${BUILD_DIRS}
+	cd ${WRKSRC} && contrib/gcc_update --touch
+
+do-build:
+	${LN} -sf ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc
+	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++)
+	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g++)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} all-target-libstdc++-v3)
+
+post-build:
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gcc/cc1plus ${GCC_ARCHDIR}
+	(cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		c++.install-common c++.install-man)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		install-target-libstdc++-v3)
+
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/gcc3.mk \
+		${PREFIX}/share/examples/gcc/mk-g++.conf
+
+.include "../../lang/gcc3-c/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc3-c++/PLIST b/lang/gcc3-c++/PLIST
new file mode 100644
index 00000000000..f652a609641
--- /dev/null
+++ b/lang/gcc3-c++/PLIST
@@ -0,0 +1,208 @@
+@comment $NetBSD: PLIST,v 1.1 2003/07/06 12:15:09 drochner Exp $
+gcc3/bin/c++
+gcc3/bin/g++
+gcc3/bin/${GCC_PLATFORM}-c++
+gcc3/bin/${GCC_PLATFORM}-g++
+gcc3/include/c++/${PKGVERSION}/algorithm
+gcc3/include/c++/${PKGVERSION}/backward/algo.h
+gcc3/include/c++/${PKGVERSION}/backward/algobase.h
+gcc3/include/c++/${PKGVERSION}/backward/alloc.h
+gcc3/include/c++/${PKGVERSION}/backward/backward_warning.h
+gcc3/include/c++/${PKGVERSION}/backward/bvector.h
+gcc3/include/c++/${PKGVERSION}/backward/complex.h
+gcc3/include/c++/${PKGVERSION}/backward/defalloc.h
+gcc3/include/c++/${PKGVERSION}/backward/deque.h
+gcc3/include/c++/${PKGVERSION}/backward/fstream.h
+gcc3/include/c++/${PKGVERSION}/backward/function.h
+gcc3/include/c++/${PKGVERSION}/backward/hash_map.h
+gcc3/include/c++/${PKGVERSION}/backward/hash_set.h
+gcc3/include/c++/${PKGVERSION}/backward/hashtable.h
+gcc3/include/c++/${PKGVERSION}/backward/heap.h
+gcc3/include/c++/${PKGVERSION}/backward/iomanip.h
+gcc3/include/c++/${PKGVERSION}/backward/iostream.h
+gcc3/include/c++/${PKGVERSION}/backward/istream.h
+gcc3/include/c++/${PKGVERSION}/backward/iterator.h
+gcc3/include/c++/${PKGVERSION}/backward/list.h
+gcc3/include/c++/${PKGVERSION}/backward/map.h
+gcc3/include/c++/${PKGVERSION}/backward/multimap.h
+gcc3/include/c++/${PKGVERSION}/backward/multiset.h
+gcc3/include/c++/${PKGVERSION}/backward/new.h
+gcc3/include/c++/${PKGVERSION}/backward/ostream.h
+gcc3/include/c++/${PKGVERSION}/backward/pair.h
+gcc3/include/c++/${PKGVERSION}/backward/queue.h
+gcc3/include/c++/${PKGVERSION}/backward/rope.h
+gcc3/include/c++/${PKGVERSION}/backward/set.h
+gcc3/include/c++/${PKGVERSION}/backward/slist.h
+gcc3/include/c++/${PKGVERSION}/backward/stack.h
+gcc3/include/c++/${PKGVERSION}/backward/stream.h
+gcc3/include/c++/${PKGVERSION}/backward/streambuf.h
+gcc3/include/c++/${PKGVERSION}/backward/strstream
+gcc3/include/c++/${PKGVERSION}/backward/tempbuf.h
+gcc3/include/c++/${PKGVERSION}/backward/tree.h
+gcc3/include/c++/${PKGVERSION}/backward/vector.h
+gcc3/include/c++/${PKGVERSION}/bits/basic_ios.h
+gcc3/include/c++/${PKGVERSION}/bits/basic_ios.tcc
+gcc3/include/c++/${PKGVERSION}/bits/basic_string.h
+gcc3/include/c++/${PKGVERSION}/bits/basic_string.tcc
+gcc3/include/c++/${PKGVERSION}/bits/boost_concept_check.h
+gcc3/include/c++/${PKGVERSION}/bits/char_traits.h
+gcc3/include/c++/${PKGVERSION}/bits/cmath.tcc
+gcc3/include/c++/${PKGVERSION}/bits/codecvt.h
+gcc3/include/c++/${PKGVERSION}/bits/concept_check.h
+gcc3/include/c++/${PKGVERSION}/bits/cpp_type_traits.h
+gcc3/include/c++/${PKGVERSION}/bits/deque.tcc
+gcc3/include/c++/${PKGVERSION}/bits/fpos.h
+gcc3/include/c++/${PKGVERSION}/bits/fstream.tcc
+gcc3/include/c++/${PKGVERSION}/bits/functexcept.h
+gcc3/include/c++/${PKGVERSION}/bits/gslice.h
+gcc3/include/c++/${PKGVERSION}/bits/gslice_array.h
+gcc3/include/c++/${PKGVERSION}/bits/indirect_array.h
+gcc3/include/c++/${PKGVERSION}/bits/ios_base.h
+gcc3/include/c++/${PKGVERSION}/bits/istream.tcc
+gcc3/include/c++/${PKGVERSION}/bits/list.tcc
+gcc3/include/c++/${PKGVERSION}/bits/locale_classes.h
+gcc3/include/c++/${PKGVERSION}/bits/locale_facets.h
+gcc3/include/c++/${PKGVERSION}/bits/locale_facets.tcc
+gcc3/include/c++/${PKGVERSION}/bits/localefwd.h
+gcc3/include/c++/${PKGVERSION}/bits/mask_array.h
+gcc3/include/c++/${PKGVERSION}/bits/ostream.tcc
+gcc3/include/c++/${PKGVERSION}/bits/pthread_allocimpl.h
+gcc3/include/c++/${PKGVERSION}/bits/slice_array.h
+gcc3/include/c++/${PKGVERSION}/bits/sstream.tcc
+gcc3/include/c++/${PKGVERSION}/bits/stl_algo.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_algobase.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_alloc.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_bvector.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_construct.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_deque.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_function.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_heap.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_iterator.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_iterator_base_funcs.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_iterator_base_types.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_list.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_map.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_multimap.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_multiset.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_numeric.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_pair.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_pthread_alloc.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_queue.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_raw_storage_iter.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_relops.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_set.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_stack.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_tempbuf.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_threads.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_tree.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_uninitialized.h
+gcc3/include/c++/${PKGVERSION}/bits/stl_vector.h
+gcc3/include/c++/${PKGVERSION}/bits/stream_iterator.h
+gcc3/include/c++/${PKGVERSION}/bits/streambuf.tcc
+gcc3/include/c++/${PKGVERSION}/bits/streambuf_iterator.h
+gcc3/include/c++/${PKGVERSION}/bits/stringfwd.h
+gcc3/include/c++/${PKGVERSION}/bits/type_traits.h
+gcc3/include/c++/${PKGVERSION}/bits/valarray_array.h
+gcc3/include/c++/${PKGVERSION}/bits/valarray_array.tcc
+gcc3/include/c++/${PKGVERSION}/bits/valarray_meta.h
+gcc3/include/c++/${PKGVERSION}/bits/vector.tcc
+gcc3/include/c++/${PKGVERSION}/bitset
+gcc3/include/c++/${PKGVERSION}/cassert
+gcc3/include/c++/${PKGVERSION}/cctype
+gcc3/include/c++/${PKGVERSION}/cerrno
+gcc3/include/c++/${PKGVERSION}/cfloat
+gcc3/include/c++/${PKGVERSION}/ciso646
+gcc3/include/c++/${PKGVERSION}/climits
+gcc3/include/c++/${PKGVERSION}/clocale
+gcc3/include/c++/${PKGVERSION}/cmath
+gcc3/include/c++/${PKGVERSION}/complex
+gcc3/include/c++/${PKGVERSION}/csetjmp
+gcc3/include/c++/${PKGVERSION}/csignal
+gcc3/include/c++/${PKGVERSION}/cstdarg
+gcc3/include/c++/${PKGVERSION}/cstddef
+gcc3/include/c++/${PKGVERSION}/cstdio
+gcc3/include/c++/${PKGVERSION}/cstdlib
+gcc3/include/c++/${PKGVERSION}/cstring
+gcc3/include/c++/${PKGVERSION}/ctime
+gcc3/include/c++/${PKGVERSION}/cwchar
+gcc3/include/c++/${PKGVERSION}/cwctype
+gcc3/include/c++/${PKGVERSION}/cxxabi.h
+gcc3/include/c++/${PKGVERSION}/deque
+gcc3/include/c++/${PKGVERSION}/exception
+gcc3/include/c++/${PKGVERSION}/exception_defines.h
+gcc3/include/c++/${PKGVERSION}/ext/algorithm
+gcc3/include/c++/${PKGVERSION}/ext/enc_filebuf.h
+gcc3/include/c++/${PKGVERSION}/ext/functional
+gcc3/include/c++/${PKGVERSION}/ext/hash_map
+gcc3/include/c++/${PKGVERSION}/ext/hash_set
+gcc3/include/c++/${PKGVERSION}/ext/iterator
+gcc3/include/c++/${PKGVERSION}/ext/memory
+gcc3/include/c++/${PKGVERSION}/ext/numeric
+gcc3/include/c++/${PKGVERSION}/ext/rb_tree
+gcc3/include/c++/${PKGVERSION}/ext/rope
+gcc3/include/c++/${PKGVERSION}/ext/ropeimpl.h
+gcc3/include/c++/${PKGVERSION}/ext/slist
+gcc3/include/c++/${PKGVERSION}/ext/stdio_filebuf.h
+gcc3/include/c++/${PKGVERSION}/ext/stl_hash_fun.h
+gcc3/include/c++/${PKGVERSION}/ext/stl_hashtable.h
+gcc3/include/c++/${PKGVERSION}/ext/stl_rope.h
+gcc3/include/c++/${PKGVERSION}/fstream
+gcc3/include/c++/${PKGVERSION}/functional
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/atomicity.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/basic_file.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/c++config.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/c++io.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/c++locale.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/codecvt_specializations.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/ctype_base.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/ctype_inline.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/ctype_noninline.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/gthr-default.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/gthr-posix.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/gthr-single.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/gthr.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/messages_members.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/os_defines.h
+gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits/time_members.h
+gcc3/include/c++/${PKGVERSION}/iomanip
+gcc3/include/c++/${PKGVERSION}/ios
+gcc3/include/c++/${PKGVERSION}/iosfwd
+gcc3/include/c++/${PKGVERSION}/iostream
+gcc3/include/c++/${PKGVERSION}/istream
+gcc3/include/c++/${PKGVERSION}/iterator
+gcc3/include/c++/${PKGVERSION}/limits
+gcc3/include/c++/${PKGVERSION}/list
+gcc3/include/c++/${PKGVERSION}/locale
+gcc3/include/c++/${PKGVERSION}/map
+gcc3/include/c++/${PKGVERSION}/memory
+gcc3/include/c++/${PKGVERSION}/new
+gcc3/include/c++/${PKGVERSION}/numeric
+gcc3/include/c++/${PKGVERSION}/ostream
+gcc3/include/c++/${PKGVERSION}/queue
+gcc3/include/c++/${PKGVERSION}/set
+gcc3/include/c++/${PKGVERSION}/sstream
+gcc3/include/c++/${PKGVERSION}/stack
+gcc3/include/c++/${PKGVERSION}/stdexcept
+gcc3/include/c++/${PKGVERSION}/streambuf
+gcc3/include/c++/${PKGVERSION}/string
+gcc3/include/c++/${PKGVERSION}/typeinfo
+gcc3/include/c++/${PKGVERSION}/utility
+gcc3/include/c++/${PKGVERSION}/valarray
+gcc3/include/c++/${PKGVERSION}/vector
+gcc3/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}/cc1plus
+gcc3/lib/libstdc++.a
+gcc3/lib/libstdc++.la
+gcc3/lib/libstdc++.so
+gcc3/lib/libstdc++.so.5
+gcc3/lib/libstdc++.so.5.4
+gcc3/lib/libsupc++.a
+gcc3/lib/libsupc++.la
+gcc3/man/man1/g++.1
+share/examples/gcc/mk-g++.conf
+@dirrm gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}/bits
+@dirrm gcc3/include/c++/${PKGVERSION}/${GCC_PLATFORM}
+@dirrm gcc3/include/c++/${PKGVERSION}/ext
+@dirrm gcc3/include/c++/${PKGVERSION}/bits
+@dirrm gcc3/include/c++/${PKGVERSION}/backward
+@dirrm gcc3/include/c++/${PKGVERSION}
+@dirrm gcc3/include/c++
diff --git a/lang/gcc3-c++/distinfo b/lang/gcc3-c++/distinfo
new file mode 100644
index 00000000000..ca8763d5bbe
--- /dev/null
+++ b/lang/gcc3-c++/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2003/07/06 12:15:09 drochner Exp $
+
+SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
+Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (patch-aa) = 8fa1df757be692bf314f91f168ff28f03a47ceae
+SHA1 (patch-ab) = d2f4bf95eaf58e1b388771f1bc2d2083c9dcf514
diff --git a/lang/gcc3-c++/files/gcc3.mk b/lang/gcc3-c++/files/gcc3.mk
new file mode 100644
index 00000000000..80874609d83
--- /dev/null
+++ b/lang/gcc3-c++/files/gcc3.mk
@@ -0,0 +1,8 @@
+# $NetBSD: gcc3.mk,v 1.1 2003/07/06 12:15:09 drochner Exp $
+#
+# make configuration file for @PKGNAME_NOREV@
+
+USE_GCC3=	# defined
+CC=		@GCC_PREFIX@/bin/cc
+CPP=		@GCC_PREFIX@/bin/cpp
+CXX=		@GCC_PREFIX@/bin/c++
diff --git a/lang/gcc3-c++/patches/patch-aa b/lang/gcc3-c++/patches/patch-aa
new file mode 100644
index 00000000000..efc2a2a49c5
--- /dev/null
+++ b/lang/gcc3-c++/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1 2003/07/06 12:15:09 drochner Exp $
+
+--- Makefile.in.orig	2003-05-14 02:18:14.000000000 +0200
++++ Makefile.in	2003-07-03 23:14:35.000000000 +0200
+@@ -153,11 +153,11 @@
+ 
+ # For an installed makeinfo, we require it to be from texinfo 4.2 or
+ # higher, else we use the "missing" dummy.
+-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+-	then echo $$r/texinfo/makeinfo/makeinfo ; \
+-	else if (makeinfo --version \
+-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+-        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
++#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
++#	then echo $$r/texinfo/makeinfo/makeinfo ; \
++#	else if (makeinfo --version \
++#	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
++#        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+ # sub-makes.  It lets flags be given on the command line while still
+@@ -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-ab b/lang/gcc3-c++/patches/patch-ab
new file mode 100644
index 00000000000..719793a33ba
--- /dev/null
+++ b/lang/gcc3-c++/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.1 2003/07/06 12:15:10 drochner Exp $
+
+--- gcc/Makefile.in.orig	2003-04-22 17:50:48.000000000 +0200
++++ gcc/Makefile.in	2003-07-03 17:21:34.000000000 +0200
+@@ -617,8 +617,8 @@
+ 
+ # Build and host support libraries.  FORBUILD is either
+ # .. or ../$(build_alias) depending on whether host != build.
+-LIBIBERTY = ../libiberty/libiberty.a
+-BUILD_LIBIBERTY = @FORBUILD@/libiberty/libiberty.a
++LIBIBERTY = ${prefix}/lib/libiberty.a
++BUILD_LIBIBERTY = ${prefix}/lib/libiberty.a
+ 
+ # Dependencies on the intl and portability libraries.
+ LIBDEPS= $(INTLDEPS) $(LIBIBERTY)
+@@ -1273,6 +1273,7 @@
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(GCC_PREFIX)/lib\"" \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+@@ -2874,11 +2875,11 @@
+ 	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
+ 	  done; \
+ 	else true; fi
+-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
+ 	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
+ 	    for f in cpp.info gcc.info gccint.info cppinternals.info; do \
+ 		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
+-		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
++		  ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
+ 		else true; fi; \
+ 	    done; \
+ 	  else true; fi; \