mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

Update to 6.0.29 release and implement "status" and "poll" rc commands.

Browse Source
This commit is contained in:
Alex Dupre 2010-07-26 11:13:32 +00:00
parent ec3a438a22
commit 4002dc80c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258273
6 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/tomcat6/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tomcat
PORTVERSION= 6.0.28
PORTVERSION= 6.0.29
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin

6
www/tomcat6/distinfo
View File

@ -1,3 +1,3 @@
MD5 (apache-tomcat-6.0.28.tar.gz) = e79253eff8e851a2c2bf9d42e58b0a78
SHA256 (apache-tomcat-6.0.28.tar.gz) = 810d3a178e00fb1874beeb46fb5faa79e6ddf7a46a43d3b644e78f998fb18e25
SIZE (apache-tomcat-6.0.28.tar.gz) = 6405516
MD5 (apache-tomcat-6.0.29.tar.gz) = 7d614e03d18d3f21fcfdff96f0b6c311
SHA256 (apache-tomcat-6.0.29.tar.gz) = 4cb25adf2b541c93a34e2e6b1b31d6da1f77ceaa688ac1a7c6635a475ae5266d
SIZE (apache-tomcat-6.0.29.tar.gz) = 6407210

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

@ -113,6 +113,8 @@ flags="-p ${pidfile} ${java_command} start ${tomcat%%TOMCAT_VERSION%%_flags} ${l
start_precmd="pid_touch"
stop_cmd="tomcat_stop"
status_cmd="tomcat_status"
poll_cmd="tomcat_poll"
pid_touch() {
touch $pidfile
@ -124,11 +126,7 @@ tomcat_stop() {
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0
if [ -n "$pidfile" ]; then
echo "${name} not running? (check $pidfile)."
else
echo "${name} not running?"
fi
echo "${name} not running? (check $pidfile)."
return 1
fi
@ -139,10 +137,28 @@ tomcat_stop() {
rm -f ${pidfile}
}
tomcat_status() {
rc_pid=$(tomcat_check_pidfile $pidfile)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0
echo "${name} not running? (check $pidfile)."
return 1
fi
}
tomcat_poll() {
while (true) ; do
rc_pid=$(tomcat_check_pidfile $pidfile)
[ -z "$rc_pid" ] && break
sleep 2
done
}
tomcat_check_pidfile() {
_pidfile=$1
if [ -z "$_pidfile" -o -z "$_procname" ]; then
err 3 'USAGE: check_pidfile pidfile procname [interpreter]'
if [ -z "$_pidfile" ]; then
err 3 'USAGE: tomcat_check_pidfile pidfile'
fi
if [ ! -f $_pidfile ]; then
debug "pid file ($_pidfile): not readable."

2
www/tomcat7/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= tomcat
PORTVERSION= 6.0.28
PORTVERSION= 6.0.29
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin

6
www/tomcat7/distinfo
View File

@ -1,3 +1,3 @@
MD5 (apache-tomcat-6.0.28.tar.gz) = e79253eff8e851a2c2bf9d42e58b0a78
SHA256 (apache-tomcat-6.0.28.tar.gz) = 810d3a178e00fb1874beeb46fb5faa79e6ddf7a46a43d3b644e78f998fb18e25
SIZE (apache-tomcat-6.0.28.tar.gz) = 6405516
MD5 (apache-tomcat-6.0.29.tar.gz) = 7d614e03d18d3f21fcfdff96f0b6c311
SHA256 (apache-tomcat-6.0.29.tar.gz) = 4cb25adf2b541c93a34e2e6b1b31d6da1f77ceaa688ac1a7c6635a475ae5266d
SIZE (apache-tomcat-6.0.29.tar.gz) = 6407210

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

@ -113,6 +113,8 @@ flags="-p ${pidfile} ${java_command} start ${tomcat%%TOMCAT_VERSION%%_flags} ${l
start_precmd="pid_touch"
stop_cmd="tomcat_stop"
status_cmd="tomcat_status"
poll_cmd="tomcat_poll"
pid_touch() {
touch $pidfile
@ -124,11 +126,7 @@ tomcat_stop() {
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0
if [ -n "$pidfile" ]; then
echo "${name} not running? (check $pidfile)."
else
echo "${name} not running?"
fi
echo "${name} not running? (check $pidfile)."
return 1
fi
@ -139,10 +137,28 @@ tomcat_stop() {
rm -f ${pidfile}
}
tomcat_status() {
rc_pid=$(tomcat_check_pidfile $pidfile)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0
echo "${name} not running? (check $pidfile)."
return 1
fi
}
tomcat_poll() {
while (true) ; do
rc_pid=$(tomcat_check_pidfile $pidfile)
[ -z "$rc_pid" ] && break
sleep 2
done
}
tomcat_check_pidfile() {
_pidfile=$1
if [ -z "$_pidfile" -o -z "$_procname" ]; then
err 3 'USAGE: check_pidfile pidfile procname [interpreter]'
if [ -z "$_pidfile" ]; then
err 3 'USAGE: tomcat_check_pidfile pidfile'
fi
if [ ! -f $_pidfile ]; then
debug "pid file ($_pidfile): not readable."