pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk subst.mk: Fix mk/scrips/subst-identity.awk for FreeBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6120908d2a21
branches:  trunk
changeset: 452896:6120908d2a21
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Wed May 19 14:44:22 2021 +0000

description:
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).

diffstat:

 mk/subst.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 629022d728d2 -r 6120908d2a21 mk/subst.mk
--- a/mk/subst.mk       Wed May 19 12:06:48 2021 +0000
+++ b/mk/subst.mk       Wed May 19 14:44:22 2021 +0000
@@ -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_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                        \



Home | Main Index | Thread Index | Old Index