Patch the sample Apache Server configuration file fragment that comes with

Tomcat so that it works out of the box with our Apache Server config.

4 files changed, 43 insertions, 8 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index d93ef0b6ec1..4190d038252 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/01/13 22:14:53 jwise Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/16 21:41:08 jwise Exp $
 
 DISTNAME=	jakarta-tomcat.src
 PKGNAME=	jakarta-tomcat-3.0
@@ -21,6 +21,8 @@ NO_MTREE=
 JAKARTA_HOME?=	${JAVA_HOME}/jakarta
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
+
 post-extract:
 .for x in ${DISTFILES}
 	cd ${WRKDIR} && ${EXTRACTOR} ${DISTDIR}/$x
@@ -28,12 +30,19 @@ post-extract:
 
 post-patch:
 	${SED} -e s,@TOMCAT_HOME@,${JAKARTA_HOME}/tomcat,g \
-		< ${WRKSRC}/build.xml > ${WRKSRC}/build.xml.tmp
-	${MV} ${WRKSRC}/build.xml.tmp ${WRKSRC}/build.xml
+		< ${WRKSRC}/build.xml > ${WRKSRC}/build.tmp
+	${MV} ${WRKSRC}/build.tmp ${WRKSRC}/build.xml
+	${SED} -e s,@LOCALBASE@,${LOCALBASE},g \
+		< ${WRKSRC}/src/etc/tomcat.conf > ${WRKSRC}/src/etc/tomcat.tmp
+	${MV} ${WRKSRC}/src/etc/tomcat.tmp ${WRKSRC}/src/etc/tomcat.conf
 
 do-build:
 	cd ${WRKSRC} && ${SH} ./build.sh
 
+post-build:
+	${SED} 's,@TOMCAT_HOME@,${JAKARTA_HOME}/tomcat,g' \
+		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
+
 do-install:
 	${MKDIR} ${JAKARTA_HOME}/tomcat
 	cd ${WRKSRC} && ${SH} ./build.sh dist
diff --git a/www/jakarta-tomcat/files/patch-sum b/www/jakarta-tomcat/files/patch-sum
index 7ebf8bee061..95ed8742340 100644
--- a/www/jakarta-tomcat/files/patch-sum
+++ b/www/jakarta-tomcat/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/01/12 22:21:35 jwise Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/16 21:41:09 jwise Exp $
 
 MD5 (patch-aa) = 41a85a8cc20c07771f9884d8432af72e
+MD5 (patch-ab) = 8c132b67443980c0d678c5ea67e6a37e
diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab
new file mode 100644
index 00000000000..5c6bcd265ed
--- /dev/null
+++ b/www/jakarta-tomcat/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2000/01/16 21:41:09 jwise Exp $
+--- src/etc/tomcat.conf.orig	Sun Jan 16 15:21:00 2000
++++ src/etc/tomcat.conf	Sun Jan 16 16:12:03 2000
+@@ -10,7 +10,7 @@
+ # Tell Apache on Unix to load the Apache JServ communication module
+ # For shared object builds only!!!
+ # @LOAD_OR_NOT@LoadModule jserv_module @LIBEXECDIR@/mod_jserv.so
+-LoadModule jserv_module libexec/mod_jserv.so
++LoadModule jserv_module @LOCALBASE@/lib/httpd/mod_jserv.so
+ 
+ <IfModule mod_jserv.c>
+ # Do not edit! 
+@@ -18,6 +18,7 @@
+ ApJServDefaultProtocol ajpv12
+ ApJServSecretKey DISABLED
+ ApJServMountCopy on
++ApJServLogFile /var/log/httpd/mod_jserv.log
+ ApJServLogLevel notice
+ 
+ 
diff --git a/www/jakarta-tomcat/pkg/MESSAGE b/www/jakarta-tomcat/pkg/MESSAGE
index 7e9bccd93b1..571bf914bda 100644
--- a/www/jakarta-tomcat/pkg/MESSAGE
+++ b/www/jakarta-tomcat/pkg/MESSAGE
@@ -1,10 +1,15 @@
 Tomcat can be started and stopped with the following commands:
 
-	cd ${JAVAHOME}/jakarta/tomcat && ./startup.sh
-	cd ${JAVAHOME}/jakarta/tomcat && ./shutdown.sh
+	cd @TOMCAT_HOME@ && ./startup.sh
+	cd @TOMCAT_HOME@ && ./shutdown.sh
 
 By default, this will start the Tomcat webserver on port 8080
 
-To get Tomcat working with Apache Server, see
+To get Tomcat working with Apache Server quickly, install the
+ap-jserv package and add the following line to your httpd.conf:
 
-	${JAVAHOME}/jakarta/tomcat/Tomcat+Apache-HOWTO
+	Include @TOMCAT_HOME@/etc/tomcat.conf
+
+and make sure that apache and tomcat are not set to run on the
+same http port, and that jserv.conf from mod_jserv is not also
+included.