. Update to 5.0.25.

. Update maintainer's email address.

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

3 files changed, 20 insertions, 19 deletions

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index a96faec31af8..c94b2602b717 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	jakarta-tomcat
-PORTVERSION=	5.0.24
+PORTVERSION=	5.0.25
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
-MAINTAINER=	liukang@bjpu.edu.cn
+MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
 
 USE_JAVA=	yes
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index de5463890f83..888c5914d128 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.24.tar.gz) = 93b3028f05e1a7cb51546e89d6869321
-SIZE (jakarta-tomcat-5.0.24.tar.gz) = 10238534
+MD5 (jakarta-tomcat-5.0.25.tar.gz) = 456001c1844b25605e0cf76537fa8504
+SIZE (jakarta-tomcat-5.0.25.tar.gz) = 10227073
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index e27a285bfc7c..d26eafc0faf3 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -1,3 +1,18 @@
+@exec mkdir %D/%%T%%/server || true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@exec mkdir %D/%%T%%/shared/lib || true
+@exec mkdir %D/%%T%%/temp || true
 bin/tomcat50ctl
 etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/LICENSE
@@ -50,8 +65,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/conf/web.xml
 %%T%%/logs/stderr.log
 %%T%%/logs/stdout.log
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
 %%T%%/server/lib/catalina-ant.jar
 %%T%%/server/lib/catalina-cluster.jar
 %%T%%/server/lib/catalina-i18n-es.jar
@@ -88,9 +101,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/admin/WEB-INF/web.xml
 %%T%%/server/webapps/admin/admin.css
 %%T%%/server/webapps/admin/admin.xml
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
 %%T%%/server/webapps/admin/images/BlueTile.gif
 %%T%%/server/webapps/admin/images/Connector.gif
 %%T%%/server/webapps/admin/images/Context.gif
@@ -121,8 +131,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/admin/images/linelastnode.gif
 %%T%%/server/webapps/admin/images/linemiddlenode.gif
 %%T%%/server/webapps/admin/images/linevertical.gif
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
 %%T%%/server/webapps/admin/resources/dataSources.jspf
 %%T%%/server/webapps/admin/resources/envEntries.jspf
 %%T%%/server/webapps/admin/resources/listDataSources.jspf
@@ -133,9 +141,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/admin/resources/mailSessions.jspf
 %%T%%/server/webapps/admin/resources/resourceLinks.jspf
 %%T%%/server/webapps/admin/resources/userDatabases.jspf
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
 %%T%%/server/webapps/admin/tree-control-test.css
 %%T%%/server/webapps/admin/users/groups.jspf
 %%T%%/server/webapps/admin/users/listGroups.jspf
@@ -143,7 +148,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/admin/users/listUsers.jspf
 %%T%%/server/webapps/admin/users/roles.jspf
 %%T%%/server/webapps/admin/users/users.jspf
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
 %%T%%/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
 %%T%%/server/webapps/manager/WEB-INF/web.xml
 %%T%%/server/webapps/manager/html-manager-howto.html
@@ -160,10 +164,6 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/server/webapps/manager/manager.xml
 %%T%%/server/webapps/manager/status.xsd
 %%T%%/server/webapps/manager/xform.xsl
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
 %%T%%/webapps/ROOT/RELEASE-NOTES.txt
 %%T%%/webapps/ROOT/WEB-INF/classes/org/apache/jsp/index_jsp.class
 %%T%%/webapps/ROOT/WEB-INF/lib/catalina-root.jar
@@ -297,6 +297,7 @@ etc/rc.d/020.jakarta-tomcat50.sh
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$7.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$8.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$9.class
+%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class
 %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class