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

functional change.

10 files changed, 151 insertions, 151 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/+$//}
diff --git a/lang/gcc3-c/buildlink2.mk b/lang/gcc3-c/buildlink2.mk
index 755fcde4191..316483fde40 100644
--- a/lang/gcc3-c/buildlink2.mk
+++ b/lang/gcc3-c/buildlink2.mk
@@ -1,40 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/21 10:37:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3C_BUILDLINK2_MK)
-GCC3C_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_C_BUILDLINK2_MK)
+GCC3_C_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=		gcc3c
-BUILDLINK_DEPENDS.gcc3c?=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
+BUILDLINK_PACKAGES+=		gcc3-c
+BUILDLINK_DEPENDS.gcc3-c?=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=	full
+BUILDLINK_DEPMETHOD.gcc3-c+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=	build
+BUILDLINK_DEPMETHOD.gcc3-c?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3c=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-c=	${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3c=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/libgcc_s.*
+BUILDLINK_FILES.gcc3-c=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/libgcc_s.*
 
-BUILDLINK_PRE_TARGETS+=	gcc3c-buildlink
+BUILDLINK_PRE_TARGETS+=	gcc3-c-buildlink
 
-gcc3c-buildlink: _BUILDLINK_USE
+gcc3-c-buildlink: _BUILDLINK_USE
 
-.endif	# GCC3C_BUILDLINK2_MK
+.endif	# GCC3_C_BUILDLINK2_MK
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 9e75b1ab15b..7400e8aa181 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 04:19:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
+GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3c
+BUILDLINK_DEPENDS+=	gcc3-c
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3c}
-BUILDLINK_PACKAGES+=	gcc3c
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-c}
+BUILDLINK_PACKAGES+=	gcc3-c
 
-.if !empty(GCC3C_BUILDLINK3_MK:M+)
+.if !empty(GCC3_C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
 # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common"
@@ -22,19 +22,19 @@ BUILDLINK_PACKAGES+=	gcc3c
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3c?=	gcc3${GCC3_PKGMODIF}-c
-BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
-BUILDLINK_LIBDIRS.gcc3c?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
+BUILDLINK_PKGBASE.gcc3-c?=	gcc3${GCC3_PKGMODIF}-c
+BUILDLINK_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
+BUILDLINK_LIBDIRS.gcc3-c?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=	full
+BUILDLINK_DEPMETHOD.gcc3-c+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=	build
+BUILDLINK_DEPMETHOD.gcc3-c?=	build
 .endif
 
-.endif	# GCC3C_BUILDLINK3_MK
+.endif	# GCC3_C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-f77/buildlink2.mk b/lang/gcc3-f77/buildlink2.mk
index 41911e3d703..62600d1fde8 100644
--- a/lang/gcc3-f77/buildlink2.mk
+++ b/lang/gcc3-f77/buildlink2.mk
@@ -1,36 +1,36 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/01 11:39:58 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3F77_BUILDLINK2_MK)
-GCC3F77_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_F77_BUILDLINK2_MK)
+GCC3_F77_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=		gcc3f77
-BUILDLINK_DEPENDS.gcc3f77?=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3f77?=	../../lang/gcc3-f77
+BUILDLINK_PACKAGES+=		gcc3-f77
+BUILDLINK_DEPENDS.gcc3-f77?=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-f77?=	../../lang/gcc3-f77
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3f77+=	full
+BUILDLINK_DEPMETHOD.gcc3-f77+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3f77?=	build
+BUILDLINK_DEPMETHOD.gcc3-f77?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3f77=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-f77=	${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3f77=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h
-BUILDLINK_FILES.gcc3f77+=	${_GCC_SUBPREFIX}lib/libfrtbegin.*
-BUILDLINK_FILES.gcc3f77+=	${_GCC_SUBPREFIX}lib/libg2c.*
+BUILDLINK_FILES.gcc3-f77=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h
+BUILDLINK_FILES.gcc3-f77+=	${_GCC_SUBPREFIX}lib/libfrtbegin.*
+BUILDLINK_FILES.gcc3-f77+=	${_GCC_SUBPREFIX}lib/libg2c.*
 
-BUILDLINK_TARGETS+=	gcc3f77-buildlink
+BUILDLINK_TARGETS+=	gcc3-f77-buildlink
 
-gcc3f77-buildlink: _BUILDLINK_USE
+gcc3-f77-buildlink: _BUILDLINK_USE
 
-.endif	# GCC3F77_BUILDLINK2_MK
+.endif	# GCC3_F77_BUILDLINK2_MK
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 9e531a2cffd..d0fb0605932 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/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}+
-GCC3F77_BUILDLINK3_MK:=	${GCC3F77_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3f77
+BUILDLINK_DEPENDS+=	gcc3-f77
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3f77}
-BUILDLINK_PACKAGES+=	gcc3f77
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-f77}
+BUILDLINK_PACKAGES+=	gcc3-f77
 
