Rename the internal package variable referred to by buildlink[23]. No

functional change.

2 files changed, 32 insertions, 32 deletions

diff --git a/lang/gcc3-c++/buildlink2.mk b/lang/gcc3-c++/buildlink2.mk
index 6887c3ff64d..7d45c203155 100644
--- a/lang/gcc3-c++/buildlink2.mk
+++ b/lang/gcc3-c++/buildlink2.mk
@@ -1,40 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3CXX_BUILDLINK2_MK)
-GCC3CXX_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_CXX_BUILDLINK2_MK)
+GCC3_CXX_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++
+BUILDLINK_PACKAGES+=		gcc3-cxx
+BUILDLINK_DEPENDS.gcc3-cxx?=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-cxx?=	../../lang/gcc3-c++
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3cxx+=	full
+BUILDLINK_DEPMETHOD.gcc3-cxx+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3cxx?=	build
+BUILDLINK_DEPMETHOD.gcc3-cxx?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3cxx=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-cxx=	${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_FILES.gcc3-cxx=	${_GCC_SUBPREFIX}include/c++/*/*
+BUILDLINK_FILES.gcc3-cxx+=	${_GCC_SUBPREFIX}include/c++/*/*/*
+BUILDLINK_FILES.gcc3-cxx+=	${_GCC_SUBPREFIX}include/c++/*/*/*/*
+BUILDLINK_FILES.gcc3-cxx+=	${_GCC_SUBPREFIX}lib/libstdc++.*
+BUILDLINK_FILES.gcc3-cxx+=	${_GCC_SUBPREFIX}lib/libsupc++.*
 
-BUILDLINK_TARGETS+=	gcc3cxx-buildlink
+BUILDLINK_TARGETS+=	gcc3-cxx-buildlink
 BUILDLINK_TARGETS+=     libstdc++-buildlink-la
 
-gcc3cxx-buildlink: _BUILDLINK_USE
+gcc3-cxx-buildlink: _BUILDLINK_USE
 
 libstdc++-buildlink-la:               
 	${_PKG_SILENT}${_PKG_DEBUG}					\
@@ -42,4 +42,4 @@ libstdc++-buildlink-la:
 	libpattern="/usr/lib/libstdc++.*";				\
 	${BUILDLINK_FAKE_LA}
 
-.endif	# GCC3CXX_BUILDLINK2_MK
+.endif	# GCC3_CXX_BUILDLINK2_MK
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 38c851a1fed..0710de0d411 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,36 +1,36 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCC3CXX_BUILDLINK3_MK:=	${GCC3CXX_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3cxx
+BUILDLINK_DEPENDS+=	gcc3-cxx
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3cxx}
-BUILDLINK_PACKAGES+=	gcc3cxx
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-cxx}
+BUILDLINK_PACKAGES+=	gcc3-cxx
 
-.if !empty(GCC3CXX_BUILDLINK3_MK:M+)
+.if !empty(GCC3_CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3cxx?=	gcc3${GCC3_PKGMODIF}-c++
-BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3cxx?=	../../lang/gcc3-c++
-BUILDLINK_LIBDIRS.gcc3cxx?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///}
+BUILDLINK_PKGBASE.gcc3-cxx?=	gcc3${GCC3_PKGMODIF}-c++
+BUILDLINK_DEPENDS.gcc3-cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-cxx?=	../../lang/gcc3-c++
+BUILDLINK_LIBDIRS.gcc3-cxx?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3cxx+=	full
+BUILDLINK_DEPMETHOD.gcc3-cxx+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3cxx?=	build
+BUILDLINK_DEPMETHOD.gcc3-cxx?=	build
 .endif
 
-.endif	# GCC3CXX_BUILDLINK3_MK
+.endif	# GCC3_CXX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}