[pkgsrc/trunk]: pkgsrc/www/jakarta-tomcat Update the jakarta-tomcat package t...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/jakarta-tomcat Update the jakarta-tomcat package t...
From: erh <erh%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:01:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec4f00fbbb25
branches:  trunk
changeset: 474448:ec4f00fbbb25
user:      erh <erh%pkgsrc.org@localhost>
date:      Thu Apr 29 18:24:55 2004 +0000

description:
Update the jakarta-tomcat package to Tomcat 5.0.19.
This is a Java Servlet 2.4 and JSP 2.0 server.

diffstat:

 www/jakarta-tomcat/DESCR            |     1 +
 www/jakarta-tomcat/MESSAGE          |     8 +-
 www/jakarta-tomcat/Makefile         |    78 +-
 www/jakarta-tomcat/PLIST            |  2157 ++++++++++++++++++++++++++++------
 www/jakarta-tomcat/distinfo         |    11 +-
 www/jakarta-tomcat/files/tomcat.sh  |    11 +-
 www/jakarta-tomcat/patches/patch-aa |   106 -
 www/jakarta-tomcat/patches/patch-ab |    29 -
 www/jakarta-tomcat/patches/patch-ac |    15 -
 www/jakarta-tomcat/patches/patch-ad |    41 -
 www/jakarta-tomcat/patches/patch-ae |    21 -
 11 files changed, 1801 insertions(+), 677 deletions(-)

diffs (truncated from 2608 to 300 lines):

diff -r 50de80dab4c0 -r ec4f00fbbb25 www/jakarta-tomcat/DESCR
--- a/www/jakarta-tomcat/DESCR  Thu Apr 29 18:19:05 2004 +0000
+++ b/www/jakarta-tomcat/DESCR  Thu Apr 29 18:24:55 2004 +0000
@@ -2,3 +2,4 @@
 by the Apache Foundation's Jakarta Project.  Tomcat can be run as a
 standalone web server with Servlet and JSP support, or using Apache
 Server as its web server via the mod_jk Apache module (www/ap-jk).
+This is the Tomcat 5 package, which is a Java Serlet 2.4 and JSP 2.0 server.
diff -r 50de80dab4c0 -r ec4f00fbbb25 www/jakarta-tomcat/MESSAGE
--- a/www/jakarta-tomcat/MESSAGE        Thu Apr 29 18:19:05 2004 +0000
+++ b/www/jakarta-tomcat/MESSAGE        Thu Apr 29 18:24:55 2004 +0000
@@ -1,18 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/04/23 22:43:20 reed Exp $
+$NetBSD: MESSAGE,v 1.5 2004/04/29 18:24:55 erh Exp $
 
 For detailed instructions on how to run Tomcat, either as a
 standalone server or in conjunction with Apache (using the
 www/ap-jk package), see:
 
-       ${PREFIX}/tomcat/doc/uguide/tomcat_ug.html
+       http://localhost:8080/tomcat-docs/index.html
 
 For more information on application development with Tomcat, see
 
-       ${PREFIX}/tomcat/doc/appdev/index.html
+       http://localhost:8080/tomcat-docs/appdev/index.html
 
 Note that tomcat may be started with the following command:
 
-       ${RCD_SCRIPTS_EXAMPLEDIR}/tomcat start
+       ${PREFIX}/etc/rc.d/tomcat5 start
 
 ===========================================================================
diff -r 50de80dab4c0 -r ec4f00fbbb25 www/jakarta-tomcat/Makefile
--- a/www/jakarta-tomcat/Makefile       Thu Apr 29 18:19:05 2004 +0000
+++ b/www/jakarta-tomcat/Makefile       Thu Apr 29 18:24:55 2004 +0000
@@ -1,35 +1,35 @@
-# $NetBSD: Makefile,v 1.41 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.42 2004/04/29 18:24:55 erh Exp $
 
