CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun 20 11:59:20 UTC 2017

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

Log Message:
Default to oracle-jdk8 on newer Darwin/x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 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.109 pkgsrc/mk/java-vm.mk:1.110
--- pkgsrc/mk/java-vm.mk:1.109  Wed May 10 14:04:31 2017
+++ pkgsrc/mk/java-vm.mk        Tue Jun 20 11:59:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.109 2017/05/10 14:04:31 ryoon Exp $
+# $NetBSD: java-vm.mk,v 1.110 2017/06/20 11:59:20 jperkin Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -103,7 +103,8 @@ _PKG_JVM_DEFAULT?=  openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[1234].*-i386)
 _PKG_JVM_DEFAULT?=     sun-jdk6
 .  elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
-        !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+        !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
+        !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
 _PKG_JVM_DEFAULT?=     oracle-jdk8
 .  elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
 _PKG_JVM_DEFAULT?=     sun-jdk6