diff -ur www-servers/tomcat/files/6/tomcat.conf /Volumes/Shared/prefix/usr/portage/www-servers/tomcat/files/6/tomcat.conf --- www-servers/tomcat/files/6/tomcat.conf 2009-11-27 14:17:31 +0100 +++ /Volumes/Shared/prefix/usr/portage/www-servers/tomcat/files/6/tomcat.conf 2008-12-21 13:11:31 +0100 @@ -50,7 +50,6 @@ # NOTE: jpda requires JPDA (see below) TOMCAT_START="start" TOMCAT_STOP="stop" -TOMCAT_INIT_TIMEOUT="120" # (Optional) Java runtime options used when the "start", "stop", or "run" # commands are executed. diff -ur www-servers/tomcat/files/6/tomcat.init /Volumes/Shared/prefix/usr/portage/www-servers/tomcat/files/6/tomcat.init --- www-servers/tomcat/files/6/tomcat.init 2009-11-27 14:17:30 +0100 +++ /Volumes/Shared/prefix/usr/portage/www-servers/tomcat/files/6/tomcat.init 2008-12-21 13:11:31 +0100 @@ -97,7 +97,6 @@ init_env_vars start-stop-daemon --stop --quiet \ --pidfile /var/run/tomcat-6.pid \ - --retry ${TOMCAT_INIT_TIMEOUT} \ --exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT} eend $? }