1. update www/jakarta-tomcat5 to 5.0.27

2. move the orignal config file to ${APP_HOME}/conf.orig, I think it would be helpful if the config files have been changed.

PR:		ports/69617
Submitted by:	maintainer

3 files changed, 17 insertions, 8 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index c94b2602b717..9f6f17c10bfb 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.25
+PORTVERSION=	5.0.27
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@@ -113,6 +113,10 @@ do-install:
 	@${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..."
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 888c5914d128..0e9caf73e9db 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.25.tar.gz) = 456001c1844b25605e0cf76537fa8504
-SIZE (jakarta-tomcat-5.0.25.tar.gz) = 10227073
+MD5 (jakarta-tomcat-5.0.27.tar.gz) = b802ee042677e284bcf65738c7bdc3b6
+SIZE (jakarta-tomcat-5.0.27.tar.gz) = 10298374
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index d26eafc0faf3..d45639884e4d 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -13,6 +13,7 @@
 @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
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -38,12 +39,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/tool-wrapper-using-launcher.sh
 %%T%%/bin/tool-wrapper.sh
 %%T%%/common/endorsed/xercesImpl.jar
-%%T%%/common/endorsed/xmlParserAPIs.jar
+%%T%%/common/endorsed/xml-apis.jar
+%%T%%/common/lib/ant-launcher.jar
 %%T%%/common/lib/ant.jar
-%%T%%/common/lib/commons-collections.jar
-%%T%%/common/lib/commons-dbcp-1.1.jar
+%%T%%/common/lib/commons-collections-2.1.1.jar
+%%T%%/common/lib/commons-dbcp-1.2.1.jar
 %%T%%/common/lib/commons-el.jar
-%%T%%/common/lib/commons-pool-1.1.jar
+%%T%%/common/lib/commons-pool-1.2.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
 %%T%%/common/lib/jsp-api.jar
@@ -289,6 +291,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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$1.class
+%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$2.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$3.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$4.class
@@ -297,7 +300,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$7.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$8.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$9.class
-%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.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
@@ -804,6 +806,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIEnvironment.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIRunner.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.HTTPHeaderInputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.NameValuePair.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/Constants.html
@@ -1064,6 +1067,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/JkChannel.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/JkHandler.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/Msg.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/MsgContext.html
@@ -1741,6 +1745,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @exec mkdir %D/%%T%%/work || true
 @exec mkdir %D/%%T%%/common/classes ||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