Rename TOOLS_DEPENDS.* to TOOLS_DEPMETHOD.* to roughly match the

buildlink terminology for the same concept.

2 files changed, 29 insertions, 29 deletions

diff --git a/mk/tools/coreutils.mk b/mk/tools/coreutils.mk
index 97236f53737..7117c4d311d 100644
--- a/mk/tools/coreutils.mk
+++ b/mk/tools/coreutils.mk
@@ -1,10 +1,10 @@
-# $NetBSD: coreutils.mk,v 1.3 2005/04/26 23:02:48 jlam Exp $
+# $NetBSD: coreutils.mk,v 1.4 2005/04/28 02:10:56 jlam Exp $
 #
 # This Makefile fragment unconditionally replaces the system-supplied
 # "core" utilities with the ones from the GNU coreutils package when
 # "coreutils" is added to USE_TOOLS.
 #
-# Set TOOLS_DEPENDS.coreutils to "DEPENDS" to get a run-time dependency
+# Set TOOLS_DEPMETHOD.coreutils to "DEPENDS" to get a run-time dependency
 # on coreutils.
 #
 
@@ -12,8 +12,8 @@
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=		TOOLS_IGNORE.coreutils=
 .  else
-TOOLS_DEPENDS.coreutils?=	BUILD_DEPENDS
-${TOOLS_DEPENDS.coreutils}+=	coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_DEPMETHOD.coreutils?=	BUILD_DEPENDS
+${TOOLS_DEPMETHOD.coreutils}+=	coreutils>=5.2.1:../../sysutils/coreutils
 
 # List of core utilities for which we'll create symlinks under
 # ${TOOLS_DIR}.  This isn't every utility provided by coreutils, but
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 9fe4083fe43..295d98150b7 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.43 2005/04/27 17:29:06 jlam Exp $
+# $NetBSD: replace.mk,v 1.44 2005/04/28 02:10:56 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -22,10 +22,10 @@
 # to be generated that may be used as a yacc-replacement.
 #
 # By default, any dependencies on the pkgsrc tools are build dependencies,
-# but this may be changed by explicitly setting TOOLS_DEPENDS.<tool>,
+# but this may be changed by explicitly setting TOOLS_DEPMETHOD.<tool>,
 # e.g.:
 #
-#	TOOLS_DEPENDS.tbl=	DEPENDS
+#	TOOLS_DEPMETHOD.tbl=	DEPENDS
 #
 
 # Continue to allow USE_GNU_TOOLS and USE_TBL until packages have been
@@ -99,9 +99,9 @@ _TOOLS_USE_PKGSRC.${_t_}?=	yes
 .endfor
 .undef _t_
 
-# TOOLS_DEPENDS.<tool> defaults to BUILD_DEPENDS.
+# TOOLS_DEPMETHOD.<tool> defaults to BUILD_DEPENDS.
 .for _t_ in ${_TOOLS_REPLACE_LIST}
-TOOLS_DEPENDS.${_t_}?=	BUILD_DEPENDS
+TOOLS_DEPMETHOD.${_t_}?=	BUILD_DEPENDS
 .endfor
 .undef _t_
 
@@ -119,7 +119,7 @@ TOOLS_DEPENDS.${_t_}?=	BUILD_DEPENDS
 .  if !empty(PKGPATH:Mlang/gawk)
 MAKEFLAGS+=			TOOLS_IGNORE.awk=
 .  elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
-${TOOLS_DEPENDS.awk}+=		gawk>=3.1.1:../../lang/gawk
+${TOOLS_DEPMETHOD.awk}+=	gawk>=3.1.1:../../lang/gawk
 TOOLS_SYMLINK+=			awk
 TOOLS_REAL_CMD.awk=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
 .    if exists(${TOOLS_REAL_CMD.awk})
@@ -132,7 +132,7 @@ ${_TOOLS_VARNAME.awk}=		${TOOLS_REAL_CMD.awk}
 .  if !empty(PKGPATH:Mdevel/bison)
 MAKEFLAGS+=			TOOLS_IGNORE.bison=
 .  elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
