[pkgsrc/trunk]: pkgsrc/mk Support lang/openjdk7 and make it the default on

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac4356ae8902
branches:  trunk
changeset: 566102:ac4356ae8902
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 14 13:20:05 2009 +0000

description:
Support lang/openjdk7 and make it the default on
NetBSD-[4-9]*-i386 and NetBSD-[5-9]*-x86_64.

diffstat:

 mk/java-vm.mk |  22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diffs (92 lines):

diff -r 5325e4fae411 -r ac4356ae8902 mk/java-vm.mk
--- a/mk/java-vm.mk     Wed Oct 14 12:42:42 2009 +0000
+++ b/mk/java-vm.mk     Wed Oct 14 13:20:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.69 2009/06/05 16:00:47 abs Exp $
+# $NetBSD: java-vm.mk,v 1.70 2009/10/14 13:20:05 wiz Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -9,7 +9,7 @@
 # PKG_JVM_DEFAULT
 #      The JVM that should be used if nothing particular is specified.
 #
-#      Possible values: jdk kaffe openjdk7-bin
+#      Possible values: jdk kaffe openjdk7 openjdk7-bin
 #              sun-jdk14 jdk14 sun-jdk15 sun-jdk6 jdk15
 #      Default value: (platform-dependent)
 #
@@ -68,7 +68,7 @@
 
 # This is a list of all of the JDKs that may be used.
 #
-_PKG_JVMS.7=           openjdk7-bin
+_PKG_JVMS.7=           openjdk7 openjdk7-bin
 _PKG_JVMS.6=           ${_PKG_JVMS.7} sun-jdk6
 _PKG_JVMS.1.5=         ${_PKG_JVMS.6} sun-jdk15 jdk15
 _PKG_JVMS.1.4=         ${_PKG_JVMS.1.5} sun-jdk14 jdk14
@@ -91,8 +91,9 @@
 _PKG_JVM_DEFAULT=      ${PKG_JVM_DEFAULT}
 .endif
 .if !defined(_PKG_JVM_DEFAULT)
-.  if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386)
-_PKG_JVM_DEFAULT?=     openjdk7-bin
+.  if !empty(MACHINE_PLATFORM:MNetBSD-[456789].*-i386) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
+_PKG_JVM_DEFAULT?=     openjdk7
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
       !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86)
 _PKG_JVM_DEFAULT?=     sun-jdk
@@ -137,6 +138,9 @@
        Linux-*-i[3-6]86 \
        NetBSD-*-i386 NetBSD-*-x86_64 \
        SunOS-5.11-i386
+_ONLY_FOR_PLATFORMS.openjdk7= \
+       NetBSD-[4-9]*-i386 \
+       NetBSD-[5-9]*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk7-bin= \
        NetBSD-[5-9]*-i386 \
        NetBSD-[5-9]*-x86_64
@@ -154,6 +158,7 @@
 _JAVA_PKGBASE.jdk14=           jdk14
 _JAVA_PKGBASE.jdk15=           jdk15
 _JAVA_PKGBASE.kaffe=           kaffe
+_JAVA_PKGBASE.openjdk7=                openjdk7
 _JAVA_PKGBASE.openjdk7-bin=    openjdk7-bin
 _JAVA_PKGBASE.sun-jdk14=       sun-jre14
 _JAVA_PKGBASE.sun-jdk15=       sun-jre15
@@ -163,6 +168,7 @@
 _JAVA_NAME.jdk=                        jdk11
 _JAVA_NAME.jdk14=              jdk14
 _JAVA_NAME.kaffe=              kaffe
+_JAVA_NAME.openjdk7=           openjdk7
 _JAVA_NAME.openjdk7-bin=       openjdk7-bin
 _JAVA_NAME.sun-jdk14=          sun14
 _JAVA_NAME.sun-jdk15=          sun15
@@ -244,6 +250,7 @@
 BUILDLINK_API_DEPENDS.jdk14?=          jdk14-[0-9]*
 BUILDLINK_API_DEPENDS.jdk15?=          jdk15-[0-9]*
 BUILDLINK_API_DEPENDS.kaffe?=          kaffe>=1.1.4
+BUILDLINK_API_DEPENDS.openjdk7?=       openjdk7-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk7-bin?=   openjdk7-bin-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk14?=      sun-jdk14-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre14?=      sun-jre14-[0-9]*
@@ -256,6 +263,7 @@
 _JRE.jdk14=            jdk14
 _JRE.jdk15=            jdk15
 _JRE.kaffe=            kaffe
+_JRE.openjdk7=         openjdk7
 _JRE.openjdk7-bin=     openjdk7-bin
 _JRE.sun-jdk14=                sun-jre14
 _JRE.sun-jdk15=                sun-jre15
@@ -279,6 +287,10 @@
 _JDK_PKGSRCDIR=                ../../lang/kaffe
 _JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=    ${LOCALBASE}/java/kaffe
+.elif ${_PKG_JVM} == "openjdk7"
+_JDK_PKGSRCDIR=                ../../lang/openjdk7
+_JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT=    ${LOCALBASE}/java/openjdk7
 .elif ${_PKG_JVM} == "openjdk7-bin"
 _JDK_PKGSRCDIR=                ../../lang/openjdk7-bin
 _JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}