- Make sure the rc script creates and chowns the PID file before running

  'daemon'.  No need for the port to create a PID file at install time
  (it would just be eaten by rc.d/cleanvar anyway).
- Use 'ps -o comm' to grab a suitable procname.  'ps -o command' is not
  reliable enough.
- Bump PORTREVISION since these changes fix broken rc script operation.

Approved by:	maintainer timeout (as part of previous update)

1 files changed, 8 insertions, 1 deletions

diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in
index 105bcae..96994d9 100644
--- a/www/tomcat55/files/tomcat55.sh.in
+++ b/www/tomcat55/files/tomcat55.sh.in
@@ -109,7 +109,7 @@ log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
 if [ -f $pidfile ]; then
   read rc_pid junk < $pidfile
   if [ ! -z "$rc_pid" ]; then
-    procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
+    procname=`ps -o comm= $rc_pid`
   fi
 fi
 
@@ -118,8 +118,15 @@ required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
 command="/usr/sbin/daemon"
 flags="-p ${pidfile} ${java_command} start ${tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
 
+start_precmd=pid_touch
 stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
 
+pid_touch ()
+{
+	touch $pidfile
+	chown $tomcat%%TOMCAT_VERSION%%_user $pidfile
+}
+
 tomcat%%TOMCAT_VERSION%%_stop() {
 	rc_pid=$(check_pidfile $pidfile $procname)