diff options
| author | salo <salo@pkgsrc.org> | 2006-07-10 13:27:58 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2006-07-10 13:27:58 +0000 |
| commit | 450d47d4248bdd8b3d0f33cbbc141f4b182bfaba (patch) | |
| tree | f2ab3f3a91ee7b0290426e19a21eca871657f68f /www | |
| parent | 235b0b2d5fc20b400379fd77b6682995b830fd9c (diff) | |
| download | pkgsrc-450d47d4248bdd8b3d0f33cbbc141f4b182bfaba.tar.gz | |
Pullup ticket 1734 - requested by minskim
build and runtime fixes for apache-tomcat55
Revisions pulled up:
- pkgsrc/www/apache-tomcat55/Makefile 1.5, 1.6
Module Name: pkgsrc
Committed By: minskim
Date: Fri Jul 7 03:02:13 UTC 2006
Modified Files:
pkgsrc/www/apache-tomcat55: Makefile
Log Message:
This package does not need JDK. Set USE_JAVAàun.
---
Module Name: pkgsrc
Committed By: minskim
Date: Fri Jul 7 03:12:19 UTC 2006
Modified Files:
pkgsrc/www/apache-tomcat55: Makefile
Log Message:
Correct a variable name (PKG_JAVA_HOME). Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache-tomcat55/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile index e0ea3d1237c..e63da9d3916 100644 --- a/www/apache-tomcat55/Makefile +++ b/www/apache-tomcat55/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2006/06/26 15:11:44 joerg Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2006/07/10 13:27:58 salo Exp $ DISTNAME= apache-tomcat-${TOMCAT_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www java # The list of sites to download is generated by an apache website. # The getsite.sh script parses the HTML and extracts the urls. @@ -13,6 +13,7 @@ COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server TOMCAT_VERSION= 5.5.14 +USE_JAVA= run # This needs java 1.5 or higher. USE_JAVA2= 1.5 @@ -48,7 +49,7 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} .endfor -FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} +FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} # If we were going to build jsvc, this would be a start # post-extract: |