[pkgsrc/trunk]: pkgsrc/www Correct a variable name (PKG_JAVA_HOME). Bump PKG...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dda75d513142
branches:  trunk
changeset: 515722:dda75d513142
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Jul 07 03:11:48 2006 +0000

description:
Correct a variable name (PKG_JAVA_HOME).  Bump PKGREVISION.

diffstat:

 www/apache-tomcat55/Makefile |  6 +++---
 www/jakarta-tomcat5/Makefile |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r d5f8524837cd -r dda75d513142 www/apache-tomcat55/Makefile
--- a/www/apache-tomcat55/Makefile      Fri Jul 07 03:02:13 2006 +0000
+++ b/www/apache-tomcat55/Makefile      Fri Jul 07 03:11:48 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/07/07 03:02:13 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/07 03:12:19 minskim 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.
@@ -49,7 +49,7 @@
 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:
diff -r d5f8524837cd -r dda75d513142 www/jakarta-tomcat5/Makefile
--- a/www/jakarta-tomcat5/Makefile      Fri Jul 07 03:02:13 2006 +0000
+++ b/www/jakarta-tomcat5/Makefile      Fri Jul 07 03:11:48 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/07/07 03:02:39 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/07 03:11:48 minskim Exp $
 
 PKGNAME=       jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=      jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www java
 # The list of sites to download is generated by a jakarta website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -47,7 +47,7 @@
 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}
 
 do-build:
        @${MV} ${WRKSRC}/conf ${WRKDIR}