diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-07-29 17:13:50 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-07-29 17:13:50 +0000 |
| commit | 8702cff3b5755a7b89f9d0dd46c31873c72c3693 (patch) | |
| tree | fdc17a7327452f6b32adc3abefe945cda5653c4b /www | |
| parent | e27e67e1ef657d2f5e32b947a5f30633a5201ffb (diff) | |
| download | ports-8702cff3b5755a7b89f9d0dd46c31873c72c3693.tar.gz ports-8702cff3b5755a7b89f9d0dd46c31873c72c3693.zip | |
Notes
Diffstat (limited to 'www')
| -rw-r--r-- | www/tomcat6/Makefile | 1 | ||||
| -rw-r--r-- | www/tomcat6/files/tomcat6.sh.in | 12 | ||||
| -rw-r--r-- | www/tomcat7/Makefile | 1 | ||||
| -rw-r--r-- | www/tomcat7/files/tomcat6.sh.in | 12 |
4 files changed, 4 insertions, 22 deletions
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile index 880096545508..0e7e47e0a02f 100644 --- a/www/tomcat6/Makefile +++ b/www/tomcat6/Makefile @@ -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 diff --git a/www/tomcat6/files/tomcat6.sh.in b/www/tomcat6/files/tomcat6.sh.in index a2266c310a97..dc5670fb91be 100644 --- a/www/tomcat6/files/tomcat6.sh.in +++ b/www/tomcat6/files/tomcat6.sh.in @@ -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" diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile index 880096545508..0e7e47e0a02f 100644 --- a/www/tomcat7/Makefile +++ b/www/tomcat7/Makefile @@ -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 diff --git a/www/tomcat7/files/tomcat6.sh.in b/www/tomcat7/files/tomcat6.sh.in index a2266c310a97..dc5670fb91be 100644 --- a/www/tomcat7/files/tomcat6.sh.in +++ b/www/tomcat7/files/tomcat6.sh.in @@ -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" |