-DISTNAME=      jakarta-tomcat-${TOMCAT_VERSION}-src
-PKGNAME=       ${DISTNAME:S/-src$//}
-TOMCAT_VERSION=        3.2.4
-PKGREVISION=   1
+DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
+WRKSRC=                ${WRKDIR}/${DISTNAME}
 CATEGORIES=    www java
-MASTER_SITES=  http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
+# The list of sites to download is generated by a jakarta website.
+# The getsite.sh script parses the HTML and extracts the urls.
+DYNAMIC_MASTER_SITES=1
 
-MAINTAINER=    jwise%NetBSD.org@localhost
-HOMEPAGE=      http://jakarta.apache.org/
-COMMENT=       The Apache Project's Java Servlet 2.2 and JSP 1.1 server
+MAINTAINER=    erh%NetBSD.org@localhost
+HOMEPAGE=      http://jakarta.apache.org/tomcat/
+COMMENT=       The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-DEPENDS+=      jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
-DEPENDS+=      apache-ant>=1.4.1:../../devel/apache-ant
+TOMCAT_VERSION=        5.0.19
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}
+# This needs java 1.4 or higher.
+USE_JAVA=run
+USE_JAVA2=yes
+
 USE_BUILDLINK2=        yes
-MAKEFILE=      build.xml
-ALL_TARGET=    main
-INSTALL_TARGET=        dist
 
-SAMPLECONFDIR=                 ${PREFIX}/tomcat/conf
+TOMCAT_LIB=     ${PREFIX}/tomcat
+
+SAMPLECONFDIR=                 ${TOMCAT_LIB}/conf
 PKG_SYSCONFDIR.jakarta-tomcat= ${SAMPLECONFDIR}
 
 USE_PKGINSTALL=        yes
-OWN_DIRS=      ${PREFIX}/tomcat
-OWN_DIRS+=     ${PREFIX}/tomcat/conf
-OWN_DIRS+=     ${PREFIX}/tomcat/logs
-OWN_DIRS+=     ${PREFIX}/tomcat/webapps
-CFILES=                server.xml web.xml tomcat-users.xml jni_server.xml
-CFILES+=       tomcat.policy workers.properties
+CFILES=                server.xml web.xml tomcat-users.xml
+CFILES+=       catalina.policy catalina.properties jk2.properties
+CFILES+=       Catalina/localhost/admin.xml
+CFILES+=       Catalina/localhost/balancer.xml
+CFILES+=       Catalina/localhost/manager.xml
 
 CONF_FILES=    # empty
 .for FILE in ${CFILES}
@@ -37,23 +37,23 @@
 .endfor
 RCD_SCRIPTS=   tomcat
 
-FILES_SUBST+=  JAVA_HOME=${PKG_JAVA_HOME}
-
-post-patch:
-       ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
-       for file in ${WRKSRC}/src/etc/workers.properties; do            \
-               ${SED}  -e "s|@PREFIX@|${PREFIX}|g"                     \
-                       -e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g"           \
-                       $$file > $$file.tmp;                            \
-               ${MV} -f $$file.tmp $$file;                             \
-       done
-
-post-install:
-       ${RM} ${PREFIX}/tomcat/webapps/examples.war
+FILES_SUBST+=  JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_LIB=${TOMCAT_LIB}
 
 .include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
+
+do-build:
+.for FILE in ${CFILES}
+       ${MV} -f ${WRKSRC}/conf/${FILE} ${WRKSRC}/conf/${FILE}.default
+.endfor
 
