Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1638265152249850"
MIME-Version: 1.0
Date: Tue, 30 Nov 2021 09:39:12 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20211130093912.26AC3FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1638265152249850
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:39:12 UTC 2021

Modified Files:
	pkgsrc/mk: bsd.prefs.mk

Log Message:
mk: Remove LOWER_OS_VERSION.

OS_VERSION removes any non-numeric characters, so having a lowercase version
of it will always be identical.  There's only a single package, a very old
version of gcc in wip, that references this variable so it should be safe to
just remove and avoid any potential confusion.


To generate a diff of this commit:
cvs rdiff -u -r1.414 -r1.415 pkgsrc/mk/bsd.prefs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1638265152249850
Content-Disposition: inline
Content-Length: 1864
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.414 pkgsrc/mk/bsd.prefs.mk:1.415
--- pkgsrc/mk/bsd.prefs.mk:1.414	Tue Nov 30 09:06:37 2021
+++ pkgsrc/mk/bsd.prefs.mk	Tue Nov 30 09:39:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.414 2021/11/30 09:06:37 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.415 2021/11/30 09:39:11 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -172,7 +172,7 @@ OS_VARIANT!=		${UNAME} -s
 
 .elif ${OPSYS} == "Darwin"
 LOWER_OPSYS?=		darwin
-LOWER_OPSYS_VERSUFFIX=	${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+LOWER_OPSYS_VERSUFFIX=	${OS_VERSION:C/([0-9]*).*/\1/}
 LOWER_VENDOR?=		apple
 _OPSYS_VERSION_CMD=	sw_vers -productVersion | \
 			awk -F. '{printf("%02d%02d%02d", $$1, $$2, $$3)}'
@@ -185,7 +185,7 @@ LOWER_VENDOR?=		pc
 .elif ${OPSYS} == "FreeBSD"
 OS_VERSION:=		${OS_VERSION:C/-.*$//}
 LOWER_OPSYS?=		freebsd
-LOWER_OPSYS_VERSUFFIX=	${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+LOWER_OPSYS_VERSUFFIX=	${OS_VERSION:C/([0-9]*).*/\1/}
 .  if ${MACHINE_ARCH} == "i386"
 LOWER_VENDOR?=		pc
 .  endif
@@ -201,7 +201,7 @@ LOWER_VENDOR?=		pc
 LOWER_OPSYS?=		interix
 LOWER_VENDOR?=		pc
 .  if exists(/usr/lib/libc.so.5.2) || exists(/usr/lib/x86/libc.so.5.2)
-LOWER_OPSYS_VERSUFFIX=	${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+LOWER_OPSYS_VERSUFFIX=	${OS_VERSION:C/([0-9]*).*/\1/}
 .  else
 LOWER_OPSYS_VERSUFFIX?=	3
 .    if exists(/usr/lib/libc.so.3.5)
@@ -215,7 +215,6 @@ OS_VERSION=		3.0
 
 .elif ${OPSYS} == "MirBSD"
 LOWER_OPSYS?=		mirbsd
-LOWER_OS_VERSION=	${OS_VERSION}
 LOWER_OPSYS_VERSUFFIX=	${OS_VERSION}
 LOWER_VENDOR?=		unknown
 
@@ -316,7 +315,6 @@ LOWER_OPSYS:=		${OPSYS:tl}
 
 # Now commit the version values computed above, eliding the :sh
 OS_VERSION:=		${OS_VERSION}
-LOWER_OS_VERSION:=	${OS_VERSION:tl}
 
 MAKEFLAGS+=		LOWER_OPSYS=${LOWER_OPSYS:Q}
 

--_----------=_1638265152249850--