summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2010-02-03 00:49:58 +0000
committerminskim <minskim@pkgsrc.org>2010-02-03 00:49:58 +0000
commit43e6ff9c856fb33703a31298e4e5176e37fa09d1 (patch)
tree93f46326a24bf310ff9e2be9caa281c13bd7b82b
parent5a217df56782c35bb151012870ebde27369e7be7 (diff)
downloadpkgsrc-43e6ff9c856fb33703a31298e4e5176e37fa09d1.tar.gz
Use sun-jdk6 on Darwin-10.
-rw-r--r--mk/java-vm.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 10144e5ac73..f3f286c64e4 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.71 2009/10/20 02:33:01 obache Exp $
+# $NetBSD: java-vm.mk,v 1.72 2010/02/03 00:49:58 minskim Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -135,6 +135,7 @@ _ONLY_FOR_PLATFORMS.sun-jdk15= \
NetBSD-*-i386 NetBSD-*-x86_64
_ONLY_FOR_PLATFORMS.sun-jdk6= \
Darwin-9.*-* \
+ Darwin-10.*-* \
DragonFly-*-i386 \
FreeBSD-6.*-i386 \
Linux-*-i[3-6]86 \
@@ -197,6 +198,7 @@ _PKG_JVM_INSTALLED.${_jvm_}!= \
!empty(MACHINE_PLATFORM:MNetBSD-[2-9].*-x86_64) || \
!empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
!empty(MACHINE_PLATFORM:MDarwin-[8-9].*-*) || \
+ !empty(MACHINE_PLATFORM:MDarwin-10.*-*) || \
!empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
. if defined(_PKG_JVM_INSTALLED.sun-jdk6) && \
(${_PKG_JVM_INSTALLED.sun-jdk6} == "yes")