-${TOOLS_DEPENDS.bison}+=	bison>=1.0:../../devel/bison
+${TOOLS_DEPMETHOD.bison}+=	bison>=1.0:../../devel/bison
 TOOLS_WRAP+=			bison
 TOOLS_REAL_CMD.bison=		${LOCALBASE}/bin/bison
 TOOLS_ARGS.bison=		-y
@@ -147,7 +147,7 @@ TOOLS_CMD.bison=		${TOOLS_DIR}/bin/yacc
 .  if !empty(PKGPATH:Mdevel/diffutils)
 MAKEFLAGS+=			TOOLS_IGNORE.cmp=
 .  elif !empty(_TOOLS_USE_PKGSRC.cmp:M[yY][eE][sS])
-${TOOLS_DEPENDS.cmp}+=		diffutils>=2.8.1:../../devel/diffutils
+${TOOLS_DEPMETHOD.cmp}+=	diffutils>=2.8.1:../../devel/diffutils
 TOOLS_SYMLINK+=			cmp
 TOOLS_REAL_CMD.cmp=		${LOCALBASE}/bin/cmp
 .    if exists(${TOOLS_REAL_CMD.cmp})
@@ -176,7 +176,7 @@ USE_TOOLS+=	${_t_}
 .    if !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])
-${TOOLS_DEPENDS.grep}+=		grep>=2.5.1:../../textproc/grep
+${TOOLS_DEPMETHOD.grep}+=	grep>=2.5.1:../../textproc/grep
 .      for _t_ in ${_TOOLS_GREPUTILS}
 _TOOLS_USE_PKGSRC.${_t_}=	yes
 TOOLS_SYMLINK+=			${_t_}
@@ -193,7 +193,7 @@ ${_TOOLS_VARNAME.${_t_}}=	${TOOLS_REAL_CMD.${_t_}}
 .  if !empty(PKGPATH:Msysutils/file)
 MAKEFLAGS+=			TOOLS_IGNORE.file=
 .  elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
-${TOOLS_DEPENDS.file}+=		file>=4.13:../../sysutils/file
+${TOOLS_DEPMETHOD.file}+=	file>=4.13:../../sysutils/file
 TOOLS_SYMLINK+=			file
 TOOLS_REAL_CMD.file=		${LOCALBASE}/bin/file
 .    if exists(${TOOLS_REAL_CMD.file})
@@ -219,7 +219,7 @@ USE_TOOLS+=	${_t_}
 .    endfor
 .    if !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
-${TOOLS_DEPENDS.find}+=		findutils>=4.1:../../sysutils/findutils
+${TOOLS_DEPMETHOD.find}+=	findutils>=4.1:../../sysutils/findutils
 .      for _t_ in ${_TOOLS_FINDUTILS}
 _TOOLS_USE_PKGSRC.${_t_}=	yes
 TOOLS_SYMLINK+=			${_t_}
@@ -236,7 +236,7 @@ ${_TOOLS_VARNAME.${_t_}}=	${TOOLS_REAL_CMD.${_t_}}
 .  if !empty(PKGPATH:Mlang/gawk)
 MAKEFLAGS+=			TOOLS_IGNORE.gawk=
 .  elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
-${TOOLS_DEPENDS.gawk}+=		gawk>=3.1.1:../../lang/gawk
+${TOOLS_DEPMETHOD.gawk}+=	gawk>=3.1.1:../../lang/gawk
 TOOLS_SYMLINK+=			gawk
 TOOLS_REAL_CMD.gawk=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
 .    if exists(${TOOLS_REAL_CMD.gawk})
@@ -250,7 +250,7 @@ TOOLS_CMD.gawk=			${TOOLS_DIR}/bin/awk
 .  if !empty(PKGPATH:Mdevel/m4)
 MAKEFLAGS+=			TOOLS_IGNORE.gm4=
 .  elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
-${TOOLS_DEPENDS.gm4}+=		m4>=1.4:../../devel/m4
+${TOOLS_DEPMETHOD.gm4}+=	m4>=1.4:../../devel/m4
 TOOLS_SYMLINK+=			gm4
 TOOLS_REAL_CMD.gm4=		${LOCALBASE}/bin/gm4
 .    if exists(${TOOLS_REAL_CMD.gm4})
