3 files changed, 11 insertions, 8 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 554f55b670d4..8f7f2b44a49f 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.6
+PORTVERSION=	5.0.10
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-alpha/bin/
 
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 7cc8cf85bb2f..0ea9a8feb845 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.6.tar.gz) = e06b1e29b6767f375fd651a211f12234
+MD5 (jakarta-tomcat-5.0.10.tar.gz) = 691fa83783bcd95b433b8699221724c5
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 6c8a1921d5ec..698c393a182c 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -19,6 +19,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/startup.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/lib/ant.jar
 %%T%%/common/lib/commons-collections.jar
 %%T%%/common/lib/commons-dbcp.jar
@@ -27,10 +29,8 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx-tools.jar
 %%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
-%%T%%/common/lib/mx4j.license
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
 %%T%%/common/lib/naming-java.jar
@@ -584,11 +584,15 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/AbstractCatalinaTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/DeployTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/InstallTask.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/JMXQueryTask.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/JMXSetTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ListTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ReloadTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RemoveTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ResourcesTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RolesTask.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ServerinfoTask.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/SessionsTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StartTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StopTask.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/UndeployTask.html
@@ -1151,6 +1155,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEImplementation.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEKeyManager.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSESocketFactory.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/package-summary.html
@@ -1663,9 +1668,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/ssi-howto.html
 %%T%%/webapps/tomcat-docs/ssl-howto.html
 %%T%%/webapps/tomcat-docs/status.html
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
-@dirrm %%T%%/work 
+@dirrm %%T%%/work
 @dirrm %%T%%/webapps/tomcat-docs/servletapi/resources
 @dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
 @dirrm %%T%%/webapps/tomcat-docs/servletapi/javax/servlet/http
@@ -1900,7 +1903,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/server/lib
 @dirrm %%T%%/server/classes
 @dirrm %%T%%/server
-@dirrm %%T%%/logs 
+@dirrm %%T%%/logs
 @dirrm %%T%%/conf/Catalina/localhost
 @dirrm %%T%%/conf/Catalina
 @dirrm %%T%%/conf