summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/jakarta-tomcat/Makefile12
-rw-r--r--www/jakarta-tomcat/files/md58
-rw-r--r--www/jakarta-tomcat/files/patch-sum6
-rw-r--r--www/jakarta-tomcat/patches/patch-aa22
-rw-r--r--www/jakarta-tomcat/patches/patch-ab54
-rw-r--r--www/jakarta-tomcat/pkg/PLIST3
6 files changed, 52 insertions, 53 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index bd4f4dd0a08..52481c59c34 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2000/09/03 13:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/12/13 03:49:30 jwise Exp $
DISTNAME= jakarta-tomcat.src
-PKGNAME= jakarta-tomcat-3.1
+PKGNAME= jakarta-tomcat-3.1.1
CATEGORIES= www
-MASTER_SITES= http://jakarta.apache.org/builds/tomcat/release/v3.1/src/
-DISTFILES= jakarta-tomcat.tar.gz jakarta-tools.tar.gz jakarta-ant.tar.gz
+MASTER_SITES= http://jakarta.apache.org/builds/tomcat/release/v3.1.1/src/
+DISTFILES= jakarta-tomcat-3.1.1-src.tar.gz jakarta-tools.tar.gz jakarta-ant.tar.gz
MAINTAINER= jwise@netbsd.org
HOMEPAGE= http://jakarta.apache.org/
-DIST_SUBDIR= jakarta-3.1
+DIST_SUBDIR= jakarta-3.1.1
USE_JAVA= yes
-WRKSRC= ${WRKDIR}/jakarta-tomcat
+WRKSRC= ${WRKDIR}/jakarta-tomcat-3.1.1-src
JAKARTA_HOME= ${PREFIX}/jakarta
MAKE_ENV+= JAVA_HOME=${JAVA_HOME}
diff --git a/www/jakarta-tomcat/files/md5 b/www/jakarta-tomcat/files/md5
index 1cc6fabbae1..24ac8ea15bf 100644
--- a/www/jakarta-tomcat/files/md5
+++ b/www/jakarta-tomcat/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.3 2000/05/14 23:35:27 jwise Exp $
+$NetBSD: md5,v 1.4 2000/12/13 03:49:30 jwise Exp $
-MD5 (jakarta-3.1/jakarta-tomcat.tar.gz) = 32025cd19b28c416532eb17e7cda1218
-MD5 (jakarta-3.1/jakarta-tools.tar.gz) = c9a7d3860b862e8b66200d2cc573ba0b
-MD5 (jakarta-3.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
+MD5 (jakarta-3.1.1/jakarta-tomcat-3.1.1-src.tar.gz) = 1c1091acc6fc3116d0ffbc5d8bac34de
+MD5 (jakarta-3.1.1/jakarta-tools.tar.gz) = c9a7d3860b862e8b66200d2cc573ba0b
+MD5 (jakarta-3.1.1/jakarta-ant.tar.gz) = f3c6f2df40562b36eed067a8b6580526
diff --git a/www/jakarta-tomcat/files/patch-sum b/www/jakarta-tomcat/files/patch-sum
index 1d29a1866aa..4744ece12fb 100644
--- a/www/jakarta-tomcat/files/patch-sum
+++ b/www/jakarta-tomcat/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/05/31 22:47:28 jwise Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/13 03:49:30 jwise Exp $
-MD5 (patch-aa) = e092af614d52c333443970cbe61b3257
-MD5 (patch-ab) = abdbe33cda4ab2eab28bb1c396d3bca2
+MD5 (patch-aa) = 8965bfb0403833d22e92c963ebb78674
+MD5 (patch-ab) = c53b218d07d676bd8a5a8b351f5467c1
MD5 (patch-ac) = 4dc7fd9b8fe64cd3726ae64b0fc32411
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index a7f2a7e459e..a86be3ed5f5 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2000/09/03 13:38:49 wiz Exp $
---- build.xml.orig Sun May 14 17:16:26 2000
-+++ build.xml Sun May 14 17:17:45 2000
+$NetBSD: patch-aa,v 1.4 2000/12/13 03:49:30 jwise Exp $
+--- build.xml.orig Tue Dec 12 14:50:46 2000
++++ build.xml Tue Dec 12 18:53:17 2000
@@ -6,7 +6,7 @@
- <property name="ant.home" value="../jakarta-ant" />
- <property name="build.compiler" value="classic"/>
- <property name="tomcat.build" value="../build/tomcat"/>
-- <property name="tomcat.home" value="../dist/tomcat"/>
-+ <property name="tomcat.home" value="@JAKARTA_HOME@/tomcat"/>
- </target>
-
- <!-- ==================== Copy static files ==================== -->
+ <property name="ant.home" value="../jakarta-ant" />
+ <property name="build.compiler" value="classic"/>
+ <property name="tomcat.build" value="../build/tomcat"/>
+- <property name="tomcat.home" value="../dist/tomcat"/>
++ <property name="tomcat.home" value="@JAKARTA_HOME@/tomcat"/>
+ </target>
+
+ <!-- ==================== Copy static files ==================== -->
diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab
index 34704764c9a..a096b997422 100644
--- a/www/jakarta-tomcat/patches/patch-ab
+++ b/www/jakarta-tomcat/patches/patch-ab
@@ -1,28 +1,28 @@
-$NetBSD: patch-ab,v 1.3 2000/09/03 13:38:49 wiz Exp $
---- ./src/share/org/apache/tomcat/task/ApacheConfig.java.orig Sun May 14 18:11:20 2000
-+++ ./src/share/org/apache/tomcat/task/ApacheConfig.java Sun May 14 18:13:28 2000
+--- src/share/org/apache/tomcat/task/ApacheConfig.java.orig Tue Dec 12 14:51:28 2000
++++ src/share/org/apache/tomcat/task/ApacheConfig.java Tue Dec 12 18:58:28 2000
@@ -97,7 +97,7 @@
- } else {
- // XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
- // home
-- pw.println("LoadModule jserv_module libexec/mod_jserv.so");
-+ pw.println("LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so");
- }
-
- pw.println("ApJServManual on");
-@@ -105,13 +105,14 @@
- pw.println("ApJServSecretKey DISABLED");
- pw.println("ApJServMountCopy on");
- pw.println("ApJServLogLevel notice");
-+ pw.println("ApJServLogFile /var/log/httpd/jserv/mod_jserv.log");
- pw.println();
-
- // XXX read it from ContextManager
- pw.println("ApJServDefaultPort 8007");
-
- pw.println();
-- pw.println("AddType test/jsp .jsp");
-+ pw.println("AddType text/jsp .jsp");
- pw.println("AddHandler jserv-servlet .jsp");
-
-
+ } else {
+ // XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat
+ // home
+- pw.println("LoadModule jserv_module libexec/mod_jserv.so");
++ pw.println("LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so");
+ }
+
+ pw.println("ApJServManual on");
+@@ -105,13 +105,15 @@
+ pw.println("ApJServSecretKey DISABLED");
+ pw.println("ApJServMountCopy on");
+ pw.println("ApJServLogLevel notice");
++ pw.println("ApJServLogFile /var/log/httpd/jserv/mod_jserv.log");
++
+ pw.println();
+
+ // XXX read it from ContextManager
+ pw.println("ApJServDefaultPort 8007");
+
+ pw.println();
+- pw.println("AddType test/jsp .jsp");
++ pw.println("AddType text/jsp .jsp");
+ pw.println("AddHandler jserv-servlet .jsp");
+
+
diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST
index c396a77e7b7..b99ce3ec2bc 100644
--- a/www/jakarta-tomcat/pkg/PLIST
+++ b/www/jakarta-tomcat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/14 23:35:28 jwise Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/12/13 03:49:31 jwise Exp $
jakarta/tomcat/LICENSE
jakarta/tomcat/bin/ant
jakarta/tomcat/bin/antRun
@@ -371,7 +371,6 @@ jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlAction.java
jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMapper.java
jakarta/tomcat/src/org/apache/tomcat/util/xml/XmlMatch.java
jakarta/tomcat/webapps/ROOT.war
-jakarta/tomcat/webapps/admin.war
jakarta/tomcat/webapps/examples.war
jakarta/tomcat/webapps/test.war
@comment these are automatically created at run time
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 14:34:33 +0000