Update to 7.0.30

Changelog:
The Apache Tomcat Project is proud to announce the release of version 7.0.30
of Apache Tomcat. This release contains numerous bug fixes and improvements
compared to version 7.0.29. The notable changes include:

* Significantly reduced memory footprint during web application start while
  Servlet 3.0 annotation and SCI scanning is in progress.
* Adds support for scanning of classes that use Java 7 specific byte code
  for Servlet 3.0 annotation and SCI scanning.
* Improvements to DIGEST and FORM authentication.

Full details of these changes, and all the other changes, are available in the
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html .

3 files changed, 35 insertions, 9 deletions

diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile
index 7362dfd250c..c2655ce7df7 100644
--- a/www/apache-tomcat7/Makefile
+++ b/www/apache-tomcat7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/05/06 08:08:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/06 12:05:24 ryoon Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
 
@@ -24,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		7.0.26
+TOMCAT_VER=		7.0.30
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat7/PLIST b/www/apache-tomcat7/PLIST
index 9e4829fcedf..49ad852e453 100644
--- a/www/apache-tomcat7/PLIST
+++ b/www/apache-tomcat7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/02/05 15:29:18 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/06 12:05:24 ryoon Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -31,7 +31,7 @@ share/tomcat/lib/catalina-ant.jar
 share/tomcat/lib/catalina-ha.jar
 share/tomcat/lib/catalina-tribes.jar
 share/tomcat/lib/catalina.jar
-share/tomcat/lib/ecj-3.7.1.jar
+share/tomcat/lib/ecj-3.7.2.jar
 share/tomcat/lib/el-api.jar
 share/tomcat/lib/jasper-el.jar
 share/tomcat/lib/jasper.jar
@@ -185,6 +185,7 @@ share/tomcat/webapps/docs/tribes/setup.html
 share/tomcat/webapps/docs/tribes/status.html
 share/tomcat/webapps/docs/tribes/transport.html
 share/tomcat/webapps/docs/virtual-hosting-howto.html
+share/tomcat/webapps/docs/web-socket-howto.html
 share/tomcat/webapps/docs/windows-auth-howto.html
 share/tomcat/webapps/docs/windows-service-howto.html
 share/tomcat/webapps/examples/WEB-INF/classes/CookieExample.class
@@ -296,6 +297,28 @@ share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
 share/tomcat/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
 share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
 share/tomcat/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$ChatMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage$EchoMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$EchoStreamInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Direction.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Location.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Snake.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$1.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$SnakeMessageInbound.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.class
+share/tomcat/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
 share/tomcat/webapps/examples/WEB-INF/jsp/applet/Clock2.java
 share/tomcat/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 share/tomcat/webapps/examples/WEB-INF/jsp/example-taglib.tld
@@ -497,6 +520,10 @@ share/tomcat/webapps/examples/servlets/reqheaders.html
 share/tomcat/webapps/examples/servlets/reqinfo.html
 share/tomcat/webapps/examples/servlets/reqparams.html
 share/tomcat/webapps/examples/servlets/sessions.html
+share/tomcat/webapps/examples/websocket/chat.html
+share/tomcat/webapps/examples/websocket/echo.html
+share/tomcat/webapps/examples/websocket/index.html
+share/tomcat/webapps/examples/websocket/snake.html
 share/tomcat/webapps/host-manager/META-INF/context.xml
 share/tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
 share/tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
diff --git a/www/apache-tomcat7/distinfo b/www/apache-tomcat7/distinfo
index c4e4197ee15..5ecd26fcacd 100644
--- a/www/apache-tomcat7/distinfo
+++ b/www/apache-tomcat7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/03/05 11:18:17 abs Exp $
+$NetBSD: distinfo,v 1.4 2012/10/06 12:05:24 ryoon Exp $
 
-SHA1 (apache-tomcat-7.0.26.tar.gz) = 7702bf80c9f765fb40043b45f988bdcce421f541
-RMD160 (apache-tomcat-7.0.26.tar.gz) = 2bec968a0cf8aeba384f78121cbb563bf9704989
-Size (apache-tomcat-7.0.26.tar.gz) = 7540233 bytes
+SHA1 (apache-tomcat-7.0.30.tar.gz) = 2632d72b2e980f874ddc4f5b0f39a941f9937158
+RMD160 (apache-tomcat-7.0.30.tar.gz) = 97cbfb436be00a15f6ebf58e4cb4719b449e2ddc
+Size (apache-tomcat-7.0.30.tar.gz) = 7697071 bytes