 @@ -1,14 +1,14 @@
-# $NetBSD: subst.mk,v 1.69 2020/03/22 12:15:59 rillig Exp $
+# $NetBSD: subst.mk,v 1.70 2020/03/22 13:19:50 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
 @@ -149,27 +149,27 @@ ${_SUBST_COOKIE.${_class_}}:
 	if [ "$$message" ]; then ${ECHO_SUBST_MSG} "$$message"; fi
 	${RUN}								\
 	basedir=${WRKSRC:Q};						\
 	emptydir="$$basedir/.subst-empty";				\
 	patterns=${SUBST_FILES.${_class_}:Q};				\
 	${MKDIR} "$$emptydir"; cd "$$emptydir";				\
 	for pattern in $$patterns; do					\
 	changed=no;							\
 	cd "$$basedir";							\
 	for file in $$pattern; do					\
 		case $$file in /*) ;; *) file="./$$file";; esac;	\
 		tmpfile="$$file.subst.sav";				\
 		if [ ! -f "$$file" ]; then				\
-			${_SUBST_WARN.${_class_}} "Ignoring non-existent file \"$$file\"."; \
+			[ -d "$$file" ] || ${_SUBST_WARN.${_class_}} "Ignoring non-existent file \"$$file\"."; \
 		elif ${_SUBST_IS_TEXT_FILE_CMD.${_class_}}; then	\
 			${SUBST_FILTER_CMD.${_class_}}			\
 			< "$$file"					\
 			> "$$tmpfile";					\
 			if ${TEST} -x "$$file"; then			\
 				${CHMOD} +x "$$tmpfile";		\
 			fi;						\
 			if ${CMP} -s "$$tmpfile" "$$file"; then 	\
 				${_SUBST_WARN.${_class_}} "Nothing changed in $$file."; \
 				${RM} -f "$$tmpfile";			\
 			else						\
 				changed=yes;				\
 				${_SUBST_KEEP.${_class_}};		\

 @@ -828,13 +828,98 @@ if test_case_begin "SUBST_VARS for varia
 	assert_that "vars.txt" --file-is-lines \
 		"dots" \
 		"letters" \
 		"@VAR.()@" \
 		"angle brackets" \
 		"@VAR.[]@"
 	assert_that "stdout" --file-is-lines \
 		"=> Substituting \"vars\" in vars.txt"
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "pattern matches directory"; then
 	# When a pattern matches a directory, that directory is silently
 	# skipped.
+	#
 	# In this test case, the pattern also matches a regular file that
 	# is actually modified. Therefore the pattern has an effect, and
 	# there is no error message.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	dir' \
 		'SUBST_STAGE.dir=	pre-configure' \
 		'SUBST_FILES.dir=	sub*' \
 		'SUBST_VARS.dir=	VAR' \
 		'SUBST_NOOP_OK.dir=	no' \
 		'' \
 		'VAR=			value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	mkdir "$tmpdir/subdir"
 	create_file_lines "subdir/subfile" \
 		"@VAR@"
 	create_file_lines "subst-file" \
 		"@VAR@"
 	test_file "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "subst-file" --file-is-lines "value"
 	assert_that "subdir/subfile" --file-is-lines "@VAR@" # unchanged
 	assert_that "stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*"
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "pattern matches only directory"; then
 	# When a pattern matches a directory, that directory is silently
 	# skipped.
+	#
 	# In this test case, the pattern also matches a regular file that
 	# is actually modified. Therefore the pattern has an effect, and
 	# there is no error message.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	dir' \
 		'SUBST_STAGE.dir=	pre-configure' \
 		'SUBST_FILES.dir=	sub*' \
 		'SUBST_VARS.dir=	VAR' \
 		'SUBST_NOOP_OK.dir=	no' \
 		'' \
 		'VAR=			value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	mkdir "$tmpdir/subdir"
 	create_file_lines "subdir/subfile" \
 		"@VAR@"
 	test_file "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "subdir/subfile" --file-is-lines "@VAR@" # unchanged
 	assert_that "stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*" \
 		"fail: [subst.mk:dir] The pattern sub* has no effect." \
 		"*** Error code 1" \
 		"" \
 		"Stop." \
 		"$make: stopped in $PWD"
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals 1
 	test_case_end
 fi