CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri May  1 19:53:48 UTC 2020

Modified Files:
        pkgsrc/mk: subst.mk
        pkgsrc/regress/infra-unittests: subst.sh

Log Message:
mk/subst.mk: fix typo in diagnostic


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/mk/subst.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/regress/infra-unittests/subst.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/subst.mk
diff -u pkgsrc/mk/subst.mk:1.90 pkgsrc/mk/subst.mk:1.91
--- pkgsrc/mk/subst.mk:1.90     Fri May  1 06:42:32 2020
+++ pkgsrc/mk/subst.mk  Fri May  1 19:53:48 2020
@@ -1,4 +1,4 @@
-# $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.
@@ -190,7 +190,7 @@ ${_SUBST_COOKIE.${class}}:
                        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}} || {        \

Index: pkgsrc/regress/infra-unittests/subst.sh
diff -u pkgsrc/regress/infra-unittests/subst.sh:1.28 pkgsrc/regress/infra-unittests/subst.sh:1.29
--- pkgsrc/regress/infra-unittests/subst.sh:1.28        Fri May  1 06:42:32 2020
+++ pkgsrc/regress/infra-unittests/subst.sh     Fri May  1 19:53:48 2020
@@ -1,5 +1,5 @@
 #! /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.
 #
@@ -258,7 +258,7 @@ EOF
 
        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' \
                '' \
@@ -290,7 +290,7 @@ EOF
 
        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"
 
@@ -318,7 +318,7 @@ EOF
 
        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"
@@ -343,9 +343,9 @@ EOF
 
        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 non-existent file "not".' \
-               'info: [subst.mk:class] Ignoring non-existent file "exist".'
+               'info: [subst.mk:class] Ignoring nonexistent file "does".' \
+               'info: [subst.mk:class] Ignoring nonexistent file "not".' \
+               'info: [subst.mk:class] Ignoring nonexistent file "exist".'
        assert_that "actual-output" --file-equals "expected-output"
        assert_that "$exitcode" --equals "0"
 
@@ -1026,7 +1026,7 @@ if test_case_begin "empty SUBST_SED"; th
 
        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' \
                '' \
@@ -1060,7 +1060,7 @@ if test_case_begin "typo in SUBST_CLASSE
 
        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' \
                '' \