Date: Wed, 14 Dec 2005 07:43:58 GMT From: Kang Liu <cnkang@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/90380: [maintainer] update www/jakarta-tomcat55 to 5.5.12 Message-ID: <200512140743.jBE7hwIE035549@www.freebsd.org> Resent-Message-ID: <200512140750.jBE7o2RQ043861@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90380 >Category: ports >Synopsis: [maintainer] update www/jakarta-tomcat55 to 5.5.12 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 14 07:50:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kang Liu >Release: 6.0 >Organization: Beijing University of Technology >Environment: FreeBSD-6.0 >Description: 1. Now tomcat is a top level apache project, I think it could be better if we change port name from jakarta-tomcat55 to apache-tomcat55. ref:http://jakarta.apache.org/site/news/news-2005-q4.html#20051009.2 2. Update tomcat55 to 5.5.12 3. Add SHA256 to distinfo 4. Change WWW site in pkg-descr >How-To-Repeat: >Fix: Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat55/distinfo,v retrieving revision 1.15 diff -u -r1.15 distinfo --- distinfo 25 Jul 2005 16:10:34 -0000 1.15 +++ distinfo 14 Dec 2005 06:51:07 -0000 @@ -1,4 +1,6 @@ -MD5 (jakarta-tomcat-5.5.9.tar.gz) = 35ea177af353446af1de3c762a4f0f4d -SIZE (jakarta-tomcat-5.5.9.tar.gz) = 5210986 -MD5 (jakarta-tomcat-5.5.9-compat.tar.gz) = 33f27b14f0ece9aedccecf7212d73ffc -SIZE (jakarta-tomcat-5.5.9-compat.tar.gz) = 1367217 +MD5 (apache-tomcat-5.5.12.tar.gz) = 4c51a16d86131ca7958273080efb473f +SHA256 (apache-tomcat-5.5.12.tar.gz) = 7a19f6a42bb2a0879a35d76dea16f38b169689eac18b488168eeca16c1beb73e +SIZE (apache-tomcat-5.5.12.tar.gz) = 5924214 +MD5 (apache-tomcat-5.5.12-compat.tar.gz) = e1c7c959d73dabe299fd4500a86657a2 +SHA256 (apache-tomcat-5.5.12-compat.tar.gz) = f9dd38df997c7cd53a94bb74b5e67616bd88584176a8e39c0a2db4da9b47d70c +SIZE (apache-tomcat-5.5.12-compat.tar.gz) = 1607878 Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat55/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- Makefile 29 Sep 2005 15:08:23 -0000 1.29 +++ Makefile 14 Dec 2005 06:50:59 -0000 @@ -5,8 +5,8 @@ # $FreeBSD: ports/www/jakarta-tomcat55/Makefile,v 1.29 2005/09/29 15:08:23 hq Exp $ # -PORTNAME= jakarta-tomcat -PORTVERSION= 5.5.9 +PORTNAME= apache-tomcat +PORTVERSION= 5.5.12 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat55/pkg-descr,v retrieving revision 1.3 diff -u -r1.3 pkg-descr --- pkg-descr 13 Jun 2005 14:08:34 -0000 1.3 +++ pkg-descr 14 Dec 2005 06:57:21 -0000 @@ -10,4 +10,4 @@ under the hood, resulting in improved performance, stability, and total cost of ownership. -WWW: http://jakarta.apache.org/tomcat/ +WWW: http://tomcat.apache.org/ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat55/pkg-plist,v retrieving revision 1.17 diff -u -r1.17 pkg-plist --- pkg-plist 2 Sep 2005 12:45:34 -0000 1.17 +++ pkg-plist 1 Oct 2005 19:41:25 -0000 @@ -4,21 +4,11 @@ @unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.policy must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.properties must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/context.xml %D/%%T%%/conf/context.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/context.xml; else echo If permanently deleting this package, %D/%%T%%/conf/context.xml must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/jk2.manifest %D/%%T%%/conf/jk2.manifest.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.manifest; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.manifest must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/jkconf.ant.xml %D/%%T%%/conf/jkconf.ant.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jkconf.ant.xml; else echo If permanently deleting this package, %D/%%T%%/conf/jkconf.ant.xml must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/jkconfig.manifest %D/%%T%%/conf/jkconfig.manifest.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jkconfig.manifest; else echo If permanently deleting this package, %D/%%T%%/conf/jkconfig.manifest must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/server-minimal.xml %D/%%T%%/conf/server-minimal.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-minimal.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server-minimal.xml must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/shm.manifest %D/%%T%%/conf/shm.manifest.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/shm.manifest; else echo If permanently deleting this package, %D/%%T%%/conf/shm.manifest must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/tomcat-jk2.manifest %D/%%T%%/conf/tomcat-jk2.manifest.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-jk2.manifest; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-jk2.manifest must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/uriworkermap.properties %D/%%T%%/conf/uriworkermap.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/uriworkermap.properties; else echo If permanently deleting this package, %D/%%T%%/conf/uriworkermap.properties must be removed manually; fi @unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/workers.properties %D/%%T%%/conf/workers.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/workers.properties; else echo If permanently deleting this package, %D/%%T%%/conf/workers.properties must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/workers.properties.minimal %D/%%T%%/conf/workers.properties.minimal.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/workers.properties.minimal; else echo If permanently deleting this package, %D/%%T%%/conf/workers.properties.minimal must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/workers2.properties %D/%%T%%/conf/workers2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/workers2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/workers2.properties must be removed manually; fi -@unexec if cmp -s %D/%%T%%/conf/workers2.properties.minimal %D/%%T%%/conf/workers2.properties.minimal.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/workers2.properties.minimal; else echo If permanently deleting this package, %D/%%T%%/conf/workers2.properties.minimal must be removed manually; fi +@unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi bin/tomcat55ctl etc/rc.d/jakarta-tomcat55.sh %%T%%/LICENSE @@ -26,21 +16,23 @@ %%T%%/RELEASE-NOTES %%T%%/RUNNING.txt %%T%%/bin/bootstrap.jar +%%T%%/bin/catalina-tasks.xml %%T%%/bin/catalina.sh %%T%%/bin/commons-daemon.jar %%T%%/bin/commons-logging-api.jar %%T%%/bin/digest.sh -%%JAVA14%%%%T%%/bin/jmx.jar +%%T%%/bin/jmx.jar +%%T%%/bin/jmxaccessor-tasks.xml %%T%%/bin/jsvc.tar.gz %%T%%/bin/setclasspath.sh %%T%%/bin/shutdown.sh %%T%%/bin/startup.sh %%T%%/bin/tomcat-juli.jar +%%T%%/bin/tomcat-native.tar.gz %%T%%/bin/tool-wrapper.sh %%T%%/bin/version.sh -%%T%%/common/classes/logging.properties -%%JAVA14%%%%T%%/common/endorsed/xercesImpl.jar -%%JAVA14%%%%T%%/common/endorsed/xml-apis.jar +%%T%%/common/endorsed/xercesImpl.jar +%%T%%/common/endorsed/xml-apis.jar %%T%%/common/i18n/tomcat-i18n-en.jar %%T%%/common/i18n/tomcat-i18n-es.jar %%T%%/common/i18n/tomcat-i18n-fr.jar @@ -60,23 +52,14 @@ %%T%%/conf/catalina.policy.%%CONF_EXT%% %%T%%/conf/catalina.properties.%%CONF_EXT%% %%T%%/conf/context.xml.%%CONF_EXT%% -%%T%%/conf/jk2.manifest.%%CONF_EXT%% -%%T%%/conf/jk2.properties.%%CONF_EXT%% -%%T%%/conf/jkconf.ant.xml.%%CONF_EXT%% -%%T%%/conf/jkconfig.manifest.%%CONF_EXT%% %%T%%/conf/server-minimal.xml.%%CONF_EXT%% %%T%%/conf/server.xml.%%CONF_EXT%% -%%T%%/conf/shm.manifest.%%CONF_EXT%% -%%T%%/conf/tomcat-jk2.manifest.%%CONF_EXT%% %%T%%/conf/tomcat-users.xml.%%CONF_EXT%% -%%T%%/conf/uriworkermap.properties.%%CONF_EXT%% %%T%%/conf/web.xml.%%CONF_EXT%% -%%T%%/conf/workers.properties.%%CONF_EXT%% -%%T%%/conf/workers.properties.minimal.%%CONF_EXT%% -%%T%%/conf/workers2.properties.%%CONF_EXT%% -%%T%%/conf/workers2.properties.minimal.%%CONF_EXT%% +%%T%%/conf/logging.properties.%%CONF_EXT%% %%T%%/logs/stderr.log %%T%%/logs/stdout.log +%%T%%/server/lib/catalina-ant-jmx.jar %%T%%/server/lib/catalina-ant.jar %%T%%/server/lib/catalina-cluster.jar %%T%%/server/lib/catalina-optional.jar @@ -89,6 +72,7 @@ %%T%%/server/lib/servlets-ssi.renametojar %%T%%/server/lib/servlets-webdav.jar %%T%%/server/lib/tomcat-ajp.jar +%%T%%/server/lib/tomcat-apr.jar %%T%%/server/lib/tomcat-coyote.jar %%T%%/server/lib/tomcat-http.jar %%T%%/server/lib/tomcat-util.jar @@ -126,6 +110,7 @@ %%T%%/webapps/ROOT/WEB-INF/lib/catalina-root.jar %%T%%/webapps/ROOT/WEB-INF/web.xml %%T%%/webapps/ROOT/admin/index.html +%%T%%/webapps/ROOT/favicon.ico %%T%%/webapps/ROOT/index.jsp %%T%%/webapps/ROOT/jakarta-banner.gif %%T%%/webapps/ROOT/tomcat-power.gif @@ -246,16 +231,6 @@ %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/panel_tag.class %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/xhtmlbasic_tag.class %%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/choose_jsp.class -%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$1.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$2.class -%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$3.class -%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$4.class -%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$5.class -%%T%%/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$6.class -%%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.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 @@ -273,7 +248,6 @@ %%T%%/webapps/jsp-examples/WEB-INF/jsp2/jsp2-example-taglib.tld %%T%%/webapps/jsp-examples/WEB-INF/lib/jstl.jar %%T%%/webapps/jsp-examples/WEB-INF/lib/standard.jar -%%T%%/webapps/jsp-examples/WEB-INF/tagPlugins.xml %%T%%/webapps/jsp-examples/WEB-INF/tags/displayProducts.tag %%T%%/webapps/jsp-examples/WEB-INF/tags/helloWorld.tag %%T%%/webapps/jsp-examples/WEB-INF/tags/panel.tag @@ -508,6 +482,7 @@ %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html %%T%%/webapps/tomcat-docs/appdev/source.html %%T%%/webapps/tomcat-docs/appdev/web.xml.txt +%%T%%/webapps/tomcat-docs/apr.html %%T%%/webapps/tomcat-docs/architecture/index.html %%T%%/webapps/tomcat-docs/architecture/overview.html %%T%%/webapps/tomcat-docs/architecture/printer/index.html @@ -716,6 +691,7 @@ %%T%%/webapps/tomcat-docs/manager-howto.html %%T%%/webapps/tomcat-docs/mbeans-descriptor-howto.html %%T%%/webapps/tomcat-docs/monitoring.html +%%T%%/webapps/tomcat-docs/printer/apr.html %%T%%/webapps/tomcat-docs/printer/balancer-howto.html %%T%%/webapps/tomcat-docs/printer/building.html %%T%%/webapps/tomcat-docs/printer/cgi-howto.html @@ -1042,3 +1018,4 @@ @dirrm %%T%%/common @dirrm %%T%%/bin @dirrm %%T%% + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512140743.jBE7hwIE035549>