CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Aug 11 18:13:33 UTC 2025

Modified Files:
        pkgsrc/mk: java-vm.mk

Log Message:
mk/java-vm.mk: Fix the logic for choosing JDK per-platform to match the reality


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/mk/java-vm.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/java-vm.mk
diff -u pkgsrc/mk/java-vm.mk:1.141 pkgsrc/mk/java-vm.mk:1.142
--- pkgsrc/mk/java-vm.mk:1.141  Thu Apr  3 14:00:02 2025
+++ pkgsrc/mk/java-vm.mk        Mon Aug 11 18:13:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.141 2025/04/03 14:00:02 hauke Exp $
+# $NetBSD: java-vm.mk,v 1.142 2025/08/11 18:13:33 pho Exp $
 #
 # This Makefile fragment provides a Java VM, either at build-time or at
 # run-time, depending on the package's needs.
@@ -174,20 +174,22 @@ _ONLY_FOR_PLATFORMS.openjdk8= \
        FreeBSD-10.*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk11= \
        NetBSD-[8-9].*-x86_64           NetBSD-1[0-9].*-x86_64          \
-        NetBSD-[8-9].*-i386            NetBSD-1[0-9].*i386             \
-       NetBSD-9.99.*-aarch64           NetBSD-1[0-9].*-aarch64         \
-        NetBSD-9.99.*-earmv[67]hf      NetBSD-1[0-9].*-earmv[67]hf
+        NetBSD-[8-9].*-i386            NetBSD-1[0-9].*-i386            \
+       NetBSD-9.[4-9].*-aarch64        NetBSD-1[0-9].*-aarch64         \
+        NetBSD-9.*-earmv[67]hf         NetBSD-1[0-9].*-earmv[67]hf
 _ONLY_FOR_PLATFORMS.openjdk17= \
        NetBSD-9.*-x86_64               NetBSD-1[0-9].*-x86_64          \
         NetBSD-9.*-i386                        NetBSD-1[0-9].*-i386            \
-       NetBSD-9.99.*-aarch64           NetBSD-1[0-9].*-aarch64         \
-        NetBSD-9.99.*-earmv[67]hf      NetBSD-1[0-9].*-earmv[67]hf
+       NetBSD-9.[4-9].*-aarch64        NetBSD-1[0-9].*-aarch64         \
+        NetBSD-9.*-earmv[67]hf         NetBSD-1[0-9].*-earmv[67]hf
 _ONLY_FOR_PLATFORMS.oracle-jdk17= \
        NetBSD-9.*-x86_64               NetBSD-1[0-9].*-x86_64          \
        Darwin-*-aarch64                Darwin-*-x86_64                 \
        Linux-*-aarch64                 Linux-*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk21= \
-       NetBSD-9.*-x86_64               NetBSD-1[0-9].*-x86_64
+       NetBSD-9.*-x86_64               NetBSD-1[0-9].*-x86_64          \
+       NetBSD-9.*-i386                 NetBSD-1[0-9].*-i386            \
+       NetBSD-9.[4-9]-aarch64          NetBSD-1[0-9].*-aarch64
 _ONLY_FOR_PLATFORMS.oracle-jdk21= \
        NetBSD-9.*-x86_64               NetBSD-1[0-9].*-x86_64          \
        Darwin-*-aarch64                Darwin-*-x86_64                 \