[pkgsrc/trunk]: pkgsrc/mk/buildlink3 mk/buildlink3: fix breakage from previou...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65ad17477a6d
branches:  trunk
changeset: 381554:65ad17477a6d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jul 09 08:19:18 2022 +0000

description:
mk/buildlink3: fix breakage from previous commit

The expressions for USE_BUILTIN.* and for IGNORE_PKG.* can be undefined.
The function 'empty' takes care of these, the direct expressions
generate a (misleading) error message 'Malformed conditional'.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5bfcd41f214b -r 65ad17477a6d mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Sat Jul 09 08:18:02 2022 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Sat Jul 09 08:19:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.249 2022/07/09 07:46:02 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.250 2022/07/09 08:19:18 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -130,7 +130,7 @@
      _ok_:=yes
 .  else
      # leaving a package (in the buildlink tree)
-.    if ${USE_BUILTIN.${_pkg_:S/^-//}:M[Yy][Ee][Ss]}
+.    if ${USE_BUILTIN.${_pkg_:S/^-//}:Uno:M[Yy][Ee][Ss]}
        # this package is going to use the builtin version
 .      if ${_ok_} != yes
          # not ok for it to be builtin; force it to pkgsrc
@@ -142,7 +142,7 @@
 .      else
          #.say "${_stack_:C/.*/  /} ${_pkg_:S/^-//} built-in"
 .      endif
-.    elif !${IGNORE_PKG.${_pkg_:S/^-//}:M[Yy][Ee][Ss]}
+.    elif !${IGNORE_PKG.${_pkg_:S/^-//}:Uno:M[Yy][Ee][Ss]}
        # no builtin version or not using it
        #.say "${_stack_:C/.*/  /} ${_pkg_:S/^-//} pkgsrc"
 .      if ${_ok_} == yes