56 files changed, 1549 insertions, 2728 deletions

diff --git a/MOVED b/MOVED
index c98ce350c9e3..d8149c84fc46 100644
--- a/MOVED
+++ b/MOVED
@@ -2164,3 +2164,4 @@ misc/tvguide||2006-02-03|Remove expired port
 japanese/gn-gnspool||2006-02-06|Remove expired port
 www/adzap2squirm||2006-02-06|Remove expired port
 graphics/linux-bmrt||2006-02-06|Remove dead project
+www/jakarta-tomcat55|www/tomcat55|2006-02-07|Renamed (no longer a Jakarta project)
diff --git a/UPDATING b/UPDATING
index b79951095d73..04fdf73aedd5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,27 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060207:
+  AFFECTS: users of www/jakarta-tomcat4, www/jakarta-tomcat41, 
+           www/jakarta-tomcat5, www/jakarta-tomcat55, and www/tomcat55
+  AUTHOR: lawrance@FreeBSD.org
+
+  The Tomcat ports listed above have been converted to use new-style
+  rc scripts.  In order to enable Tomcat, you must add:
+
+	tomcat{4,41,5,55}_enable="YES"
+
+  to your rc.conf.  Select the appropriate version number for your
+  installation.  When shutting down, the rc scripts will kill the
+  Tomcat process after a default timeout of 10 seconds.  This can be
+  changed by setting the tomcatXX_stop_timeout variable in rc.conf.
+
+  Tomcat 5.5 users please note that the rc variables have changed name
+  from jakarta_tomcat55_* to tomcat55_*.
+
+  The "tomcatctl" executable is no longer installed.  Please use the
+  rc scripts to control tomcat instead.
+
 20060202:
   AFFECTS: users of textproc/expat2
   AUTHOR: kuriyama@FreeBSD.org
diff --git a/www/Makefile b/www/Makefile
index f3e20173e54d..3888e8864499 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -195,7 +195,7 @@
     SUBDIR += jakarta-tomcat4
     SUBDIR += jakarta-tomcat41
     SUBDIR += jakarta-tomcat5
-    SUBDIR += jakarta-tomcat55
+    SUBDIR += tomcat55
     SUBDIR += jdresolve
     SUBDIR += jesred
     SUBDIR += jetspeed
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 5ba4c5f3579f..51a75f801937 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	http://distfiles.coredump.cn/ \
 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/liukang/
@@ -15,31 +15,24 @@ MASTER_SITES=	http://distfiles.coredump.cn/ \
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 4.0.x branch
 
-DEPRECATED=	"www/jakarta-tomcat5 is recommended instead for new installations"
+DEPRECATED=	www/jakarta-tomcat5 is recommended instead for new installations
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+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=${USER} WWWGRP=${GROUP}
+PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
-USER=		www
-GROUP=		www
+TOMCAT_USER?=	www
+TOMCAT_GROUP?=	www
 PW?=		/usr/sbin/pw
 HTTP_PORT?=	8180
 SHUTDOWN_PORT?=	8005
@@ -47,74 +40,61 @@ WARP_PORT?=	8008
 AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${FILESDIR}/daemonctl.c \
