Index: head/www/jakarta-tomcat4/Makefile
===================================================================
--- head/www/jakarta-tomcat4/Makefile	(revision 172556)
+++ head/www/jakarta-tomcat4/Makefile	(revision 172557)
@@ -1,140 +1,140 @@
 # New ports collection makefile for:	jakarta-tomcat
 # Date created:		20 Oct 2000
 # Whom:			des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www java
 MASTER_SITES=	http://distfiles.coredump.cn/ \
 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/liukang/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, stable 4.0.x branch
 
 DEPRECATED=	www/jakarta-tomcat5 is recommended instead for new installations
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
 USE_RC_SUBR=	tomcat4.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 WARP_PORT?=	8008
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		JAVA_HOME=${JAVA_HOME} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER} \
 		USER=${TOMCAT_USER} \
 		WARP_PORT=${WARP_PORT}
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   WARP port:                ${WARP_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
 .include <bsd.port.post.mk>

Property changes on: head/www/jakarta-tomcat4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.58
\ No newline at end of property
+1.59
\ No newline at end of property
Index: head/www/jakarta-tomcat4/files/tomcat4.sh.in
===================================================================
--- head/www/jakarta-tomcat4/files/tomcat4.sh.in	(revision 172556)
+++ head/www/jakarta-tomcat4/files/tomcat4.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/jakarta-tomcat4/files/tomcat4.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/jakarta-tomcat41/Makefile
===================================================================
--- head/www/jakarta-tomcat41/Makefile	(revision 172556)
+++ head/www/jakarta-tomcat41/Makefile	(revision 172557)
@@ -1,135 +1,135 @@
 # New ports collection makefile for:	jakarta-tomcat
 # Date created:		20 Oct 2000
 # Whom:			des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
 USE_RC_SUBR=	tomcat41.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		JAVA_HOME=${JAVA_HOME} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER} \
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
 .include <bsd.port.post.mk>

Property changes on: head/www/jakarta-tomcat41/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.65
\ No newline at end of property
+1.66
\ No newline at end of property
Index: head/www/jakarta-tomcat41/files/tomcat41.sh.in
===================================================================
--- head/www/jakarta-tomcat41/files/tomcat41.sh.in	(revision 172556)
+++ head/www/jakarta-tomcat41/files/tomcat41.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/jakarta-tomcat41/files/tomcat41.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/jakarta-tomcat5/Makefile
===================================================================
--- head/www/jakarta-tomcat5/Makefile	(revision 172556)
+++ head/www/jakarta-tomcat5/Makefile	(revision 172557)
@@ -1,135 +1,135 @@
 # New ports collection makefile for:	jakarta-tomcat-devel
 # Date created:		Tue Aug 12 23:26:32 CST 2003
 # Whom:			Kang Liu <liukang@bjpu.edu.cn>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	5.0.30
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
 USE_RC_SUBR=	tomcat50.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		JAVA_HOME=${JAVA_HOME} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDOUT_LOG}
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
 .include <bsd.port.post.mk>

Property changes on: head/www/jakarta-tomcat5/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/www/jakarta-tomcat5/files/tomcat50.sh.in
===================================================================
--- head/www/jakarta-tomcat5/files/tomcat50.sh.in	(revision 172556)
+++ head/www/jakarta-tomcat5/files/tomcat50.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/jakarta-tomcat5/files/tomcat50.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/tomcat41/Makefile
===================================================================
--- head/www/tomcat41/Makefile	(revision 172556)
+++ head/www/tomcat41/Makefile	(revision 172557)
@@ -1,135 +1,135 @@
 # New ports collection makefile for:	jakarta-tomcat
 # Date created:		20 Oct 2000
 # Whom:			des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
 USE_RC_SUBR=	tomcat41.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		JAVA_HOME=${JAVA_HOME} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER} \
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 
 .include <bsd.port.post.mk>

Property changes on: head/www/tomcat41/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.65
\ No newline at end of property
+1.66
\ No newline at end of property
Index: head/www/tomcat41/files/tomcat41.sh.in
===================================================================
--- head/www/tomcat41/files/tomcat41.sh.in	(revision 172556)
+++ head/www/tomcat41/files/tomcat41.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/tomcat41/files/tomcat41.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/tomcat55/Makefile
===================================================================
--- head/www/tomcat55/Makefile	(revision 172556)
+++ head/www/tomcat55/Makefile	(revision 172557)
@@ -1,140 +1,141 @@
 # New ports collection makefile for:	jakarta-tomcat-devel
 # Date created:		Tue Aug 12 23:26:32 CST 2003
 # Whom:			Kang Liu <liukang@bjpu.edu.cn>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.17
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
 USE_RC_SUBR=	tomcat55.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4"
 DISTFILES+=	apache-tomcat-${PORTVERSION}-compat.tar.gz
 PLIST_SUB+=	JAVA14=""
 .else
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDOUT_LOG}
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>

Property changes on: head/www/tomcat55/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/www/tomcat55/files/tomcat55.sh.in
===================================================================
--- head/www/tomcat55/files/tomcat55.sh.in	(revision 172556)
+++ head/www/tomcat55/files/tomcat55.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/tomcat55/files/tomcat55.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/tomcat6/Makefile
===================================================================
--- head/www/tomcat6/Makefile	(revision 172556)
+++ head/www/tomcat6/Makefile	(revision 172557)
@@ -1,140 +1,141 @@
 # New ports collection makefile for:	jakarta-tomcat-devel
 # Date created:		Tue Aug 12 23:26:32 CST 2003
 # Whom:			Kang Liu <liukang@bjpu.edu.cn>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.17
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
 USE_RC_SUBR=	tomcat55.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4"
 DISTFILES+=	apache-tomcat-${PORTVERSION}-compat.tar.gz
 PLIST_SUB+=	JAVA14=""
 .else
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDOUT_LOG}
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>

