diff options
| author | abs <abs@pkgsrc.org> | 2004-04-02 17:26:21 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2004-04-02 17:26:21 +0000 |
| commit | f5012d338dbddc2764c41b668e1ae71d3ed9a33a (patch) | |
| tree | 625ea0fe89e253448fbe799fd3e774a7a824309f /mk | |
| parent | f8e4ffe328812051e7d760e005ebc49080396378 (diff) | |
| download | pkgsrc-f5012d338dbddc2764c41b668e1ae71d3ed9a33a.tar.gz | |
Match NetBSD-2.* for mapping sun-jdk to sun-jdk14 not sun-jdk13. Also cleanup
NetBSD-2* to NetBSD-2.*
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index a948f7b5983..3da7abee6e5 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.19 2004/03/22 04:09:51 kristerw Exp $ +# $NetBSD: java-vm.mk,v 1.20 2004/04/02 17:26:21 abs Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -79,9 +79,9 @@ _PKG_JVM_DEFAULT?= kaffe _ONLY_FOR_PLATFORMS.jdk= \ NetBSD-*-i386 Linux-*-i[3-6]86 _ONLY_FOR_PLATFORMS.jdk12= \ - NetBSD-1.[6-9]*-i386 NetBSD-2*-i386 + NetBSD-1.[6-9]*-i386 NetBSD-2.*-i386 _ONLY_FOR_PLATFORMS.jdk13= \ - NetBSD-1.[6-9]*-i386 NetBSD-2*-i386 + NetBSD-1.[6-9]*-i386 NetBSD-2.*-i386 _ONLY_FOR_PLATFORMS.blackdown-jdk13= \ NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc @@ -92,7 +92,7 @@ _ONLY_FOR_PLATFORMS.blackdown-jdk13+= \ _ONLY_FOR_PLATFORMS.sun-jdk13= \ NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* _ONLY_FOR_PLATFORMS.sun-jdk14= \ - NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-2*-i386 \ + NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 NetBSD-2.*-i386 \ Linux-*-i[3-6]86 _ONLY_FOR_PLATFORMS.kaffe= \ *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc @@ -134,7 +134,7 @@ _PKG_JVM_INSTALLED.${_jvm_}!= \ # .if ${_PKG_JVM_DEFAULT} == "sun-jdk" . if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*-i386) || \ - !empty(MACHINE_PLATFORM:MNetBSD-1.[7-9]*-i386) || \ + !empty(MACHINE_PLATFORM:MNetBSD-2.*-i386) || \ !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) . if defined(_PKG_JVM_INSTALLED.sun-jdk14) && \ (${_PKG_JVM_INSTALLED.sun-jdk14} == "yes") |