[pkgsrc/trunk]: pkgsrc/mk/tools We can't add dependencies on packages that ar...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3ebb628b10f
branches:  trunk
changeset: 493103:a3ebb628b10f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 27 15:21:50 2005 +0000

description:
We can't add dependencies on packages that are never registered.
archivers/pax and pkgtools/mtree fall in this category since they are
usually installed by pkgsrc bootstrap.

diffstat:

 mk/tools/replace.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 5a01dffb8081 -r a3ebb628b10f mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Apr 27 14:57:54 2005 +0000
+++ b/mk/tools/replace.mk       Wed Apr 27 15:21:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.34 2005/04/27 06:15:53 jlam Exp $
+# $NetBSD: replace.mk,v 1.35 2005/04/27 15:21:50 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -348,7 +348,11 @@
 .    endfor
 .    if !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS]) || \
         !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
-${TOOLS_DEPENDS.pax}+=         pax>=20040802:../../archivers/pax
+#
+# 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_REAL_CMD.gtar=           ${LOCALBASE}/bin/tar
 TOOLS_REAL_CMD.pax=            ${LOCALBASE}/bin/pax
 .      for _t_ in ${_TOOLS_PAXUTILS}
@@ -413,7 +417,11 @@
 .  if !empty(PKGPATH:Mpkgtools/mtree)
 MAKEFLAGS+=                    TOOLS_IGNORE.mtree=
 .  elif !empty(_TOOLS_USE_PKGSRC.mtree:M[yY][eE][sS])
-${TOOLS_DEPENDS.mtree}+=       mtree>=20040722:../../pkgtools/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_SYMLINK+=                        mtree
 TOOLS_REAL_CMD.mtree=          ${LOCALBASE}/bin/mtree
 .    if exists(${TOOLS_REAL_CMD.mtree})