Tue Jun 16 18:13:54 2020 UTC ()
mk/subst.mk: SUBST_NOOP_OK defaults to yes again

There are still some packages that fail the strict SUBST check.  These
packages should nevertheless be built using the default pkgsrc
configuration, at least in the stable 2020Q2 branch.  After 2020Q2 has
been switched, the strict SUBST checks will be activated again in the
default configuration.


(rillig)
diff -r1.99 -r1.100 pkgsrc/mk/subst.mk
cvs diff -r1.99 -r1.100 pkgsrc/mk/subst.mk (expand / switch to unified diff)

--- pkgsrc/mk/subst.mk 2020/06/11 20:13:22 1.99
+++ pkgsrc/mk/subst.mk 2020/06/16 18:13:54 1.100
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: subst.mk,v 1.99 2020/06/11 20:13:22 rillig Exp $ 1# $NetBSD: subst.mk,v 1.100 2020/06/16 18:13:54 rillig Exp $
2# 2#
3# The subst framework replaces text in one or more files in the WRKSRC 3# The subst framework replaces text in one or more files in the WRKSRC
4# directory. Packages can define several ``classes'' of replacements. 4# directory. Packages can define several ``classes'' of replacements.
5# Each such class defines: 5# Each such class defines:
6# 6#
7# - in which stage of the build process the replacement happens 7# - in which stage of the build process the replacement happens
8# - which files are affected by the replacement 8# - which files are affected by the replacement
9# - which text or pattern is replaced by which replacement text 9# - which text or pattern is replaced by which replacement text
10# 10#
11# A typical example is: 11# A typical example is:
12# 12#
13# SUBST_CLASSES+= prefix 13# SUBST_CLASSES+= prefix
14# SUBST_STAGE.prefix= pre-configure 14# SUBST_STAGE.prefix= pre-configure
@@ -100,27 +100,27 @@ @@ -100,27 +100,27 @@
100# may include unaffected files. 100# may include unaffected files.
101# 101#
102# 2. There are multiple SUBST_SED patterns, and some of these 102# 2. There are multiple SUBST_SED patterns, and some of these
103# do not count as identity substitution since they contain 103# do not count as identity substitution since they contain
104# ".*" or similar parts. 104# ".*" or similar parts.
105# 105#
106# See also: 106# See also:
107# PLIST_SUBST 107# PLIST_SUBST
108# 108#
109# Keywords: subst 109# Keywords: subst
110# 110#
111 111
112SUBST_SHOW_DIFF?= no 112SUBST_SHOW_DIFF?= no
113SUBST_NOOP_OK?= no # since May 2020 113SUBST_NOOP_OK?= yes # for the stable branch 2020Q2
114 114
115_VARGROUPS+= subst 115_VARGROUPS+= subst
116_USER_VARS.subst= SUBST_SHOW_DIFF SUBST_NOOP_OK 116_USER_VARS.subst= SUBST_SHOW_DIFF SUBST_NOOP_OK
117_PKG_VARS.subst= SUBST_CLASSES 117_PKG_VARS.subst= SUBST_CLASSES
118.for c in ${SUBST_CLASSES} 118.for c in ${SUBST_CLASSES}
119. for pv in SUBST_STAGE SUBST_MESSAGE SUBST_FILES SUBST_SED SUBST_VARS \ 119. for pv in SUBST_STAGE SUBST_MESSAGE SUBST_FILES SUBST_SED SUBST_VARS \
120 SUBST_FILTER_CMD SUBST_SKIP_TEXT_CHECK SUBST_NOOP_OK 120 SUBST_FILTER_CMD SUBST_SKIP_TEXT_CHECK SUBST_NOOP_OK
121_PKG_VARS.subst+= ${pv}.${c} 121_PKG_VARS.subst+= ${pv}.${c}
122. endfor 122. endfor
123.endfor 123.endfor
124_DEF_VARS.subst= ECHO_SUBST_MSG 124_DEF_VARS.subst= ECHO_SUBST_MSG
125_USE_VARS.subst= WRKDIR WRKSRC 125_USE_VARS.subst= WRKDIR WRKSRC
126_IGN_VARS.subst= _SUBST_IS_TEXT_FILE_CMD 126_IGN_VARS.subst= _SUBST_IS_TEXT_FILE_CMD