Fri Mar 6 18:28:45 2015 UTC ()
- add OR list operators; \\ -> \


(szptvlfn)
diff -r1.100 -r1.101 pkgsrc/mk/java-vm.mk
cvs diff -r1.100 -r1.101 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2015/03/06 12:24:43 1.100
+++ pkgsrc/mk/java-vm.mk 2015/03/06 18:28:45 1.101
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.100 2015/03/06 12:24:43 tnn Exp $ 1# $NetBSD: java-vm.mk,v 1.101 2015/03/06 18:28:45 szptvlfn 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: kaffe openjdk7 openjdk8 12# Possible values: kaffe openjdk7 openjdk8
13# sun-jdk6 sun-jdk7 13# sun-jdk6 sun-jdk7
14# Default value: (platform-dependent) 14# Default value: (platform-dependent)
@@ -87,27 +87,27 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}} @@ -87,27 +87,27 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}}
87_PKG_JVM_DEFAULT:= ${PKG_JVM} 87_PKG_JVM_DEFAULT:= ${PKG_JVM}
88. endif 88. endif
89.endif 89.endif
90 90
91# Set the default JVM for this platform. 91# Set the default JVM for this platform.
92# 92#
93.if !empty(PKG_JVM_DEFAULT) 93.if !empty(PKG_JVM_DEFAULT)
94_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} 94_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
95.endif 95.endif
96.if !defined(_PKG_JVM_DEFAULT) 96.if !defined(_PKG_JVM_DEFAULT)
97. if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \ 97. if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
98 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64) 98 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
99_PKG_JVM_DEFAULT?= openjdk7 99_PKG_JVM_DEFAULT?= openjdk7
100. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) \\ 100. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
101 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf) 101 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
102_PKG_JVM_DEFAULT?= openjdk8 102_PKG_JVM_DEFAULT?= openjdk8
103. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 103. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
104 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ 104 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
105 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 105 !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
106_PKG_JVM_DEFAULT?= sun-jdk6 106_PKG_JVM_DEFAULT?= sun-jdk6
107. elif !empty(MACHINE_PLATFORM:MDarwin-*-*) 107. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
108_PKG_JVM_DEFAULT?= sun-jdk6 108_PKG_JVM_DEFAULT?= sun-jdk6
109. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \ 109. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
110 !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) 110 !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
111_PKG_JVM_DEFAULT?= openjdk7 111_PKG_JVM_DEFAULT?= openjdk7
112. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*) 112. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
113_PKG_JVM_DEFAULT?= openjdk7 113_PKG_JVM_DEFAULT?= openjdk7