-MAKE_PROGRAM=  ${LOCALBASE}/bin/ant
-MAKE_FLAGS=    -Dpkgsrc.prefix=${PREFIX}
-CLASSPATH:=    ${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH}
+do-install:
+       ${INSTALL_DATA_DIR} ${TOMCAT_LIB}
+       cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}
+       @${FIND} ${TOMCAT_LIB} -type f -print \
+               | ${XARGS} ${CHMOD} a+r
+       @${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
+               | ${XARGS} ${CHMOD} a+rx
+       @${FIND} ${TOMCAT_LIB} -type d -print \
+               | ${XARGS} ${CHMOD} a+rx
+
+.include "../../mk/bsd.pkg.mk"
diff -r 50de80dab4c0 -r ec4f00fbbb25 www/jakarta-tomcat/PLIST
--- a/www/jakarta-tomcat/PLIST  Thu Apr 29 18:19:05 2004 +0000
+++ b/www/jakarta-tomcat/PLIST  Thu Apr 29 18:24:55 2004 +0000
@@ -1,420 +1,1759 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:59 reed Exp $
-tomcat/KEYS
+@comment $NetBSD: PLIST,v 1.7 2004/04/29 18:24:55 erh Exp $
 tomcat/LICENSE
 tomcat/RELEASE-NOTES
-tomcat/bin/jspc.sh
+tomcat/RUNNING.txt
+tomcat/bin/LauncherBootstrap.class
+tomcat/bin/bootstrap.jar
+tomcat/bin/catalina.bat
+tomcat/bin/catalina.sh
+tomcat/bin/catalina.xml
+tomcat/bin/commons-daemon.jar
+tomcat/bin/commons-launcher.jar
+tomcat/bin/commons-logging-api.jar
+tomcat/bin/cpappend.bat
+tomcat/bin/digest.bat
+tomcat/bin/digest.sh
+tomcat/bin/jsvc.tar.gz
+tomcat/bin/launcher.properties
+tomcat/bin/service.bat
+tomcat/bin/setclasspath.bat
+tomcat/bin/setclasspath.sh
+tomcat/bin/shutdown-using-launcher.bat
+tomcat/bin/shutdown-using-launcher.sh
+tomcat/bin/shutdown.bat
 tomcat/bin/shutdown.sh
+tomcat/bin/startup-using-launcher.bat
+tomcat/bin/startup-using-launcher.sh
+tomcat/bin/startup.bat
 tomcat/bin/startup.sh
-tomcat/bin/tomcat.sh
-tomcat/conf/build.xml
-tomcat/conf/jni_server.xml.default
-tomcat/conf/jni_workers.properties
-tomcat/conf/manifest.servlet
-tomcat/conf/mod_jk.conf
-tomcat/conf/obj.conf
+tomcat/bin/tomcat.exe
+tomcat/bin/tomcatw.exe
+tomcat/bin/tool-wrapper-using-launcher.bat
+tomcat/bin/tool-wrapper-using-launcher.sh
+tomcat/bin/tool-wrapper.bat
+tomcat/bin/tool-wrapper.sh
+tomcat/common/endorsed/xercesImpl.jar
+tomcat/common/endorsed/xmlParserAPIs.jar
+tomcat/common/lib/ant.jar
+tomcat/common/lib/commons-collections.jar
+tomcat/common/lib/commons-dbcp-1.1.jar
+tomcat/common/lib/commons-el.jar
+tomcat/common/lib/commons-pool-1.1.jar
+tomcat/common/lib/jasper-compiler.jar
+tomcat/common/lib/jasper-runtime.jar
+tomcat/common/lib/jmx.jar
+tomcat/common/lib/jsp-api.jar
+tomcat/common/lib/naming-common.jar
+tomcat/common/lib/naming-factory.jar
+tomcat/common/lib/naming-java.jar
+tomcat/common/lib/naming-resources.jar
+tomcat/common/lib/servlet-api.jar
+tomcat/conf/Catalina/localhost/admin.xml.default
+tomcat/conf/Catalina/localhost/balancer.xml.default
+tomcat/conf/Catalina/localhost/manager.xml.default
+tomcat/conf/catalina.policy.default
+tomcat/conf/catalina.properties.default
+tomcat/conf/jk2.properties.default
+tomcat/conf/server-minimal.xml
 tomcat/conf/server.xml.default
-tomcat/conf/test-tomcat.xml
 tomcat/conf/tomcat-users.xml.default
-tomcat/conf/tomcat.conf
-tomcat/conf/tomcat.policy.default
-tomcat/conf/tomcat.properties
-tomcat/conf/uriworkermap.properties
-tomcat/conf/web.dtd
 tomcat/conf/web.xml.default
-tomcat/conf/workers.properties.default
-tomcat/conf/wrapper.properties
-tomcat/doc/AJPv13.html
-tomcat/doc/JDBCRealm.howto
-tomcat/doc/NT-Service-howto.html
-tomcat/doc/Tomcat-Workers-HowTo.html
-tomcat/doc/Tomcat-on-NetWare-HowTo.html
-tomcat/doc/appdev/build.xml.txt
-tomcat/doc/appdev/contents.html
-tomcat/doc/appdev/deployment.html
-tomcat/doc/appdev/footer.html
-tomcat/doc/appdev/header.html
-tomcat/doc/appdev/index.html
-tomcat/doc/appdev/installation.html
-tomcat/doc/appdev/introduction.html
-tomcat/doc/appdev/processes.html
-tomcat/doc/appdev/sample/build.bat
-tomcat/doc/appdev/sample/build.sh
-tomcat/doc/appdev/sample/build.xml
-tomcat/doc/appdev/sample/etc/web.xml
-tomcat/doc/appdev/sample/src/Hello.java
-tomcat/doc/appdev/sample/web/hello.jsp
-tomcat/doc/appdev/sample/web/images/tomcat.gif
-tomcat/doc/appdev/sample/web/index.html
-tomcat/doc/appdev/source.html
-tomcat/doc/appdev/tomcat.gif
-tomcat/doc/appdev/web.xml.txt
-tomcat/doc/faq
-tomcat/doc/in-process-howto.html
-tomcat/doc/index.html
-tomcat/doc/mod_jk-howto.html
-tomcat/doc/readme
-tomcat/doc/tomcat-apache-howto.html
-tomcat/doc/tomcat-iis-howto.html
-tomcat/doc/tomcat-localization-howto.html
-tomcat/doc/tomcat-netscape-howto.html
-tomcat/doc/tomcat-ssl-howto.html
-tomcat/doc/uguide/images/banner.gif
-tomcat/doc/uguide/images/tomcat.gif
-tomcat/doc/uguide/style.css
-tomcat/doc/uguide/tomcat-security-unix.html
-tomcat/doc/uguide/tomcat-security.html
-tomcat/doc/uguide/tomcat_ug.html
-tomcat/lib/jasper.jar
-tomcat/lib/test/Golden/Err.txt
-tomcat/lib/test/Golden/ForwardWithQuery.txt
-tomcat/lib/test/Golden/HelloWorld.txt
-tomcat/lib/test/Golden/Include.txt
-tomcat/lib/test/Golden/IncludeFile.txt
-tomcat/lib/test/Golden/Mismatch1.txt
-tomcat/lib/test/Golden/Mismatch2.txt
-tomcat/lib/test/Golden/MustFail.txt
-tomcat/lib/test/Golden/PrintWriterTest.txt
-tomcat/lib/test/Golden/ServletParam.txt
-tomcat/lib/test/Golden/SimpleForward.txt
-tomcat/lib/test/Golden/SimpleInclude.txt
-tomcat/lib/test/Golden/beanSer.txt
-tomcat/lib/test/Golden/beanTest.txt
-tomcat/lib/test/Golden/buffer.txt
-tomcat/lib/test/Golden/classTest.txt
-tomcat/lib/test/Golden/image1.gif
-tomcat/lib/test/Golden/implicitConfig.txt
-tomcat/lib/test/Golden/implicitContext.txt
-tomcat/lib/test/Golden/implicitException.txt
-tomcat/lib/test/Golden/implicitOut.txt
-tomcat/lib/test/Golden/implicitPage.txt
-tomcat/lib/test/Golden/implicitPageContext.txt
-tomcat/lib/test/Golden/implicitRequest.txt
-tomcat/lib/test/Golden/implicitResponse.txt
-tomcat/lib/test/Golden/implicitSession.txt
-tomcat/lib/test/Golden/import.txt
-tomcat/lib/test/Golden/index.txt
-tomcat/lib/test/Golden/jsptoservlet.txt
-tomcat/lib/test/Golden/movedindex.txt
-tomcat/lib/test/Golden/movedwelcome.txt
-tomcat/lib/test/Golden/pageImport.txt
-tomcat/lib/test/Golden/parse.txt
-tomcat/lib/test/Golden/servletParam1.txt
-tomcat/lib/test/Golden/servletParam2.txt
-tomcat/lib/test/Golden/welcome.txt
-tomcat/lib/webserver.jar
-tomcat/src/org/apache/jasper/CommandLineContext.java
-tomcat/src/org/apache/jasper/Constants.java
-tomcat/src/org/apache/jasper/EmbededServletOptions.java
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note updates to the jakarta-tomcat packages.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump of nbitools.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note updates to the jakarta-tomcat packages.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump of nbitools.
Indexes:
Home | Main Index | Thread Index | Old Index