cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Really fix shutdown script on all FreeBSD releases.

Browse Source
This commit is contained in:
Alex Dupre 2009-07-29 17:13:50 +00:00
parent e27e67e1ef
commit 8702cff3b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238634
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/tomcat6/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 6.0.20
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin

12
www/tomcat6/files/tomcat6.sh.in
View File

@ -74,6 +74,7 @@ tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-
name="tomcat%%TOMCAT_VERSION%%"
rcvar=`set_rcvar`
pidfile="/var/run/%%APP_SHORTNAME%%.pid"
procname="java"
load_rc_config "${name}"
@ -105,17 +106,6 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
# 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= -p $rc_pid | cut -f1 -d ' '`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

1
www/tomcat7/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 6.0.20
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin

12
www/tomcat7/files/tomcat6.sh.in
View File

@ -74,6 +74,7 @@ tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-
name="tomcat%%TOMCAT_VERSION%%"
rcvar=`set_rcvar`
pidfile="/var/run/%%APP_SHORTNAME%%.pid"
procname="java"
load_rc_config "${name}"
@ -105,17 +106,6 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
# 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= -p $rc_pid | cut -f1 -d ' '`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"