Sun Jun 23 17:43:39 2013 UTC ()
Switch SunOS-5.11-x86_64 to openjdk7 by default.


(jperkin)
diff -r1.91 -r1.92 pkgsrc/mk/java-vm.mk
cvs diff -r1.91 -r1.92 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2013/06/15 09:46:01 1.91
+++ pkgsrc/mk/java-vm.mk 2013/06/23 17:43:39 1.92
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.91 2013/06/15 09:46:01 jperkin Exp $ 1# $NetBSD: java-vm.mk,v 1.92 2013/06/23 17:43:39 jperkin Exp $
2# 2#
3# This Makefile fragment handles Java dependencies and make variables, 3# This Makefile fragment handles Java dependencies and make variables,
4# and is meant to be included by packages that require Java either at 4# and is meant to be included by packages that require Java either at
5# build-time or at run-time. 5# build-time or at run-time.
6# 6#
7# User-settable variables: 7# User-settable variables:
8# 8#
9# PKG_JVM_DEFAULT 9# PKG_JVM_DEFAULT
10# The JVM that should be used if nothing particular is specified. 10# The JVM that should be used if nothing particular is specified.
11# 11#
12# Possible values: kaffe openjdk7 openjdk7-bin 12# Possible values: kaffe openjdk7 openjdk7-bin
13# sun-jdk6 sun-jdk7 jdk15 jdk16 13# sun-jdk6 sun-jdk7 jdk15 jdk16
14# Default value: (platform-dependent) 14# Default value: (platform-dependent)
@@ -92,30 +92,29 @@ _PKG_JVM_DEFAULT:= ${PKG_JVM} @@ -92,30 +92,29 @@ _PKG_JVM_DEFAULT:= ${PKG_JVM}
92.if !empty(PKG_JVM_DEFAULT) 92.if !empty(PKG_JVM_DEFAULT)
93_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} 93_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
94.endif 94.endif
95.if !defined(_PKG_JVM_DEFAULT) 95.if !defined(_PKG_JVM_DEFAULT)
96. if !empty(MACHINE_PLATFORM:MNetBSD-[456789].*-i386) || \ 96. if !empty(MACHINE_PLATFORM:MNetBSD-[456789].*-i386) || \
97 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64) 97 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
98_PKG_JVM_DEFAULT?= openjdk7 98_PKG_JVM_DEFAULT?= openjdk7
99. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 99. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
100 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ 100 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
101 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 101 !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
102_PKG_JVM_DEFAULT?= sun-jdk6 102_PKG_JVM_DEFAULT?= sun-jdk6
103. elif !empty(MACHINE_PLATFORM:MDarwin-*-*) 103. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
104_PKG_JVM_DEFAULT?= sun-jdk6 104_PKG_JVM_DEFAULT?= sun-jdk6
105. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) 105. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
 106 !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
106_PKG_JVM_DEFAULT?= openjdk7 107_PKG_JVM_DEFAULT?= openjdk7
107. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) 
108_PKG_JVM_DEFAULT?= sun-jdk6 
109. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*) 108. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
110_PKG_JVM_DEFAULT?= openjdk7 109_PKG_JVM_DEFAULT?= openjdk7
111. else 110. else
112_PKG_JVM_DEFAULT?= kaffe 111_PKG_JVM_DEFAULT?= kaffe
113. endif 112. endif
114.endif 113.endif
115 114
116# These lists are copied from the JVM package Makefiles. 115# These lists are copied from the JVM package Makefiles.
117_ONLY_FOR_PLATFORMS.jdk15= \ 116_ONLY_FOR_PLATFORMS.jdk15= \
118 DragonFly-*-* \ 117 DragonFly-*-* \
119 FreeBSD-8.[1-9]*-i386 FreeBSD-8.[1-9]*-x86_64 \ 118 FreeBSD-8.[1-9]*-i386 FreeBSD-8.[1-9]*-x86_64 \
120 NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64 119 NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64
121_ONLY_FOR_PLATFORMS.jdk16= \ 120_ONLY_FOR_PLATFORMS.jdk16= \