1.Update www/jakarta-tomcat to 5.0.18.

Changelog: http://jakarta.apache.org/tomcat/tomcat-5.0-doc/changelog.html
2.Fix wrong url in the 2nd master site

PR:		ports/61767
Submitted by:	Kang Liu <liukang@bjpu.edu.cn> (maintainer)

15 files changed, 140 insertions, 40 deletions

diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 6fd670dc547a..49b9dd866b72 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.16
-PORTREVISION=	1
+PORTVERSION=	5.0.18
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
diff --git a/www/jakarta-tomcat5/distinfo b/www/jakarta-tomcat5/distinfo
index 7d5f03237b84..b8a6d5c304dd 100644
--- a/www/jakarta-tomcat5/distinfo
+++ b/www/jakarta-tomcat5/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
+MD5 (jakarta-tomcat-5.0.18.tar.gz) = 6653a88da9b805920485071fb73d4017
diff --git a/www/jakarta-tomcat5/pkg-plist b/www/jakarta-tomcat5/pkg-plist
index 35168e4a477d..ab7f48d71694 100644
--- a/www/jakarta-tomcat5/pkg-plist
+++ b/www/jakarta-tomcat5/pkg-plist
@@ -45,6 +45,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
@@ -521,6 +522,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/architecture/index.html
+%%T%%/webapps/tomcat-docs/architecture/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/index.html
+%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
+%%T%%/webapps/tomcat-docs/architecture/startup.html
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 %%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
@@ -1005,9 +1018,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
@@ -1247,25 +1264,25 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
 %%T%%/webapps/tomcat-docs/cluster-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp.html
 %%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
 %%T%%/webapps/tomcat-docs/config/host.html
+%%T%%/webapps/tomcat-docs/config/http.html
 %%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/jk2.html
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/coyote.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
 %%T%%/webapps/tomcat-docs/config/printer/host.html
+%%T%%/webapps/tomcat-docs/config/printer/http.html
 %%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/jk2.html
 %%T%%/webapps/tomcat-docs/config/printer/loader.html
 %%T%%/webapps/tomcat-docs/config/printer/logger.html
 %%T%%/webapps/tomcat-docs/config/printer/manager.html
@@ -1806,6 +1823,10 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs
 @dirrm %%T%%/webapps/tomcat-docs/catalina
+@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
+@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
+@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
+@dirrm %%T%%/webapps/tomcat-docs/architecture
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 6fd670dc547a..49b9dd866b72 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.16
-PORTREVISION=	1
+PORTVERSION=	5.0.18
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
diff --git a/www/jakarta-tomcat55/distinfo b/www/jakarta-tomcat55/distinfo
index 7d5f03237b84..b8a6d5c304dd 100644
--- a/www/jakarta-tomcat55/distinfo
+++ b/www/jakarta-tomcat55/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
+MD5 (jakarta-tomcat-5.0.18.tar.gz) = 6653a88da9b805920485071fb73d4017
diff --git a/www/jakarta-tomcat55/pkg-plist b/www/jakarta-tomcat55/pkg-plist
index 35168e4a477d..ab7f48d71694 100644
--- a/www/jakarta-tomcat55/pkg-plist
+++ b/www/jakarta-tomcat55/pkg-plist
@@ -45,6 +45,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
@@ -521,6 +522,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/architecture/index.html
+%%T%%/webapps/tomcat-docs/architecture/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/index.html
+%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
+%%T%%/webapps/tomcat-docs/architecture/startup.html
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 %%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
@@ -1005,9 +1018,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
@@ -1247,25 +1264,25 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
 %%T%%/webapps/tomcat-docs/cluster-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp.html
 %%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
 %%T%%/webapps/tomcat-docs/config/host.html
+%%T%%/webapps/tomcat-docs/config/http.html
 %%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/jk2.html
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/coyote.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
 %%T%%/webapps/tomcat-docs/config/printer/host.html
