CVS commit: pkgsrc/mk

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Nov 18 15:07:17 UTC 2023

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

Log Message:
Drop support for USE_JAVA2=9

Now all packages have been updated to their correct (11) requirement


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 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.135 pkgsrc/mk/java-vm.mk:1.136
--- pkgsrc/mk/java-vm.mk:1.135  Sat Nov 18 14:38:07 2023
+++ pkgsrc/mk/java-vm.mk        Sat Nov 18 15:07:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.135 2023/11/18 14:38:07 abs Exp $
+# $NetBSD: java-vm.mk,v 1.136 2023/11/18 15:07:17 abs Exp $
 #
 # This Makefile fragment provides a Java VM, either at build-time or at
 # run-time, depending on the package's needs.
@@ -28,10 +28,10 @@
 #
 # USE_JAVA2
 #      When the package needs a Java 2 implementation, this variable
-#      should be set to "yes". It can also be set to "1.4", "1.5", "6", "7",
-#      "8", "9", "11" and "17" require an even more recent implementation.
+#      should be set to "yes". It can also be set to "1.4", "1.5", "6",
+#       "7", "8", "11" and "17" require an even more recent implementation.
 #
-#      Possible values: yes no 1.4 1.5 6 7 8 9 11 17
+#      Possible values: yes no 1.4 1.5 6 7 8 11 17
 #      Default value: no
 #
 # PKG_JVMS_ACCEPTED
@@ -81,8 +81,7 @@ _PKG_JVMS.11=         ${_PKG_JVMS.17} openjdk11
 .else
 _PKG_JVMS.11=          ${_PKG_JVMS.17} adoptopenjdk11-bin openjdk-bin openjdk11
 .endif
-_PKG_JVMS.9=           ${_PKG_JVMS.11}
-_PKG_JVMS.8=           ${_PKG_JVMS.9} openjdk8 oracle-jdk8
+_PKG_JVMS.8=           ${_PKG_JVMS.11} openjdk8 oracle-jdk8
 _PKG_JVMS.7=           ${_PKG_JVMS.8} sun-jdk7
 _PKG_JVMS.6=           ${_PKG_JVMS.7} jdk16
 _PKG_JVMS.1.5=         ${_PKG_JVMS.6} jdk15