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

functional change.

2 files changed, 28 insertions, 28 deletions

diff --git a/lang/gcc3-java/buildlink2.mk b/lang/gcc3-java/buildlink2.mk
index 79abd09002c..d7dce811c50 100644
--- a/lang/gcc3-java/buildlink2.mk
+++ b/lang/gcc3-java/buildlink2.mk
@@ -1,35 +1,35 @@
-# $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(GCC3JAVA_BUILDLINK2_MK)
-GCC3JAVA_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_JAVA_BUILDLINK2_MK)
+GCC3_JAVA_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=		gcc3java
-BUILDLINK_DEPENDS.gcc3java?=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
+BUILDLINK_PACKAGES+=		gcc3-java
+BUILDLINK_DEPENDS.gcc3-java?=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-java?=	../../lang/gcc3-java
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3java+=	full
+BUILDLINK_DEPMETHOD.gcc3-java+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3java?=	build
+BUILDLINK_DEPMETHOD.gcc3-java?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3java=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-java=	${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3java=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/java/*
-BUILDLINK_FILES.gcc3java+=	${_GCC_SUBPREFIX}/lib/libjava.*
+BUILDLINK_FILES.gcc3-java=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/java/*
+BUILDLINK_FILES.gcc3-java+=	${_GCC_SUBPREFIX}/lib/libjava.*
 
-BUILDLINK_TARGETS+=	gcc3java-buildlink
+BUILDLINK_TARGETS+=	gcc3-java-buildlink
 
-gcc3java-buildlink: _BUILDLINK_USE
+gcc3-java-buildlink: _BUILDLINK_USE
 
-.endif	# GCC3JAVA_BUILDLINK2_MK
+.endif	# GCC3_JAVA_BUILDLINK2_MK
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 72b5db9b05e..5fead2ef83b 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/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}+
-GCC3JAVA_BUILDLINK3_MK:=	${GCC3JAVA_BUILDLINK3_MK}+
+GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3java
+BUILDLINK_DEPENDS+=	gcc3-java
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3java}
-BUILDLINK_PACKAGES+=	gcc3java
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-java}
+BUILDLINK_PACKAGES+=	gcc3-java
 
-.if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
+.if !empty(GCC3_JAVA_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3java?=	gcc3${GCC3_PKGMODIF}-java
-BUILDLINK_DEPENDS.gcc3java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
-BUILDLINK_LIBDIRS.gcc3java?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3java}\///}
+BUILDLINK_PKGBASE.gcc3-java?=	gcc3${GCC3_PKGMODIF}-java
+BUILDLINK_DEPENDS.gcc3-java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-java?=	../../lang/gcc3-java
+BUILDLINK_LIBDIRS.gcc3-java?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3java+=	full
+BUILDLINK_DEPMETHOD.gcc3-java+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3java?=	build
+BUILDLINK_DEPMETHOD.gcc3-java?=	build
 .endif
 
-.endif	# GCC3JAVA_BUILDLINK3_MK
+.endif	# GCC3_JAVA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}