+%%T%%/webapps/tomcat-docs/config/printer/http.html
 %%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/jk2.html
 %%T%%/webapps/tomcat-docs/config/printer/loader.html
 %%T%%/webapps/tomcat-docs/config/printer/logger.html
 %%T%%/webapps/tomcat-docs/config/printer/manager.html
@@ -1806,6 +1823,10 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs
 @dirrm %%T%%/webapps/tomcat-docs/catalina
+@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
+@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
+@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
+@dirrm %%T%%/webapps/tomcat-docs/architecture
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 6fd670dc547a..49b9dd866b72 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.16
-PORTREVISION=	1
+PORTVERSION=	5.0.18
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
diff --git a/www/tomcat55/distinfo b/www/tomcat55/distinfo
index 7d5f03237b84..b8a6d5c304dd 100644
--- a/www/tomcat55/distinfo
+++ b/www/tomcat55/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
+MD5 (jakarta-tomcat-5.0.18.tar.gz) = 6653a88da9b805920485071fb73d4017
diff --git a/www/tomcat55/pkg-plist b/www/tomcat55/pkg-plist
index 35168e4a477d..ab7f48d71694 100644
--- a/www/tomcat55/pkg-plist
+++ b/www/tomcat55/pkg-plist
@@ -45,6 +45,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
@@ -521,6 +522,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/architecture/index.html
+%%T%%/webapps/tomcat-docs/architecture/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/index.html
+%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
+%%T%%/webapps/tomcat-docs/architecture/startup.html
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 %%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
@@ -1005,9 +1018,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
@@ -1247,25 +1264,25 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
 %%T%%/webapps/tomcat-docs/cluster-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp.html
 %%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
 %%T%%/webapps/tomcat-docs/config/host.html
+%%T%%/webapps/tomcat-docs/config/http.html
 %%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/jk2.html
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/coyote.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
 %%T%%/webapps/tomcat-docs/config/printer/host.html
+%%T%%/webapps/tomcat-docs/config/printer/http.html
 %%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/jk2.html
 %%T%%/webapps/tomcat-docs/config/printer/loader.html
 %%T%%/webapps/tomcat-docs/config/printer/logger.html
 %%T%%/webapps/tomcat-docs/config/printer/manager.html
@@ -1806,6 +1823,10 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs
 @dirrm %%T%%/webapps/tomcat-docs/catalina
+@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
+@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
+@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
+@dirrm %%T%%/webapps/tomcat-docs/architecture
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 6fd670dc547a..49b9dd866b72 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.16
-PORTREVISION=	1
+PORTVERSION=	5.0.18
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 7d5f03237b84..b8a6d5c304dd 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
+MD5 (jakarta-tomcat-5.0.18.tar.gz) = 6653a88da9b805920485071fb73d4017
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 35168e4a477d..ab7f48d71694 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -45,6 +45,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
@@ -521,6 +522,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/architecture/index.html
+%%T%%/webapps/tomcat-docs/architecture/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/index.html
+%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
+%%T%%/webapps/tomcat-docs/architecture/startup.html
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 %%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
@@ -1005,9 +1018,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
@@ -1247,25 +1264,25 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
 %%T%%/webapps/tomcat-docs/cluster-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp.html
 %%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
 %%T%%/webapps/tomcat-docs/config/host.html
+%%T%%/webapps/tomcat-docs/config/http.html
 %%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/jk2.html
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/coyote.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
 %%T%%/webapps/tomcat-docs/config/printer/host.html
+%%T%%/webapps/tomcat-docs/config/printer/http.html
 %%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/jk2.html
 %%T%%/webapps/tomcat-docs/config/printer/loader.html
 %%T%%/webapps/tomcat-docs/config/printer/logger.html
 %%T%%/webapps/tomcat-docs/config/printer/manager.html
@@ -1806,6 +1823,10 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs
 @dirrm %%T%%/webapps/tomcat-docs/catalina
