[pkgsrc/trunk]: pkgsrc Allow USE_JAVA2 to (optionally) be set to 1.4 or 1.5, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5551fa8b61a3
branches:  trunk
changeset: 495075:5551fa8b61a3
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Jun 02 10:07:48 2005 +0000

description:
Allow USE_JAVA2 to (optionally) be set to 1.4 or 1.5, and use in tomcat55

diffstat:

 mk/java-vm.mk                 |  11 ++++++++---
 www/jakarta-tomcat55/Makefile |   6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 33328627ee36 -r 5551fa8b61a3 mk/java-vm.mk
--- a/mk/java-vm.mk     Thu Jun 02 09:48:43 2005 +0000
+++ b/mk/java-vm.mk     Thu Jun 02 10:07:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.41 2005/04/20 13:17:40 tron Exp $
+# $NetBSD: java-vm.mk,v 1.42 2005/06/02 10:07:48 abs Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -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.
@@ -41,7 +42,11 @@
 
 # This is a list of all of the JVMs that may be used with java-vm.mk.
 #
-.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 \
                        sun-jdk15 jdk14 # win32-jdk
 .else
diff -r 33328627ee36 -r 5551fa8b61a3 www/jakarta-tomcat55/Makefile
--- a/www/jakarta-tomcat55/Makefile     Thu Jun 02 09:48:43 2005 +0000
+++ b/www/jakarta-tomcat55/Makefile     Thu Jun 02 10:07:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/02 10:07:48 abs Exp $
 
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
 CATEGORIES=    www java
@@ -12,8 +12,8 @@
 
 TOMCAT_VERSION=        5.5.7
 
-# This needs java 1.4 or higher.
-USE_JAVA2=     yes
+# This needs java 1.5 or higher.
+USE_JAVA2=     1.50
 
 TOMCAT_LIB=     ${PREFIX}/tomcat
 CATALINA_DIR=  Catalina/localhost