From b786dee9bec703d0f1c35965f32bb9184eb8dadb Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Fri, 7 Jul 2006 03:11:48 +0000
Subject: Correct a variable name (PKG_JAVA_HOME).  Bump PKGREVISION.

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

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index ba78e58c4f4..1af6d12e52a 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -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+=	${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:
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 0b6b25bbf0f..767746e2c92 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -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+=	${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}
 
 do-build:
 	@${MV} ${WRKSRC}/conf ${WRKDIR}
-- 
cgit v1.2.3