CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Dec 14 16:51:17 UTC 2020

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

Log Message:
Prefer openjdk11 to adoptopenjdk11-bin for NetBSD

(In the _PKG_JVMS.9 case)


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 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.121 pkgsrc/mk/java-vm.mk:1.122
--- pkgsrc/mk/java-vm.mk:1.121  Wed Jul 29 21:42:30 2020
+++ pkgsrc/mk/java-vm.mk        Mon Dec 14 16:51:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.121 2020/07/29 21:42:30 rjs Exp $
+# $NetBSD: java-vm.mk,v 1.122 2020/12/14 16:51:16 abs Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -73,7 +73,12 @@ PKG_JVMS_ACCEPTED?=  ${_PKG_JVMS}
 
 # This is a list of all of the JDKs that may be used.
 #
+# adoptopenjdk11-bin and openjdk-bin do not provide native NetBSD binaries
+.if ${OPSYS} == "NetBSD"
+_PKG_JVMS.9=           openjdk11 adoptopenjdk11-bin openjdk-bin
+.else
 _PKG_JVMS.9=           adoptopenjdk11-bin openjdk-bin openjdk11
+.endif
 _PKG_JVMS.8=           ${_PKG_JVMS.9} openjdk8 oracle-jdk8
 _PKG_JVMS.7=           ${_PKG_JVMS.8} sun-jdk7
 _PKG_JVMS.6=           ${_PKG_JVMS.7} jdk16