+@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
+@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
+@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
+@dirrm %%T%%/webapps/tomcat-docs/architecture
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 6fd670dc547a..49b9dd866b72 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.16
-PORTREVISION=	1
+PORTVERSION=	5.0.18
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
 		http://distfiles.coredump.cn/
 
 MAINTAINER=	liukang@bjpu.edu.cn
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index 7d5f03237b84..b8a6d5c304dd 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
+MD5 (jakarta-tomcat-5.0.18.tar.gz) = 6653a88da9b805920485071fb73d4017
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 35168e4a477d..ab7f48d71694 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -45,6 +45,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%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
@@ -521,6 +522,18 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
 %%T%%/webapps/tomcat-docs/appdev/source.html
 %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
+%%T%%/webapps/tomcat-docs/architecture/index.html
+%%T%%/webapps/tomcat-docs/architecture/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/index.html
+%%T%%/webapps/tomcat-docs/architecture/printer/overview.html
+%%T%%/webapps/tomcat-docs/architecture/printer/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/printer/startup.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess.html
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
+%%T%%/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
+%%T%%/webapps/tomcat-docs/architecture/startup.html
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
+%%T%%/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 %%T%%/webapps/tomcat-docs/balancer-howto.html
 %%T%%/webapps/tomcat-docs/build.xml
 %%T%%/webapps/tomcat-docs/building.html
@@ -1005,9 +1018,13 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
 %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
@@ -1247,25 +1264,25 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/tomcat-docs/changelog.html
 %%T%%/webapps/tomcat-docs/class-loader-howto.html
 %%T%%/webapps/tomcat-docs/cluster-howto.html
+%%T%%/webapps/tomcat-docs/config/ajp.html
 %%T%%/webapps/tomcat-docs/config/context.html
-%%T%%/webapps/tomcat-docs/config/coyote.html
 %%T%%/webapps/tomcat-docs/config/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/engine.html
 %%T%%/webapps/tomcat-docs/config/globalresources.html
 %%T%%/webapps/tomcat-docs/config/host.html
+%%T%%/webapps/tomcat-docs/config/http.html
 %%T%%/webapps/tomcat-docs/config/index.html
-%%T%%/webapps/tomcat-docs/config/jk2.html
 %%T%%/webapps/tomcat-docs/config/loader.html
 %%T%%/webapps/tomcat-docs/config/logger.html
 %%T%%/webapps/tomcat-docs/config/manager.html
+%%T%%/webapps/tomcat-docs/config/printer/ajp.html
 %%T%%/webapps/tomcat-docs/config/printer/context.html
-%%T%%/webapps/tomcat-docs/config/printer/coyote.html
 %%T%%/webapps/tomcat-docs/config/printer/defaultcontext.html
 %%T%%/webapps/tomcat-docs/config/printer/engine.html
 %%T%%/webapps/tomcat-docs/config/printer/globalresources.html
 %%T%%/webapps/tomcat-docs/config/printer/host.html
+%%T%%/webapps/tomcat-docs/config/printer/http.html
 %%T%%/webapps/tomcat-docs/config/printer/index.html
-%%T%%/webapps/tomcat-docs/config/printer/jk2.html
 %%T%%/webapps/tomcat-docs/config/printer/loader.html
 %%T%%/webapps/tomcat-docs/config/printer/logger.html
 %%T%%/webapps/tomcat-docs/config/printer/manager.html
@@ -1806,6 +1823,10 @@ etc/rc.d/020.jakarta-tomcat50.sh
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs/api
 @dirrm %%T%%/webapps/tomcat-docs/catalina/docs
 @dirrm %%T%%/webapps/tomcat-docs/catalina
+@dirrm %%T%%/webapps/tomcat-docs/architecture/startup
+@dirrm %%T%%/webapps/tomcat-docs/architecture/requestProcess
+@dirrm %%T%%/webapps/tomcat-docs/architecture/printer
+@dirrm %%T%%/webapps/tomcat-docs/architecture
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/images
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web/WEB-INF
 @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/web