From 314fa7a3d9e6a99b19be00339e9bcb109703d857 Mon Sep 17 00:00:00 2001 From: Sam Lawrance Date: Tue, 7 Feb 2006 13:41:00 +0000 Subject: Since the procname of tomcat processes may vary due to javavmwrapper, subvert the 'check_pid_file' procname check by setting it from the output of 'ps'. Remove the previous attempt at handling this problem, which was to put a wildcard in procname. I'll wear my pointy hat for that bogus hack. Reported by: Fritz Heinrichmeyer --- www/tomcat7/Makefile | 2 +- www/tomcat7/files/tomcat55.sh.in | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'www/tomcat7') diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile index 0ace200106e2..7616322cf390 100644 --- a/www/tomcat7/Makefile +++ b/www/tomcat7/Makefile @@ -7,7 +7,7 @@ PORTNAME= tomcat PORTVERSION= 5.5.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin diff --git a/www/tomcat7/files/tomcat55.sh.in b/www/tomcat7/files/tomcat55.sh.in index dac2e79731df..105bcae155c7 100644 --- a/www/tomcat7/files/tomcat55.sh.in +++ b/www/tomcat7/files/tomcat55.sh.in @@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \ log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \ 2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} " -procname="*java" +# Subvert the check_pid_file procname check. +if [ -f $pidfile ]; then + read rc_pid junk < $pidfile + if [ ! -z "$rc_pid" ]; then + procname=`ps -o command= $rc_pid | cut -d ' ' -f 1` + fi +fi + required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml" command="/usr/sbin/daemon" -- cgit v1.2.3