 @@ -1,14 +1,14 @@
-# $NetBSD: subst.mk,v 1.75 2020/04/18 11:32:01 rillig Exp $
+# $NetBSD: subst.mk,v 1.76 2020/04/18 11:42:34 rillig Exp $
+#
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
 # Each such class defines:
+#
 #	- in which stage of the build process the replacement happens
 #	- which files are affected by the replacement
 #	- which text or pattern is replaced by which replacement text
+#
 # A typical example is:
+#
 #	SUBST_CLASSES+=		prefix
 #	SUBST_STAGE.prefix=	pre-configure
 @@ -87,72 +87,73 @@
+#
 #	Default: no (up to 2019Q4), yes (starting with 2020Q1)
+#
 # See also:
 #	PLIST_SUBST
+#
 # Keywords: subst
+#
 SUBST_SHOW_DIFF?=	no
 SUBST_NOOP_OK?=		yes	# only for backwards compatiblity
 _VARGROUPS+=		subst
-_USR_VARS.subst=	SUBST_SHOW_DIFF SUBST_NOOP_OK
+_USER_VARS.subst=	SUBST_SHOW_DIFF SUBST_NOOP_OK
 _PKG_VARS.subst=	SUBST_CLASSES
 .for c in ${SUBST_CLASSES}
 .  for pv in SUBST_STAGE SUBST_MESSAGE SUBST_FILES SUBST_SED SUBST_VARS	\
 	SUBST_FILTER_CMD SUBST_SKIP_TEXT_CHECK SUBST_NOOP_OK
 _PKG_VARS.subst+=	${pv}.${c}
 .  endfor
 .endfor
 _DEF_VARS.subst=	ECHO_SUBST_MSG
 _USE_VARS.subst=	WRKDIR WRKSRC
 _IGN_VARS.subst=	_SUBST_IS_TEXT_FILE_CMD
 _SORTED_VARS.subst=	SUBST_CLASSES SUBST_FILES.* SUBST_VARS.*
 _LISTED_VARS.subst=	SUBST_SED.* SUBST_FILTER_CMD.*
 ECHO_SUBST_MSG?=	${STEP_MSG}
-# _SUBST_IS_TEXT_FILE_CMD returns 0 if $$file is a text file.
+# _SUBST_IS_TEXT_FILE_CMD exits successfully if $$file is a text file.
-_SUBST_IS_TEXT_FILE_CMD?= \
+_SUBST_IS_TEXT_FILE_CMD= \
-	[ -z "`LC_ALL=C ${TR} -cd '\\0' < "$$file" | ${TR} '\\0' 'x'`" ]
+	[ -z "`LC_ALL=C ${TR} -cd '\\0' < \"$$file\" | ${TR} '\\0' 'x'`" ]
 .if ${SUBST_CLASSES:U:O} != ${SUBST_CLASSES:U:O:u}
 PKG_FAIL_REASON+=	"[subst.mk] duplicate SUBST class in: ${SUBST_CLASSES:O}"
 .endif
 .for class in ${SUBST_CLASSES:O:u}
 _SUBST_COOKIE.${class}=		${WRKDIR}/.subst_${class}_done
 SUBST_FILTER_CMD.${class}?=	LC_ALL=C ${SED} ${SUBST_SED.${class}}
 SUBST_VARS.${class}?=		# none
 SUBST_MESSAGE.${class}?=	Substituting "${class}" in ${SUBST_FILES.${class}}
 .  for v in ${SUBST_VARS.${class}}
 SUBST_FILTER_CMD.${class}+=	-e s,@${v:C|[^A-Za-z0-9_]|\\\\&|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
 .  endif
 _SUBST_KEEP.${class}?=		${DO_NADA}
-SUBST_SKIP_TEXT_CHECK.${class}?=	no
+SUBST_SKIP_TEXT_CHECK.${class}?= \
 				no
 SUBST_NOOP_OK.${class}?=	${SUBST_NOOP_OK}
 _SUBST_WARN.${class}=		${${SUBST_NOOP_OK.${class}:tl} == yes:?${INFO_MSG}:${WARNING_MSG}} "[subst.mk:${class}]"
-.if !empty(SUBST_SKIP_TEXT_CHECK.${class}:M[Yy][Ee][Ss])
+.  if !empty(SUBST_SKIP_TEXT_CHECK.${class}:M[Yy][Ee][Ss])
 _SUBST_IS_TEXT_FILE_CMD.${class}=	${TRUE}
-.else
+.  else
 _SUBST_IS_TEXT_FILE_CMD.${class}=	${_SUBST_IS_TEXT_FILE_CMD}
-.endif
+.  endif
 .  if defined(SUBST_STAGE.${class})
 ${SUBST_STAGE.${class}}: subst-${class}
 .  else
 # SUBST_STAGE.* does not need to be defined.
 #PKG_FAIL_REASON+=	"SUBST_STAGE missing for ${class}."
 .  endif
 .PHONY: subst-${class}
 subst-${class}: ${_SUBST_COOKIE.${class}}
 ${_SUBST_COOKIE.${class}}:
 	${RUN} message=${SUBST_MESSAGE.${class}:Q};			\
 @@ -181,20 +182,20 @@ ${_SUBST_COOKIE.${class}}:
 				${_SUBST_WARN.${class}} "Nothing changed in $$file."; \
 				${RM} -f "$$tmpfile";			\
 			else						\
 				changed=yes;				\
 				${_SUBST_KEEP.${class}};		\
 				${MV} -f "$$tmpfile" "$$file"; 		\
 				${ECHO} "$$file" >> ${.TARGET}.tmp;	\
 			fi;						\
 		else							\
 			${_SUBST_WARN.${class}} "Ignoring non-text file \"$$file\"."; \
 		fi;							\
 	done;								\
+	\
-	if test "$$changed,${SUBST_NOOP_OK.${class}:tl}" = no,no; then \
+	if ${TEST} "$$changed,${SUBST_NOOP_OK.${class}:tl}" = no,no; then \
 		${FAIL_MSG} "[subst.mk:${class}] The pattern $$pattern has no effect."; \
 	fi; \
 	done; \
 	cd ${WRKDIR}; ${RMDIR} "$$emptydir"
 	${RUN} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET}
 .endfor