pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update www/jakarta-tomcat to 5.0.24.
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b646b008dcd
branches: trunk
changeset: 475804:2b646b008dcd
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Wed May 26 15:16:25 2004 +0000
description:
Update www/jakarta-tomcat to 5.0.24.
Changes *unknown*, sorry but can't find them.
While here, install the configuration files correctly, use
${RCD_SCRIPTS_DIR} in MESSAGE, etc.
diffstat:
doc/CHANGES | 3 +-
www/jakarta-tomcat/MESSAGE | 4 +-
www/jakarta-tomcat/Makefile | 65 ++++---
www/jakarta-tomcat/PLIST | 330 +++++++++++++++++++++++++++++++++++++------
www/jakarta-tomcat/distinfo | 6 +-
5 files changed, 328 insertions(+), 80 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r e801eca7bc4b -r 2b646b008dcd doc/CHANGES
--- a/doc/CHANGES Wed May 26 15:09:17 2004 +0000
+++ b/doc/CHANGES Wed May 26 15:16:25 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6034 2004/05/26 15:09:17 wiz Exp $
+$NetBSD: CHANGES,v 1.6035 2004/05/26 15:16:25 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -2657,3 +2657,4 @@
Updated lwm to 1.2.0 [adam 2004-05-26]
Updated libidn to 0.4.6 [wiz 2004-05-26]
Updated chkrootkit to 0.43nb1 [wiz 2004-05-26]
+ Updated jakarta-tomcat to 5.0.24 [xtraeme 2004-05-26]
diff -r e801eca7bc4b -r 2b646b008dcd www/jakarta-tomcat/MESSAGE
--- a/www/jakarta-tomcat/MESSAGE Wed May 26 15:09:17 2004 +0000
+++ b/www/jakarta-tomcat/MESSAGE Wed May 26 15:16:25 2004 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/04/29 18:24:55 erh Exp $
+$NetBSD: MESSAGE,v 1.6 2004/05/26 15:16:26 xtraeme Exp $
For detailed instructions on how to run Tomcat, either as a
standalone server or in conjunction with Apache (using the
@@ -13,6 +13,6 @@
Note that tomcat may be started with the following command:
- ${PREFIX}/etc/rc.d/tomcat5 start
+ ${RCD_SCRIPTS_DIR}/tomcat start
===========================================================================
diff -r e801eca7bc4b -r 2b646b008dcd www/jakarta-tomcat/Makefile
--- a/www/jakarta-tomcat/Makefile Wed May 26 15:09:17 2004 +0000
+++ b/www/jakarta-tomcat/Makefile Wed May 26 15:16:25 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2004/05/05 15:37:25 abs Exp $
+# $NetBSD: Makefile,v 1.44 2004/05/26 15:16:26 xtraeme Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
# The list of sites to download is generated by a jakarta website.
@@ -12,49 +11,59 @@
HOMEPAGE= http://jakarta.apache.org/tomcat/
COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server
-TOMCAT_VERSION= 5.0.19
+TOMCAT_VERSION= 5.0.24
# This needs java 1.4 or higher.
-USE_JAVA=yes
-USE_JAVA2=yes
-
+USE_JAVA2= yes
USE_BUILDLINK2= yes
TOMCAT_LIB= ${PREFIX}/tomcat
+CATALINA_DIR= Catalina/localhost
-SAMPLECONFDIR= ${TOMCAT_LIB}/conf
-PKG_SYSCONFDIR.jakarta-tomcat= ${SAMPLECONFDIR}
+EGDIR= ${TOMCAT_LIB}/share/examples/${PKGBASE}
+EGDIR2= ${EGDIR}/${CATALINA_DIR}
+
+PKG_SYSCONFDIR.jakarta-tomcat= ${TOMCAT_LIB}/conf
+MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat}/${CATALINA_DIR}
USE_PKGINSTALL= yes
+RCD_SCRIPTS= tomcat
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
+CF2FILES= admin.xml balancer.xml manager.xml
CONF_FILES= # empty
-.for FILE in ${CFILES}
-CONF_FILES+= ${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE}
+.for f in ${CFILES}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-RCD_SCRIPTS= tomcat
+.undef f
+.for f in ${CF2FILES}
+CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
+.endfor
+.undef f
-FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_LIB=${TOMCAT_LIB}
-
-.include "../../mk/java-vm.mk"
+FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB}
do-build:
-.for FILE in ${CFILES}
- ${MV} -f ${WRKSRC}/conf/${FILE} ${WRKSRC}/conf/${FILE}.default
+ @${MV} ${WRKSRC}/conf ${WRKDIR}
+do-install:
+ ${INSTALL_DATA_DIR} ${EGDIR2}
+.for f in ${CFILES}
+ ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
.endfor
-
-do-install:
+.undef f
+.for f in ${CF2FILES}
+ ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
+.endfor
+.undef f
${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
+ @(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; \
+ ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | \
+ ${XARGS} rm -f)
+.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e801eca7bc4b -r 2b646b008dcd www/jakarta-tomcat/PLIST
--- a/www/jakarta-tomcat/PLIST Wed May 26 15:09:17 2004 +0000
+++ b/www/jakarta-tomcat/PLIST Wed May 26 15:16:25 2004 +0000
@@ -1,36 +1,27 @@
-@comment $NetBSD: PLIST,v 1.7 2004/04/29 18:24:55 erh Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/05/26 15:16:26 xtraeme Exp $
tomcat/LICENSE
+tomcat/NOTICE
tomcat/RELEASE-NOTES
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/jmx.jar
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.exe
-tomcat/bin/tomcatw.exe
-tomcat/bin/tool-wrapper-using-launcher.bat
+tomcat/bin/tomcat5.exe
+tomcat/bin/tomcat5w.exe
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
@@ -41,23 +32,12 @@
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/tomcat-users.xml.default
-tomcat/conf/web.xml.default
tomcat/server/lib/catalina-ant.jar
tomcat/server/lib/catalina-cluster.jar
tomcat/server/lib/catalina-i18n-es.jar
@@ -155,7 +135,17 @@
tomcat/server/webapps/manager/images/void.gif
tomcat/server/webapps/manager/manager-howto.html
tomcat/server/webapps/manager/manager.xml
+tomcat/server/webapps/manager/status.xsd
tomcat/server/webapps/manager/xform.xsl
+tomcat/share/examples/jakarta-tomcat/Catalina/localhost/admin.xml
+tomcat/share/examples/jakarta-tomcat/Catalina/localhost/balancer.xml
+tomcat/share/examples/jakarta-tomcat/Catalina/localhost/manager.xml
+tomcat/share/examples/jakarta-tomcat/catalina.policy
+tomcat/share/examples/jakarta-tomcat/catalina.properties
+tomcat/share/examples/jakarta-tomcat/jk2.properties
+tomcat/share/examples/jakarta-tomcat/server.xml
+tomcat/share/examples/jakarta-tomcat/tomcat-users.xml
+tomcat/share/examples/jakarta-tomcat/web.xml
tomcat/webapps/ROOT/RELEASE-NOTES.txt
tomcat/webapps/ROOT/WEB-INF/classes/org/apache/jsp/index_jsp.class
tomcat/webapps/ROOT/WEB-INF/lib/catalina-root.jar
@@ -661,6 +651,7 @@
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
@@ -725,6 +716,7 @@
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -793,6 +785,7 @@
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/package-tree.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIEnvironment.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIRunner.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.NameValuePair.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/Constants.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
@@ -999,14 +992,18 @@
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
@@ -1722,38 +1719,279 @@
tomcat/webapps/webdav/index.html
tomcat/webapps/webdav/tomcat-power.gif
tomcat/webapps/webdav/tomcat.gif
-@comment must explicitly remove webapp working files, but not any user files in webapps
-@unexec /rescue/rm -rf %D/tomcat/webapps/ROOT
-@unexec /rescue/rm -rf %D/tomcat/webapps/balancer
-@unexec /rescue/rm -rf %D/tomcat/webapps/jsp-examples
-@unexec /rescue/rm -rf %D/tomcat/webapps/servlets-examples
-@unexec /rescue/rm -rf %D/tomcat/webapps/tomcat-docs
-@unexec /rescue/rm -rf %D/tomcat/webapps/webdav
-@unexec /rescue/rm -rf %D/tomcat/server/webapps
-@comment must explicitly remove tomcat working stash
-@unexec /rescue/rm -rf %D/tomcat/work
-@comment also remove auto-generated conf fragments, if present
-@unexec /rescue/rm -f %D/tomcat/conf/iis_redirect.reg-auto
-@unexec /rescue/rm -f %D/tomcat/conf/mod_jk.conf-auto
-@unexec /rescue/rm -f %D/tomcat/conf/obj.conf-auto
-@unexec /rescue/rm -f %D/tomcat/conf/uriworkermap.properties-auto
+@exec ${MKDIR} %D/tomcat/work
+@dirrm tomcat/work
+@dirrm tomcat/webapps/webdav/WEB-INF
+@dirrm tomcat/webapps/webdav
+@dirrm tomcat/webapps/tomcat-docs/servletapi/resources
+@dirrm tomcat/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use
+@dirrm tomcat/webapps/tomcat-docs/servletapi/javax/servlet/http
+@dirrm tomcat/webapps/tomcat-docs/servletapi/javax/servlet/class-use
+@dirrm tomcat/webapps/tomcat-docs/servletapi/javax/servlet
+@dirrm tomcat/webapps/tomcat-docs/servletapi/javax
+@dirrm tomcat/webapps/tomcat-docs/servletapi
+@dirrm tomcat/webapps/tomcat-docs/printer
+@dirrm tomcat/webapps/tomcat-docs/jspapi/resources
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet/jsp
+@dirrm tomcat/webapps/tomcat-docs/jspapi/javax/servlet
Home |
Main Index |
Thread Index |
Old Index