 @@ -1,14 +1,14 @@
-# $NetBSD: subst.mk,v 1.90 2020/05/01 06:42:32 rillig Exp $
+# $NetBSD: subst.mk,v 1.91 2020/05/01 19:53:48 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
 @@ -180,27 +180,27 @@ ${_SUBST_COOKIE.${class}}:
 	patterns=${SUBST_FILES.${class}:Q};				\
 	set -f;								\
 	noop_count='';							\
 	noop_patterns='';						\
 	noop_sep='';							\
 	for pattern in $$patterns; do					\
 		set +f;							\
 		changed=no;						\
 		for file in $$pattern; do				\
 			case $$file in ([!A-Za-z0-9/]*) file="./$$file";; esac; \
 			tmpfile="$$file.subst.sav";			\
 			[ -d "$$file" ] && continue;			\
 			[ -f "$$file" ] || {				\
-				${_SUBST_WARN.${class}} "Ignoring non-existent file \"$$file\"."; \
+				${_SUBST_WARN.${class}} "Ignoring nonexistent file \"$$file\"."; \
 				continue;				\
 			};						\
 			${_SUBST_IS_TEXT_FILE_CMD.${class}} || {	\
 				${_SUBST_WARN.${class}} "Ignoring non-text file \"$$file\"."; \
 				continue;				\
 			};						\
 			${SUBST_FILTER_CMD.${class}} < "$$file" > "$$tmpfile";	\
 			${CMP} -s "$$tmpfile" "$$file" && {		\
 				${AWK} -f ${PKGSRCDIR}/mk/scripts/subst-identity.awk -- ${SUBST_SED.${class}} \
 				&& found=`LC_ALL=C ${SED} -n ${SUBST_SED.${class}:C,^['"]?s.*,&p,:C,[\\`"],\\\\&,g} "$$file"` \
 				&& [ -n "$$found" ] && {		\
 					changed=yes;			\
 					continue;			\

 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: subst.sh,v 1.28 2020/05/01 06:42:32 rillig Exp $
+# $NetBSD: subst.sh,v 1.29 2020/05/01 19:53:48 rillig Exp $
+#
 # Tests for mk/subst.mk.
+#
 set -eu
 . "./test.subr"
 test_case_set_up() {
 	rm -rf "$tmpdir"/.??* "$tmpdir"/*
 	create_file "prepare-subst.mk" <<EOF
 @@ -248,27 +248,27 @@ SUBST_FILES.class=	nonexistent
 SUBST_SED.class=	-e 's,file,example,'
 SUBST_NOOP_OK.class=	no
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 all: subst-class
 EOF
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in nonexistent' \
-		'warning: [subst.mk:class] Ignoring non-existent file "nonexistent".' \
+		'warning: [subst.mk:class] Ignoring nonexistent file "nonexistent".' \
 		'fail: [subst.mk:class] The filename pattern "nonexistent" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "1"
 	test_case_end
 fi
 if test_case_begin "single file nonexistent ok"; then
 @@ -280,27 +280,27 @@ SUBST_FILES.class=	nonexistent
 SUBST_SED.class=	-e 's,file,example,'
 SUBST_NOOP_OK.class=	yes
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 all: subst-class
 EOF
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in nonexistent' \
-		'info: [subst.mk:class] Ignoring non-existent file "nonexistent".'
+		'info: [subst.mk:class] Ignoring nonexistent file "nonexistent".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "several patterns, 1 nonexistent"; then
 	create_file "testcase.mk" <<EOF
 SUBST_CLASSES+=		class
 SUBST_STAGE.class=	pre-configure
 SUBST_FILES.class=	*exist* *not-found*
 @@ -308,54 +308,54 @@ SUBST_SED.class=	-e 's,file,example,'
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 all: subst-class
 EOF
 	create_file_lines "exists"	"this file exists"
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in *exist* *not-found*' \
-		'info: [subst.mk:class] Ignoring non-existent file "./*not-found*".'
+		'info: [subst.mk:class] Ignoring nonexistent file "./*not-found*".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "exists" --file-contains-exactly "this example exists"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "multiple missing files, all are reported at once"; then
 	create_file "testcase.mk" <<EOF
 SUBST_CLASSES+=		class
 SUBST_STAGE.class=	pre-configure
 SUBST_FILES.class=	does not exist
 SUBST_SED.class=	-e 'sahara'
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 EOF
 	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in does not exist' \
-		'info: [subst.mk:class] Ignoring non-existent file "does".' \
+		'info: [subst.mk:class] Ignoring nonexistent file "does".' \
-		'info: [subst.mk:class] Ignoring non-existent file "not".' \
+		'info: [subst.mk:class] Ignoring nonexistent file "not".' \
-		'info: [subst.mk:class] Ignoring non-existent file "exist".'
+		'info: [subst.mk:class] Ignoring nonexistent file "exist".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "multiple no-op files, all are reported at once"; then
 	create_file "testcase.mk" <<EOF
 SUBST_CLASSES+=		class
 SUBST_STAGE.class=	pre-configure
 SUBST_FILES.class=	first second third
 @@ -1016,27 +1016,27 @@ if test_case_begin "empty SUBST_SED"; th
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'all:' \
 		'	@printf "%s\n" ${PKG_FAIL_REASON:Uok}' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/out" 2>&1 \
 	&& exitcode=0 || exitcode=$?
 	assert_that "out" --file-is-lines \
 		'=> Substituting "id" in file' \
-		'warning: [subst.mk:id] Ignoring non-existent file "file".' \
+		'warning: [subst.mk:id] Ignoring nonexistent file "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "typo in SUBST_CLASSES"; then
 	# Look closely. The SUBST_CLASSES line contains a typo.
 @@ -1050,27 +1050,27 @@ if test_case_begin "typo in SUBST_CLASSE
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'all:' \
 		'	@printf "%s\n" ${PKG_FAIL_REASON:Uok}' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/out" 2>&1 \
 	&& exitcode=0 || exitcode=$?
 	assert_that "out" --file-is-lines \
 		'=> Substituting "id" in file' \
-		'warning: [subst.mk:id] Ignoring non-existent file "file".' \
+		'warning: [subst.mk:id] Ignoring nonexistent file "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "executable bit is preserved"; then
 	create_file_lines "testcase.mk" \