Fri Jun 5 16:00:47 2009 UTC ()
PR pkg/41542 - java-vm.mk needs updating for openjdk7-bin from yamt


(abs)
diff -r1.68 -r1.69 pkgsrc/mk/java-vm.mk
cvs diff -r1.68 -r1.69 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2009/04/10 09:05:25 1.68
+++ pkgsrc/mk/java-vm.mk 2009/06/05 16:00:47 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.68 2009/04/10 09:05:25 abs Exp $ 1# $NetBSD: java-vm.mk,v 1.69 2009/06/05 16:00:47 abs 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 openjdk7-bin 12# Possible values: jdk kaffe openjdk7-bin
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)
@@ -128,27 +128,28 @@ _ONLY_FOR_PLATFORMS.sun-jdk15= \ @@ -128,27 +128,28 @@ _ONLY_FOR_PLATFORMS.sun-jdk15= \
128 Darwin-[8-9].*-* \ 128 Darwin-[8-9].*-* \
129 DragonFly-*-i386 \ 129 DragonFly-*-i386 \
130 FreeBSD-6.*-i386 \ 130 FreeBSD-6.*-i386 \
131 Linux-*-i[3-6]86 \ 131 Linux-*-i[3-6]86 \
132 NetBSD-*-i386 NetBSD-*-x86_64 132 NetBSD-*-i386 NetBSD-*-x86_64
133_ONLY_FOR_PLATFORMS.sun-jdk6= \ 133_ONLY_FOR_PLATFORMS.sun-jdk6= \
134 Darwin-9.*-* \ 134 Darwin-9.*-* \
135 DragonFly-*-i386 \ 135 DragonFly-*-i386 \
136 FreeBSD-6.*-i386 \ 136 FreeBSD-6.*-i386 \
137 Linux-*-i[3-6]86 \ 137 Linux-*-i[3-6]86 \
138 NetBSD-*-i386 NetBSD-*-x86_64 \ 138 NetBSD-*-i386 NetBSD-*-x86_64 \
139 SunOS-5.11-i386 139 SunOS-5.11-i386
140_ONLY_FOR_PLATFORMS.openjdk7-bin= \ 140_ONLY_FOR_PLATFORMS.openjdk7-bin= \
141 NetBSD-*-i386 141 NetBSD-[5-9]*-i386 \
 142 NetBSD-[5-9]*-x86_64
142 143
143# Set the accepted JVMs for this platform. 144# Set the accepted JVMs for this platform.
144.for _jvm_ in ${_PKG_JVMS} 145.for _jvm_ in ${_PKG_JVMS}
145. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} 146. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}}
146. if !empty(MACHINE_PLATFORM:M${_pattern_}) 147. if !empty(MACHINE_PLATFORM:M${_pattern_})
147_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} 148_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}}
148. endif 149. endif
149. endfor 150. endfor
150.endfor 151.endfor
151 152
152_JAVA_PKGBASE.jdk= jdk 153_JAVA_PKGBASE.jdk= jdk
153_JAVA_PKGBASE.jdk14= jdk14 154_JAVA_PKGBASE.jdk14= jdk14
154_JAVA_PKGBASE.jdk15= jdk15 155_JAVA_PKGBASE.jdk15= jdk15