CVS commit: pkgsrc/mk

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed May 19 14:44:22 UTC 2021

Modified Files:
        pkgsrc/mk: subst.mk

Log Message:
subst.mk: Fix mk/scrips/subst-identity.awk for FreeBSD

At least on FreeBSD 13.0, awk '/^[\t -~]/' does not match alphabetical
characters with some utf-8 locales (e.g. neither en_US.UTF-8 nor
fr_FR.UTF-8 works but C.UTF-8 does).


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/mk/subst.mk

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.103 pkgsrc/mk/subst.mk:1.104
--- pkgsrc/mk/subst.mk:1.103    Tue Oct  6 17:48:02 2020
+++ pkgsrc/mk/subst.mk  Wed May 19 14:44:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.103 2020/10/06 17:48:02 rillig Exp $
+# $NetBSD: subst.mk,v 1.104 2021/05/19 14:44:22 triaxx Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -195,7 +195,7 @@ ${_SUBST_COOKIE.${class}}:
                        };                                              \
                        ${SUBST_FILTER_CMD.${class}} < "$$file" > "$$tmpfile"; \
                        ${CMP} -s "$$tmpfile" "$$file" && {             \
-                               ${AWK} -f ${PKGSRCDIR}/mk/scripts/subst-identity.awk -- ${SUBST_SED.${class}} \
+                               LC_ALL=C ${AWK} -f ${PKGSRCDIR}/mk/scripts/subst-identity.awk -- ${SUBST_SED.${class}} \
                                && found_text=$$(LC_ALL=C ${SED} -n ${SUBST_SED.${class}:C,^['"]?s.*,&p,} "$$file") \
                                && [ -n "$$found_text" ]                \
                                && found_any=yes                        \