CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 11:47:48 UTC 2025

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

Log Message:
mk: Fix Cygwin OS_VERSION.

At least on the GitHub runners, uname -r returns "3.5.7-1.x86_64".

>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit $ca8916bd8c18aacca733588eb6fa3ddd7c1d99cb


To generate a diff of this commit:
cvs rdiff -u -r1.453 -r1.454 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.453 pkgsrc/mk/bsd.prefs.mk:1.454
--- pkgsrc/mk/bsd.prefs.mk:1.453        Mon Oct 14 07:58:24 2024
+++ pkgsrc/mk/bsd.prefs.mk      Tue Feb 18 11:47:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.453 2024/10/14 07:58:24 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.454 2025/02/18 11:47:48 wiz Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -187,7 +187,7 @@ NATIVE_LOWER_OPSYS?=        bsdi
 NATIVE_LOWER_OPSYS?=   cygwin
 NATIVE_LOWER_VENDOR?=  pc
 _NATIVE_OS_VERSION!=   ${UNAME} -r
-NATIVE_OS_VERSION=     ${_NATIVE_OS_VERSION:C/\(.*\)//}
+NATIVE_OS_VERSION=     ${_NATIVE_OS_VERSION:C/\(.*\)//:C/-.*//}
 NATIVE_OS_VARIANT!=    ${UNAME} -s
 
 .elif ${NATIVE_OPSYS} == "Darwin"