CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Mar 21 19:26:12 UTC 2020

Modified Files:
        pkgsrc/mk: subst.mk

Log Message:
mk/subst.mk: run diff in the default locale

The diff program is only used to produce informative output in the build
logs, nevertheless its output might be translated if there are lines that
do not end with a newline.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 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.67 pkgsrc/mk/subst.mk:1.68
--- pkgsrc/mk/subst.mk:1.67     Sat Mar 21 13:30:35 2020
+++ pkgsrc/mk/subst.mk  Sat Mar 21 19:26:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.67 2020/03/21 13:30:35 rillig Exp $
+# $NetBSD: subst.mk,v 1.68 2020/03/21 19:26:12 rillig Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -121,7 +121,7 @@ SUBST_MESSAGE.${_class_}?=  Substituting 
 SUBST_FILTER_CMD.${_class_}+=  -e s,@${v:C|[^A-Za-z0-9_]|\\\\&|gW:Q}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:S|${.newline}|\\${.newline}|gW:Q},g
 .  endfor
 .  if ${SUBST_SHOW_DIFF.${_class_}:U${SUBST_SHOW_DIFF}:tl} == yes
-_SUBST_KEEP.${_class_}?=       ${DIFF} -u "$$file" "$$tmpfile" || true
+_SUBST_KEEP.${_class_}?=       LC_ALL=C ${DIFF} -u "$$file" "$$tmpfile" || true
 .  endif
 _SUBST_KEEP.${_class_}?=       ${DO_NADA}
 SUBST_SKIP_TEXT_CHECK.${_class_}?=     no