Fri Oct 24 21:01:57 2008 UTC ()
Darwin-9.* supports Java 1.6


(adrianp)
diff -r1.63 -r1.64 pkgsrc/mk/java-vm.mk
cvs diff -r1.63 -r1.64 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2008/03/25 13:41:44 1.63
+++ pkgsrc/mk/java-vm.mk 2008/10/24 21:01:57 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.63 2008/03/25 13:41:44 wiz Exp $ 1# $NetBSD: java-vm.mk,v 1.64 2008/10/24 21:01:57 adrianp 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: jdk kaffe 12# Possible values: jdk kaffe
13# sun-jdk14 jdk14 sun-jdk15 sun-jdk6 jdk15 13# sun-jdk14 jdk14 sun-jdk15 sun-jdk6 jdk15
14# Default value: (platform-dependent) 14# Default value: (platform-dependent)
@@ -116,26 +116,27 @@ _ONLY_FOR_PLATFORMS.kaffe= \ @@ -116,26 +116,27 @@ _ONLY_FOR_PLATFORMS.kaffe= \
116_ONLY_FOR_PLATFORMS.sun-jdk14= \ 116_ONLY_FOR_PLATFORMS.sun-jdk14= \
117 Darwin-[678].*-* \ 117 Darwin-[678].*-* \
118 DragonFly-*-i386 \ 118 DragonFly-*-i386 \
119 FreeBSD-6.*-i386 \ 119 FreeBSD-6.*-i386 \
120 Linux-*-i[3-6]86 \ 120 Linux-*-i[3-6]86 \
121 NetBSD-*-i386 121 NetBSD-*-i386
122_ONLY_FOR_PLATFORMS.sun-jdk15= \ 122_ONLY_FOR_PLATFORMS.sun-jdk15= \
123 Darwin-[8-9].*-* \ 123 Darwin-[8-9].*-* \
124 DragonFly-*-i386 \ 124 DragonFly-*-i386 \
125 FreeBSD-6.*-i386 \ 125 FreeBSD-6.*-i386 \
126 Linux-*-i[3-6]86 \ 126 Linux-*-i[3-6]86 \
127 NetBSD-*-i386 NetBSD-*-x86_64 127 NetBSD-*-i386 NetBSD-*-x86_64
128_ONLY_FOR_PLATFORMS.sun-jdk6= \ 128_ONLY_FOR_PLATFORMS.sun-jdk6= \
 129 Darwin-9.*-* \
129 DragonFly-*-i386 \ 130 DragonFly-*-i386 \
130 FreeBSD-6.*-i386 \ 131 FreeBSD-6.*-i386 \
131 Linux-*-i[3-6]86 \ 132 Linux-*-i[3-6]86 \
132 NetBSD-*-i386 133 NetBSD-*-i386
133 134
134# Set the accepted JVMs for this platform. 135# Set the accepted JVMs for this platform.
135.for _jvm_ in ${_PKG_JVMS} 136.for _jvm_ in ${_PKG_JVMS}
136. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} 137. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}}
137. if !empty(MACHINE_PLATFORM:M${_pattern_}) 138. if !empty(MACHINE_PLATFORM:M${_pattern_})
138_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} 139_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}}
139. endif 140. endif
140. endfor 141. endfor
141.endfor 142.endfor