Received: by mail.netbsd.org (Postfix, from userid 605) id 7A07184D51; Wed, 19 May 2021 14:44:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B5F5E84D41 for ; Wed, 19 May 2021 14:44:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KxAkUxicq1Yo for ; Wed, 19 May 2021 14:44:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 13E7884D2C for ; Wed, 19 May 2021 14:44:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0D12CFA95; Wed, 19 May 2021 14:44:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162143546329100" MIME-Version: 1.0 Date: Wed, 19 May 2021 14:44:23 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20210519144423.0D12CFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162143546329100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_162143546329100 Content-Disposition: inline Content-Length: 984 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.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 \ --_----------=_162143546329100--