diff options
| author | minskim <minskim@pkgsrc.org> | 2010-02-03 00:49:58 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2010-02-03 00:49:58 +0000 |
| commit | c0337b88fb680878d7d9a8a3d94c843fca0175ef (patch) | |
| tree | 93f46326a24bf310ff9e2be9caa281c13bd7b82b /mk | |
| parent | b6e4435424429aa4404c8792c963cd51e03c2297 (diff) | |
| download | pkgsrc-c0337b88fb680878d7d9a8a3d94c843fca0175ef.tar.gz | |
Use sun-jdk6 on Darwin-10.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 4 |
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") |