@@ -264,7 +264,7 @@ TOOLS_CMD.gm4=			${TOOLS_DIR}/bin/m4
 .  if !empty(PKGPATH:Mdevel/gmake)
 MAKEFLAGS+=			TOOLS_IGNORE.gmake=
 .  elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
-${TOOLS_DEPENDS.gmake}+=	gmake>=3.78:../../devel/gmake
+${TOOLS_DEPMETHOD.gmake}+=	gmake>=3.78:../../devel/gmake
 TOOLS_SYMLINK+=			gmake
 TOOLS_REAL_CMD.gmake=		${LOCALBASE}/bin/gmake
 .    if exists(${TOOLS_REAL_CMD.gmake})
@@ -277,7 +277,7 @@ ${_TOOLS_VARNAME.gmake}=	${TOOLS_REAL_CMD.gmake}
 .  if !empty(PKGPATH:Mtextproc/sed)
 MAKEFLAGS+=			TOOLS_IGNORE.gsed=
 .  elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
-${TOOLS_DEPENDS.gsed}+=		gsed>=3.0.2:../../textproc/gsed
+${TOOLS_DEPMETHOD.gsed}+=	gsed>=3.0.2:../../textproc/gsed
 TOOLS_SYMLINK+=			gsed
 TOOLS_REAL_CMD.gsed=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
 .    if exists(${TOOLS_REAL_CMD.gsed})
@@ -308,7 +308,7 @@ USE_TOOLS+=	${_t_}
 # This is installed by pkgsrc bootstrap, and is never registered, so
 # comment out the dependency on it.
 #
-#${TOOLS_DEPENDS.pax}+=		pax>=20040802:../../archivers/pax
+#${TOOLS_DEPMETHOD.pax}+=	pax>=20040802:../../archivers/pax
 TOOLS_REAL_CMD.gtar=		${LOCALBASE}/bin/tar
 TOOLS_REAL_CMD.pax=		${LOCALBASE}/bin/pax
 .      for _t_ in ${_TOOLS_PAXUTILS}
@@ -343,7 +343,7 @@ USE_TOOLS+=	${_t_}
 .    if !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
-${TOOLS_DEPENDS.gzip}+=		gzip-base>=1.2.4b:../../archivers/gzip-base
+${TOOLS_DEPMETHOD.gzip}+=	gzip-base>=1.2.4b:../../archivers/gzip-base
 .      for _t_ in ${_TOOLS_GZIPUTILS}
 _TOOLS_USE_PKGSRC.${_t_}=	yes
 TOOLS_SYMLINK+=			${_t_}
@@ -375,7 +375,7 @@ ${_TOOLS_VARNAME.lex}=		${TOOLS_REAL_CMD.lex}
 .  if !empty(PKGPATH:Mdevel/m4)
 MAKEFLAGS+=			TOOLS_IGNORE.m4=
 .  elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS])
-${TOOLS_DEPENDS.m4}+=		m4>=1.4:../../devel/m4
+${TOOLS_DEPMETHOD.m4}+=		m4>=1.4:../../devel/m4
 TOOLS_SYMLINK+=			m4
 TOOLS_REAL_CMD.m4=		${LOCALBASE}/bin/gm4
 .    if exists(${TOOLS_REAL_CMD.m4})
@@ -392,7 +392,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mtree=
 # This is installed by pkgsrc bootstrap, and is never registered, so
 # comment out the dependency on it.
 #
-#${TOOLS_DEPENDS.mtree}+=	mtree>=20040722:../../pkgtools/mtree
+#${TOOLS_DEPMETHOD.mtree}+=	mtree>=20040722:../../pkgtools/mtree
 TOOLS_SYMLINK+=			mtree
 TOOLS_REAL_CMD.mtree=		${LOCALBASE}/bin/mtree
 .    if exists(${TOOLS_REAL_CMD.mtree})
@@ -405,7 +405,7 @@ ${_TOOLS_VARNAME.mtree}=	${TOOLS_REAL_CMD.mtree}
 .  if !empty(PKGPATH:Mdevel/patch)
 MAKEFLAGS+=			TOOLS_IGNORE.patch=
 .  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