-.if !empty(GCC3F77_BUILDLINK3_MK:M+)
+.if !empty(GCC3_F77_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3f77?=	gcc3${GCC3_PKGMODIF}-f77
-BUILDLINK_DEPENDS.gcc3f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3f77?=	../../lang/gcc3-f77
-BUILDLINK_LIBDIRS.gcc3f77?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3f77}\///}
+BUILDLINK_PKGBASE.gcc3-f77?=	gcc3${GCC3_PKGMODIF}-f77
+BUILDLINK_DEPENDS.gcc3-f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-f77?=	../../lang/gcc3-f77
+BUILDLINK_LIBDIRS.gcc3-f77?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3f77+=	full
+BUILDLINK_DEPMETHOD.gcc3-f77+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3f77?=	build
+BUILDLINK_DEPMETHOD.gcc3-f77?=	build
 .endif
 
-.endif	# GCC3F77_BUILDLINK3_MK
+.endif	# GCC3_F77_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
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/+$//}
diff --git a/lang/gcc3-objc/buildlink2.mk b/lang/gcc3-objc/buildlink2.mk
index e636c85214a..774980952a7 100644
--- a/lang/gcc3-objc/buildlink2.mk
+++ b/lang/gcc3-objc/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(GCC3OBJC_BUILDLINK2_MK)
-GCC3OBJC_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_OBJC_BUILDLINK2_MK)
+GCC3_OBJC_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=		gcc3objc
-BUILDLINK_DEPENDS.gcc3objc?=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3objc?=	../../lang/gcc3-objc
+BUILDLINK_PACKAGES+=		gcc3-objc
+BUILDLINK_DEPENDS.gcc3-objc?=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-objc?=	../../lang/gcc3-objc
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3objc+=	full
+BUILDLINK_DEPMETHOD.gcc3-objc+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3objc?=	build
+BUILDLINK_DEPMETHOD.gcc3-objc?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3objc=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-objc=	${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3objc=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/objc/*
-BUILDLINK_FILES.gcc3objc+=	${_GCC_SUBPREFIX}/lib/libobjc.*
+BUILDLINK_FILES.gcc3-objc=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/objc/*
+BUILDLINK_FILES.gcc3-objc+=	${_GCC_SUBPREFIX}/lib/libobjc.*
 
-BUILDLINK_TARGETS+=	gcc3objc-buildlink
+BUILDLINK_TARGETS+=	gcc3-objc-buildlink
 
-gcc3objc-buildlink: _BUILDLINK_USE
+gcc3-objc-buildlink: _BUILDLINK_USE
 
-.endif	# GCC3OBJC_BUILDLINK2_MK
+.endif	# GCC3_OBJC_BUILDLINK2_MK
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 0ef61dda643..feb6ed62b2f 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/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}+
-GCC3OBJC_BUILDLINK3_MK:=	${GCC3OBJC_BUILDLINK3_MK}+
+GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3objc
+BUILDLINK_DEPENDS+=	gcc3-objc
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3objc}
-BUILDLINK_PACKAGES+=	gcc3objc
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-objc}
+BUILDLINK_PACKAGES+=	gcc3-objc
 
-.if !empty(GCC3OBJC_BUILDLINK3_MK:M+)
+.if !empty(GCC3_OBJC_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3objc?=	gcc3${GCC3_PKGMODIF}-objc
-BUILDLINK_DEPENDS.gcc3objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3objc?=	../../lang/gcc3-objc
-BUILDLINK_LIBDIRS.gcc3objc?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3objc}\///}
+BUILDLINK_PKGBASE.gcc3-objc?=	gcc3${GCC3_PKGMODIF}-objc
+BUILDLINK_DEPENDS.gcc3-objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-objc?=	../../lang/gcc3-objc
+BUILDLINK_LIBDIRS.gcc3-objc?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3objc+=	full
+BUILDLINK_DEPMETHOD.gcc3-objc+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3objc?=	build
+BUILDLINK_DEPMETHOD.gcc3-objc?=	build
 .endif
 
-.endif	# GCC3OBJC_BUILDLINK3_MK
+.endif	# GCC3_OBJC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}