Add scsl-jdk15 and scsl-jre15, SCSL licensed versions of sun-jdk15 and

sun-jre15, but running natively on NetBSD (so far).

1 files changed, 19 insertions, 6 deletions

diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index bb8c04f4db1..04dc92cd63c 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.46 2006/05/10 07:25:03 minskim Exp $
+# $NetBSD: java-vm.mk,v 1.47 2006/05/15 19:44:06 tv Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -43,15 +43,15 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 # This is a list of all of the JVMs that may be used with java-vm.mk.
 #
 .if defined(USE_JAVA2) && ${USE_JAVA2} == "1.5"
-_PKG_JVMS?=		sun-jdk15
+_PKG_JVMS?=		sun-jdk15 scsl-jdk15
 .elif defined(USE_JAVA2) && ${USE_JAVA2} == "1.4"
-_PKG_JVMS?=		sun-jdk14 sun-jdk15 jdk14
+_PKG_JVMS?=		sun-jdk14 sun-jdk15 scsl-jdk15 jdk14
 .elif defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
 _PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \
-			sun-jdk15 jdk14 # win32-jdk
+			sun-jdk15 scsl-jdk15 scsl-jdk15 jdk14 # win32-jdk
 .else
 _PKG_JVMS?=		jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \
-			sun-jdk15 jdk14 # win32-jdk
+			sun-jdk15 scsl-jdk15 jdk14 # win32-jdk
 .endif
 
 # To be deprecated: if PKG_JVM is explicitly set, then use it as the
@@ -98,6 +98,8 @@ _ONLY_FOR_PLATFORMS.jdk14= \
 	NetBSD-[2-9].*-i386 DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.kaffe= \
 	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc
+_ONLY_FOR_PLATFORMS.scsl-jdk15= \
+	NetBSD-[2-9].*-i386
 _ONLY_FOR_PLATFORMS.sun-jdk13= \
 	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* DragonFly-*-i386
 _ONLY_FOR_PLATFORMS.sun-jdk14= \
@@ -122,6 +124,7 @@ _JAVA_PKGBASE.blackdown-jdk13=	blackdown-jdk13
 _JAVA_PKGBASE.jdk=		jdk
 _JAVA_PKGBASE.jdk14=		jdk14
 _JAVA_PKGBASE.kaffe=		kaffe
+_JAVA_PKGBASE.scsl-jdk15=	scsl-jre15
 _JAVA_PKGBASE.sun-jdk13=	sun-jre13
 _JAVA_PKGBASE.sun-jdk14=	sun-jre14
 _JAVA_PKGBASE.sun-jdk15=	sun-jre15
@@ -147,7 +150,10 @@ _PKG_JVM_INSTALLED.${_jvm_}!= \
       !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*-i386) || \
       !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
       !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
-.    if defined(_PKG_JVM_INSTALLED.sun-jdk15) && \
+.    if defined(_PKG_JVM_INSTALLED.scsl-jdk15) && \
+	(${_PKG_JVM_INSTALLED.scsl-jdk15} == "yes")
+_PKG_JVM_DEFAULT=	scsl-jdk15
+.    elif defined(_PKG_JVM_INSTALLED.sun-jdk15) && \
 	(${_PKG_JVM_INSTALLED.sun-jdk15} == "yes")
 _PKG_JVM_DEFAULT=	sun-jdk15
 .    elif defined(_PKG_JVM_INSTALLED.sun-jdk14) && \
@@ -205,6 +211,8 @@ BUILDLINK_API_DEPENDS.blackdown-jre13?=	blackdown-jre13-[0-9]*
 BUILDLINK_API_DEPENDS.jdk?=			jdk-[0-9]*
 BUILDLINK_API_DEPENDS.jdk14?=		jdk14-[0-9]*
 BUILDLINK_API_DEPENDS.kaffe?=		kaffe>=1.1.4
+BUILDLINK_API_DEPENDS.scsl-jdk15?=		scsl-jdk15-[0-9]*
+BUILDLINK_API_DEPENDS.scsl-jre15?=		scsl-jre15-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk13?=		sun-jdk13-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre13?=		sun-jre13-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk14?=		sun-jdk14-[0-9]*
@@ -217,6 +225,7 @@ _JRE.blackdown-jdk13=	blackdown-jre13
 _JRE.jdk=		jdk
 _JRE.jdk14=		jdk14
 _JRE.kaffe=		kaffe
+_JRE.scsl-jdk15=	scsl-jre15
 _JRE.sun-jdk13=		sun-jre13
 _JRE.sun-jdk14=		sun-jre14
 _JRE.sun-jdk15=		sun-jre15
@@ -245,6 +254,10 @@ _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.4.2
 _JDK_PKGSRCDIR=		../../lang/kaffe
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/kaffe
+.elif ${_PKG_JVM} == "scsl-jdk15"
+_JDK_PKGSRCDIR=		../../lang/scsl-jdk15
+_JRE_PKGSRCDIR=		../../lang/scsl-jre15
+_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/scsl-1.5
 .elif ${_PKG_JVM} == "sun-jdk13"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk13
 _JRE_PKGSRCDIR=		../../lang/sun-jre13