- update to 6.0.14

Approved by:	delphij (mentor)

6 files changed, 142 insertions, 10 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index c72fa16f70b..6c5aa492e07 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache-tomcat
-PORTVERSION=	6.0.13
-PORTREVISION=	1
+PORTVERSION=	6.0.14
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index fa0fa45299b..a0516c4dff3 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-6.0.13.tar.gz) = 50442a96332f0ec0cc1fba354f733ad6
-SHA256 (apache-tomcat-6.0.13.tar.gz) = 4dd237e6cfced1d92b6e9725bc98ddddd8497eb7fea5f5a5d35b91eaaec2c1a2
-SIZE (apache-tomcat-6.0.13.tar.gz) = 5965952
+MD5 (apache-tomcat-6.0.14.tar.gz) = 3b18ff250d8172737c4f67f11631f68a
+SHA256 (apache-tomcat-6.0.14.tar.gz) = 04535ff829131883f5aaf3c9c07124bc05b286253735fe085b9bb4a2c7e55122
+SIZE (apache-tomcat-6.0.14.tar.gz) = 5986411
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 142e9c7d578..08fbe340bf7 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -261,6 +261,73 @@
 %%T%%/webapps/docs/RELEASE-NOTES.txt
 %%T%%/webapps/docs/windows-service-howto.html
 %%T%%/webapps/examples/jsp/plugin/applet/Clock2.class
+%%T%%/webapps/examples/jsp/num/numguess.jsp.html
+%%T%%/webapps/examples/jsp/chat/chat.jsp.html
+%%T%%/webapps/examples/jsp/chat/login.jsp.html
+%%T%%/webapps/examples/jsp/chat/post.jsp.html
+%%T%%/webapps/examples/jsp/checkbox/checkresult.jsp.html
+%%T%%/webapps/examples/jsp/colors/colrs.jsp.html
+%%T%%/webapps/examples/jsp/dates/date.jsp.html
+%%T%%/webapps/examples/jsp/error/err.jsp.html
+%%T%%/webapps/examples/jsp/error/errorpge.jsp.html
+%%T%%/webapps/examples/jsp/forward/forward.jsp.html
+%%T%%/webapps/examples/jsp/forward/one.jsp.html
+%%T%%/webapps/examples/jsp/include/foo.jsp.html
+%%T%%/webapps/examples/jsp/include/include.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/functions.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/Functions.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
+%%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx.html
+%%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
+%%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf.html
+%%T%%/webapps/examples/jsp/jsp2/misc/config.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
+%%T%%/webapps/examples/jsp/jsptoserv/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
+%%T%%/webapps/examples/jsp/jsptoserv/servletToJsp.java.html
+%%T%%/webapps/examples/jsp/cal/Entry.java.html
+%%T%%/webapps/examples/jsp/cal/JspCalendar.java.html
+%%T%%/webapps/examples/jsp/cal/TableBean.java.html
+%%T%%/webapps/examples/jsp/cal/cal1.jsp.html
+%%T%%/webapps/examples/jsp/cal/cal2.jsp.html
+%%T%%/webapps/examples/jsp/cal/Entries.java.html
+%%T%%/webapps/examples/jsp/plugin/plugin.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/error.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/index.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/login.jsp.html
+%%T%%/webapps/examples/jsp/sessions/carts.jsp.html
+%%T%%/webapps/examples/jsp/simpletag/foo.jsp.html
+%%T%%/webapps/examples/jsp/snp/snoop.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/choose.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/foreach.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/if.jsp.html
+%%T%%/webapps/examples/jsp/xml/xml.jsp.html
+%%T%%/webapps/examples/jsp/source.jsp.html
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
 %%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index c72fa16f70b..6c5aa492e07 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache-tomcat
-PORTVERSION=	6.0.13
-PORTREVISION=	1
+PORTVERSION=	6.0.14
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index fa0fa45299b..a0516c4dff3 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-6.0.13.tar.gz) = 50442a96332f0ec0cc1fba354f733ad6
-SHA256 (apache-tomcat-6.0.13.tar.gz) = 4dd237e6cfced1d92b6e9725bc98ddddd8497eb7fea5f5a5d35b91eaaec2c1a2
-SIZE (apache-tomcat-6.0.13.tar.gz) = 5965952
+MD5 (apache-tomcat-6.0.14.tar.gz) = 3b18ff250d8172737c4f67f11631f68a
+SHA256 (apache-tomcat-6.0.14.tar.gz) = 04535ff829131883f5aaf3c9c07124bc05b286253735fe085b9bb4a2c7e55122
+SIZE (apache-tomcat-6.0.14.tar.gz) = 5986411
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 142e9c7d578..08fbe340bf7 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -261,6 +261,73 @@
 %%T%%/webapps/docs/RELEASE-NOTES.txt
 %%T%%/webapps/docs/windows-service-howto.html
 %%T%%/webapps/examples/jsp/plugin/applet/Clock2.class
+%%T%%/webapps/examples/jsp/num/numguess.jsp.html
+%%T%%/webapps/examples/jsp/chat/chat.jsp.html
+%%T%%/webapps/examples/jsp/chat/login.jsp.html
+%%T%%/webapps/examples/jsp/chat/post.jsp.html
+%%T%%/webapps/examples/jsp/checkbox/checkresult.jsp.html
+%%T%%/webapps/examples/jsp/colors/colrs.jsp.html
+%%T%%/webapps/examples/jsp/dates/date.jsp.html
+%%T%%/webapps/examples/jsp/error/err.jsp.html
+%%T%%/webapps/examples/jsp/error/errorpge.jsp.html
+%%T%%/webapps/examples/jsp/forward/forward.jsp.html
+%%T%%/webapps/examples/jsp/forward/one.jsp.html
+%%T%%/webapps/examples/jsp/include/foo.jsp.html
+%%T%%/webapps/examples/jsp/include/include.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/functions.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/el/Functions.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
+%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
+%%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx.html
+%%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
+%%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf.html
+%%T%%/webapps/examples/jsp/jsp2/misc/config.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
+%%T%%/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
+%%T%%/webapps/examples/jsp/jsptoserv/hello.jsp.html
+%%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
+%%T%%/webapps/examples/jsp/jsptoserv/servletToJsp.java.html
+%%T%%/webapps/examples/jsp/cal/Entry.java.html
+%%T%%/webapps/examples/jsp/cal/JspCalendar.java.html
+%%T%%/webapps/examples/jsp/cal/TableBean.java.html
+%%T%%/webapps/examples/jsp/cal/cal1.jsp.html
+%%T%%/webapps/examples/jsp/cal/cal2.jsp.html
+%%T%%/webapps/examples/jsp/cal/Entries.java.html
+%%T%%/webapps/examples/jsp/plugin/plugin.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/error.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/index.jsp.html
+%%T%%/webapps/examples/jsp/security/protected/login.jsp.html
+%%T%%/webapps/examples/jsp/sessions/carts.jsp.html
+%%T%%/webapps/examples/jsp/simpletag/foo.jsp.html
+%%T%%/webapps/examples/jsp/snp/snoop.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/choose.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/foreach.jsp.html
+%%T%%/webapps/examples/jsp/tagplugin/if.jsp.html
+%%T%%/webapps/examples/jsp/xml/xml.jsp.html
+%%T%%/webapps/examples/jsp/source.jsp.html
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
 %%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class