3 files changed, 17 insertions, 15 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 24024dbbc0fa..0ee2ddd9385b 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	tomcat
-PORTVERSION=	5.5.12
-PORTREVISION=	3
+PORTVERSION=	5.5.17
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
 MAINTAINER=	liukang@cn.freebsd.org
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index dcea6c7a5e12..5504365bad28 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (apache-tomcat-5.5.17.tar.gz) = 994d39c0d2f462c79288e0249991dd49
+SHA256 (apache-tomcat-5.5.17.tar.gz) = 73973dedc54bd4363d90bb97ff3978cd41c43d61b2e0507be332d97eceae3eff
+SIZE (apache-tomcat-5.5.17.tar.gz) = 5994530
+MD5 (apache-tomcat-5.5.17-compat.tar.gz) = 27aca181f2cc19b97b5ac9beeb711244
+SHA256 (apache-tomcat-5.5.17-compat.tar.gz) = 29c0a7510225b892830713cf50b3bdb4980757a9c953503819fab89003271603
+SIZE (apache-tomcat-5.5.17-compat.tar.gz) = 1624033
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index bf6ed0a24ed7..41177ce11536 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -20,6 +20,7 @@
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
 %%JAVA14%%%%T%%/bin/jmx.jar
+%%T%%/bin/jkstatus-tasks.xml
 %%T%%/bin/jmxaccessor-tasks.xml
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/setclasspath.sh
@@ -50,11 +51,11 @@
 %%T%%/conf/catalina.policy.%%CONF_EXT%%
 %%T%%/conf/catalina.properties.%%CONF_EXT%%
 %%T%%/conf/context.xml.%%CONF_EXT%%
+%%T%%/conf/logging.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%%/conf/logging.properties.%%CONF_EXT%%
 %%T%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant-jmx.jar
@@ -73,16 +74,17 @@
 %%T%%/server/lib/tomcat-apr.jar
 %%T%%/server/lib/tomcat-coyote.jar
 %%T%%/server/lib/tomcat-http.jar
+%%T%%/server/lib/tomcat-jkstatus-ant.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/asf-logo.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
@@ -92,11 +94,11 @@
 %%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/asf-logo.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
@@ -104,13 +106,14 @@
 %%T%%/server/webapps/manager/manager.xml
 %%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
+%%T%%/temp/bugzilla37035-safeToDelete.tmp
 %%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/asf-logo-wide.gif
 %%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
@@ -555,11 +558,11 @@
 %%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/asf-logo.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