CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 23 10:53:14 UTC 2022

Modified Files:
        pkgsrc/mk: bsd.pkg.mk djbware.mk subst.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.2043 -r1.2044 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/djbware.mk
cvs rdiff -u -r1.105 -r1.106 pkgsrc/mk/subst.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/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2043 pkgsrc/mk/bsd.pkg.mk:1.2044
--- pkgsrc/mk/bsd.pkg.mk:1.2043 Wed Nov 23 10:16:44 2022
+++ pkgsrc/mk/bsd.pkg.mk        Wed Nov 23 10:53:14 2022
@@ -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 @@ ERROR_CAT?=         ${SED} -e "s|^|ERROR: |" 1>
 
 # 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.

Index: pkgsrc/mk/djbware.mk
diff -u pkgsrc/mk/djbware.mk:1.32 pkgsrc/mk/djbware.mk:1.33
--- pkgsrc/mk/djbware.mk:1.32   Thu Nov 19 09:16:38 2020
+++ pkgsrc/mk/djbware.mk        Wed Nov 23 10:53:14 2022
@@ -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 @@ DJB_CONFIG_DIR?=      ${WRKSRC}
 .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

Index: pkgsrc/mk/subst.mk
diff -u pkgsrc/mk/subst.mk:1.105 pkgsrc/mk/subst.mk:1.106
--- pkgsrc/mk/subst.mk:1.105    Wed Jul  6 20:59:51 2022
+++ pkgsrc/mk/subst.mk  Wed Nov 23 10:53:14 2022
@@ -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_MESSAGE.${class}?=    Substituting "$
 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