>Number: 74705
>Category: ports
>Synopsis: [maintainer] update www/jakarta-tomcat41 to 4.1.31
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 05 06:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: 4.10 & 5.3
>Organization:
Beijing University of Technology
>Environment:
FreeBSD 4.10-RELEASE-p2 #79
>Description:
1. update www/jakarta-tomcat41 to 4.1.31
2. use MASTER_SITE_APACHE_JAKARTA as MASTER_SITES
3. Update to bsd.java.mk 2.0
4. improved filename of manpage in Makefile
>How-To-Repeat:
>Fix:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat41/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 8 Mar 2004 10:06:07 -0000 1.15
+++ distinfo 5 Dec 2004 06:21:01 -0000
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-4.1.30.tar.gz) = ff27f6a5900768c1aafab4a68675b2ed
-SIZE (jakarta-tomcat-4.1.30.tar.gz) = 7894019
+MD5 (jakarta-tomcat-4.1.31.tar.gz) = e768c4681a1c3460f959dd5fe93c4b55
+SIZE (jakarta-tomcat-4.1.31.tar.gz) = 8058534
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat41/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile 3 Dec 2004 14:20:04 -0000 1.57
+++ Makefile 5 Dec 2004 06:21:01 -0000
@@ -6,21 +6,20 @@
#
PORTNAME= jakarta-tomcat
-PORTVERSION= 4.1.30
-PORTREVISION= 0
+PORTVERSION= 4.1.31
CATEGORIES= www java
-MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-4/v${PORTVERSION}/bin/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= znerd
+MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
+MASTER_SITE_SUBDIR= tomcat-4/v${PORTVERSION}/bin
MAINTAINER= liukang at bjut.edu.cn
COMMENT= Open-source Java web server by Apache, stable 4.1.x branch
-USE_JAVA= 1.2+
+USE_JAVA= yes
+JAVA_VERSION= 1.2+
NO_BUILD= YES
LATEST_LINK= ${APP_SHORTNAME}
-MAN1= tomcat41ctl.1
+MAN1= ${CONTROL_SCRIPT_NAME}.1
MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat41/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist 21 Nov 2003 06:53:45 -0000 1.22
+++ pkg-plist 5 Dec 2004 06:21:12 -0000
@@ -1,3 +1,10 @@
+ at exec mkdir %D/%%T%%/server || true
+ at exec mkdir %D/%%T%%/server/classes || true
+ at exec mkdir %D/%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters ||true
+ at exec mkdir %D/%%T%%/shared || true
+ at exec mkdir %D/%%T%%/shared/classes || true
+ at exec mkdir %D/%%T%%/shared/lib || true
+ at exec mkdir %D/%%T%%/webapps/tomcat-docs/jk2/printer ||true
bin/tomcat41ctl
etc/rc.d/020.jakarta-tomcat41.sh
%%T%%/LICENSE
@@ -19,6 +26,7 @@
%%T%%/common/endorsed/xercesImpl.jar
%%T%%/common/endorsed/xmlParserAPIs.jar
%%T%%/common/lib/activation.jar
+%%T%%/common/lib/ant-launcher.jar
%%T%%/common/lib/ant.jar
%%T%%/common/lib/commons-collections.jar
%%T%%/common/lib/commons-dbcp-1.1.jar
@@ -43,8 +51,6 @@
%%T%%/conf/web.xml
%%T%%/logs/stderr.log
%%T%%/logs/stdout.log
- at exec mkdir %D/%%T%%/server || true
- at exec mkdir %D/%%T%%/server/classes || true
%%T%%/server/lib/catalina-ant.jar
%%T%%/server/lib/catalina.jar
%%T%%/server/lib/commons-beanutils.jar
@@ -122,7 +128,6 @@
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextsAction.class
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.class
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.class
- at exec mkdir %D/%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters ||true
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.class
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.class
%%T%%/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.class
@@ -367,9 +372,6 @@
%%T%%/server/webapps/manager/images/tomcat.gif
%%T%%/server/webapps/manager/images/void.gif
%%T%%/server/webapps/manager/manager-howto.html
- at exec mkdir %D/%%T%%/shared || true
- at exec mkdir %D/%%T%%/shared/classes || true
- at exec mkdir %D/%%T%%/shared/lib || true
%%T%%/temp/README.txt
%%T%%/webapps/ROOT/WEB-INF/web.xml
%%T%%/webapps/ROOT/index.jsp
@@ -709,6 +711,9 @@
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-frame.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-summary.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-tree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetInitParameter.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetInitParameterNames.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetNamedDispatcher.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetRequestDispatcher.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetResource.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetResourcePaths.html
@@ -827,6 +832,8 @@
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-tree.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIEnvironment.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIRunner.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.HTTPHeaderInputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.NameValuePair.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/Constants.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -1237,6 +1244,10 @@
%%T%%/webapps/tomcat-docs/jk2/common/AJPv13-extensions-proposal.html
%%T%%/webapps/tomcat-docs/jk2/common/AJPv13.html
%%T%%/webapps/tomcat-docs/jk2/common/doccontrib.html
+%%T%%/webapps/tomcat-docs/jk2/common/printer/AJPv13-extensions-proposal.html
+%%T%%/webapps/tomcat-docs/jk2/common/printer/AJPv13.html
+%%T%%/webapps/tomcat-docs/jk2/common/printer/doccontrib.html
+%%T%%/webapps/tomcat-docs/jk2/common/printer/tools.html
%%T%%/webapps/tomcat-docs/jk2/common/tools.html
%%T%%/webapps/tomcat-docs/jk2/faq.html
%%T%%/webapps/tomcat-docs/jk2/images/corner.gif
@@ -1251,6 +1262,12 @@
%%T%%/webapps/tomcat-docs/jk2/jk/domhowto.html
%%T%%/webapps/tomcat-docs/jk2/jk/iishowto.html
%%T%%/webapps/tomcat-docs/jk2/jk/neshowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/aphowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/domhowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/iishowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/neshowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/quickhowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk/printer/workershowto.html
%%T%%/webapps/tomcat-docs/jk2/jk/quickhowto.html
%%T%%/webapps/tomcat-docs/jk2/jk/workershowto.html
%%T%%/webapps/tomcat-docs/jk2/jk2/confighowto.html
@@ -1260,10 +1277,22 @@
%%T%%/webapps/tomcat-docs/jk2/jk2/configweb.html
%%T%%/webapps/tomcat-docs/jk2/jk2/configwebcom.html
%%T%%/webapps/tomcat-docs/jk2/jk2/configwebex.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/davhowto.html
%%T%%/webapps/tomcat-docs/jk2/jk2/installhowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/confighowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtc.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtccom.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configtcex.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configweb.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configwebcom.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/configwebex.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/davhowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/installhowto.html
+%%T%%/webapps/tomcat-docs/jk2/jk2/printer/vhosthowto.html
%%T%%/webapps/tomcat-docs/jk2/jk2/vhosthowto.html
+%%T%%/webapps/tomcat-docs/jk2/printer/faq.html
+%%T%%/webapps/tomcat-docs/jk2/printer/index.html
%%T%%/webapps/tomcat-docs/jk2/style.css
- at exec mkdir %D/%%T%%/webapps/tomcat-docs/jk2/printer ||true
%%T%%/webapps/tomcat-docs/jndi-datasource-examples-howto.html
%%T%%/webapps/tomcat-docs/jndi-resources-howto.html
%%T%%/webapps/tomcat-docs/manager-howto.html
@@ -1472,9 +1501,12 @@
@dirrm %%T%%/webapps/tomcat-docs/servletapi
@dirrm %%T%%/webapps/tomcat-docs/printer
@dirrm %%T%%/webapps/tomcat-docs/jk2/printer
+ at dirrm %%T%%/webapps/tomcat-docs/jk2/jk2/printer
@dirrm %%T%%/webapps/tomcat-docs/jk2/jk2
+ at dirrm %%T%%/webapps/tomcat-docs/jk2/jk/printer
@dirrm %%T%%/webapps/tomcat-docs/jk2/jk
@dirrm %%T%%/webapps/tomcat-docs/jk2/images
+ at dirrm %%T%%/webapps/tomcat-docs/jk2/common/printer
@dirrm %%T%%/webapps/tomcat-docs/jk2/common
@dirrm %%T%%/webapps/tomcat-docs/jk2
@dirrm %%T%%/webapps/tomcat-docs/jasper/docs/api/resources
>Release-Note:
>Audit-Trail:
>Unformatted: