pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Properly deal with case where TOOL_DEPENDS.* ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cfac312864fb
branches: trunk
changeset: 494086:cfac312864fb
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu May 19 02:27:38 2005 +0000
description:
Properly deal with case where TOOL_DEPENDS.* is a list of values by
iterating over each dependency in the list.
diffstat:
mk/tools/replace.mk | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diffs (25 lines):
diff -r 42d7d2bc868c -r cfac312864fb mk/tools/replace.mk
--- a/mk/tools/replace.mk Thu May 19 01:30:48 2005 +0000
+++ b/mk/tools/replace.mk Thu May 19 02:27:38 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.83 2005/05/18 05:31:55 jlam Exp $
+# $NetBSD: replace.mk,v 1.84 2005/05/19 02:27:38 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions.
@@ -996,9 +996,12 @@
#
.for _t_ in ${_USE_TOOLS}
. if defined(TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
-. if empty(${TOOLS_DEPMETHOD.${_t_}}:M${TOOLS_DEPENDS.${_t_}})
-${TOOLS_DEPMETHOD.${_t_}}+= ${TOOLS_DEPENDS.${_t_}}
-. endif
+. for _dep_ in ${TOOLS_DEPENDS.${_t_}}
+. if empty(${TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
+${TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
+. endif
+. endfor
+. undef _dep_
. endif
.endfor
Home |
Main Index |
Thread Index |
Old Index