14 files changed, 63 insertions, 56 deletions

diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 61872bf11189..395d84ecb59f 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	http://distfiles.coredump.cn/ \
 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/liukang/
@@ -134,12 +134,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
diff --git a/www/jakarta-tomcat4/files/tomcat4.sh.in b/www/jakarta-tomcat4/files/tomcat4.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/jakarta-tomcat4/files/tomcat4.sh.in
+++ b/www/jakarta-tomcat4/files/tomcat4.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)
 
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index c099ddd51f16..fe86f12d5a93 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
@@ -129,12 +129,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
diff --git a/www/jakarta-tomcat41/files/tomcat41.sh.in b/www/jakarta-tomcat41/files/tomcat41.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/jakarta-tomcat41/files/tomcat41.sh.in
+++ b/www/jakarta-tomcat41/files/tomcat41.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)
 
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 5e129832d988..90489cdaa72c 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	5.0.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -129,12 +129,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
diff --git a/www/jakarta-tomcat5/files/tomcat50.sh.in b/www/jakarta-tomcat5/files/tomcat50.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/jakarta-tomcat5/files/tomcat50.sh.in
+++ b/www/jakarta-tomcat5/files/tomcat50.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)
 
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index c099ddd51f16..fe86f12d5a93 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
@@ -129,12 +129,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
diff --git a/www/tomcat41/files/tomcat41.sh.in b/www/tomcat41/files/tomcat41.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/tomcat41/files/tomcat41.sh.in
+++ b/www/tomcat41/files/tomcat41.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)
 
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 7616322cf390..24024dbbc0fa 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -136,12 +136,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>
diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in
index 105bcae155c7..96994d9519b3 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)
 
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 7616322cf390..24024dbbc0fa 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -136,12 +136,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>
diff --git a/www/tomcat6/files/tomcat55.sh.in b/www/tomcat6/files/tomcat55.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/tomcat6/files/tomcat55.sh.in
+++ b/www/tomcat6/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)
 
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 7616322cf390..24024dbbc0fa 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -136,12 +136,6 @@ do-install:
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Creating PID file..."
-	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
-	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_MSG} " [ DONE ]"
-
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>
diff --git a/www/tomcat7/files/tomcat55.sh.in b/www/tomcat7/files/tomcat55.sh.in
index 105bcae155c7..96994d9519b3 100644
--- a/www/tomcat7/files/tomcat55.sh.in
+++ b/www/tomcat7/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)