summaryrefslogtreecommitdiff
path: root/www/tomcat6
diff options
context:
space:
mode:
authorSam Lawrance <lawrance@FreeBSD.org>2006-02-08 13:35:17 +0000
committerSam Lawrance <lawrance@FreeBSD.org>2006-02-08 13:35:17 +0000
commitb79dc1999f020ba33dd14202d58b662bcbcf2f29 (patch)
tree2e7a841a991eb5316e22149af05a0b38ea2b32f8 /www/tomcat6
parentRemove needless quoting and fix incorrect IGNORE text. (diff)
- 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)
Notes
Notes: svn path=/head/; revision=155511
Diffstat (limited to 'www/tomcat6')
-rw-r--r--www/tomcat6/Makefile8
-rw-r--r--www/tomcat6/files/tomcat55.sh.in9
2 files changed, 9 insertions, 8 deletions
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)