CVS commit: pkgsrc/mk

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug  6 07:38:44 UTC 2022

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

Log Message:
mk: Revert userland version detection for OS_VERSION for NetBSD, causes
unintended consequences when an older userland is bootstrapped, and
incompatibility with osabi. Separate variable for userland version
for NetBSD is likely the way forward.


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

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

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.425 pkgsrc/mk/bsd.prefs.mk:1.426
--- pkgsrc/mk/bsd.prefs.mk:1.425        Mon Aug  1 07:58:21 2022
+++ pkgsrc/mk/bsd.prefs.mk      Sat Aug  6 07:38:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.425 2022/08/01 07:58:21 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.426 2022/08/06 07:38:44 nia Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -101,11 +101,7 @@ 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
@@ -117,14 +113,8 @@ MAKEFLAGS+=                OS_VERSION=${OS_VERSION:Q}
 # it to a custom command in the later OPSYS-specific section.
 #
 .if !defined(OPSYS_VERSION)
-.  if ${OPSYS} == "NetBSD" && exists(/etc/release)
-_OPSYS_VERSION_CMD=    head -1 /etc/release | \
-                       sed -e "s,^NetBSD ,,g" | \
-                       awk -F. '{major=int($$1); minor=int($$2); if (minor>=100) minor=99; patch=int($$3); if (patch>=100) patch=99; printf "%02d%02d%02d", major, minor, patch}'
-.  else
 _OPSYS_VERSION_CMD=    ${UNAME} -r | \
                        awk -F. '{major=int($$1); minor=int($$2); if (minor>=100) minor=99; patch=int($$3); if (patch>=100) patch=99; printf "%02d%02d%02d", major, minor, patch}'
-.  endif
 OPSYS_VERSION=         ${_OPSYS_VERSION_CMD:sh}
 MAKEFLAGS+=            OPSYS_VERSION=${OPSYS_VERSION:Q}
 .endif