Subject: Packages wanting jre14 or jre15
To: None <tech-pkg@netbsd.org>
From: David Brownlee <abs@absd.org>
List: tech-pkg
Date: 04/02/2005 11:16:05
 	What do people think about the following?

--- java-vm.mk  24 Mar 2005 17:46:01 -0000      1.39
+++ java-vm.mk  2 Apr 2005 10:14:47 -0000
@@ -17,7 +17,8 @@
  #      add the dependency on the JDK.  The default value is "yes".
  #
  # USE_JAVA2 is used to note that the package requires a Java2 
implementation.
-#      It's undefined by default, but may be set to "yes".
+#      It's undefined by default, but may be set to "yes" or to one of
+#      1.4 or 1.5
  #
  # PKG_JVM_DEFAULT is a user-settable variable whose value is the default
  #      JVM to use.
@@ -42,7 +43,11 @@
  # This is a list of all of the JVMs that may be used with java-vm.mk.
  # Note: The wonka configuration is still under development
  #
-.if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
+.if defined(USE_JAVA2) && ${USE_JAVA2} == "1.5"
+_PKG_JVMS?=            sun-jdk15
+.elif defined(USE_JAVA2) && ${USE_JAVA2} == "1.4"
+_PKG_JVMS?=            sun-jdk14 sun-jdk15 jdk14
+.elif defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
  _PKG_JVMS?=            sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka \
                         sun-jdk15 jdk14 # win32-jdk
  .else