Received: by mail.netbsd.org (Postfix, from userid 605) id A2F7884EBC; Sat, 21 Mar 2020 19:26:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2BDD884DCF for ; Sat, 21 Mar 2020 19:26:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Rz7vaxAi2QmP for ; Sat, 21 Mar 2020 19:26:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8134B84CD2 for ; Sat, 21 Mar 2020 19:26:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7B075FB27; Sat, 21 Mar 2020 19:26:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584818772226420" MIME-Version: 1.0 Date: Sat, 21 Mar 2020 19:26:12 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200321192612.7B075FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584818772226420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1584818772226420 Content-Disposition: inline Content-Length: 1000 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1584818772226420--