diff options
author | jwise <jwise> | 2001-03-29 22:22:13 +0000 |
---|---|---|
committer | jwise <jwise> | 2001-03-29 22:22:13 +0000 |
commit | ccb441c95ef012d690a47f4166603030b3419cc2 (patch) | |
tree | ad2adff0c339eb8902ea0a96ae6f3d4ead8221b9 /www | |
parent | 540ffb564492e30df27537dce51ce9db6075df18 (diff) | |
download | pkgsrc-ccb441c95ef012d690a47f4166603030b3419cc2.tar.gz |
Add `workers.properties' to config files which receive special treatment.
Diffstat (limited to 'www')
-rw-r--r-- | www/jakarta-tomcat/patches/patch-aa | 4 | ||||
-rw-r--r-- | www/jakarta-tomcat/pkg/INSTALL | 4 | ||||
-rw-r--r-- | www/jakarta-tomcat/pkg/PLIST | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa index 26a9d1c0167..de952eefbeb 100644 --- a/www/jakarta-tomcat/patches/patch-aa +++ b/www/jakarta-tomcat/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/03/28 02:46:08 jwise Exp $ +$NetBSD: patch-aa,v 1.6 2001/03/29 22:22:13 jwise Exp $ --- build.xml.orig Tue Dec 12 14:51:36 2000 +++ build.xml Tue Mar 27 17:17:22 2001 @@ -6,11 +6,11 @@ @@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.5 2001/03/28 02:46:08 jwise Exp $ + <!-- <mapper type="glob" from="*.xml" to="*.xml.default"/> --> </copy> + <move todir="${tomcat.build}/conf/"> -+ <fileset dir="${tomcat.build}/conf/" includes="jni_server.xml,server.xml,tomcat.policy,tomcat-users.xml,web.xml"/> ++ <fileset dir="${tomcat.build}/conf/" includes="jni_server.xml,server.xml,tomcat.policy,tomcat-users.xml,web.xml,workers.properties"/> + <mapper type="glob" from="*" to="*.default"/> + </move> <copy tofile="${tomcat.build}/conf/build.xml" diff --git a/www/jakarta-tomcat/pkg/INSTALL b/www/jakarta-tomcat/pkg/INSTALL index 1fe8a07713b..3b76eeb4365 100644 --- a/www/jakarta-tomcat/pkg/INSTALL +++ b/www/jakarta-tomcat/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2001/03/28 02:46:09 jwise Exp $ +# $NetBSD: INSTALL,v 1.2 2001/03/29 22:22:14 jwise Exp $ PKGNAME=$1 STAGE=$2 @@ -11,7 +11,7 @@ CP="@CP@" SERVERROOT=${PKG_PREFIX}/tomcat/conf SAMPLECONFDIR=${SERVERROOT} CONFDIR=${SERVERROOT} -CONFFILES="server.xml web.xml tomcat-users.xml jni_server.xml tomcat.policy" +CONFFILES="server.xml web.xml tomcat-users.xml jni_server.xml tomcat.policy workers.properties" case ${STAGE} in PRE-INSTALL) diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST index b5950768cc4..40d66f8e3bd 100644 --- a/www/jakarta-tomcat/pkg/PLIST +++ b/www/jakarta-tomcat/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2001/03/28 02:46:09 jwise Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/03/29 22:22:14 jwise Exp $ etc/rc.d/tomcat tomcat/webapps/admin.war tomcat/webapps/test.war @@ -47,10 +47,10 @@ tomcat/conf/tomcat.conf tomcat/conf/web.dtd tomcat/conf/obj.conf tomcat/conf/mod_jk.conf -tomcat/conf/workers.properties tomcat/conf/build.xml tomcat/conf/uriworkermap.properties tomcat/conf/manifest.servlet +tomcat/conf/workers.properties.default tomcat/conf/jni_server.xml.default tomcat/conf/test-tomcat.xml tomcat/conf/server.xml.default @@ -349,6 +349,11 @@ tomcat/src/org/apache/jasper/Options.java @unexec rm -rf tomcat/webapps/test @comment must explicitly remove tomcat working stash @unexec rm -rf tomcat/work +@comment also remove auto-generated conf fragments, if present +@unexec rm -f /usr/pkg/tomcat/conf/iis_redirect.reg-auto +@unexec rm -f /usr/pkg/tomcat/conf/mod_jk.conf-auto +@unexec rm -f /usr/pkg/tomcat/conf/obj.conf-auto +@unexec rm -f /usr/pkg/tomcat/conf/uriworkermap.properties-auto @dirrm tomcat/src/org/apache/tomcat/util/xml @dirrm tomcat/src/org/apache/tomcat/util/pattern @dirrm tomcat/src/org/apache/tomcat/util |