- provide startup script

- log tomcat messages to a file (logs/tomcat.log)
- fix plist

4 files changed, 44 insertions, 5 deletions

diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index efecaf7bd79e..efda6536dafc 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/
 DIST_SUBDIR=	jakarta/tomcat/${PORTVERSION}
@@ -20,8 +20,13 @@ RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
 NO_BUILD=	yes
 
 do-install:
-	/usr/bin/perl -i -pe "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/conf/workers.properties
+	@/usr/bin/perl -i -pe "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/conf/workers.properties
 	@${LN} -fs ${WRKSRC} ${WRKDIR}/tomcat
 	@pinstall -v -d ${WRKDIR}
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/tomcat.sh > ${WRKDIR}/tomcat.sh
+	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
+
+post-install:
+	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/jakarta-tomcat41/files/patch-ab b/www/jakarta-tomcat41/files/patch-ab
new file mode 100644
index 000000000000..4cd9c6810ff5
--- /dev/null
+++ b/www/jakarta-tomcat41/files/patch-ab
@@ -0,0 +1,10 @@
+--- conf/server.xml.orig	Tue Dec 12 22:36:20 2000
++++ conf/server.xml	Mon May 21 00:25:46 2001
+@@ -67,6 +67,7 @@
+     -->
+     <Logger name="tc_log" 
+             verbosityLevel = "INFORMATION" 
++            path="logs/tomcat.log" 
+     />
+ 
+     <Logger name="servlet_log" 
diff --git a/www/jakarta-tomcat41/files/tomcat.sh b/www/jakarta-tomcat41/files/tomcat.sh
new file mode 100644
index 000000000000..0b3990d7d84c
--- /dev/null
+++ b/www/jakarta-tomcat41/files/tomcat.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+JAVA_HOME=%%PREFIX%%/jdk1.1.8
+export JAVA_HOME
+TOMCAT_HOME=%%PREFIX%%/tomcat
+export TOMCAT_HOME
+
+case "$1" in
+	start)
+		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			%%PREFIX%%/tomcat/bin/tomcat.sh start > /dev/null && echo ' tomcat'
+		fi
+		;;
+	stop)
+		if [ -x %%PREFIX%%/tomcat/bin/tomcat.sh ]; then
+			%%PREFIX%%/tomcat/bin/tomcat.sh stop > /dev/null && echo ' tomcat'
+		fi
+		;;
+	*)
+		echo ""
+		echo "Usage: `basename $0` { start | stop }"
+		echo ""
+		exit 64
+		;;
+esac
diff --git a/www/jakarta-tomcat41/pkg-plist b/www/jakarta-tomcat41/pkg-plist
index 75948be109f6..12d5c80cc664 100644
--- a/www/jakarta-tomcat41/pkg-plist
+++ b/www/jakarta-tomcat41/pkg-plist
@@ -46,7 +46,6 @@ tomcat/doc/appdev/sample/build.bat
 tomcat/doc/appdev/sample/build.sh
 tomcat/doc/appdev/sample/build.xml
 tomcat/doc/appdev/sample/etc/web.xml
-tomcat/doc/appdev/sample/src/Hello.java
 tomcat/doc/appdev/sample/web/hello.jsp
 tomcat/doc/appdev/sample/web/images/tomcat.gif
 tomcat/doc/appdev/sample/web/index.html
@@ -78,16 +77,16 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @dirrm tomcat/webapps
+@dirrm tomcat/logs
+@dirrm tomcat/lib
 @dirrm tomcat/doc/uguide/images
 @dirrm tomcat/doc/uguide
 @dirrm tomcat/doc/appdev/sample/web/images
 @dirrm tomcat/doc/appdev/sample/web
 @dirrm tomcat/doc/appdev/sample/etc
-@dirrm tomcat/doc/appdev/sample/src
 @dirrm tomcat/doc/appdev/sample
 @dirrm tomcat/doc/appdev
 @dirrm tomcat/doc
-@dirrm tomcat/lib
 @dirrm tomcat/conf
 @dirrm tomcat/bin
 @dirrm tomcat