diff options
| author | jlam <jlam> | 2005-04-27 15:21:50 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-27 15:21:50 +0000 |
| commit | 6f1324121025903d1e1013ff9d71516f9350adbe (patch) | |
| tree | d7ce80ad70450ef83492b1ac845b6e4a6f92c0c2 /mk | |
| parent | 43cfaf9f687a81fe0a41e6f8b1cb114419519a20 (diff) | |
| download | pkgsrc-6f1324121025903d1e1013ff9d71516f9350adbe.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index f9c17ae0521..06aaccac6a6 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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 @@ USE_TOOLS+= ${_t_} . 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 @@ ${_TOOLS_VARNAME.lex}= ${TOOLS_REAL_CMD.lex} . 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}) |