diff options
| author | abs <abs@pkgsrc.org> | 2005-06-02 10:07:48 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2005-06-02 10:07:48 +0000 |
| commit | 4c051b2ece3e62205a7e76c8142c6ee813ca1b49 (patch) | |
| tree | 04d4235796ee4cc79b3ab5c125ccf6927198dd78 | |
| parent | b01e6789122c0c8dcf0b7373ff50edf597634018 (diff) | |
| download | pkgsrc-4c051b2ece3e62205a7e76c8142c6ee813ca1b49.tar.gz | |
Allow USE_JAVA2 to (optionally) be set to 1.4 or 1.5, and use in tomcat55
| -rw-r--r-- | mk/java-vm.mk | 11 | ||||
| -rw-r--r-- | www/jakarta-tomcat55/Makefile | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index de4a2e5b834..87679bf3d8b 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -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 @@ 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) && !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 --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile index a716267b7c3..071afa0e9ab 100644 --- a/www/jakarta-tomcat55/Makefile +++ b/www/jakarta-tomcat55/Makefile @@ -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 @@ COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server 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 |