15 files changed, 70 insertions, 25 deletions

diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index dfe79fb2f2fd..a96faec31af8 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.19
+PORTVERSION=	5.0.24
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
+MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
diff --git a/www/jakarta-tomcat5/distinfo b/www/jakarta-tomcat5/distinfo
index bc306a31a041..de5463890f83 100644
--- a/www/jakarta-tomcat5/distinfo
+++ b/www/jakarta-tomcat5/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.19.tar.gz) = 6c8a19851ecc4d3c0116d9adfac3b8b9
-SIZE (jakarta-tomcat-5.0.19.tar.gz) = 10046129
+MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
+SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
diff --git a/www/jakarta-tomcat5/pkg-plist b/www/jakarta-tomcat5/pkg-plist
index 8de276e7cbeb..e27a285bfc7c 100644
--- a/www/jakarta-tomcat5/pkg-plist
+++ b/www/jakarta-tomcat5/pkg-plist
@@ -1,6 +1,7 @@
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
+%%T%%/NOTICE
 %%T%%/RELEASE-NOTES
 %%T%%/RUNNING.txt
 %%T%%/bin/LauncherBootstrap.class
@@ -11,6 +12,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/launcher.properties
 %%T%%/bin/setclasspath.sh
@@ -29,7 +31,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -157,6 +158,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/server/webapps/manager/manager.xml
+%%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
 @exec mkdir %D/%%T%%/shared || true
 @exec mkdir %D/%%T%%/shared/classes || true
@@ -667,6 +669,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -731,6 +734,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -799,6 +803,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.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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1005,14 +1010,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index dfe79fb2f2fd..a96faec31af8 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.19
+PORTVERSION=	5.0.24
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
+MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
diff --git a/www/jakarta-tomcat55/distinfo b/www/jakarta-tomcat55/distinfo
index bc306a31a041..de5463890f83 100644
--- a/www/jakarta-tomcat55/distinfo
+++ b/www/jakarta-tomcat55/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.19.tar.gz) = 6c8a19851ecc4d3c0116d9adfac3b8b9
-SIZE (jakarta-tomcat-5.0.19.tar.gz) = 10046129
+MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
+SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
diff --git a/www/jakarta-tomcat55/pkg-plist b/www/jakarta-tomcat55/pkg-plist
index 8de276e7cbeb..e27a285bfc7c 100644
--- a/www/jakarta-tomcat55/pkg-plist
+++ b/www/jakarta-tomcat55/pkg-plist
@@ -1,6 +1,7 @@
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
+%%T%%/NOTICE
 %%T%%/RELEASE-NOTES
 %%T%%/RUNNING.txt
 %%T%%/bin/LauncherBootstrap.class
@@ -11,6 +12,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/launcher.properties
 %%T%%/bin/setclasspath.sh
@@ -29,7 +31,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -157,6 +158,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/server/webapps/manager/manager.xml
+%%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
 @exec mkdir %D/%%T%%/shared || true
 @exec mkdir %D/%%T%%/shared/classes || true
@@ -667,6 +669,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -731,6 +734,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -799,6 +803,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.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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1005,14 +1010,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index dfe79fb2f2fd..a96faec31af8 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.19
+PORTVERSION=	5.0.24
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
+MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
diff --git a/www/tomcat55/distinfo b/www/tomcat55/distinfo
index bc306a31a041..de5463890f83 100644
--- a/www/tomcat55/distinfo
+++ b/www/tomcat55/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.19.tar.gz) = 6c8a19851ecc4d3c0116d9adfac3b8b9
-SIZE (jakarta-tomcat-5.0.19.tar.gz) = 10046129
+MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
+SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index 8de276e7cbeb..e27a285bfc7c 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -1,6 +1,7 @@
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
+%%T%%/NOTICE
 %%T%%/RELEASE-NOTES
 %%T%%/RUNNING.txt
 %%T%%/bin/LauncherBootstrap.class
@@ -11,6 +12,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/launcher.properties
 %%T%%/bin/setclasspath.sh
@@ -29,7 +31,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -157,6 +158,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/server/webapps/manager/manager.xml
+%%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
 @exec mkdir %D/%%T%%/shared || true
 @exec mkdir %D/%%T%%/shared/classes || true
@@ -667,6 +669,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -731,6 +734,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -799,6 +803,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.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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1005,14 +1010,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index dfe79fb2f2fd..a96faec31af8 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.19
+PORTVERSION=	5.0.24
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
+MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index bc306a31a041..de5463890f83 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.19.tar.gz) = 6c8a19851ecc4d3c0116d9adfac3b8b9
-SIZE (jakarta-tomcat-5.0.19.tar.gz) = 10046129
+MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
+SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 8de276e7cbeb..e27a285bfc7c 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -1,6 +1,7 @@
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
+%%T%%/NOTICE
 %%T%%/RELEASE-NOTES
 %%T%%/RUNNING.txt
 %%T%%/bin/LauncherBootstrap.class
@@ -11,6 +12,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/launcher.properties
 %%T%%/bin/setclasspath.sh
@@ -29,7 +31,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -157,6 +158,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/server/webapps/manager/manager.xml
+%%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
 @exec mkdir %D/%%T%%/shared || true
 @exec mkdir %D/%%T%%/shared/classes || true
@@ -667,6 +669,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -731,6 +734,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -799,6 +803,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.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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1005,14 +1010,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index dfe79fb2f2fd..a96faec31af8 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.19
+PORTVERSION=	5.0.24
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
+MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index bc306a31a041..de5463890f83 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.19.tar.gz) = 6c8a19851ecc4d3c0116d9adfac3b8b9
-SIZE (jakarta-tomcat-5.0.19.tar.gz) = 10046129
+MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
+SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 8de276e7cbeb..e27a285bfc7c 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -1,6 +1,7 @@
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
+%%T%%/NOTICE
 %%T%%/RELEASE-NOTES
 %%T%%/RUNNING.txt
 %%T%%/bin/LauncherBootstrap.class
@@ -11,6 +12,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/bin/commons-launcher.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/launcher.properties
 %%T%%/bin/setclasspath.sh
@@ -29,7 +31,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/common/lib/commons-pool-1.1.jar
 %%T%%/common/lib/jasper-compiler.jar
 %%T%%/common/lib/jasper-runtime.jar
-%%T%%/common/lib/jmx.jar
 %%T%%/common/lib/jsp-api.jar
 %%T%%/common/lib/naming-common.jar
 %%T%%/common/lib/naming-factory.jar
@@ -157,6 +158,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/images/void.gif
 %%T%%/server/webapps/manager/manager-howto.html
 %%T%%/server/webapps/manager/manager.xml
+%%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
 @exec mkdir %D/%%T%%/shared || true
 @exec mkdir %D/%%T%%/shared/classes || true
@@ -667,6 +669,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -731,6 +734,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -799,6 +803,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.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
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1005,14 +1010,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html