4 files changed, 83 insertions, 25 deletions
diff --git a/lang/gcc3-c++/DESCR b/lang/gcc3-c++/DESCR
index bef410282ba..38b2055393c 100644
--- a/lang/gcc3-c++/DESCR
+++ b/lang/gcc3-c++/DESCR
@@ -1,14 +1,3 @@
-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 (GCC) version 3.x.
 
-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*.
+This package includes support for compiling the C++ language.
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 8fac4decc5c..34a1102c51a 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:02 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.8 2004/02/01 14:05:47 jlam Exp $
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
-COMMENT=		GNU Compiler Collection, version 3, c++ compiler
+PKGNAME=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
+COMMENT=	GNU Compiler Collection, v3 - C++ compiler
 
-.include "../gcc3-c/buildaddon.mk"
+.include "../gcc3-c/language.mk"
 
 CONFIGURE_ARGS+=	--enable-languages="c++"
 
 do-build:
-	(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)
+	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)
+	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 ${GCC_PREFIX}/mk/c++.mk
diff --git a/lang/gcc3-c++/buildlink2.mk b/lang/gcc3-c++/buildlink2.mk
new file mode 100644
index 00000000000..6887c3ff64d
--- /dev/null
+++ b/lang/gcc3-c++/buildlink2.mk
@@ -0,0 +1,45 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+.if !defined(GCC3CXX_BUILDLINK2_MK)
+GCC3CXX_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+.endif
+BUILDLINK_PACKAGES+=		gcc3cxx
+BUILDLINK_DEPENDS.gcc3cxx?=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3cxx?=	../../lang/gcc3-c++
+
+# Packages that link against gcc shared libraries need a full
+# dependency.
+#
+.if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3cxx+=	full
+.else
+BUILDLINK_DEPMETHOD.gcc3cxx?=	build
+.endif
+
+BUILDLINK_PREFIX.gcc3cxx=	${LOCALBASE}
+BUILDLINK_WRAPPER_ENV+=	\
+	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
+
+BUILDLINK_FILES.gcc3cxx=	${_GCC_SUBPREFIX}include/c++/*/*
+BUILDLINK_FILES.gcc3cxx+=	${_GCC_SUBPREFIX}include/c++/*/*/*
+BUILDLINK_FILES.gcc3cxx+=	${_GCC_SUBPREFIX}include/c++/*/*/*/*
+BUILDLINK_FILES.gcc3cxx+=	${_GCC_SUBPREFIX}lib/libstdc++.*
+BUILDLINK_FILES.gcc3cxx+=	${_GCC_SUBPREFIX}lib/libsupc++.*
+
+BUILDLINK_TARGETS+=	gcc3cxx-buildlink
+BUILDLINK_TARGETS+=     libstdc++-buildlink-la
+
+gcc3cxx-buildlink: _BUILDLINK_USE
+
+libstdc++-buildlink-la:               
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	lafile="${BUILDLINK_DIR}/lib/libstdc++.la";			\
+	libpattern="/usr/lib/libstdc++.*";				\
+	${BUILDLINK_FAKE_LA}
+
+.endif	# GCC3CXX_BUILDLINK2_MK
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
new file mode 100644
index 00000000000..82ec44fd243
--- /dev/null
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GCC3CXX_BUILDLINK3_MK:=	${GCC3CXX_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(GCC3CXX_BUILDLINK3_MK:M+)
+.  if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+.  endif
+BUILDLINK_PACKAGES+=		gcc3cxx
+BUILDLINK_DEPENDS+=		gcc3cxx
+BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3cxx?=	../../lang/gcc3-c++
+
+# Packages that link against shared libraries need a full dependency.
+.  if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3cxx+=	full
+.  else
+BUILDLINK_DEPMETHOD.gcc3cxx?=	build
+.  endif
+.endif	# GCC3CXX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}