-		${FILESDIR}/daemonctl.1 \
-		${FILESDIR}/startup.sh \
-		conf/server.xml
+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} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
+	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@(cd ${WRKSRC} && ${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`)
+.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}
@@ -136,28 +116,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
-	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
@@ -168,7 +126,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
+	@${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..."
@@ -177,18 +136,11 @@ do-install:
 
 	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${USER}:${GROUP} ${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}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/tomcat6/pkg-deinstall b/www/jakarta-tomcat4/files/pkg-deinstall.in
index 88e413468f94..af8ac5adfe8b 100644
--- a/www/tomcat6/pkg-deinstall
+++ b/www/jakarta-tomcat4/files/pkg-deinstall.in
@@ -8,14 +8,16 @@
 # * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat6/Attic/pkg-deinstall,v 1.3 2005-09-29 15:08:23 hq Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/pkg-deinstall.in,v 1.1 2006-02-07 08:50:07 lawrance Exp $
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat5
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
 		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-		echo "To delete the %%USER%% user permanently, use 'pw userdel %%USER%%'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/jakarta-tomcat5/pkg-install b/www/jakarta-tomcat4/files/pkg-install.in
index 3464b03abde6..0dcb1d560d6b 100644
--- a/www/jakarta-tomcat5/pkg-install
+++ b/www/jakarta-tomcat4/files/pkg-install.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Checks if the 'www' user and group exist. If they don't, then
+# Checks if the '%%USER%%' user and group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat5/Attic/pkg-install,v 1.1 2003-08-13 11:39:38 znerd Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/pkg-install.in,v 1.1 2006-02-07 08:50:07 lawrance Exp $
 #
 
 # Make sure we're called during the 'make install' process
@@ -12,10 +12,10 @@ if [ "$2" != "PRE-INSTALL" ]; then
 fi
 
 # Set some constants
-USER=www
-GROUP=${USER}
 UID=80
 GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
 
 # See if the group already exists
 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
diff --git a/www/jakarta-tomcat4/files/startup.sh b/www/jakarta-tomcat4/files/startup.sh
deleted file mode 100644
index edd373ee1478..000000000000
--- a/www/jakarta-tomcat4/files/startup.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# -*- mode: Fundamental; tab-width: 4; -*-
-# ex:ts=4
-#
-# %%APP_TITLE%% startup script.
-#
-# $FreeBSD$
-#
-
-
-# Set some variables
-MYSELF=`basename $0`
-
-case "$1" in
-	start)
-		echo -n ' '
-		truncate -s 0 %%PID_FILE%%
-		chown %%USER%%:%%GROUP%% %%PID_FILE%%
-		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start" >/dev/null && echo -n '%%APP_SHORTNAME%%'
-		;;
-	stop)
-		echo -n ' '
-		chown %%USER%%:%%GROUP%% %%PID_FILE%%
-		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop" >/dev/null 2>&1 ; echo -n '%%APP_SHORTNAME%%'
-		;;
-	*)
-		echo ""
-		echo "Usage: ${MYSELF} { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/www/jakarta-tomcat4/files/tomcat4.sh.in b/www/jakarta-tomcat4/files/tomcat4.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/jakarta-tomcat4/files/tomcat4.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/jakarta-tomcat4/pkg-plist b/www/jakarta-tomcat4/pkg-plist
index 95e5b3ae4ed9..93c4e516a832 100644
--- a/www/jakarta-tomcat4/pkg-plist
+++ b/www/jakarta-tomcat4/pkg-plist
@@ -4,8 +4,6 @@
 @unexec if cmp -s %D/%%T%%/conf/server-noexamples.xml.config %D/%%T%%/conf/server-noexamples.xml.config.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-noexamples.xml.config; fi
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; fi
 @unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; fi
-bin/tomcat4ctl
-etc/rc.d/020.jakarta-tomcat4.sh
 %%T%%/logs/stdout.log
 %%T%%/logs/stderr.log
 %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java
@@ -970,7 +968,7 @@ etc/rc.d/020.jakarta-tomcat4.sh
 @exec mkdir %D/%%T%%/temp || true
 @exec mkdir %D/%%T%%/server/classes || true
 @exec mkdir %D/%%T%%/work || true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrmtry %%T%%/conf
 @dirrm %%T%%/logs
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index c5110f4b381d..db7b44a561c5 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
@@ -15,105 +15,81 @@ MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
-PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+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=${USER} WWWGRP=${GROUP}
+PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
-USER=		www
-GROUP=		www
+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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		conf/server.xml
+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} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
+	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@(cd ${WRKSRC} && ${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`)
+.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}
@@ -135,28 +111,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
-	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
@@ -167,7 +121,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
+	@${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..."
@@ -176,18 +131,11 @@ do-install:
 
 	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${USER}:${GROUP} ${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}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/tomcat7/pkg-deinstall b/www/jakarta-tomcat41/files/pkg-deinstall.in
index 585399330cb7..d88b0d5e8d47 100644
--- a/www/tomcat7/pkg-deinstall
+++ b/www/jakarta-tomcat41/files/pkg-deinstall.in
@@ -8,14 +8,16 @@
 # * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat7/Attic/pkg-deinstall,v 1.3 2005-09-29 15:08:23 hq Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/pkg-deinstall.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat5
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
 		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-		echo "To delete the %%USER%% user permanently, use 'pw userdel %%USER%%'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/jakarta-tomcat4/pkg-install b/www/jakarta-tomcat41/files/pkg-install.in
index 687ec3fc1f9e..2835b8a1b831 100644
--- a/www/jakarta-tomcat4/pkg-install
+++ b/www/jakarta-tomcat41/files/pkg-install.in
@@ -3,7 +3,7 @@
 # Checks if the 'www' user and group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/pkg-install.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
 # Make sure we're called during the 'make install' process
@@ -12,10 +12,10 @@ if [ "$2" != "PRE-INSTALL" ]; then
 fi
 
 # Set some constants
-USER=www
-GROUP=${USER}
 UID=80
 GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
 
 # See if the group already exists
 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
diff --git a/www/jakarta-tomcat41/files/tomcat41.sh.in b/www/jakarta-tomcat41/files/tomcat41.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/jakarta-tomcat41/files/tomcat41.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/jakarta-tomcat41/pkg-plist b/www/jakarta-tomcat41/pkg-plist
index 97610509ba7b..4168d64f9987 100644
--- a/www/jakarta-tomcat41/pkg-plist
+++ b/www/jakarta-tomcat41/pkg-plist
@@ -6,7 +6,6 @@
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
 bin/tomcat41ctl
-etc/rc.d/020.jakarta-tomcat41.sh
 %%T%%/LICENSE
 %%T%%/README.txt
 %%T%%/RELEASE-NOTES-4.1.txt
@@ -1488,7 +1487,7 @@ etc/rc.d/020.jakarta-tomcat41.sh
 @exec mkdir %D/%%T%%/shared/lib || true
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 3a4be620f700..a2026fbe6eff 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -7,111 +7,89 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	5.0.30
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
-PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+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/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
-USER=		www
-GROUP=		www
+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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		conf/server.xml
+REPLACE_FILES=	${WRKSRC}/conf/server.xml
+REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
-PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
+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} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
+	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@(cd ${WRKSRC} && ${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`)
+.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}
@@ -133,31 +111,9 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
-	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${ECHO_MSG} -n ">> Creating log files..."
-	@${INSTALL} /dev/null ${STDOUT_LOG}
-	@${INSTALL} /dev/null ${STDERR_LOG}
+	@${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..."
@@ -165,7 +121,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
+	@${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..."
@@ -174,17 +131,11 @@ do-install:
 
 	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${USER}:${GROUP} ${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}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
+
 .include <bsd.port.post.mk>
diff --git a/www/jakarta-tomcat55/pkg-deinstall b/www/jakarta-tomcat5/files/pkg-deinstall.in
index 8be859f8f697..6d7063513c7d 100644
--- a/www/jakarta-tomcat55/pkg-deinstall
+++ b/www/jakarta-tomcat5/files/pkg-deinstall.in
@@ -8,14 +8,16 @@
 # * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat55/Attic/pkg-deinstall,v 1.3 2005-09-29 15:08:23 hq Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat5/files/Attic/pkg-deinstall.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat5
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
 		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-		echo "To delete the %%USER%% user permanently, use 'pw userdel %%USER%%'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/tomcat41/pkg-install b/www/jakarta-tomcat5/files/pkg-install.in
index 687ec3fc1f9e..cfa95219c434 100644
--- a/www/tomcat41/pkg-install
+++ b/www/jakarta-tomcat5/files/pkg-install.in
@@ -3,7 +3,7 @@
 # Checks if the 'www' user and group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat5/files/Attic/pkg-install.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
 # Make sure we're called during the 'make install' process
@@ -12,10 +12,10 @@ if [ "$2" != "PRE-INSTALL" ]; then
 fi
 
 # Set some constants
-USER=www
-GROUP=${USER}
 UID=80
 GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
 
 # See if the group already exists
 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
diff --git a/www/jakarta-tomcat5/files/tomcat50.sh.in b/www/jakarta-tomcat5/files/tomcat50.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/jakarta-tomcat5/files/tomcat50.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/jakarta-tomcat5/pkg-deinstall b/www/jakarta-tomcat5/pkg-deinstall
deleted file mode 100644
index eee37aaf960c..000000000000
--- a/www/jakarta-tomcat5/pkg-deinstall
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# This script does the following.
-#
-# * Checks if the PID file exists. If it does, it kills the
-#   process and removes the PID file.
-#
-# * Checks if the 'www' user exists. If it does, then it displays
-#   a message.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat5/Attic/pkg-deinstall,v 1.2 2004-01-02 12:31:11 znerd Exp $
-#
-
-# Make sure we're in the right stage of the process
-if [ "$2" = "DEINSTALL" ]; then
-
-	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat5
-	if [ -s ${PID_FILE} ]; then
-		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
-		/bin/kill ${PID} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-		echo -n ">> Removing PID file (${PID_FILE})..."
-		rm ${PID_FILE} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-	fi
-fi
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-	# If the user exists, then display a message
-	if pw usershow "www" 2>/dev/null 1>&2; then
-		echo "To delete the www user permanently, use 'pw userdel www'"
-	fi
-fi
-
-exit 0
diff --git a/www/jakarta-tomcat5/pkg-plist b/www/jakarta-tomcat5/pkg-plist
index 321922a70f83..1211c91aa028 100644
--- a/www/jakarta-tomcat5/pkg-plist
+++ b/www/jakarta-tomcat5/pkg-plist
@@ -9,8 +9,6 @@
 @unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
-bin/tomcat50ctl
-etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -1763,7 +1761,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @exec mkdir %D/%%T%%/shared/lib || true
 @exec mkdir %D/%%T%%/temp || true
 @exec mkdir %D/%%T%%/webapps/balancer/images || true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
deleted file mode 100644
index 0f57d1a27cd3..000000000000
--- a/www/jakarta-tomcat55/Makefile
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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.5.12
-CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
-DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
-
-MAINTAINER=	liukang@cn.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=	yes
-
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
-
-MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
-APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
-LOG_DIR=	${APP_HOME}/logs
-APP_TITLE=	Jakarta Tomcat
-APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
-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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
-PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${WRKSRC}/conf/server.xml
-JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-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_FILES=	tomcat.sh
-SUB_LIST=	TOMCAT_VERSION=${MAJOR_VER:S/.//} \
-		TOMCAT_HOME=${APP_HOME} \
-		USER=${TOMCAT_USER} \
-		STDOUT_LOG=${STDOUT_LOG} \
-		STDERR_LOG=${STDERR_LOG}
-
-REPLACE_FILES+=	${PKGDIR}/pkg-install \
-		${PKGDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
-.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} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-
-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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${TOMCAT_GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${TOMCAT_USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
-	@${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 ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/jakarta-tomcat${MAJOR_VER:S/.//}.sh
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
-	@${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}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Fixing permissions..."
-	@${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}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${TOMCAT_GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
-.include <bsd.port.post.mk>
diff --git a/www/jakarta-tomcat55/distinfo b/www/jakarta-tomcat55/distinfo
deleted file mode 100644
index dcea6c7a5e12..000000000000
--- a/www/jakarta-tomcat55/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (apache-tomcat-5.5.12.tar.gz) = 4c51a16d86131ca7958273080efb473f
-SHA256 (apache-tomcat-5.5.12.tar.gz) = 7a19f6a42bb2a0879a35d76dea16f38b169689eac18b488168eeca16c1beb73e
-SIZE (apache-tomcat-5.5.12.tar.gz) = 5924214
-MD5 (apache-tomcat-5.5.12-compat.tar.gz) = e1c7c959d73dabe299fd4500a86657a2
-SHA256 (apache-tomcat-5.5.12-compat.tar.gz) = f9dd38df997c7cd53a94bb74b5e67616bd88584176a8e39c0a2db4da9b47d70c
-SIZE (apache-tomcat-5.5.12-compat.tar.gz) = 1607878
diff --git a/www/jakarta-tomcat55/files/patch-conf::server.xml b/www/jakarta-tomcat55/files/patch-conf::server.xml
deleted file mode 100644
index 1e1f67aed8f6..000000000000
--- a/www/jakarta-tomcat55/files/patch-conf::server.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-$FreeBSD$
-
---- conf/server.xml.orig	Sun Jun  5 21:37:27 2005
-+++ conf/server.xml	Sun Jun  5 21:40:08 2005
-@@ -10,7 +10,7 @@
-      define subcomponents such as "Valves" or "Loggers" at this level.
-  -->
- 
--<Server port="8005" shutdown="SHUTDOWN">
-+<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN">
- 
-   <!-- Comment these entries out to disable JMX MBeans support used for the 
-        administration web application -->
-@@ -72,8 +72,8 @@
-          IP address of the remote client.
-     -->
- 
--    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
--    <Connector port="8080" maxHttpHeaderSize="8192"
-+    <!-- Define a non-SSL HTTP/1.1 Connector -->
-+    <Connector port="%%HTTP_PORT%%" maxHttpHeaderSize="8192"
-                maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-                enableLookups="false" redirectPort="8443" acceptCount="100"
-                connectionTimeout="20000" disableUploadTimeout="true" />
-@@ -97,8 +97,8 @@
-                clientAuth="false" sslProtocol="TLS" />
-     -->
- 
--    <!-- Define an AJP 1.3 Connector on port 8009 -->
--    <Connector port="8009" 
-+    <!-- Define an AJP 1.3 Connector -->
-+    <Connector port="%%AJP_1_3_PORT%%" 
-                enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
- 
-     <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
diff --git a/www/jakarta-tomcat55/files/tomcat.sh.in b/www/jakarta-tomcat55/files/tomcat.sh.in
deleted file mode 100644
index 0dca0cb4afbf..000000000000
--- a/www/jakarta-tomcat55/files/tomcat.sh.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: jakarta-tomcat%%TOMCAT_VERSION%%
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Configuration settings for jakarta-tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable jakarta-tomcat%%TOMCAT_VERSION%%
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_flags (str):
-#   Set to "" by default.
-#   Extra flags passed to start command
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_HOME variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_BASE variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
-#   Set to "%%TOMCAT_HOME%%/temp" by default.
-#   Set the CATALINA_TMPDIR variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log (str)
-#   Set to "%%STDOUT_LOG%%" by default.
-#   Set the location for the Tomcat process log (standard output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log (str)
-#   Set to "%%STDERR_LOG%%" by default.
-#   Set the location for the Tomcat process log (error output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_home (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_version (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_os (str):
-#   Specify the requirements of the Java VM to use. See javavm(1).
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_classpath (str):
-#   Set to "" by default.
-#   Addtional classes to add to the CLASSPATH
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-
-jakarta_tomcat%%TOMCAT_VERSION%%_enable="${jakarta_tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_java_version="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_user="${jakarta_tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
-
-. %%RC_SUBR%%
-
-name="jakarta_tomcat%%TOMCAT_VERSION%%"
-rcvar=`set_rcvar`
-
-load_rc_config "${name}"
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
-	export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
-	export JAVA_VERSION="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
-	export JAVA_VENDOR="${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
-	export JAVA_OS="${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}"
-fi
-
-java_command="%%LOCALBASE%%/bin/java \
-	${jakarta_tomcat%%TOMCAT_VERSION%%_java_opts} \
-	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-	-classpath %%TOMCAT_HOME%%/bin/bootstrap.jar:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${jakarta_tomcat%%TOMCAT_VERSION%%_classpath} \
-	-Dcatalina.base=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base} \
-	-Dcatalina.home=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home} \
-	-Djava.io.tmpdir=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
-	org.apache.catalina.startup.Bootstrap"
-
-log_args=">> ${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log} \
-	2>> ${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log} "
-
-procname="java"
-required_files="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
-
-command="/usr/sbin/daemon"
-flags="${command} ${java_command} start ${jakarta_tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
-
-stop_cmd="jakarta_tomcat%%TOMCAT_VERSION%%_stop"
-
-jakarta_tomcat%%TOMCAT_VERSION%%_stop() {
-	echo "Stopping ${name}."
-	${java_command} stop
-	wait_for_pids
-}
-
-run_rc_command "$1"
diff --git a/www/jakarta-tomcat55/pkg-descr b/www/jakarta-tomcat55/pkg-descr
deleted file mode 100644
index d489e8c5428b..000000000000
--- a/www/jakarta-tomcat55/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Jakarta Tomcat is a web server written in 100% Pure Java.
-
-Tomcat 5.x is the current release of Tomcat, 
-and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases. 
-The 5.x releases implement the Servlet 2.4 and JSP 2.0 specifications.
-
-Apache Tomcat 5.5 is the current focus of development.
-While it supports the same Servlet and JSP Specification versions
-as Apache Tomcat 5.0.x, there are significant changes in many areas
-under the hood, resulting in improved performance, stability,
-and total cost of ownership.
-
-WWW: http://tomcat.apache.org/
diff --git a/www/jakarta-tomcat55/pkg-install b/www/jakarta-tomcat55/pkg-install
deleted file mode 100644
index 70e83cf7a68e..000000000000
--- a/www/jakarta-tomcat55/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Checks if the '%%USER%%' user and %%GROUP%% group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat55/Attic/pkg-install,v 1.3 2005-09-29 15:08:23 hq Exp $
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-UID=80
-GID=${UID}
-
-# See if the group already exists
-if ! pw groupshow "%%GROUP%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd "%%GROUP%%" -g ${GID}; then
-		echo "Added group \"%%GROUP%%\"."
-	elif pw groupadd "%%GROUP%%"; then
-		echo "Added group \"%%GROUP%%\"."
-	else
-		echo "Adding group \"%%GROUP%%\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd "%%USER%%" -u ${UID} -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	elif pw useradd "%%USER%%" -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	else
-		echo "Adding user \"%%USER%%\" failed..."
-		exit 1
-	fi
-fi
-exit 0
diff --git a/www/jakarta-tomcat55/pkg-plist b/www/jakarta-tomcat55/pkg-plist
deleted file mode 100644
index 94e996564dae..000000000000
--- a/www/jakarta-tomcat55/pkg-plist
+++ /dev/null
@@ -1,1020 +0,0 @@
-@comment $FreeBSD$
-@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/host-manager.xml %D/%%T%%/conf/Catalina/localhost/host-manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/host-manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/host-manager.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/manager.xml %D/%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/manager.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.policy must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.properties must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/context.xml %D/%%T%%/conf/context.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/context.xml; else echo If permanently deleting this package, %D/%%T%%/conf/context.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/server-minimal.xml %D/%%T%%/conf/server-minimal.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-minimal.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server-minimal.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
-@unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi
-bin/tomcat55ctl
-etc/rc.d/jakarta-tomcat55.sh
-%%T%%/LICENSE
-%%T%%/NOTICE
-%%T%%/RELEASE-NOTES
-%%T%%/RUNNING.txt
-%%T%%/bin/bootstrap.jar
-%%T%%/bin/catalina-tasks.xml
-%%T%%/bin/catalina.sh
-%%T%%/bin/commons-daemon.jar
-%%T%%/bin/commons-logging-api.jar
-%%T%%/bin/digest.sh
-%%JAVA14%%%%T%%/bin/jmx.jar
-%%T%%/bin/jmxaccessor-tasks.xml
-%%T%%/bin/jsvc.tar.gz
-%%T%%/bin/setclasspath.sh
-%%T%%/bin/shutdown.sh
-%%T%%/bin/startup.sh
-%%T%%/bin/tomcat-juli.jar
-%%T%%/bin/tomcat-native.tar.gz
-%%T%%/bin/tool-wrapper.sh
-%%T%%/bin/version.sh
-%%JAVA14%%%%T%%/common/endorsed/xercesImpl.jar
-%%JAVA14%%%%T%%/common/endorsed/xml-apis.jar
-%%T%%/common/i18n/tomcat-i18n-en.jar
-%%T%%/common/i18n/tomcat-i18n-es.jar
-%%T%%/common/i18n/tomcat-i18n-fr.jar
-%%T%%/common/i18n/tomcat-i18n-ja.jar
-%%T%%/common/lib/commons-el.jar
-%%T%%/common/lib/jasper-compiler-jdt.jar
-%%T%%/common/lib/jasper-compiler.jar
-%%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jsp-api.jar
-%%T%%/common/lib/naming-factory-dbcp.jar
-%%T%%/common/lib/naming-factory.jar
-%%T%%/common/lib/naming-resources.jar
-%%T%%/common/lib/servlet-api.jar
-%%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/host-manager.xml.%%CONF_EXT%%
-%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%
-%%T%%/conf/catalina.policy.%%CONF_EXT%%
-%%T%%/conf/catalina.properties.%%CONF_EXT%%
-%%T%%/conf/context.xml.%%CONF_EXT%%
-%%T%%/conf/server-minimal.xml.%%CONF_EXT%%
-%%T%%/conf/server.xml.%%CONF_EXT%%
-%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%
-%%T%%/conf/web.xml.%%CONF_EXT%%
-%%T%%/conf/logging.properties.%%CONF_EXT%%
-%%T%%/logs/stderr.log
-%%T%%/logs/stdout.log
-%%T%%/server/lib/catalina-ant-jmx.jar
-%%T%%/server/lib/catalina-ant.jar
-%%T%%/server/lib/catalina-cluster.jar
-%%T%%/server/lib/catalina-optional.jar
-%%T%%/server/lib/catalina-storeconfig.jar
-%%T%%/server/lib/catalina.jar
-%%T%%/server/lib/commons-modeler.jar
-%%T%%/server/lib/servlets-cgi.renametojar
-%%T%%/server/lib/servlets-default.jar
-%%T%%/server/lib/servlets-invoker.jar
-%%T%%/server/lib/servlets-ssi.renametojar
-%%T%%/server/lib/servlets-webdav.jar
-%%T%%/server/lib/tomcat-ajp.jar
-%%T%%/server/lib/tomcat-apr.jar
-%%T%%/server/lib/tomcat-coyote.jar
-%%T%%/server/lib/tomcat-http.jar
-%%T%%/server/lib/tomcat-util.jar
-%%T%%/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar
-%%T%%/server/webapps/host-manager/WEB-INF/web.xml
-%%T%%/server/webapps/host-manager/host-manager.xml
-%%T%%/server/webapps/host-manager/images/add.gif
-%%T%%/server/webapps/host-manager/images/code.gif
-%%T%%/server/webapps/host-manager/images/design.gif
-%%T%%/server/webapps/host-manager/images/docs.gif
-%%T%%/server/webapps/host-manager/images/fix.gif
-%%T%%/server/webapps/host-manager/images/jakarta-logo.gif
-%%T%%/server/webapps/host-manager/images/tomcat.gif
-%%T%%/server/webapps/host-manager/images/update.gif
-%%T%%/server/webapps/host-manager/images/void.gif
-%%T%%/server/webapps/host-manager/manager.xml
-%%T%%/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
-%%T%%/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.0.jar
-%%T%%/server/webapps/manager/WEB-INF/web.xml
-%%T%%/server/webapps/manager/html-manager-howto.html
-%%T%%/server/webapps/manager/images/add.gif
-%%T%%/server/webapps/manager/images/code.gif
-%%T%%/server/webapps/manager/images/design.gif
-%%T%%/server/webapps/manager/images/docs.gif
-%%T%%/server/webapps/manager/images/fix.gif
-%%T%%/server/webapps/manager/images/jakarta-logo.gif
-%%T%%/server/webapps/manager/images/tomcat.gif
-%%T%%/server/webapps/manager/images/update.gif
-%%T%%/server/webapps/manager/images/void.gif
-%%T%%/server/webapps/manager/manager-howto.html
-%%T%%/server/webapps/manager/manager.xml
-%%T%%/server/webapps/manager/status.xsd
-%%T%%/server/webapps/manager/xform.xsl
-%%T%%/webapps/ROOT/RELEASE-NOTES.txt
-%%T%%/webapps/ROOT/WEB-INF/lib/catalina-root.jar
-%%T%%/webapps/ROOT/WEB-INF/web.xml
-%%T%%/webapps/ROOT/admin/index.html
-%%T%%/webapps/ROOT/favicon.ico
-%%T%%/webapps/ROOT/index.jsp
-%%T%%/webapps/ROOT/jakarta-banner.gif
-%%T%%/webapps/ROOT/tomcat-power.gif
-%%T%%/webapps/ROOT/tomcat.gif
-%%T%%/webapps/balancer/META-INF/context.xml
-%%T%%/webapps/balancer/WEB-INF/config/rules.xml
-%%T%%/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
-%%T%%/webapps/balancer/WEB-INF/web.xml
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entry.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entry.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/error/Smart.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/error/Smart.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal1_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal2_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/checkbox/checkresult_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/colors/colrs_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/dates/date_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/err_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/errorpge_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/forward_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/one_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/foo_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/include_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002darithmetic_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002dcomparisons_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/functions_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/implicit_002dobjects_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/jspattribute_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp$shuffle_jspHelper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx$basic_jspxHelper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/textRotate_jspx.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/config_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/dynamicattrs_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/book_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/hello_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp$repeat_jspHelper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/hello_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp$panel_jspHelper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp$products_jspHelper.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/hello_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/jsptoservlet_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/num/numguess_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/plugin/plugin_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/error_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/index_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/login_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/sessions/carts_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/simpletag/foo_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/snp/snoop_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/source_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/displayProducts_tag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/helloWorld_tag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/panel_tag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/xhtmlbasic_tag.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/choose_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/servletToJsp.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/servletToJsp.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.java
-%%T%%/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.java
-%%T%%/webapps/jsp-examples/WEB-INF/jsp/applet/Clock2.java
-%%T%%/webapps/jsp-examples/WEB-INF/jsp/debug-taglib.tld
-%%T%%/webapps/jsp-examples/WEB-INF/jsp/example-taglib.tld
-%%T%%/webapps/jsp-examples/WEB-INF/jsp2/jsp2-example-taglib.tld
-%%T%%/webapps/jsp-examples/WEB-INF/lib/jstl.jar
-%%T%%/webapps/jsp-examples/WEB-INF/lib/standard.jar
-%%T%%/webapps/jsp-examples/WEB-INF/tags/displayProducts.tag
-%%T%%/webapps/jsp-examples/WEB-INF/tags/helloWorld.tag
-%%T%%/webapps/jsp-examples/WEB-INF/tags/panel.tag
-%%T%%/webapps/jsp-examples/WEB-INF/tags/xhtmlbasic.tag
-%%T%%/webapps/jsp-examples/WEB-INF/web.xml
-%%T%%/webapps/jsp-examples/cal/Entries.java.html
-%%T%%/webapps/jsp-examples/cal/Entry.java.html
-%%T%%/webapps/jsp-examples/cal/JspCalendar.java.html
-%%T%%/webapps/jsp-examples/cal/TableBean.java.html
-%%T%%/webapps/jsp-examples/cal/cal1.jsp
-%%T%%/webapps/jsp-examples/cal/cal1.jsp.html
-%%T%%/webapps/jsp-examples/cal/cal2.jsp
-%%T%%/webapps/jsp-examples/cal/cal2.jsp.html
-%%T%%/webapps/jsp-examples/cal/calendar.html
-%%T%%/webapps/jsp-examples/cal/login.html
-%%T%%/webapps/jsp-examples/checkbox/CheckTest.html
-%%T%%/webapps/jsp-examples/checkbox/check.html
-%%T%%/webapps/jsp-examples/checkbox/checkresult.jsp
-%%T%%/webapps/jsp-examples/checkbox/checkresult.jsp.html
-%%T%%/webapps/jsp-examples/checkbox/cresult.html
-%%T%%/webapps/jsp-examples/colors/ColorGameBean.html
-%%T%%/webapps/jsp-examples/colors/clr.html
-%%T%%/webapps/jsp-examples/colors/colors.html
-%%T%%/webapps/jsp-examples/colors/colrs.jsp
-%%T%%/webapps/jsp-examples/colors/colrs.jsp.html
-%%T%%/webapps/jsp-examples/dates/date.html
-%%T%%/webapps/jsp-examples/dates/date.jsp
-%%T%%/webapps/jsp-examples/dates/date.jsp.html
-%%T%%/webapps/jsp-examples/error/er.html
-%%T%%/webapps/jsp-examples/error/err.jsp
-%%T%%/webapps/jsp-examples/error/err.jsp.html
-%%T%%/webapps/jsp-examples/error/error.html
-%%T%%/webapps/jsp-examples/error/errorpge.jsp
-%%T%%/webapps/jsp-examples/forward/forward.jsp
-%%T%%/webapps/jsp-examples/forward/forward.jsp.html
-%%T%%/webapps/jsp-examples/forward/fwd.html
-%%T%%/webapps/jsp-examples/forward/one.jsp
-%%T%%/webapps/jsp-examples/forward/two.html
-%%T%%/webapps/jsp-examples/images/code.gif
-%%T%%/webapps/jsp-examples/images/execute.gif
-%%T%%/webapps/jsp-examples/images/read.gif
-%%T%%/webapps/jsp-examples/images/return.gif
-%%T%%/webapps/jsp-examples/include/foo.html
-%%T%%/webapps/jsp-examples/include/foo.jsp
-%%T%%/webapps/jsp-examples/include/inc.html
-%%T%%/webapps/jsp-examples/include/include.jsp
-%%T%%/webapps/jsp-examples/include/include.jsp.html
-%%T%%/webapps/jsp-examples/index.html
-%%T%%/webapps/jsp-examples/jsp2/el/Functions.java.html
-%%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.html
-%%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.html
-%%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/el/functions.html
-%%T%%/webapps/jsp-examples/jsp2/el/functions.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/functions.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.html
-%%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.jsp
-%%T%%/webapps/jsp-examples/jsp2/el/implicit-objects.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/FooBean.java.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/HelloWorldSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/ShuffleSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/TileSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.html
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp
-%%T%%/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/jspx/basic.html
-%%T%%/webapps/jsp-examples/jsp2/jspx/basic.jspx
-%%T%%/webapps/jsp-examples/jsp2/jspx/basic.jspx.html
-%%T%%/webapps/jsp-examples/jsp2/jspx/svgexample.html
-%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.html
-%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jpg
-%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jspx
-%%T%%/webapps/jsp-examples/jsp2/jspx/textRotate.jspx.html
-%%T%%/webapps/jsp-examples/jsp2/misc/EchoAttributesTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/misc/coda.jspf
-%%T%%/webapps/jsp-examples/jsp2/misc/coda.jspf.html
-%%T%%/webapps/jsp-examples/jsp2/misc/config.html
-%%T%%/webapps/jsp-examples/jsp2/misc/config.jsp
-%%T%%/webapps/jsp-examples/jsp2/misc/config.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.html
-%%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp
-%%T%%/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/misc/prelude.jspf
-%%T%%/webapps/jsp-examples/jsp2/misc/prelude.jspf.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/BookBean.java.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/FindBookSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/Functions.java.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/HelloWorldSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/RepeatSimpleTag.java.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/book.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/book.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/book.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/hello.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/hello.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/hello.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.html
-%%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.jsp
-%%T%%/webapps/jsp-examples/jsp2/simpletag/repeat.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/displayProducts.tag.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/hello.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/helloWorld.tag.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/panel.tag.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/products.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/products.jsp
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/products.jsp.html
-%%T%%/webapps/jsp-examples/jsp2/tagfiles/xhtmlbasic.tag.html
-%%T%%/webapps/jsp-examples/jsptoserv/hello.jsp
-%%T%%/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp
-%%T%%/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp.html
-%%T%%/webapps/jsp-examples/jsptoserv/jts.html
-%%T%%/webapps/jsp-examples/jsptoserv/servletToJsp.java.html
-%%T%%/webapps/jsp-examples/num/numguess.html
-%%T%%/webapps/jsp-examples/num/numguess.jsp
-%%T%%/webapps/jsp-examples/num/numguess.jsp.html
-%%T%%/webapps/jsp-examples/plugin/applet/Clock2.class
-%%T%%/webapps/jsp-examples/plugin/applet/Clock2.java
-%%T%%/webapps/jsp-examples/plugin/plugin.html
-%%T%%/webapps/jsp-examples/plugin/plugin.jsp
-%%T%%/webapps/jsp-examples/plugin/plugin.jsp.html
-%%T%%/webapps/jsp-examples/security/protected/error.jsp
-%%T%%/webapps/jsp-examples/security/protected/index.jsp
-%%T%%/webapps/jsp-examples/security/protected/login.jsp
-%%T%%/webapps/jsp-examples/sessions/DummyCart.html
-%%T%%/webapps/jsp-examples/sessions/carts.html
-%%T%%/webapps/jsp-examples/sessions/carts.jsp
-%%T%%/webapps/jsp-examples/sessions/carts.jsp.html
-%%T%%/webapps/jsp-examples/sessions/crt.html
-%%T%%/webapps/jsp-examples/simpletag/foo.html
-%%T%%/webapps/jsp-examples/simpletag/foo.jsp
-%%T%%/webapps/jsp-examples/simpletag/foo.jsp.html
-%%T%%/webapps/jsp-examples/snp/snoop.html
-%%T%%/webapps/jsp-examples/snp/snoop.jsp
-%%T%%/webapps/jsp-examples/snp/snoop.jsp.html
-%%T%%/webapps/jsp-examples/source.jsp
-%%T%%/webapps/jsp-examples/tagplugin/choose.html
-%%T%%/webapps/jsp-examples/tagplugin/choose.jsp
-%%T%%/webapps/jsp-examples/tagplugin/choose.jsp.html
-%%T%%/webapps/jsp-examples/tagplugin/foreach.html
-%%T%%/webapps/jsp-examples/tagplugin/foreach.jsp
-%%T%%/webapps/jsp-examples/tagplugin/foreach.jsp.html
-%%T%%/webapps/jsp-examples/tagplugin/howto.html
-%%T%%/webapps/jsp-examples/tagplugin/if.html
-%%T%%/webapps/jsp-examples/tagplugin/if.jsp
-%%T%%/webapps/jsp-examples/tagplugin/if.jsp.html
-%%T%%/webapps/jsp-examples/tagplugin/notes.html
-%%T%%/webapps/jsp-examples/xml/xml.html
-%%T%%/webapps/jsp-examples/xml/xml.jsp
-%%T%%/webapps/jsp-examples/xml/xml.jsp.html
-%%T%%/webapps/servlets-examples/WEB-INF/classes/CookieExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/CookieExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/LocalStrings.properties
-%%T%%/webapps/servlets-examples/WEB-INF/classes/LocalStrings_en.properties
-%%T%%/webapps/servlets-examples/WEB-INF/classes/LocalStrings_es.properties
-%%T%%/webapps/servlets-examples/WEB-INF/classes/LocalStrings_fr.properties
-%%T%%/webapps/servlets-examples/WEB-INF/classes/LocalStrings_pt.properties
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/SessionExample.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/SessionExample.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.java
-%%T%%/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.class
-%%T%%/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.java
-%%T%%/webapps/servlets-examples/WEB-INF/web.xml
-%%T%%/webapps/servlets-examples/cookies.html
-%%T%%/webapps/servlets-examples/helloworld.html
-%%T%%/webapps/servlets-examples/images/code.gif
-%%T%%/webapps/servlets-examples/images/execute.gif
-%%T%%/webapps/servlets-examples/images/return.gif
-%%T%%/webapps/servlets-examples/index.html
-%%T%%/webapps/servlets-examples/reqheaders.html
-%%T%%/webapps/servlets-examples/reqinfo.html
-%%T%%/webapps/servlets-examples/reqparams.html
-%%T%%/webapps/servlets-examples/sessions.html
-%%T%%/webapps/tomcat-docs/RELEASE-NOTES.txt
-%%T%%/webapps/tomcat-docs/WEB-INF/web.xml
-%%T%%/webapps/tomcat-docs/appdev/build.xml.txt
-%%T%%/webapps/tomcat-docs/appdev/deployment.html
-%%T%%/webapps/tomcat-docs/appdev/index.html
-%%T%%/webapps/tomcat-docs/appdev/installation.html
-%%T%%/webapps/tomcat-docs/appdev/introduction.html
-%%T%%/webapps/tomcat-docs/appdev/printer/build.xml.txt
-%%T%%/webapps/tomcat-docs/appdev/printer/deployment.html
-%%T%%/webapps/tomcat-docs/appdev/printer/index.html
-%%T%%/webapps/tomcat-docs/appdev/printer/installation.html
-%%T%%/webapps/tomcat-docs/appdev/printer/introduction.html
-%%T%%/webapps/tomcat-docs/appdev/printer/processes.html
-%%T%%/webapps/tomcat-docs/appdev/printer/source.html
-%%T%%/webapps/tomcat-docs/appdev/printer/web.xml.txt
-%%T%%/webapps/tomcat-docs/appdev/processes.html
-%%T%%/webapps/tomcat-docs/appdev/sample/build.xml
-%%T%%/webapps/tomcat-docs/appdev/sample/docs/README.txt
-%%T%%/webapps/tomcat-docs/appdev/sample/index.html
-%%T%%/webapps/tomcat-docs/appdev/sample/sample.war
-%%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java
-%%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF/web.xml
-%%T%%/webapps/tomcat-docs/appdev/sample/web/hello.jsp
-%%T%%/webapps/tomcat-docs/appdev/sample/web/images/tomcat.gif
-%%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
-%%T%%/webapps/tomcat-docs/appdev/source.html
-%%T%%/webapps/tomcat-docs/appdev/web.xml.txt
-%%T%%/webapps/tomcat-docs/apr.html
-%%T%%/webapps/tomcat-docs/architecture/index.html
-%%T%%/webapps/tomcat-docs/architecture/overview.html
-%%T%%/webapps/tomcat-docs/architecture/printer/index.html
-%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
-%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
-%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
-%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
-%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
-%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
-%%T%%/webapps/tomcat-docs/architecture/startup.html
-%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
-%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
-%%T%%/webapps/tomcat-docs/balancer-howto.html
-%%T%%/webapps/tomcat-docs/build.xml
-%%T%%/webapps/tomcat-docs/building.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/index.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-admin-apps.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-admin-objects.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-admin-opers.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-default.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-invoker.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-jdbc-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-jndi-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/fs-memory-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/index.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/mbean-names.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-apps.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-objects.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-opers.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-default.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-invoker.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jdbc-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jndi-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/fs-memory-realm.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/index.html
-%%T%%/webapps/tomcat-docs/catalina/funcspecs/printer/mbean-names.html
-%%T%%/webapps/tomcat-docs/cgi-howto.html
-%%T%%/webapps/tomcat-docs/changelog.html
-%%T%%/webapps/tomcat-docs/class-loader-howto.html
-%%T%%/webapps/tomcat-docs/cluster-howto.html
-%%T%%/webapps/tomcat-docs/config/ajp.html
-%%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/engine.html
-%%T%%/webapps/tomcat-docs/config/globalresources.html
-%%T%%/webapps/tomcat-docs/config/host.html
-%%T%%/webapps/tomcat-docs/config/http.html
-%%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/loader.html
-%%T%%/webapps/tomcat-docs/config/manager.html
-%%T%%/webapps/tomcat-docs/config/printer/ajp.html
-%%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/engine.html
-%%T%%/webapps/tomcat-docs/config/printer/globalresources.html
-%%T%%/webapps/tomcat-docs/config/printer/host.html
-%%T%%/webapps/tomcat-docs/config/printer/http.html
-%%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/loader.html
-%%T%%/webapps/tomcat-docs/config/printer/manager.html
-%%T%%/webapps/tomcat-docs/config/printer/realm.html
-%%T%%/webapps/tomcat-docs/config/printer/resources.html
-%%T%%/webapps/tomcat-docs/config/printer/server.html
-%%T%%/webapps/tomcat-docs/config/printer/service.html
-%%T%%/webapps/tomcat-docs/config/printer/valve.html
-%%T%%/webapps/tomcat-docs/config/realm.html
-%%T%%/webapps/tomcat-docs/config/resources.html
-%%T%%/webapps/tomcat-docs/config/server.html
-%%T%%/webapps/tomcat-docs/config/service.html
-%%T%%/webapps/tomcat-docs/config/valve.html
-%%T%%/webapps/tomcat-docs/connectors.html
-%%T%%/webapps/tomcat-docs/default-servlet.html
-%%T%%/webapps/tomcat-docs/deployer-howto.html
-%%T%%/webapps/tomcat-docs/developers.html
-%%T%%/webapps/tomcat-docs/html-manager-howto.html
-%%T%%/webapps/tomcat-docs/images/add.gif
-%%T%%/webapps/tomcat-docs/images/code.gif
-%%T%%/webapps/tomcat-docs/images/design.gif
-%%T%%/webapps/tomcat-docs/images/docs.gif
-%%T%%/webapps/tomcat-docs/images/fix.gif
-%%T%%/webapps/tomcat-docs/images/jakarta-logo.gif
-%%T%%/webapps/tomcat-docs/images/printer.gif
-%%T%%/webapps/tomcat-docs/images/tomcat.gif
-%%T%%/webapps/tomcat-docs/images/update.gif
-%%T%%/webapps/tomcat-docs/images/void.gif
-%%T%%/webapps/tomcat-docs/index.html
-%%T%%/webapps/tomcat-docs/introduction.html
-%%T%%/webapps/tomcat-docs/jasper-howto.html
-%%T%%/webapps/tomcat-docs/jasper/docs/api/index.html
-%%T%%/webapps/tomcat-docs/jndi-datasource-examples-howto.html
-%%T%%/webapps/tomcat-docs/jndi-resources-howto.html
-%%T%%/webapps/tomcat-docs/jspapi/allclasses-frame.html
-%%T%%/webapps/tomcat-docs/jspapi/allclasses-noframe.html
-%%T%%/webapps/tomcat-docs/jspapi/constant-values.html
-%%T%%/webapps/tomcat-docs/jspapi/deprecated-list.html
-%%T%%/webapps/tomcat-docs/jspapi/help-doc.html
-%%T%%/webapps/tomcat-docs/jspapi/index-all.html
-%%T%%/webapps/tomcat-docs/jspapi/index.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/ErrorData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/HttpJspPage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspContext.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspEngineInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspFactory.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspPage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspTagException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspWriter.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/PageContext.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/SkipPageException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/ErrorData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/HttpJspPage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspContext.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspEngineInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspFactory.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspPage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspTagException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspWriter.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/PageContext.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/SkipPageException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELParseException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/Expression.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ExpressionEvaluator.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/FunctionMapper.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/VariableResolver.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELParseException.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/Expression.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ExpressionEvaluator.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/FunctionMapper.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/VariableResolver.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-frame.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-summary.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-tree.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-use.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-frame.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-summary.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-tree.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-use.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyContent.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/DynamicAttributes.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/FunctionInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/IterationTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspFragment.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/PageData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/Tag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAdapter.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAttributeInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagExtraInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagFileInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryValidator.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagVariableInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TryCatchFinally.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/ValidationMessage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/VariableInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyContent.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/DynamicAttributes.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/FunctionInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/IterationTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspFragment.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/PageData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/Tag.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAdapter.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAttributeInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagData.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagExtraInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagFileInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryValidator.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagSupport.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagVariableInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TryCatchFinally.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/ValidationMessage.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/VariableInfo.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/VariableInfo-1.gif
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-frame.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-summary.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-tree.html
-%%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-use.html
-%%T%%/webapps/tomcat-docs/jspapi/overview-frame.html
-%%T%%/webapps/tomcat-docs/jspapi/overview-summary.html
-%%T%%/webapps/tomcat-docs/jspapi/overview-tree.html
-%%T%%/webapps/tomcat-docs/jspapi/package-list
-%%T%%/webapps/tomcat-docs/jspapi/packages.html
-%%T%%/webapps/tomcat-docs/jspapi/resources/inherit.gif
-%%T%%/webapps/tomcat-docs/jspapi/serialized-form.html
-%%T%%/webapps/tomcat-docs/jspapi/stylesheet.css
-%%T%%/webapps/tomcat-docs/logging.html
-%%T%%/webapps/tomcat-docs/manager-howto.html
-%%T%%/webapps/tomcat-docs/mbeans-descriptor-howto.html
-%%T%%/webapps/tomcat-docs/monitoring.html
-%%T%%/webapps/tomcat-docs/printer/apr.html
-%%T%%/webapps/tomcat-docs/printer/balancer-howto.html
-%%T%%/webapps/tomcat-docs/printer/building.html
-%%T%%/webapps/tomcat-docs/printer/cgi-howto.html
-%%T%%/webapps/tomcat-docs/printer/changelog.html
-%%T%%/webapps/tomcat-docs/printer/class-loader-howto.html
-%%T%%/webapps/tomcat-docs/printer/cluster-howto.html
-%%T%%/webapps/tomcat-docs/printer/connectors.html
-%%T%%/webapps/tomcat-docs/printer/default-servlet.html
-%%T%%/webapps/tomcat-docs/printer/deployer-howto.html
-%%T%%/webapps/tomcat-docs/printer/developers.html
-%%T%%/webapps/tomcat-docs/printer/html-manager-howto.html
-%%T%%/webapps/tomcat-docs/printer/index.html
-%%T%%/webapps/tomcat-docs/printer/introduction.html
-%%T%%/webapps/tomcat-docs/printer/jasper-howto.html
-%%T%%/webapps/tomcat-docs/printer/jndi-datasource-examples-howto.html
-%%T%%/webapps/tomcat-docs/printer/jndi-resources-howto.html
-%%T%%/webapps/tomcat-docs/printer/logging.html
-%%T%%/webapps/tomcat-docs/printer/manager-howto.html
-%%T%%/webapps/tomcat-docs/printer/mbeans-descriptor-howto.html
-%%T%%/webapps/tomcat-docs/printer/monitoring.html
-%%T%%/webapps/tomcat-docs/printer/proxy-howto.html
-%%T%%/webapps/tomcat-docs/printer/realm-howto.html
-%%T%%/webapps/tomcat-docs/printer/security-manager-howto.html
-%%T%%/webapps/tomcat-docs/printer/setup.html
-%%T%%/webapps/tomcat-docs/printer/ssi-howto.html
-%%T%%/webapps/tomcat-docs/printer/ssl-howto.html
-%%T%%/webapps/tomcat-docs/printer/status.html
-%%T%%/webapps/tomcat-docs/printer/windows-service-howto.html
-%%T%%/webapps/tomcat-docs/proxy-howto.html
-%%T%%/webapps/tomcat-docs/realm-howto.html
-%%T%%/webapps/tomcat-docs/security-manager-howto.html
-%%T%%/webapps/tomcat-docs/servletapi/allclasses-frame.html
-%%T%%/webapps/tomcat-docs/servletapi/allclasses-noframe.html
-%%T%%/webapps/tomcat-docs/servletapi/constant-values.html
-%%T%%/webapps/tomcat-docs/servletapi/deprecated-list.html
-%%T%%/webapps/tomcat-docs/servletapi/help-doc.html
-%%T%%/webapps/tomcat-docs/servletapi/index-all.html
-%%T%%/webapps/tomcat-docs/servletapi/index.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/Filter.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/FilterChain.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/FilterConfig.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/GenericServlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/RequestDispatcher.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/Servlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletConfig.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletContext.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletException.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletInputStream.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletOutputStream.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequest.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponse.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponseWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/SingleThreadModel.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/UnavailableException.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Filter.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterChain.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterConfig.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/GenericServlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/RequestDispatcher.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Servlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletConfig.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContext.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletException.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletInputStream.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletOutputStream.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequest.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestAttributeEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponse.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponseWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/SingleThreadModel.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use/UnavailableException.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/Cookie.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequest.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequestWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponse.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponseWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSession.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionActivationListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionContext.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpUtils.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/Cookie.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServlet.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequest.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequestWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponse.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponseWrapper.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSession.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionActivationListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionAttributeListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionContext.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionEvent.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionListener.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpUtils.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/package-frame.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/package-summary.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/package-tree.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/package-use.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/package-frame.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/package-summary.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/package-tree.html
-%%T%%/webapps/tomcat-docs/servletapi/javax/servlet/package-use.html
-%%T%%/webapps/tomcat-docs/servletapi/overview-frame.html
-%%T%%/webapps/tomcat-docs/servletapi/overview-summary.html
-%%T%%/webapps/tomcat-docs/servletapi/overview-tree.html
-%%T%%/webapps/tomcat-docs/servletapi/package-list
-%%T%%/webapps/tomcat-docs/servletapi/packages.html
-%%T%%/webapps/tomcat-docs/servletapi/resources/inherit.gif
-%%T%%/webapps/tomcat-docs/servletapi/serialized-form.html
-%%T%%/webapps/tomcat-docs/servletapi/stylesheet.css
-%%T%%/webapps/tomcat-docs/setup.html
-%%T%%/webapps/tomcat-docs/ssi-howto.html
-%%T%%/webapps/tomcat-docs/ssl-howto.html
-%%T%%/webapps/tomcat-docs/status.html
-%%T%%/webapps/tomcat-docs/windows-service-howto.html
-%%T%%/webapps/webdav/WEB-INF/web.xml
-%%T%%/webapps/webdav/index.html
-%%T%%/webapps/webdav/tomcat-power.gif
-%%T%%/webapps/webdav/tomcat.gif
-@exec mkdir %D/%%T%%/work || true
-@exec mkdir %D/%%T%%/webapps/balancer/images || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/common/endorsed ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
-@dirrm %%T%%/work
-@dirrm %%T%%/webapps/webdav/WEB-INF
-@dirrm %%T%%/webapps/webdav
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/class-use
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet
-@dirrm %%T%%/webapps/tomcat-docs/servletapi/javax
-@dirrm %%T%%/webapps/tomcat-docs/servletapi
-@dirrm %%T%%/webapps/tomcat-docs/printer
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/resources
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet/jsp
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax/servlet
-@dirrm %%T%%/webapps/tomcat-docs/jspapi/javax
-@dirrm %%T%%/webapps/tomcat-docs/jspapi
-@dirrm %%T%%/webapps/tomcat-docs/jasper/docs/api
-@dirrm %%T%%/webapps/tomcat-docs/jasper/docs
-@dirrm %%T%%/webapps/tomcat-docs/jasper
-@dirrm %%T%%/webapps/tomcat-docs/images
-@dirrm %%T%%/webapps/tomcat-docs/config/printer
-@dirrm %%T%%/webapps/tomcat-docs/config
-@dirrm %%T%%/webapps/tomcat-docs/catalina/funcspecs/printer
-@dirrm %%T%%/webapps/tomcat-docs/catalina/funcspecs
-@dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
-@dirrm %%T%%/webapps/tomcat-docs/catalina/docs
-@dirrm %%T%%/webapps/tomcat-docs/catalina
-@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
-@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
-@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
-@dirrm %%T%%/webapps/tomcat-docs/architecture
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/docs
-@dirrm %%T%%/webapps/tomcat-docs/appdev/sample
-@dirrm %%T%%/webapps/tomcat-docs/appdev/printer
-@dirrm %%T%%/webapps/tomcat-docs/appdev
-@dirrm %%T%%/webapps/tomcat-docs/WEB-INF
-@dirrm %%T%%/webapps/tomcat-docs
-@dirrm %%T%%/webapps/servlets-examples/images
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF/classes/util
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF/classes/listeners
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF/classes/filters
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF/classes/compressionFilters
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF/classes
-@dirrm %%T%%/webapps/servlets-examples/WEB-INF
-@dirrm %%T%%/webapps/servlets-examples
-@dirrm %%T%%/webapps/jsp-examples/xml
-@dirrm %%T%%/webapps/jsp-examples/tagplugin
-@dirrm %%T%%/webapps/jsp-examples/snp
-@dirrm %%T%%/webapps/jsp-examples/simpletag
-@dirrm %%T%%/webapps/jsp-examples/sessions
-@dirrm %%T%%/webapps/jsp-examples/security/protected
-@dirrm %%T%%/webapps/jsp-examples/security
-@dirrm %%T%%/webapps/jsp-examples/plugin/applet
-@dirrm %%T%%/webapps/jsp-examples/plugin
-@dirrm %%T%%/webapps/jsp-examples/num
-@dirrm %%T%%/webapps/jsp-examples/jsptoserv
-@dirrm %%T%%/webapps/jsp-examples/jsp2/tagfiles
-@dirrm %%T%%/webapps/jsp-examples/jsp2/simpletag
-@dirrm %%T%%/webapps/jsp-examples/jsp2/misc
-@dirrm %%T%%/webapps/jsp-examples/jsp2/jspx
-@dirrm %%T%%/webapps/jsp-examples/jsp2/jspattribute
-@dirrm %%T%%/webapps/jsp-examples/jsp2/el
-@dirrm %%T%%/webapps/jsp-examples/jsp2
-@dirrm %%T%%/webapps/jsp-examples/include
-@dirrm %%T%%/webapps/jsp-examples/images
-@dirrm %%T%%/webapps/jsp-examples/forward
-@dirrm %%T%%/webapps/jsp-examples/error
-@dirrm %%T%%/webapps/jsp-examples/dates
-@dirrm %%T%%/webapps/jsp-examples/colors
-@dirrm %%T%%/webapps/jsp-examples/checkbox
-@dirrm %%T%%/webapps/jsp-examples/cal
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/tags
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/lib
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/jsp2
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/jsp/applet
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/jsp
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/validators
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/util
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/sessions
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/snp
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/simpletag
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/sessions
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/plugin
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/num
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/dates
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/colors
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/checkbox
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/org
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/num
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/listeners
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2/examples
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/jsp2
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/filters
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/examples
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/error
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/dates
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/compressionFilters
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/colors
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/checkbox
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes/cal
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes
-@dirrm %%T%%/webapps/jsp-examples/WEB-INF
-@dirrm %%T%%/webapps/jsp-examples
-@dirrm %%T%%/webapps/balancer/images
-@dirrm %%T%%/webapps/balancer/WEB-INF/lib
-@dirrm %%T%%/webapps/balancer/WEB-INF/config
-@dirrm %%T%%/webapps/balancer/WEB-INF
-@dirrm %%T%%/webapps/balancer/META-INF
-@dirrm %%T%%/webapps/balancer
-@dirrm %%T%%/webapps/ROOT/admin
-@dirrm %%T%%/webapps/ROOT/WEB-INF/lib
-@dirrm %%T%%/webapps/ROOT/WEB-INF
-@dirrm %%T%%/webapps/ROOT
-@dirrm %%T%%/webapps
-@dirrm %%T%%/temp
-@dirrm %%T%%/shared/lib
-@dirrm %%T%%/shared/classes
-@dirrm %%T%%/shared
-@dirrm %%T%%/server/webapps/manager/images
-@dirrm %%T%%/server/webapps/manager/WEB-INF/lib
-@dirrm %%T%%/server/webapps/manager/WEB-INF
-@dirrm %%T%%/server/webapps/manager
-@dirrm %%T%%/server/webapps/host-manager/images
-@dirrm %%T%%/server/webapps/host-manager/WEB-INF/lib
-@dirrm %%T%%/server/webapps/host-manager/WEB-INF
-@dirrm %%T%%/server/webapps/host-manager
-@dirrm %%T%%/server/webapps
-@dirrm %%T%%/server/lib
-@dirrm %%T%%/server/classes
-@dirrm %%T%%/server
-@dirrm %%T%%/logs
-@dirrm %%T%%/conf/Catalina/localhost
-@dirrm %%T%%/conf/Catalina
-@dirrm %%T%%/conf
-@dirrm %%T%%/common/lib
-@dirrm %%T%%/common/i18n
-@dirrm %%T%%/common/endorsed
-@dirrm %%T%%/common/classes
-@dirrm %%T%%/common
-@dirrm %%T%%/bin
-@dirrm %%T%%
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index c5110f4b381d..db7b44a561c5 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.1.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
@@ -15,105 +15,81 @@ MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
-PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+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=${USER} WWWGRP=${GROUP}
+PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
 APP_TITLE=	Jakarta Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
-USER=		www
-GROUP=		www
+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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		conf/server.xml
+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} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
+	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@(cd ${WRKSRC} && ${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`)
+.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}
@@ -135,28 +111,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
-	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
@@ -167,7 +121,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
+	@${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..."
@@ -176,18 +131,11 @@ do-install:
 
 	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
-	@${CHOWN} ${USER}:${GROUP} ${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}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/tomcat55/pkg-deinstall b/www/tomcat41/files/pkg-deinstall.in
index 41ceb563a42e..801c1d94acb4 100644
--- a/www/tomcat55/pkg-deinstall
+++ b/www/tomcat41/files/pkg-deinstall.in
@@ -8,14 +8,16 @@
 # * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat55/Attic/pkg-deinstall,v 1.3 2005-09-29 15:08:23 hq Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/pkg-deinstall.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat5
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
 		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-		echo "To delete the %%USER%% user permanently, use 'pw userdel %%USER%%'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/jakarta-tomcat41/pkg-install b/www/tomcat41/files/pkg-install.in
index 687ec3fc1f9e..fafc80b49f39 100644
--- a/www/jakarta-tomcat41/pkg-install
+++ b/www/tomcat41/files/pkg-install.in
@@ -3,7 +3,7 @@
 # Checks if the 'www' user and group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/pkg-install.in,v 1.1 2006-02-07 08:50:08 lawrance Exp $
 #
 
 # Make sure we're called during the 'make install' process
@@ -12,10 +12,10 @@ if [ "$2" != "PRE-INSTALL" ]; then
 fi
 
 # Set some constants
-USER=www
-GROUP=${USER}
 UID=80
 GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
 
 # See if the group already exists
 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
diff --git a/www/tomcat41/files/tomcat41.sh.in b/www/tomcat41/files/tomcat41.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/tomcat41/files/tomcat41.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/tomcat41/pkg-plist b/www/tomcat41/pkg-plist
index 97610509ba7b..4168d64f9987 100644
--- a/www/tomcat41/pkg-plist
+++ b/www/tomcat41/pkg-plist
@@ -6,7 +6,6 @@
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
 bin/tomcat41ctl
-etc/rc.d/020.jakarta-tomcat41.sh
 %%T%%/LICENSE
 %%T%%/README.txt
 %%T%%/RELEASE-NOTES-4.1.txt
@@ -1488,7 +1487,7 @@ etc/rc.d/020.jakarta-tomcat41.sh
 @exec mkdir %D/%%T%%/shared/lib || true
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 0f57d1a27cd3..0ace200106e2 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-tomcat
+PORTNAME=	tomcat
 PORTVERSION=	5.5.12
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -19,57 +20,47 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	yes
-
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+USE_RC_SUBR=	tomcat55.sh
+SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
-APP_TITLE=	Jakarta Tomcat
+APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
 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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${WRKSRC}/conf/server.xml
+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_FILES=	tomcat.sh
-SUB_LIST=	TOMCAT_VERSION=${MAJOR_VER:S/.//} \
-		TOMCAT_HOME=${APP_HOME} \
-		USER=${TOMCAT_USER} \
+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} \
-		STDERR_LOG=${STDERR_LOG}
-
-REPLACE_FILES+=	${PKGDIR}/pkg-install \
-		${PKGDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+		TOMCAT_HOME=${APP_HOME} \
+		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
+		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
@@ -83,54 +74,23 @@ PLIST_SUB+=	JAVA14="@comment "
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${TOMCAT_GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${TOMCAT_USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+.for file in ${REPLACE_FILES}
+	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
+	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
@@ -158,27 +118,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/jakarta-tomcat${MAJOR_VER:S/.//}.sh
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${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}
@@ -189,7 +128,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}
+	@${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..."
@@ -204,11 +144,4 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${TOMCAT_GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 .include <bsd.port.post.mk>
diff --git a/www/tomcat41/pkg-deinstall b/www/tomcat55/files/pkg-deinstall.in
index 39c0a6381a8b..655ee46519d3 100644
--- a/www/tomcat41/pkg-deinstall
+++ b/www/tomcat55/files/pkg-deinstall.in
@@ -5,20 +5,22 @@
 # * Checks if the PID file exists. If it does, it kills the
 #   process and removes the PID file.
 #
-# * Checks if the 'www' user exists. If it does, then it displays
+# * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
 # $FreeBSD$
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat41.pid
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
+		echo -n ">> Killing Tomcat process (${PID})..."
 		/bin/kill ${PID} > /dev/null 2> /dev/null
 		if [ $? -eq 0 ]; then
 			echo " [ DONE ]"
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "www" 2>/dev/null 1>&2; then
-		echo "To delete the www user permanently, use 'pw userdel www'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/tomcat55/files/pkg-install.in b/www/tomcat55/files/pkg-install.in
new file mode 100644
index 000000000000..ddc5dfda878a
--- /dev/null
+++ b/www/tomcat55/files/pkg-install.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Checks if the '%%USER%%' user and '%%GROUP%%' group exist. If they don't, then
+# an attempt is made to create both.
+#
+# $FreeBSD$
+#
+
+# Make sure we're called during the 'make install' process
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
+# Set some constants
+UID=80
+GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
+
+# See if the group already exists
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw groupadd "${GROUP}" -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	elif pw groupadd "${GROUP}"; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+# See if the user already exists
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw useradd "${USER}" -u ${UID} -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	elif pw useradd "${USER}" -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/www/tomcat55/files/tomcat.sh.in b/www/tomcat55/files/tomcat.sh.in
deleted file mode 100644
index 0dca0cb4afbf..000000000000
--- a/www/tomcat55/files/tomcat.sh.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: jakarta-tomcat%%TOMCAT_VERSION%%
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Configuration settings for jakarta-tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable jakarta-tomcat%%TOMCAT_VERSION%%
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_flags (str):
-#   Set to "" by default.
-#   Extra flags passed to start command
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_HOME variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_BASE variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
-#   Set to "%%TOMCAT_HOME%%/temp" by default.
-#   Set the CATALINA_TMPDIR variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log (str)
-#   Set to "%%STDOUT_LOG%%" by default.
-#   Set the location for the Tomcat process log (standard output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log (str)
-#   Set to "%%STDERR_LOG%%" by default.
-#   Set the location for the Tomcat process log (error output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_home (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_version (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_os (str):
-#   Specify the requirements of the Java VM to use. See javavm(1).
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_classpath (str):
-#   Set to "" by default.
-#   Addtional classes to add to the CLASSPATH
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-
-jakarta_tomcat%%TOMCAT_VERSION%%_enable="${jakarta_tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_java_version="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_user="${jakarta_tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
-
-. %%RC_SUBR%%
-
-name="jakarta_tomcat%%TOMCAT_VERSION%%"
-rcvar=`set_rcvar`
-
-load_rc_config "${name}"
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
-	export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
-	export JAVA_VERSION="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
-	export JAVA_VENDOR="${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
-	export JAVA_OS="${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}"
-fi
-
-java_command="%%LOCALBASE%%/bin/java \
-	${jakarta_tomcat%%TOMCAT_VERSION%%_java_opts} \
-	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-	-classpath %%TOMCAT_HOME%%/bin/bootstrap.jar:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${jakarta_tomcat%%TOMCAT_VERSION%%_classpath} \
-	-Dcatalina.base=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base} \
-	-Dcatalina.home=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home} \
-	-Djava.io.tmpdir=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
-	org.apache.catalina.startup.Bootstrap"
-
-log_args=">> ${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log} \
-	2>> ${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log} "
-
-procname="java"
-required_files="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
-
-command="/usr/sbin/daemon"
-flags="${command} ${java_command} start ${jakarta_tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
-
-stop_cmd="jakarta_tomcat%%TOMCAT_VERSION%%_stop"
-
-jakarta_tomcat%%TOMCAT_VERSION%%_stop() {
-	echo "Stopping ${name}."
-	${java_command} stop
-	wait_for_pids
-}
-
-run_rc_command "$1"
diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/tomcat55/files/tomcat55.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/tomcat55/pkg-descr b/www/tomcat55/pkg-descr
index d489e8c5428b..a22d29893303 100644
--- a/www/tomcat55/pkg-descr
+++ b/www/tomcat55/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Tomcat is a web server written in 100% Pure Java.
+Apache Tomcat is a web server written in 100% Pure Java.
 
 Tomcat 5.x is the current release of Tomcat, 
 and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases. 
diff --git a/www/tomcat55/pkg-install b/www/tomcat55/pkg-install
deleted file mode 100644
index 9ba5ce4c17eb..000000000000
--- a/www/tomcat55/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Checks if the '%%USER%%' user and %%GROUP%% group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat55/Attic/pkg-install,v 1.3 2005-09-29 15:08:23 hq Exp $
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-UID=80
-GID=${UID}
-
-# See if the group already exists
-if ! pw groupshow "%%GROUP%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd "%%GROUP%%" -g ${GID}; then
-		echo "Added group \"%%GROUP%%\"."
-	elif pw groupadd "%%GROUP%%"; then
-		echo "Added group \"%%GROUP%%\"."
-	else
-		echo "Adding group \"%%GROUP%%\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd "%%USER%%" -u ${UID} -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	elif pw useradd "%%USER%%" -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	else
-		echo "Adding user \"%%USER%%\" failed..."
-		exit 1
-	fi
-fi
-exit 0
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index 94e996564dae..bf6ed0a24ed7 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -9,8 +9,6 @@
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi
-bin/tomcat55ctl
-etc/rc.d/jakarta-tomcat55.sh
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -843,7 +841,7 @@ etc/rc.d/jakarta-tomcat55.sh
 @exec mkdir %D/%%T%%/shared/classes || true
 @exec mkdir %D/%%T%%/server/classes || true
 @exec mkdir %D/%%T%%/common/endorsed ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 0f57d1a27cd3..0ace200106e2 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-tomcat
+PORTNAME=	tomcat
 PORTVERSION=	5.5.12
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -19,57 +20,47 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	yes
-
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+USE_RC_SUBR=	tomcat55.sh
+SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
-APP_TITLE=	Jakarta Tomcat
+APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
 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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${WRKSRC}/conf/server.xml
+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_FILES=	tomcat.sh
-SUB_LIST=	TOMCAT_VERSION=${MAJOR_VER:S/.//} \
-		TOMCAT_HOME=${APP_HOME} \
-		USER=${TOMCAT_USER} \
+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} \
-		STDERR_LOG=${STDERR_LOG}
-
-REPLACE_FILES+=	${PKGDIR}/pkg-install \
-		${PKGDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+		TOMCAT_HOME=${APP_HOME} \
+		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
+		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
@@ -83,54 +74,23 @@ PLIST_SUB+=	JAVA14="@comment "
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${TOMCAT_GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${TOMCAT_USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+.for file in ${REPLACE_FILES}
+	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
+	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
@@ -158,27 +118,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/jakarta-tomcat${MAJOR_VER:S/.//}.sh
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${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}
@@ -189,7 +128,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}
+	@${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..."
@@ -204,11 +144,4 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${TOMCAT_GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 .include <bsd.port.post.mk>
diff --git a/www/jakarta-tomcat4/pkg-deinstall b/www/tomcat6/files/pkg-deinstall.in
index d1b05d4e055b..655ee46519d3 100644
--- a/www/jakarta-tomcat4/pkg-deinstall
+++ b/www/tomcat6/files/pkg-deinstall.in
@@ -5,20 +5,22 @@
 # * Checks if the PID file exists. If it does, it kills the
 #   process and removes the PID file.
 #
-# * Checks if the 'www' user exists. If it does, then it displays
+# * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
 # $FreeBSD$
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat4.pid
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
+		echo -n ">> Killing Tomcat process (${PID})..."
 		/bin/kill ${PID} > /dev/null 2> /dev/null
 		if [ $? -eq 0 ]; then
 			echo " [ DONE ]"
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "www" 2>/dev/null 1>&2; then
-		echo "To delete the www user permanently, use 'pw userdel www'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/tomcat6/files/pkg-install.in b/www/tomcat6/files/pkg-install.in
new file mode 100644
index 000000000000..ddc5dfda878a
--- /dev/null
+++ b/www/tomcat6/files/pkg-install.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Checks if the '%%USER%%' user and '%%GROUP%%' group exist. If they don't, then
+# an attempt is made to create both.
+#
+# $FreeBSD$
+#
+
+# Make sure we're called during the 'make install' process
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
+# Set some constants
+UID=80
+GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
+
+# See if the group already exists
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw groupadd "${GROUP}" -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	elif pw groupadd "${GROUP}"; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+# See if the user already exists
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw useradd "${USER}" -u ${UID} -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	elif pw useradd "${USER}" -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/www/tomcat6/files/tomcat.sh.in b/www/tomcat6/files/tomcat.sh.in
deleted file mode 100644
index 0dca0cb4afbf..000000000000
--- a/www/tomcat6/files/tomcat.sh.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: jakarta-tomcat%%TOMCAT_VERSION%%
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Configuration settings for jakarta-tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable jakarta-tomcat%%TOMCAT_VERSION%%
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_flags (str):
-#   Set to "" by default.
-#   Extra flags passed to start command
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_HOME variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_BASE variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
-#   Set to "%%TOMCAT_HOME%%/temp" by default.
-#   Set the CATALINA_TMPDIR variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log (str)
-#   Set to "%%STDOUT_LOG%%" by default.
-#   Set the location for the Tomcat process log (standard output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log (str)
-#   Set to "%%STDERR_LOG%%" by default.
-#   Set the location for the Tomcat process log (error output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_home (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_version (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_os (str):
-#   Specify the requirements of the Java VM to use. See javavm(1).
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_classpath (str):
-#   Set to "" by default.
-#   Addtional classes to add to the CLASSPATH
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-
-jakarta_tomcat%%TOMCAT_VERSION%%_enable="${jakarta_tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_java_version="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_user="${jakarta_tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
-
-. %%RC_SUBR%%
-
-name="jakarta_tomcat%%TOMCAT_VERSION%%"
-rcvar=`set_rcvar`
-
-load_rc_config "${name}"
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
-	export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
-	export JAVA_VERSION="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
-	export JAVA_VENDOR="${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
-	export JAVA_OS="${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}"
-fi
-
-java_command="%%LOCALBASE%%/bin/java \
-	${jakarta_tomcat%%TOMCAT_VERSION%%_java_opts} \
-	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-	-classpath %%TOMCAT_HOME%%/bin/bootstrap.jar:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${jakarta_tomcat%%TOMCAT_VERSION%%_classpath} \
-	-Dcatalina.base=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base} \
-	-Dcatalina.home=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home} \
-	-Djava.io.tmpdir=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
-	org.apache.catalina.startup.Bootstrap"
-
-log_args=">> ${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log} \
-	2>> ${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log} "
-
-procname="java"
-required_files="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
-
-command="/usr/sbin/daemon"
-flags="${command} ${java_command} start ${jakarta_tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
-
-stop_cmd="jakarta_tomcat%%TOMCAT_VERSION%%_stop"
-
-jakarta_tomcat%%TOMCAT_VERSION%%_stop() {
-	echo "Stopping ${name}."
-	${java_command} stop
-	wait_for_pids
-}
-
-run_rc_command "$1"
diff --git a/www/tomcat6/files/tomcat55.sh.in b/www/tomcat6/files/tomcat55.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/tomcat6/files/tomcat55.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/tomcat6/pkg-descr b/www/tomcat6/pkg-descr
index d489e8c5428b..a22d29893303 100644
--- a/www/tomcat6/pkg-descr
+++ b/www/tomcat6/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Tomcat is a web server written in 100% Pure Java.
+Apache Tomcat is a web server written in 100% Pure Java.
 
 Tomcat 5.x is the current release of Tomcat, 
 and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases. 
diff --git a/www/tomcat6/pkg-install b/www/tomcat6/pkg-install
deleted file mode 100644
index 76202c932ca3..000000000000
--- a/www/tomcat6/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Checks if the '%%USER%%' user and %%GROUP%% group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat6/Attic/pkg-install,v 1.3 2005-09-29 15:08:23 hq Exp $
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-UID=80
-GID=${UID}
-
-# See if the group already exists
-if ! pw groupshow "%%GROUP%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd "%%GROUP%%" -g ${GID}; then
-		echo "Added group \"%%GROUP%%\"."
-	elif pw groupadd "%%GROUP%%"; then
-		echo "Added group \"%%GROUP%%\"."
-	else
-		echo "Adding group \"%%GROUP%%\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd "%%USER%%" -u ${UID} -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	elif pw useradd "%%USER%%" -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	else
-		echo "Adding user \"%%USER%%\" failed..."
-		exit 1
-	fi
-fi
-exit 0
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 94e996564dae..bf6ed0a24ed7 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -9,8 +9,6 @@
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi
-bin/tomcat55ctl
-etc/rc.d/jakarta-tomcat55.sh
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -843,7 +841,7 @@ etc/rc.d/jakarta-tomcat55.sh
 @exec mkdir %D/%%T%%/shared/classes || true
 @exec mkdir %D/%%T%%/server/classes || true
 @exec mkdir %D/%%T%%/common/endorsed ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 0f57d1a27cd3..0ace200106e2 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-tomcat
+PORTNAME=	tomcat
 PORTVERSION=	5.5.12
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -19,57 +20,47 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	yes
-
-.if !defined(NOPORTDOCS)
-MAN1=	${CONTROL_SCRIPT_NAME}.1
-.endif
+USE_RC_SUBR=	tomcat55.sh
+SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
-APP_TITLE=	Jakarta Tomcat
+APP_TITLE=	Apache Tomcat
 APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER?=	020
-STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
 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
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
-		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
-		${WRKSRC}/conf/server.xml
+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_FILES=	tomcat.sh
-SUB_LIST=	TOMCAT_VERSION=${MAJOR_VER:S/.//} \
-		TOMCAT_HOME=${APP_HOME} \
-		USER=${TOMCAT_USER} \
+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} \
-		STDERR_LOG=${STDERR_LOG}
-
-REPLACE_FILES+=	${PKGDIR}/pkg-install \
-		${PKGDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+		TOMCAT_HOME=${APP_HOME} \
+		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
+		USER=${TOMCAT_USER}
 
 .include <bsd.port.pre.mk>
 
@@ -83,54 +74,23 @@ PLIST_SUB+=	JAVA14="@comment "
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
 	@${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}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
 
 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 f in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
-	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
-	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
-	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
-	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-	-e "/%%GROUP%%/s//${TOMCAT_GROUP}/g" \
-	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
-	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
-	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
-	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
-	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
-	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
-	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
-	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
-	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
-	-e "/%%USER%%/s//${TOMCAT_USER}/g" \
-	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+.for file in ${REPLACE_FILES}
+	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
+	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
@@ -158,27 +118,6 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Compiling and installing control program..."
-	@${SED} \
-	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
-	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
-	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
-	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
-	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${CONTROL_SCRIPT}
-	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing startup script..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/jakarta-tomcat${MAJOR_VER:S/.//}.sh
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing man pages..."
-	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-
 	@${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}
@@ -189,7 +128,8 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}
+	@${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..."
@@ -204,11 +144,4 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${TOMCAT_GROUP}."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
-.endif
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
 .include <bsd.port.post.mk>
diff --git a/www/jakarta-tomcat41/pkg-deinstall b/www/tomcat7/files/pkg-deinstall.in
index 39c0a6381a8b..655ee46519d3 100644
--- a/www/jakarta-tomcat41/pkg-deinstall
+++ b/www/tomcat7/files/pkg-deinstall.in
@@ -5,20 +5,22 @@
 # * Checks if the PID file exists. If it does, it kills the
 #   process and removes the PID file.
 #
-# * Checks if the 'www' user exists. If it does, then it displays
+# * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
 # $FreeBSD$
 #
 
+USER=%%USER%%
+PID_FILE=%%PID_FILE%%
+
 # Make sure we're in the right stage of the process
 if [ "$2" = "DEINSTALL" ]; then
 
 	# Kill the process if it is still running
-	PID_FILE=/var/run/tomcat41.pid
 	if [ -s ${PID_FILE} ]; then
 		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
+		echo -n ">> Killing Tomcat process (${PID})..."
 		/bin/kill ${PID} > /dev/null 2> /dev/null
 		if [ $? -eq 0 ]; then
 			echo " [ DONE ]"
@@ -37,8 +39,8 @@ fi
 
 if [ "$2" = "POST-DEINSTALL" ]; then
 	# If the user exists, then display a message
-	if pw usershow "www" 2>/dev/null 1>&2; then
-		echo "To delete the www user permanently, use 'pw userdel www'"
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+		echo "To delete the ${USER} user permanently, use 'pw userdel ${USER}'"
 	fi
 fi
 
diff --git a/www/tomcat7/files/pkg-install.in b/www/tomcat7/files/pkg-install.in
new file mode 100644
index 000000000000..ddc5dfda878a
--- /dev/null
+++ b/www/tomcat7/files/pkg-install.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Checks if the '%%USER%%' user and '%%GROUP%%' group exist. If they don't, then
+# an attempt is made to create both.
+#
+# $FreeBSD$
+#
+
+# Make sure we're called during the 'make install' process
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
+# Set some constants
+UID=80
+GID=${UID}
+USER=%%USER%%
+GROUP=%%GROUP%%
+
+# See if the group already exists
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw groupadd "${GROUP}" -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	elif pw groupadd "${GROUP}"; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+# See if the user already exists
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+
+	# If not, try to create it
+	if pw useradd "${USER}" -u ${UID} -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	elif pw useradd "${USER}" -g "${GROUP}" -h - \
+                -s "/sbin/nologin" -d "/nonexistent" \
+                -c "World Wide Web Owner";
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/www/tomcat7/files/tomcat.sh.in b/www/tomcat7/files/tomcat.sh.in
deleted file mode 100644
index 0dca0cb4afbf..000000000000
--- a/www/tomcat7/files/tomcat.sh.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: jakarta-tomcat%%TOMCAT_VERSION%%
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Configuration settings for jakarta-tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable jakarta-tomcat%%TOMCAT_VERSION%%
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_flags (str):
-#   Set to "" by default.
-#   Extra flags passed to start command
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_HOME variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base (str)
-#   Set to "%%TOMCAT_HOME%%" by default.
-#   Set the CATALINA_BASE variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir (str)
-#   Set to "%%TOMCAT_HOME%%/temp" by default.
-#   Set the CATALINA_TMPDIR variable for the Tomcat process
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log (str)
-#   Set to "%%STDOUT_LOG%%" by default.
-#   Set the location for the Tomcat process log (standard output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log (str)
-#   Set to "%%STDERR_LOG%%" by default.
-#   Set the location for the Tomcat process log (error output)
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_home (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_version (str):
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_os (str):
-#   Specify the requirements of the Java VM to use. See javavm(1).
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_classpath (str):
-#   Set to "" by default.
-#   Addtional classes to add to the CLASSPATH
-#
-# jakarta_tomcat%%TOMCAT_VERSION%%_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-
-jakarta_tomcat%%TOMCAT_VERSION%%_enable="${jakarta_tomcat%%TOMCAT_VERSION%%_enable:-"NO"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_java_version="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_user="${jakarta_tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir:-"%%TOMCAT_HOME%%/temp"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log:-"%%STDOUT_LOG%%"}"
-jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log:-"%%STDERR_LOG%%"}"
-
-. %%RC_SUBR%%
-
-name="jakarta_tomcat%%TOMCAT_VERSION%%"
-rcvar=`set_rcvar`
-
-load_rc_config "${name}"
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then
-	export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}" ] ; then
-	export JAVA_VERSION="${jakarta_tomcat%%TOMCAT_VERSION%%_java_version}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}" ] ; then
-	export JAVA_VENDOR="${jakarta_tomcat%%TOMCAT_VERSION%%_java_vendor}"
-fi
-
-if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}" ] ; then
-	export JAVA_OS="${jakarta_tomcat%%TOMCAT_VERSION%%_java_os}"
-fi
-
-java_command="%%LOCALBASE%%/bin/java \
-	${jakarta_tomcat%%TOMCAT_VERSION%%_java_opts} \
-	-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
-	-classpath %%TOMCAT_HOME%%/bin/bootstrap.jar:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${jakarta_tomcat%%TOMCAT_VERSION%%_classpath} \
-	-Dcatalina.base=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_base} \
-	-Dcatalina.home=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home} \
-	-Djava.io.tmpdir=${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
-	org.apache.catalina.startup.Bootstrap"
-
-log_args=">> ${jakarta_tomcat%%TOMCAT_VERSION%%_stdout_log} \
-	2>> ${jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log} "
-
-procname="java"
-required_files="${jakarta_tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
-
-command="/usr/sbin/daemon"
-flags="${command} ${java_command} start ${jakarta_tomcat%%TOMCAT_VERSION%%_flags} ${log_args}"
-
-stop_cmd="jakarta_tomcat%%TOMCAT_VERSION%%_stop"
-
-jakarta_tomcat%%TOMCAT_VERSION%%_stop() {
-	echo "Stopping ${name}."
-	${java_command} stop
-	wait_for_pids
-}
-
-run_rc_command "$1"
diff --git a/www/tomcat7/files/tomcat55.sh.in b/www/tomcat7/files/tomcat55.sh.in
new file mode 100644
index 000000000000..dac2e79731df
--- /dev/null
+++ b/www/tomcat7/files/tomcat55.sh.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tomcat%%TOMCAT_VERSION%%
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD 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} "
+
+procname="*java"
+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}"
+
+stop_cmd="tomcat%%TOMCAT_VERSION%%_stop"
+
+tomcat%%TOMCAT_VERSION%%_stop() {
+	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"
diff --git a/www/tomcat7/pkg-descr b/www/tomcat7/pkg-descr
index d489e8c5428b..a22d29893303 100644
--- a/www/tomcat7/pkg-descr
+++ b/www/tomcat7/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Tomcat is a web server written in 100% Pure Java.
+Apache Tomcat is a web server written in 100% Pure Java.
 
 Tomcat 5.x is the current release of Tomcat, 
 and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases. 
diff --git a/www/tomcat7/pkg-install b/www/tomcat7/pkg-install
deleted file mode 100644
index e0e3cbb484b7..000000000000
--- a/www/tomcat7/pkg-install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Checks if the '%%USER%%' user and %%GROUP%% group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD: /tmp/pcvs/ports/www/tomcat7/Attic/pkg-install,v 1.3 2005-09-29 15:08:23 hq Exp $
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-UID=80
-GID=${UID}
-
-# See if the group already exists
-if ! pw groupshow "%%GROUP%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd "%%GROUP%%" -g ${GID}; then
-		echo "Added group \"%%GROUP%%\"."
-	elif pw groupadd "%%GROUP%%"; then
-		echo "Added group \"%%GROUP%%\"."
-	else
-		echo "Adding group \"%%GROUP%%\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "%%USER%%" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd "%%USER%%" -u ${UID} -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	elif pw useradd "%%USER%%" -g "%%GROUP%%" -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "World Wide Web Owner";
-	then
-		echo "Added user \"%%USER%%\"."
-	else
-		echo "Adding user \"%%USER%%\" failed..."
-		exit 1
-	fi
-fi
-exit 0
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 94e996564dae..bf6ed0a24ed7 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -9,8 +9,6 @@
 @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
 @unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi
-bin/tomcat55ctl
-etc/rc.d/jakarta-tomcat55.sh
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -843,7 +841,7 @@ etc/rc.d/jakarta-tomcat55.sh
 @exec mkdir %D/%%T%%/shared/classes || true
 @exec mkdir %D/%%T%%/server/classes || true
 @exec mkdir %D/%%T%%/common/endorsed ||true
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav