CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul 13 14:16:17 UTC 2016

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

Log Message:
Switch SunOS-5.11-i386 default back to openjdk7.  Oracle have broken 32-bit
support in openjdk8 and have no intention of fixing it.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 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.106 pkgsrc/mk/java-vm.mk:1.107
--- pkgsrc/mk/java-vm.mk:1.106  Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/java-vm.mk        Wed Jul 13 14:16:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.106 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: java-vm.mk,v 1.107 2016/07/13 14:16:17 jperkin Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -107,8 +107,9 @@ _PKG_JVM_DEFAULT?=  sun-jdk6
 _PKG_JVM_DEFAULT?=     oracle-jdk8
 .  elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
 _PKG_JVM_DEFAULT?=     sun-jdk6
-.  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
-        !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
+.  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
+_PKG_JVM_DEFAULT?=     openjdk7
+.  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
 _PKG_JVM_DEFAULT?=     openjdk8
 .  elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
 _PKG_JVM_DEFAULT?=     openjdk8