Ease out-of-the-box integration with mod_jk (pkgsrc/www/ap-jk):

  * include a workers.properties which works out of the box -- this
    file may be better off as part of the ap-jk package, even though it
    is somewhat tomcat-specific.  I'll give this possibility more thought.

  * modify the apache config file fragment generator which runs on tomcat
    startup to generate an Include-able apache config file fragment which
    works out of the box to laod mod_jk.

4 files changed, 51 insertions, 3 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index e8c594c3ba4..a3d0c1c8de1 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/03/29 00:19:35 jwise Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/29 23:26:24 jwise Exp $
 
 DISTNAME=	${PKGNAME}-src
 PKGNAME=	jakarta-tomcat-3.2.1
@@ -24,6 +24,12 @@ INSTALL_TARGET=	dist
 DEINSTALL_FILE=		${PKGDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
+post-patch:
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		-e "s|@JAVA_HOME@|${JAVA_HOME}|g"			\
+		${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp
+		${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties
+
 post-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
 		${FILESDIR}/tomcat.sh > ${WRKDIR}/tomcat.sh
diff --git a/www/jakarta-tomcat/files/patch-sum b/www/jakarta-tomcat/files/patch-sum
index 0b5c29db470..10dd5d32b6d 100644
--- a/www/jakarta-tomcat/files/patch-sum
+++ b/www/jakarta-tomcat/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.6 2001/03/28 02:46:08 jwise Exp $
+$NetBSD: patch-sum,v 1.7 2001/03/29 23:26:24 jwise Exp $
 
-SHA1 (patch-aa) = 2e81b9a95672822158825e25b6ed5207a88456b9
+SHA1 (patch-aa) = 7d2810e5306c68e416f04b26e505504924488f98
+SHA1 (patch-ab) = c51b4db3fd61e31d37e54f5f58a1ef33094bb13c
+SHA1 (patch-ac) = 0ce9657b32a5ddc0029b9790ac00990f8a83a0d6
diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab
new file mode 100644
index 00000000000..59cba98b0f0
--- /dev/null
+++ b/www/jakarta-tomcat/patches/patch-ab
@@ -0,0 +1,13 @@
+--- src/share/org/apache/tomcat/task/ApacheConfig.java.orig	Thu Mar 29 13:52:28 2001
++++ src/share/org/apache/tomcat/task/ApacheConfig.java	Thu Mar 29 13:52:53 2001
+@@ -115,8 +115,8 @@
+ 	    } 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");
+-                mod_jk.println("LoadModule jk_module libexec/mod_jk.so");
++		pw.println("LoadModule jserv_module lib/httpd/mod_jserv.so");
++                mod_jk.println("LoadModule jk_module lib/httpd/mod_jk.so");
+                 mod_jk.println();                                
+                 mod_jk.println("JkWorkersFile " + new File(tomcatHome, WORKERS_CONFIG));
+                 mod_jk.println("JkLogFile " + new File(tomcatHome, JK_LOG_LOCATION));
diff --git a/www/jakarta-tomcat/patches/patch-ac b/www/jakarta-tomcat/patches/patch-ac
new file mode 100644
index 00000000000..657465fc391
--- /dev/null
+++ b/www/jakarta-tomcat/patches/patch-ac
@@ -0,0 +1,27 @@
+--- src/etc/workers.properties.orig	Thu Mar 29 14:16:09 2001
++++ src/etc/workers.properties	Thu Mar 29 14:16:41 2001
+@@ -40,20 +40,20 @@
+ # installed tomcat. This is where you have your conf, webapps and lib
+ # directories.
+ #
+-workers.tomcat_home=c:\jakarta-tomcat
++workers.tomcat_home=@PREFIX@/tomcat
+ 
+ #
+ # workers.java_home should point to your Java installation. Normally
+ # you should have a bin and lib directories beneath it.
+ #
+-workers.java_home=c:\jdk1.2.2
++workers.java_home=@JAVA_HOME@
+ 
+ #
+ # You should configure your environment slash... ps=\ on NT and / on UNIX
+ # and maybe something different elsewhere.
+ #
+-ps=\
+-# ps=/
++# ps=\
++ps=/
+ 
+ #
+ #------ ADVANCED MODE ------------------------------------------------