[pkgsrc/trunk]: pkgsrc/mk mk: Don't define DO_NADA to true.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d929befb388
branches:  trunk
changeset: 388586:9d929befb388
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Nov 23 10:53:14 2022 +0000

description:
mk: Don't define DO_NADA to true.

Ironically, DO_NADA was not doing nothing, it was invoking shells simply
to run true.  Now that we are actually doing nothing, we're saving around
160 shell execs per build!

diffstat:

 mk/bsd.pkg.mk |  4 ++--
 mk/djbware.mk |  4 ++--
 mk/subst.mk   |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 3d7f3c068be0 -r 9d929befb388 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Nov 23 10:46:05 2022 +0000
+++ b/mk/bsd.pkg.mk     Wed Nov 23 10:53:14 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2043 2022/11/23 10:16:44 jperkin Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2044 2022/11/23 10:53:14 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -339,7 +339,7 @@
 
 # How to do nothing.  Override if you, for some strange reason, would rather
 # do something.
-DO_NADA?=              ${TRUE}
+DO_NADA?=
 
 # the FAIL command executes its arguments and then exits with a non-zero
 # status.
diff -r 3d7f3c068be0 -r 9d929befb388 mk/djbware.mk
--- a/mk/djbware.mk     Wed Nov 23 10:46:05 2022 +0000
+++ b/mk/djbware.mk     Wed Nov 23 10:53:14 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.32 2020/11/19 09:16:38 schmonz Exp $
+# $NetBSD: djbware.mk,v 1.33 2022/11/23 10:53:14 jperkin Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -24,7 +24,7 @@
 .endif
 DJB_CONFIG_PREFIX?=    ${PREFIX}
 DJB_CONFIG_HOME?=      conf-home
-DJB_CONFIG_CMDS?=      ${DO_NADA}
+DJB_CONFIG_CMDS?=      ${TRUE}
 
 .if defined(LICENSE) && ${LICENSE} == "djb-nonlicense"
 # Nonlicensed packages that install totally unmodified may want to opt out
diff -r 3d7f3c068be0 -r 9d929befb388 mk/subst.mk
--- a/mk/subst.mk       Wed Nov 23 10:46:05 2022 +0000
+++ b/mk/subst.mk       Wed Nov 23 10:53:14 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.105 2022/07/06 20:59:51 rillig Exp $
+# $NetBSD: subst.mk,v 1.106 2022/11/23 10:53:14 jperkin Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -143,9 +143,9 @@
 SUBST_FILTER_CMD.${class}+=    -e s,@${v:C|[.[\\*^]|\\\\&|gW:Q}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:S|${.newline}|\\${.newline}|gW:Q},g
 .  endfor
 .  if ${SUBST_SHOW_DIFF.${class}:U${SUBST_SHOW_DIFF}:tl} == yes
-_SUBST_KEEP.${class}?=         LC_ALL=C ${DIFF} -u "$$file" "$$tmpfile" || true
+_SUBST_KEEP.${class}?=         LC_ALL=C ${DIFF} -u "$$file" "$$tmpfile" || ${TRUE}
 .  endif
-_SUBST_KEEP.${class}?=         ${DO_NADA}
+_SUBST_KEEP.${class}?=         ${TRUE}
 SUBST_SKIP_TEXT_CHECK.${class}?= \
                                no
 SUBST_NOOP_OK.${class}?=       no