diff options
| author | minskim <minskim@pkgsrc.org> | 2006-05-10 07:25:03 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-05-10 07:25:03 +0000 |
| commit | a1e71190d2f3f686e0ea6d2da75b13ba4aa6476c (patch) | |
| tree | 7623ca2f0dc5cd3ff994b2f5106c86bd6ded857d /mk/java-vm.mk | |
| parent | e721287ec9af24dd1d27f610987a502658d43b2f (diff) | |
| download | pkgsrc-a1e71190d2f3f686e0ea6d2da75b13ba4aa6476c.tar.gz | |
Allow to use sun-jdk15 on Darwin-8, and sun-jdk14 on Darwin-[678].
Also make sun-jdk15 the default java on Darwin-8. This addresses PR pkg/32013.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index a27190a987f..bb8c04f4db1 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.45 2006/04/06 06:23:06 reed Exp $ +# $NetBSD: java-vm.mk,v 1.46 2006/05/10 07:25:03 minskim Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -102,10 +102,10 @@ _ONLY_FOR_PLATFORMS.sun-jdk13= \ NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* DragonFly-*-i386 _ONLY_FOR_PLATFORMS.sun-jdk14= \ NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 \ - Linux-*-i[3-6]86 DragonFly-*-i386 + Linux-*-i[3-6]86 Darwin-[678].*-* DragonFly-*-i386 _ONLY_FOR_PLATFORMS.sun-jdk15= \ NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 \ - Linux-*-i[3-6]86 DragonFly-*-i386 + Linux-*-i[3-6]86 Darwin-8.*-* DragonFly-*-i386 #_ONLY_FOR_PLATFORMS.win32-jdk= \ # Interix-*-* @@ -145,7 +145,8 @@ _PKG_JVM_INSTALLED.${_jvm_}!= \ .if ${_PKG_JVM_DEFAULT} == "sun-jdk" . if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*-i386) || \ !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*-i386) || \ - !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) + !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ + !empty(MACHINE_PLATFORM:MDarwin-8.*-*) . if defined(_PKG_JVM_INSTALLED.sun-jdk15) && \ (${_PKG_JVM_INSTALLED.sun-jdk15} == "yes") _PKG_JVM_DEFAULT= sun-jdk15 |