- Update to 5.0.30 [1]

- Use MAN1 in Makefile [1]
- Back up config files during deinstall [2]
- Fix pkg_add warnings [1]
- Add $FreeBSD$ tags where missing
- Use ECHO_MSG rather than ECHO_CMD

PR:		75152 [1], 43565 [2]
Submitted by:	maintainer [1], Brent Verner <brent@rcfile.org> [2]

20 files changed, 555 insertions, 405 deletions

diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 89cabd0e1783..558dbc72ac4c 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.29
+PORTVERSION=	5.0.30
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
+.if !defined(NOPORTDOCS)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 MAJOR_VER=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,33 +54,35 @@ JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
+CONF_EXT=	sample
+PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	@${ECHO_CMD} "Installation settings:"
-	@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
-	@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
+	@${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} "   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_CMD} -n ">> Removing unneeded files..."
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .for f in ${REPLACE_FILES}
-	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
+	@${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" \
@@ -104,25 +110,31 @@ post-patch:
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 do-install:
-	@${ECHO_CMD} -n ">> Creating destination directory..."
+	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Backing up configuration files..."
-	@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Copying files to destination directory..."
+	@${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}
-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Compiling and installing control program..."
+	@${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" \
@@ -131,47 +143,47 @@ do-install:
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Installing startup script..."
+	@${ECHO_MSG} -n ">> Installing startup script..."
 	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing man pages..."
+	@${ECHO_MSG} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-	@${ECHO_CMD} -n ">> Creating log files..."
+	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing ownership settings..."
+	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
+	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating PID file..."
+	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
 	@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
 	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
-	@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+	@${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_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
 .endif
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
diff --git a/www/jakarta-tomcat5/distinfo b/www/jakarta-tomcat5/distinfo
index d86712fec515..835ca13d6cb5 100644
--- a/www/jakarta-tomcat5/distinfo
+++ b/www/jakarta-tomcat5/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
diff --git a/www/jakarta-tomcat5/files/patch-conf::server.xml b/www/jakarta-tomcat5/files/patch-conf::server.xml
index f5e763bfcb0f..be8fa8a14884 100644
--- a/www/jakarta-tomcat5/files/patch-conf::server.xml
+++ b/www/jakarta-tomcat5/files/patch-conf::server.xml
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- conf/server.xml.orig	Sat Aug  9 14:51:53 2003
 +++ conf/server.xml	Sat Aug  9 14:57:48 2003
 @@ -10,7 +10,7 @@
diff --git a/www/jakarta-tomcat5/pkg-plist b/www/jakarta-tomcat5/pkg-plist
index b991ce115169..321922a70f83 100644
--- a/www/jakarta-tomcat5/pkg-plist
+++ b/www/jakarta-tomcat5/pkg-plist
@@ -1,19 +1,14 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties 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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -28,6 +23,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
 %%T%%/bin/digest.sh
 %%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
@@ -57,16 +55,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties.%%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%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
@@ -833,8 +831,11 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +852,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1445,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1748,22 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/webdav/tomcat.gif
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@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%%/
-@unexec rm -Rf %%T%%/conf.orig
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -2006,5 +2019,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
 @dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
 @dirrm %%T%%/bin
 @dirrm %%T%%
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 89cabd0e1783..558dbc72ac4c 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.29
+PORTVERSION=	5.0.30
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
+.if !defined(NOPORTDOCS)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 MAJOR_VER=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,33 +54,35 @@ JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
+CONF_EXT=	sample
+PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	@${ECHO_CMD} "Installation settings:"
-	@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
-	@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
+	@${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} "   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_CMD} -n ">> Removing unneeded files..."
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .for f in ${REPLACE_FILES}
-	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
+	@${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" \
@@ -104,25 +110,31 @@ post-patch:
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 do-install:
-	@${ECHO_CMD} -n ">> Creating destination directory..."
+	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Backing up configuration files..."
-	@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Copying files to destination directory..."
+	@${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}
-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Compiling and installing control program..."
+	@${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" \
@@ -131,47 +143,47 @@ do-install:
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Installing startup script..."
+	@${ECHO_MSG} -n ">> Installing startup script..."
 	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing man pages..."
+	@${ECHO_MSG} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-	@${ECHO_CMD} -n ">> Creating log files..."
+	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing ownership settings..."
+	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
+	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating PID file..."
+	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
 	@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
 	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
-	@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+	@${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_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
 .endif
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
diff --git a/www/jakarta-tomcat55/distinfo b/www/jakarta-tomcat55/distinfo
index d86712fec515..835ca13d6cb5 100644
--- a/www/jakarta-tomcat55/distinfo
+++ b/www/jakarta-tomcat55/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
diff --git a/www/jakarta-tomcat55/files/patch-conf::server.xml b/www/jakarta-tomcat55/files/patch-conf::server.xml
index f5e763bfcb0f..be8fa8a14884 100644
--- a/www/jakarta-tomcat55/files/patch-conf::server.xml
+++ b/www/jakarta-tomcat55/files/patch-conf::server.xml
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- conf/server.xml.orig	Sat Aug  9 14:51:53 2003
 +++ conf/server.xml	Sat Aug  9 14:57:48 2003
 @@ -10,7 +10,7 @@
diff --git a/www/jakarta-tomcat55/pkg-plist b/www/jakarta-tomcat55/pkg-plist
index b991ce115169..321922a70f83 100644
--- a/www/jakarta-tomcat55/pkg-plist
+++ b/www/jakarta-tomcat55/pkg-plist
@@ -1,19 +1,14 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties 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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -28,6 +23,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
 %%T%%/bin/digest.sh
 %%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
@@ -57,16 +55,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties.%%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%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
@@ -833,8 +831,11 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +852,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1445,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1748,22 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/webdav/tomcat.gif
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@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%%/
-@unexec rm -Rf %%T%%/conf.orig
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -2006,5 +2019,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
 @dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
 @dirrm %%T%%/bin
 @dirrm %%T%%
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 89cabd0e1783..558dbc72ac4c 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.29
+PORTVERSION=	5.0.30
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
+.if !defined(NOPORTDOCS)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 MAJOR_VER=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,33 +54,35 @@ JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
+CONF_EXT=	sample
+PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	@${ECHO_CMD} "Installation settings:"
-	@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
-	@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
+	@${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} "   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_CMD} -n ">> Removing unneeded files..."
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .for f in ${REPLACE_FILES}
-	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
+	@${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" \
@@ -104,25 +110,31 @@ post-patch:
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 do-install:
-	@${ECHO_CMD} -n ">> Creating destination directory..."
+	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Backing up configuration files..."
-	@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Copying files to destination directory..."
+	@${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}
-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Compiling and installing control program..."
+	@${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" \
@@ -131,47 +143,47 @@ do-install:
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Installing startup script..."
+	@${ECHO_MSG} -n ">> Installing startup script..."
 	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing man pages..."
+	@${ECHO_MSG} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-	@${ECHO_CMD} -n ">> Creating log files..."
+	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing ownership settings..."
+	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
+	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating PID file..."
+	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
 	@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
 	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
-	@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+	@${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_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
 .endif
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
diff --git a/www/tomcat55/distinfo b/www/tomcat55/distinfo
index d86712fec515..835ca13d6cb5 100644
--- a/www/tomcat55/distinfo
+++ b/www/tomcat55/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
diff --git a/www/tomcat55/files/patch-conf::server.xml b/www/tomcat55/files/patch-conf::server.xml
index f5e763bfcb0f..be8fa8a14884 100644
--- a/www/tomcat55/files/patch-conf::server.xml
+++ b/www/tomcat55/files/patch-conf::server.xml
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- conf/server.xml.orig	Sat Aug  9 14:51:53 2003
 +++ conf/server.xml	Sat Aug  9 14:57:48 2003
 @@ -10,7 +10,7 @@
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index b991ce115169..321922a70f83 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -1,19 +1,14 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties 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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -28,6 +23,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
 %%T%%/bin/digest.sh
 %%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
@@ -57,16 +55,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties.%%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%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
@@ -833,8 +831,11 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +852,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1445,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1748,22 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/webdav/tomcat.gif
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@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%%/
-@unexec rm -Rf %%T%%/conf.orig
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -2006,5 +2019,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
 @dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
 @dirrm %%T%%/bin
 @dirrm %%T%%
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 89cabd0e1783..558dbc72ac4c 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.29
+PORTVERSION=	5.0.30
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
+.if !defined(NOPORTDOCS)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 MAJOR_VER=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,33 +54,35 @@ JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
+CONF_EXT=	sample
+PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	@${ECHO_CMD} "Installation settings:"
-	@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
-	@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
+	@${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} "   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_CMD} -n ">> Removing unneeded files..."
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .for f in ${REPLACE_FILES}
-	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
+	@${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" \
@@ -104,25 +110,31 @@ post-patch:
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 do-install:
-	@${ECHO_CMD} -n ">> Creating destination directory..."
+	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Backing up configuration files..."
-	@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Copying files to destination directory..."
+	@${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}
-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Compiling and installing control program..."
+	@${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" \
@@ -131,47 +143,47 @@ do-install:
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Installing startup script..."
+	@${ECHO_MSG} -n ">> Installing startup script..."
 	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing man pages..."
+	@${ECHO_MSG} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-	@${ECHO_CMD} -n ">> Creating log files..."
+	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing ownership settings..."
+	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
+	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating PID file..."
+	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
 	@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
 	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
-	@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+	@${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_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
 .endif
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index d86712fec515..835ca13d6cb5 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
diff --git a/www/tomcat6/files/patch-conf::server.xml b/www/tomcat6/files/patch-conf::server.xml
index f5e763bfcb0f..be8fa8a14884 100644
--- a/www/tomcat6/files/patch-conf::server.xml
+++ b/www/tomcat6/files/patch-conf::server.xml
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- conf/server.xml.orig	Sat Aug  9 14:51:53 2003
 +++ conf/server.xml	Sat Aug  9 14:57:48 2003
 @@ -10,7 +10,7 @@
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index b991ce115169..321922a70f83 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -1,19 +1,14 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties 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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -28,6 +23,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
 %%T%%/bin/digest.sh
 %%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
@@ -57,16 +55,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties.%%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%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
@@ -833,8 +831,11 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +852,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1445,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1748,22 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/webdav/tomcat.gif
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@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%%/
-@unexec rm -Rf %%T%%/conf.orig
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -2006,5 +2019,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
 @dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
 @dirrm %%T%%/bin
 @dirrm %%T%%
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 89cabd0e1783..558dbc72ac4c 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.29
+PORTVERSION=	5.0.30
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 
+.if !defined(NOPORTDOCS)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 MAJOR_VER=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,33 +54,35 @@ JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
+CONF_EXT=	sample
+PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	@${ECHO_CMD} "Installation settings:"
-	@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
-	@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
-	@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
-	@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
-	@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
+	@${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} "   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_CMD} -n ">> Removing unneeded files..."
+	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .for f in ${REPLACE_FILES}
-	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
+	@${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" \
@@ -104,25 +110,31 @@ post-patch:
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
 do-install:
-	@${ECHO_CMD} -n ">> Creating destination directory..."
+	@${ECHO_MSG} -n ">> Creating destination directory..."
 	@${MKDIR} ${APP_HOME}
 	@${MKDIR} ${LOG_DIR}
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Backing up configuration files..."
-	@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
-	@${ECHO_CMD} " [ DONE ]"
-
-	@${ECHO_CMD} -n ">> Copying files to destination directory..."
+	@${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}
-	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Compiling and installing control program..."
+	@${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" \
@@ -131,47 +143,47 @@ do-install:
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
 	@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
 	@${CHMOD} 6754 ${CONTROL_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Installing startup script..."
+	@${ECHO_MSG} -n ">> Installing startup script..."
 	@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing man pages..."
+	@${ECHO_MSG} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-	@${ECHO_CMD} -n ">> Creating log files..."
+	@${ECHO_MSG} -n ">> Creating log files..."
 	@${INSTALL} /dev/null ${STDOUT_LOG}
 	@${INSTALL} /dev/null ${STDERR_LOG}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+	@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
 	@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing ownership settings..."
+	@${ECHO_MSG} -n ">> Fixing ownership settings..."
 	@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
+	@${ECHO_MSG} -n ">> Fixing permissions..."
 	@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Creating PID file..."
+	@${ECHO_MSG} -n ">> Creating PID file..."
 	@${TOUCH} ${PID_FILE}
 	@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
 	@${CHMOD} 0600 ${PID_FILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${ECHO_MSG} " [ DONE ]"
 
 post-install:
-	@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
-	@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
+	@${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_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+	@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
 .endif
 .if ${AUTO_START} == "YES"
 	@${CONTROL_SCRIPT} start || true
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index d86712fec515..835ca13d6cb5 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
diff --git a/www/tomcat7/files/patch-conf::server.xml b/www/tomcat7/files/patch-conf::server.xml
index f5e763bfcb0f..be8fa8a14884 100644
--- a/www/tomcat7/files/patch-conf::server.xml
+++ b/www/tomcat7/files/patch-conf::server.xml
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- conf/server.xml.orig	Sat Aug  9 14:51:53 2003
 +++ conf/server.xml	Sat Aug  9 14:57:48 2003
 @@ -10,7 +10,7 @@
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index b991ce115169..321922a70f83 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -1,19 +1,14 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@comment $FreeBSD$
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties 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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -28,6 +23,9 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
 %%T%%/bin/digest.sh
 %%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
@@ -57,16 +55,16 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.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/jk2.properties.%%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%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant.jar
@@ -833,8 +831,11 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +852,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1445,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
 %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1748,22 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/webdav/tomcat.gif
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@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%%/
-@unexec rm -Rf %%T%%/conf.orig
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -2006,5 +2019,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
 @dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
 @dirrm %%T%%/bin
 @dirrm %%T%%