CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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}