From a475fcea66badb200289fbcea2970fefd42c0f7a Mon Sep 17 00:00:00 2001
From: erh <erh>
Date: Thu, 29 Apr 2004 18:24:55 +0000
Subject: Update the jakarta-tomcat package to Tomcat 5.0.19. This is a Java
 Servlet 2.4 and JSP 2.0 server.

---
 www/jakarta-tomcat/files/tomcat.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'www/jakarta-tomcat/files')

diff --git a/www/jakarta-tomcat/files/tomcat.sh b/www/jakarta-tomcat/files/tomcat.sh
index 6697c7f52f4..040aed8ef0e 100644
--- a/www/jakarta-tomcat/files/tomcat.sh
+++ b/www/jakarta-tomcat/files/tomcat.sh
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tomcat.sh,v 1.9 2003/12/04 15:00:57 grant Exp $
+# $NetBSD: tomcat.sh,v 1.10 2004/04/29 18:24:55 erh Exp $
 #
 # PROVIDE: tomcat
 # REQUIRE: DAEMON
@@ -9,6 +9,7 @@
 # tomcat=YES in /etc/rc.conf.
 
 PREFIX=@PREFIX@
+TOMCAT_LIB=@TOMCAT_LIB@
 
 if [ -z "${JAVA_HOME}" ]
 then
@@ -18,7 +19,7 @@ fi
 
 name="tomcat"
 rcvar=$name
-command="${PREFIX}/tomcat/bin/tomcat.sh"
+command="${TOMCAT_LIB}/bin/catalina.sh"
 
 # set defaults
 if [ -r /etc/rc.conf ]
@@ -63,12 +64,12 @@ then
 		case ${cmd} in
 		run|start)
 			echo "Starting ${name}."
-			(cd ${PREFIX}/tomcat && ${command} ${cmd})
+			(cd ${TOMCAT_LIB} && ${command} ${cmd})
 			;;
 
 		stop)
 			echo "Stopping ${name}."
-			(cd ${PREFIX}/tomcat && ${command} ${cmd})
+			(cd ${TOMCAT_LIB} && ${command} ${cmd})
 			;;
 
 		restart)
@@ -78,7 +79,7 @@ then
 			;;
 
 		flush)
-			cd ${PREFIX}/tomcat/work && rm -rf */*
+			cd ${TOMCAT_LIB}/work && rm -rf */*
 			;;
 
 		*)
-- 
cgit v1.2.3