Property changes on: head/www/tomcat6/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/www/tomcat6/files/tomcat55.sh.in
===================================================================
--- head/www/tomcat6/files/tomcat55.sh.in	(revision 172556)
+++ head/www/tomcat6/files/tomcat55.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/tomcat6/files/tomcat55.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/tomcat7/Makefile
===================================================================
--- head/www/tomcat7/Makefile	(revision 172556)
+++ head/www/tomcat7/Makefile	(revision 172557)
@@ -1,140 +1,141 @@
 # New ports collection makefile for:	jakarta-tomcat-devel
 # Date created:		Tue Aug 12 23:26:32 CST 2003
 # Whom:			Kang Liu <liukang@bjpu.edu.cn>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.17
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
 USE_RC_SUBR=	tomcat55.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
 TOMCAT_USER?=	www
 TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
 		APP_TITLE="${APP_TITLE}" \
 		GROUP=${TOMCAT_GROUP} \
 		HTTP_PORT=${HTTP_PORT} \
 		JAR_FILE=${JAR_FILE} \
 		PID_FILE=${PID_FILE} \
 		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
 		STDERR_LOG=${STDERR_LOG} \
 		STDOUT_LOG=${STDOUT_LOG} \
 		TOMCAT_HOME=${APP_HOME} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4"
 DISTFILES+=	apache-tomcat-${PORTVERSION}-compat.tar.gz
 PLIST_SUB+=	JAVA14=""
 .else
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
 	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for file in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
 			if [ ! -e "${APP_HOME}/$$a" ]; then \
 				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
 				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
 			else \
 				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
 			fi; \
 		done
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDOUT_LOG}
 	@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDERR_LOG}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
 		${APP_HOME}/temp ${APP_HOME}/work
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
 	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
 .include <bsd.port.post.mk>

Property changes on: head/www/tomcat7/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/www/tomcat7/files/tomcat55.sh.in
===================================================================
--- head/www/tomcat7/files/tomcat55.sh.in	(revision 172556)
+++ head/www/tomcat7/files/tomcat55.sh.in	(revision 172557)
@@ -1,167 +1,167 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
 #
 # tomcat%%TOMCAT_VERSION%%_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable tomcat%%TOMCAT_VERSION%%
 #
 # tomcat%%TOMCAT_VERSION%%_flags (str):
 #   Set to "" by default.
 #   Extra flags passed to start command
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_base (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
 #   Set to "%%TOMCAT_HOME%%/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
 # tomcat%%TOMCAT_VERSION%%_stdout_log (str)
 #   Set to "%%STDOUT_LOG%%" by default.
 #   Set the location for the Tomcat process log (standard output)
 #
 # tomcat%%TOMCAT_VERSION%%_stderr_log (str)
 #   Set to "%%STDERR_LOG%%" by default.
 #   Set the location for the Tomcat process log (error output)
 #
 # tomcat%%TOMCAT_VERSION%%_stop_timeout (num)
 #   Set to "10" by default.
 #   Sets the timeout in seconds to allow tomcat to shutdown.
 #   After the timeout has elapsed, tomcat will be killed.
 #
 # tomcat%%TOMCAT_VERSION%%_java_home (str):
 # tomcat%%TOMCAT_VERSION%%_java_vendor (str):
 # tomcat%%TOMCAT_VERSION%%_java_version (str):
 # tomcat%%TOMCAT_VERSION%%_java_os (str):
 #   Specify the requirements of the Java VM to use. See javavm(1).
 #
 # tomcat%%TOMCAT_VERSION%%_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH
 #
 # tomcat%%TOMCAT_VERSION%%_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 
 tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
 tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
 tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
 tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
 tomcat%%TOMCAT_VERSION%%_stdout_log="${tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stderr_log="${tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
 tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:-"10"}"
 
 . %%RC_SUBR%%
 
 name="tomcat%%TOMCAT_VERSION%%"
 rcvar=`set_rcvar`
 pidfile="%%PID_FILE%%"
 
 load_rc_config "${name}"
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
 	export JAVA_HOME="${tomcat%%TOMCAT_VERSION%%_java_home}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
 	export JAVA_VERSION="${tomcat%%TOMCAT_VERSION%%_java_version}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
 	export JAVA_VENDOR="${tomcat%%TOMCAT_VERSION%%_java_vendor}"
 fi
 
 if [ -n "${tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
 	export JAVA_OS="${tomcat%%TOMCAT_VERSION%%_java_os}"
 fi
 
 java_command="%%LOCALBASE%%/bin/java \
 	${tomcat%%TOMCAT_VERSION%%_java_opts} \
 	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
 	-classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
 	-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
 	-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
 	-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
 	org.apache.catalina.startup.Bootstrap"
 
 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 comm= $rc_pid`
+    procname=`ps -o ucomm= $rc_pid`
   fi
 fi
 
 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)
+	rc_pid=$(check_pidfile $pidfile *$procname*)
 
 	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
 		return 1
 	fi
 	
 	echo "Stopping ${name}."
 	${java_command} stop
 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}
 }
 
 tomcat_wait_max_for_pid() {
 	_timeout=$1
 	shift
 	_pid=$1
 	_prefix=
 	while [ $_timeout -gt 0 ] ; do
 		echo -n ${_prefix:-"Waiting (max $_timeout secs) for PIDS: "}$_pid
 		_prefix=", "
 		sleep 2
 		kill -0 $_pid 2> /dev/null || break
 		_timeout=$(($_timeout-2))
 	done
 	if [ -n "$_prefix" ]; then
 		echo "."
 	fi
 }
 
 run_rc_command "$1"

Property changes on: head/www/tomcat7/files/tomcat55.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property