[pkgsrc/trunk]: pkgsrc/mk/tools mk/tools/replace.mk: take versions of FLEX_RE...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/81f6d1ae6a03
branches:  trunk
changeset: 394099:81f6d1ae6a03
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Apr 03 18:37:24 2019 +0000

description:
mk/tools/replace.mk: take versions of FLEX_REQD into account

If a package had said FLEX_REQD=1000.0, the actual dependency had still
been flex>=2.5.4. Now all version numbers from FLEX_REQD are taken into
account, too.

diffstat:

 mk/tools/replace.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r cc385ddaa568 -r 81f6d1ae6a03 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Apr 03 18:34:01 2019 +0000
+++ b/mk/tools/replace.mk       Wed Apr 03 18:37:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.288 2019/03/10 19:52:18 joerg Exp $
+# $NetBSD: replace.mk,v 1.289 2019/04/03 18:37:24 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -373,7 +373,7 @@
 .  elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
 .    include "../../devel/flex/buildlink3.mk"
 _TOOLS_DEPENDS.flex=           # empty
-.    for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
+.    for _dep_ in ${BUILDLINK_API_DEPENDS.flex} ${FLEX_REQD:S,^,flex>=,}
 _TOOLS_DEPENDS.flex+=          ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
 .    endfor
 TOOLS_DEPENDS.flex?=           ${_TOOLS_DEPENDS.flex}