Received: by mail.netbsd.org (Postfix, from userid 605) id C8C4084D5F; Fri, 22 Jul 2022 09:27:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0C5C384D44 for ; Fri, 22 Jul 2022 09:27:02 +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 aeXVtasi5gkH for ; Fri, 22 Jul 2022 09:27:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6055284D22 for ; Fri, 22 Jul 2022 09:27:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 58C92FB1A; Fri, 22 Jul 2022 09:27:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658482021293040" MIME-Version: 1.0 Date: Fri, 22 Jul 2022 09:27:01 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220722092701.58C92FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658482021293040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jul 22 09:27:01 UTC 2022 Modified Files: pkgsrc/mk: bsd.prefs.mk Log Message: mk: Also use /etc/release for OS_VERSION on NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.423 -r1.424 pkgsrc/mk/bsd.prefs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1658482021293040 Content-Disposition: inline Content-Length: 912 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.423 pkgsrc/mk/bsd.prefs.mk:1.424 --- pkgsrc/mk/bsd.prefs.mk:1.423 Fri Jul 22 09:14:43 2022 +++ pkgsrc/mk/bsd.prefs.mk Fri Jul 22 09:27:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.423 2022/07/22 09:14:43 nia Exp $ +# $NetBSD: bsd.prefs.mk,v 1.424 2022/07/22 09:27:01 nia Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -101,7 +101,11 @@ OS_VARIANT?= # empty # without executing the commands at all. Later, recursed make # invocations will skip these blocks entirely thanks to MAKEFLAGS. .if !defined(OS_VERSION) +. if ${OPSYS} == "NetBSD" && exists(/etc/release) +_OS_VERSION_CMD= head -1 /etc/release | sed -e "s,^NetBSD ,,g" -e "s,/.*$,,g" +. else _OS_VERSION_CMD= ${UNAME} -r +. endif OS_VERSION= ${_OS_VERSION_CMD:sh} MAKEFLAGS+= OS_VERSION=${OS_VERSION:Q} .endif --_----------=_1658482021293040--