3 files changed, 15 insertions, 13 deletions

diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 8da4fb637894..a852e4b1c8a0 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tomcat
-PORTVERSION=	7.0.6
+PORTVERSION=	7.0.12
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-7/v${PORTVERSION}/bin
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index 753a1d3089d5..54a08bdf94b6 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-tomcat-7.0.6.tar.gz) = 6779d04d3fcc6ef87f0b74fb5b5db26097b6ad38cad1302535cc92f6e1382068
-SIZE (apache-tomcat-7.0.6.tar.gz) = 7149673
+SHA256 (apache-tomcat-7.0.12.tar.gz) = e6fe5ad2febcd4da5509e9327f929242d021a0fe417e9e70d94f97aa3d9d6403
+SIZE (apache-tomcat-7.0.12.tar.gz) = 7205567
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index a6549b494868..066e9bc5d55d 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -43,7 +43,7 @@
 %%T%%/lib/catalina-ha.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-3.6.jar
+%%T%%/lib/ecj-3.6.2.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
@@ -197,6 +197,7 @@
 %%T%%/webapps/docs/tribes/status.html
 %%T%%/webapps/docs/tribes/transport.html
 %%T%%/webapps/docs/virtual-hosting-howto.html
+%%T%%/webapps/docs/windows-auth-howto.html
 %%T%%/webapps/docs/windows-service-howto.html
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
 %%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
@@ -213,6 +214,8 @@
 %%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.java
 %%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.class
 %%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.java
+%%T%%/webapps/examples/WEB-INF/classes/ServletToJsp.class
+%%T%%/webapps/examples/WEB-INF/classes/ServletToJsp.java
 %%T%%/webapps/examples/WEB-INF/classes/SessionExample.class
 %%T%%/webapps/examples/WEB-INF/classes/SessionExample.java
 %%T%%/webapps/examples/WEB-INF/classes/async/Async0$1.class
@@ -301,8 +304,6 @@
 %%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
 %%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
 %%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
-%%T%%/webapps/examples/WEB-INF/classes/servletToJsp.class
-%%T%%/webapps/examples/WEB-INF/classes/servletToJsp.java
 %%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
 %%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
 %%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
@@ -453,12 +454,12 @@
 %%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp
 %%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
 %%T%%/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html
+%%T%%/webapps/examples/jsp/jsptoserv/ServletToJsp.java.html
 %%T%%/webapps/examples/jsp/jsptoserv/hello.jsp
 %%T%%/webapps/examples/jsp/jsptoserv/hello.jsp.html
 %%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
 %%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
 %%T%%/webapps/examples/jsp/jsptoserv/jts.html
-%%T%%/webapps/examples/jsp/jsptoserv/servletToJsp.java.html
 %%T%%/webapps/examples/jsp/num/numguess.html
 %%T%%/webapps/examples/jsp/num/numguess.jsp
 %%T%%/webapps/examples/jsp/num/numguess.jsp.html
@@ -510,10 +511,10 @@
 %%T%%/webapps/examples/servlets/reqinfo.html
 %%T%%/webapps/examples/servlets/reqparams.html
 %%T%%/webapps/examples/servlets/sessions.html
-%%T%%/webapps/host-manager/401.jsp
-%%T%%/webapps/host-manager/403.jsp
-%%T%%/webapps/host-manager/404.jsp
 %%T%%/webapps/host-manager/META-INF/context.xml
+%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp
+%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
+%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
 %%T%%/webapps/host-manager/WEB-INF/web.xml
 %%T%%/webapps/host-manager/images/add.gif
 %%T%%/webapps/host-manager/images/asf-logo.gif
@@ -526,10 +527,10 @@
 %%T%%/webapps/host-manager/images/void.gif
 %%T%%/webapps/host-manager/index.jsp
 %%T%%/webapps/host-manager/manager.xml
-%%T%%/webapps/manager/401.jsp
-%%T%%/webapps/manager/403.jsp
-%%T%%/webapps/manager/404.jsp
 %%T%%/webapps/manager/META-INF/context.xml
+%%T%%/webapps/manager/WEB-INF/jsp/401.jsp
+%%T%%/webapps/manager/WEB-INF/jsp/403.jsp
+%%T%%/webapps/manager/WEB-INF/jsp/404.jsp
 %%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%T%%/webapps/manager/WEB-INF/web.xml
@@ -556,6 +557,7 @@
 @dirrm %%T%%/webapps/manager/META-INF
 @dirrm %%T%%/webapps/manager
 @dirrm %%T%%/webapps/host-manager/images
+@dirrm %%T%%/webapps/host-manager/WEB-INF/jsp
 @dirrm %%T%%/webapps/host-manager/WEB-INF
 @dirrm %%T%%/webapps/host-manager/META-INF
 @dirrm %%T%%/webapps/host-manager