Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C90851A9239 for ; Tue, 30 Nov 2021 09:06:39 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5207484EEC; Tue, 30 Nov 2021 09:06:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8C53D84EDC for ; Tue, 30 Nov 2021 09:06:38 +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 i5szswsf88v6 for ; Tue, 30 Nov 2021 09:06:38 +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 D6D4084E8A for ; Tue, 30 Nov 2021 09:06:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C3E08FAEC; Tue, 30 Nov 2021 09:06:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1638263197154890" MIME-Version: 1.0 Date: Tue, 30 Nov 2021 09:06:37 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20211130090637.C3E08FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1638263197154890 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Nov 30 09:06:37 UTC 2021 Modified Files: pkgsrc/mk: bsd.prefs.mk Log Message: mk: Don't expand OPSYS_VERSION early. Something about NetBSD make(1), at least on 9_STABLE, doesn't like doing this, resulting in literal "$$3" being passed to awk instead of being escaped down to "$3". The same construct works fine with pkgsrc bmake(1). There doesn't appear to be any need to evaluate it inline anyway. To generate a diff of this commit: cvs rdiff -u -r1.413 -r1.414 pkgsrc/mk/bsd.prefs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1638263197154890 Content-Disposition: inline Content-Length: 714 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/bsd.prefs.mk diff -u pkgsrc/mk/bsd.prefs.mk:1.413 pkgsrc/mk/bsd.prefs.mk:1.414 --- pkgsrc/mk/bsd.prefs.mk:1.413 Mon Nov 29 16:14:23 2021 +++ pkgsrc/mk/bsd.prefs.mk Tue Nov 30 09:06:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.413 2021/11/29 16:14:23 jperkin Exp $ +# $NetBSD: bsd.prefs.mk,v 1.414 2021/11/30 09:06:37 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -316,7 +316,6 @@ LOWER_OPSYS:= ${OPSYS:tl} # Now commit the version values computed above, eliding the :sh OS_VERSION:= ${OS_VERSION} -OPSYS_VERSION:= ${OPSYS_VERSION} LOWER_OS_VERSION:= ${OS_VERSION:tl} MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS:Q} --_----------=_1638263197154890--