Fri Dec 27 00:11:38 2013 UTC ()
Add Solaris 10 i386 and x86_64 as a supported platforms for "sun-jdk16".
This allows "pkgsrc" to detect the Java 1.6 bundled with recent
Solaris 10 update releases.

Change during freeze approved by Greg Troxel.


(tron)
diff -r1.93 -r1.94 pkgsrc/mk/java-vm.mk
cvs diff -r1.93 -r1.94 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2013/12/25 22:04:30 1.93
+++ pkgsrc/mk/java-vm.mk 2013/12/27 00:11:38 1.94
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.93 2013/12/25 22:04:30 tron Exp $ 1# $NetBSD: java-vm.mk,v 1.94 2013/12/27 00:11:38 tron 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)
@@ -123,27 +123,29 @@ _ONLY_FOR_PLATFORMS.jdk16= \ @@ -123,27 +123,29 @@ _ONLY_FOR_PLATFORMS.jdk16= \
123_ONLY_FOR_PLATFORMS.kaffe= \ 123_ONLY_FOR_PLATFORMS.kaffe= \
124 *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \ 124 *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
125 *-*-mipsel* *-*-sparc *-*-powerpc  125 *-*-mipsel* *-*-sparc *-*-powerpc
126# exclude *-*-x86_64 from kaffe list as it apparently doesn't work 126# exclude *-*-x86_64 from kaffe list as it apparently doesn't work
127_ONLY_FOR_PLATFORMS.sun-jdk6= \ 127_ONLY_FOR_PLATFORMS.sun-jdk6= \
128 Darwin-9.*-i386 Darwin-9.*-x86_64 \ 128 Darwin-9.*-i386 Darwin-9.*-x86_64 \
129 Darwin-10.*-i386 Darwin-10.*-x86_64 \ 129 Darwin-10.*-i386 Darwin-10.*-x86_64 \
130 Darwin-11.*-i386 Darwin-11.*-x86_64 \ 130 Darwin-11.*-i386 Darwin-11.*-x86_64 \
131 DragonFly-*-i386 \ 131 DragonFly-*-i386 \
132 FreeBSD-6.*-i386 \ 132 FreeBSD-6.*-i386 \
133 Linux-*-i[3-6]86 \ 133 Linux-*-i[3-6]86 \
134 Linux-*-x86_64 \ 134 Linux-*-x86_64 \
135 NetBSD-*-i386 NetBSD-*-x86_64 \ 135 NetBSD-*-i386 NetBSD-*-x86_64 \
 136 SunOS-5.10-i386 \
136 SunOS-5.10-sparc \ 137 SunOS-5.10-sparc \
 138 SunOS-5.10-x86_64 \
137 SunOS-5.11-i386 \ 139 SunOS-5.11-i386 \
138 SunOS-5.11-x86_64 140 SunOS-5.11-x86_64
139_ONLY_FOR_PLATFORMS.openjdk7= \ 141_ONLY_FOR_PLATFORMS.openjdk7= \
140 DragonFly-*-* \ 142 DragonFly-*-* \
141 NetBSD-[4-9]*-i386 \ 143 NetBSD-[4-9]*-i386 \
142 NetBSD-[5-9]*-x86_64 \ 144 NetBSD-[5-9]*-x86_64 \
143 SunOS-5.11-i386 \ 145 SunOS-5.11-i386 \
144 SunOS-5.11-x86_64 146 SunOS-5.11-x86_64
145_ONLY_FOR_PLATFORMS.openjdk7-bin= \ 147_ONLY_FOR_PLATFORMS.openjdk7-bin= \
146 NetBSD-[5-9]*-i386 \ 148 NetBSD-[5-9]*-i386 \
147 NetBSD-[5-9]*-x86_64 149 NetBSD-[5-9]*-x86_64
148_ONLY_FOR_PLATFORMS.sun-jdk7= \ 150_ONLY_FOR_PLATFORMS.sun-jdk7= \
149 Darwin-9.*-i386 Darwin-9.*-x86_64 \ 151 Darwin-9.*-i386 Darwin-9.*-x86_64 \