-${TOOLS_DEPENDS.patch}+=	patch>=2.2:../../devel/patch
+${TOOLS_DEPMETHOD.patch}+=	patch>=2.2:../../devel/patch
 TOOLS_SYMLINK+=			patch
 TOOLS_REAL_CMD.patch=		${LOCALBASE}/bin/gpatch
 .    if exists(${TOOLS_REAL_CMD.patch})
@@ -420,7 +420,7 @@ ${_TOOLS_VARNAME.patch}=	${TOOLS_REAL_CMD.patch}
 .  if !empty(PKGPATH:Mtextproc/nbsed)
 MAKEFLAGS+=			TOOLS_IGNORE.sed=
 .  elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS])
-${TOOLS_DEPENDS.sed}+=		nbsed>=20040821:../../textproc/nbsed
+${TOOLS_DEPMETHOD.sed}+=	nbsed>=20040821:../../textproc/nbsed
 TOOLS_SYMLINK+=			sed
 TOOLS_REAL_CMD.sed=		${LOCALBASE}/bin/nbsed
 .    if exists(${TOOLS_REAL_CMD.sed})
@@ -433,7 +433,7 @@ ${_TOOLS_VARNAME.sed}=	${TOOLS_REAL_CMD.sed}
 .  if !empty(PKGPATH:Mshells/pdksh)
 MAKEFLAGS+=			TOOLS_IGNORE.sh=
 .  elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
-${TOOLS_DEPENDS.sh}+=		pdksh>=5.2.14:../../shells/pdksh
+${TOOLS_DEPMETHOD.sh}+=		pdksh>=5.2.14:../../shells/pdksh
 TOOLS_SYMLINK+=			sh
 TOOLS_REAL_CMD.sh=		${LOCALBASE}/bin/pdksh
 .    if exists(${TOOLS_REAL_CMD.sh})
@@ -447,7 +447,7 @@ TOOLS_CMD.sh=			${TOOLS_DIR}/bin/sh
 .  if !empty(PKGPATH:Mpkgtools/shlock)
 MAKEFLAGS+=			TOOLS_IGNORE.shlock=
 .  elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
-${TOOLS_DEPENDS.shlock}+=	shlock>=20020114:../../pkgtools/shlock
+${TOOLS_DEPMETHOD.shlock}+=	shlock>=20020114:../../pkgtools/shlock
 TOOLS_SYMLINK+=			shlock
 TOOLS_REAL_CMD.shlock=		${LOCALBASE}/bin/shlock
 .    if exists(${TOOLS_REAL_CMD.shlock})
@@ -460,7 +460,7 @@ ${_TOOLS_VARNAME.shlock}=	${TOOLS_REAL_CMD.shlock}
 .  if !empty(PKGPATH:Mtextproc/groff)
 MAKEFLAGS+=			TOOLS_IGNORE.tbl=
 .  elif !empty(_TOOLS_USE_PKGSRC.tbl:M[yY][eE][sS])
-${TOOLS_DEPENDS.tbl}+=		groff>=1.19nb4:../../textproc/groff
+${TOOLS_DEPMETHOD.tbl}+=	groff>=1.19nb4:../../textproc/groff
 TOOLS_SYMLINK+=			tbl
 TOOLS_REAL_CMD.tbl=		${LOCALBASE}/bin/tbl
 .    if exists(${TOOLS_REAL_CMD.tbl})
@@ -475,7 +475,7 @@ ${_TOOLS_VARNAME.tbl}=		${TOOLS_REAL_CMD.tbl}
 .  if !empty(PKGPATH:Mdevel/bison)
 MAKEFLAGS+=			TOOLS_IGNORE.yacc=
 .  elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS])
-${TOOLS_DEPENDS.yacc}+=		bison>=1.0:../../devel/bison
+${TOOLS_DEPMETHOD.yacc}+=	bison>=1.0:../../devel/bison
 TOOLS_WRAP+=			yacc
 TOOLS_REAL_CMD.yacc=		${LOCALBASE}/bin/bison
 TOOLS_ARGS.yacc=		-y