CVS commit: pkgsrc/mk/tools

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Apr  3 18:37:24 UTC 2019

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 pkgsrc/mk/tools/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.288 pkgsrc/mk/tools/replace.mk:1.289
--- pkgsrc/mk/tools/replace.mk:1.288    Sun Mar 10 19:52:18 2019
+++ pkgsrc/mk/tools/replace.mk  Wed Apr  3 18:37:24 2019
@@ -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 @@ MAKEFLAGS+=                 TOOLS_IGNORE.flex=
 .  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}