Update jakarta-tomcat to 5.0.25

No Changelog available. Also switch to buildlink3

4 files changed, 12 insertions, 10 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 9c2d55f324b..33bea6cbc84 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6368 2004/06/28 13:58:25 minskim Exp $
+$NetBSD: CHANGES,v 1.6369 2004/06/28 13:59:21 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3130,3 +3130,5 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated gconf-editor to 2.6.2 [jmmv 2004-06-28]
 	Updated gnome2-applets to 2.6.2 [jmmv 2004-06-28]
 	Updated mathomatic to 11.2d [minskim 2004-06-28]
+	Updated jakarta-tomcat to 5.0.25 [abs 2004-06-28]
+
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 04b8d1a4905..4c704b32a72 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2004/06/07 22:42:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.46 2004/06/28 13:58:52 abs Exp $
 
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION=	1
 CATEGORIES=	www java
 # The list of sites to download is generated by a jakarta website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -11,11 +10,11 @@ MAINTAINER=	erh@NetBSD.org
 HOMEPAGE=	http://jakarta.apache.org/tomcat/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-TOMCAT_VERSION=	5.0.24
+TOMCAT_VERSION=	5.0.25
 
 # This needs java 1.4 or higher.
 USE_JAVA2=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 TOMCAT_LIB=     ${PREFIX}/tomcat
 CATALINA_DIR=	Catalina/localhost
diff --git a/www/jakarta-tomcat/PLIST b/www/jakarta-tomcat/PLIST
index 537b99af95b..ac94fb8fe9e 100644
--- a/www/jakarta-tomcat/PLIST
+++ b/www/jakarta-tomcat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/06/07 22:42:27 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/28 13:58:52 abs Exp $
 tomcat/LICENSE
 tomcat/NOTICE
 tomcat/RELEASE-NOTES
@@ -279,6 +279,7 @@ tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$7.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$8.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$9.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class
@@ -1311,7 +1312,6 @@ tomcat/webapps/tomcat-docs/images/update.gif
 tomcat/webapps/tomcat-docs/images/void.gif
 tomcat/webapps/tomcat-docs/index.html
 tomcat/webapps/tomcat-docs/introduction.html
-tomcat/webapps/tomcat-docs/jas
 tomcat/webapps/tomcat-docs/jasper-howto.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/allclasses-frame.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/allclasses-noframe.html
@@ -1344,6 +1344,7 @@ tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspRuntime
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.ValidAttribute.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Localizer.html
+tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.AttributeDirective.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.AttributeGenerator.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ChildInfo.html
 tomcat/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Comment.html
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index 2cb1869639e..0a240234b07 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/05/26 15:16:26 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/06/28 13:58:52 abs Exp $
 
-SHA1 (jakarta-tomcat-5.0.24.tar.gz) = 197a42b0b35c6c710f6ec3de364c29e10ac0d297
-Size (jakarta-tomcat-5.0.24.tar.gz) = 10238534 bytes
+SHA1 (jakarta-tomcat-5.0.25.tar.gz) = d61dff3395b4e2fc607d3225f449d8d76156a67b
+Size (jakarta-tomcat-5.0.25.tar.gz) = 10227073 bytes