Index: devel/jakarta-commons-daemon/Makefile =================================================================== --- devel/jakarta-commons-daemon/Makefile (revision 313947) +++ devel/jakarta-commons-daemon/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= commons-daemon PORTVERSION= 1.0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE:S,$,:src,} \ ${MASTER_SITE_APACHE_COMMONS_BINARIES:S,$,:bin,} @@ -17,7 +17,9 @@ COMMENT= Wrapper code to start/stop a Java applica LICENSE= AL2 +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes +JAVA_BUILD= jdk JAVA_VERSION= 1.6+ JAVA_OS= native GNU_CONFIGURE= yes Index: www/tomcat6/Makefile =================================================================== --- www/tomcat6/Makefile (revision 313947) +++ www/tomcat6/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 6.0.36 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin @@ -14,8 +15,7 @@ COMMENT= Open-source Java web server by Apache, 6. LICENSE= AL2 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_JAVA= yes -JAVA_VERSION= 1.6+ +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_BUILD= YES USE_RC_SUBR= tomcat6 @@ -58,8 +58,6 @@ SUB_LIST= AJP_1_3_PORT=${AJP_1_3_PORT} \ pre-patch: @${ECHO_MSG} "Installation settings:" @${ECHO_MSG} " Destination directory: ${APP_HOME}" - @${ECHO_MSG} " Location of JDK: ${JAVA_HOME}" - @${ECHO_MSG} " Location of Java port: ${JAVA_PORT}" @${ECHO_MSG} " Running as (user/group): ${TOMCAT_USER}/${TOMCAT_GROUP}" @${ECHO_MSG} " HTTP port: ${HTTP_PORT}" @${ECHO_MSG} " Shutdown listener port: ${SHUTDOWN_PORT}" @@ -96,10 +94,6 @@ do-install: . endif .endfor - @${ECHO_MSG} -n ">> Creating symlink to tools.jar..." - @${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/lib/tools.jar - @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Fixing ownership settings..." @${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \ ${APP_HOME}/temp ${APP_HOME}/webapps ${APP_HOME}/work @@ -109,4 +103,6 @@ do-install: @${FIND} ${APP_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_MSG} " [ DONE ]" + @${SED} -i "" -e '${PLIST_REINPLACE_STOPDAEMON}' ${TMPPLIST} + .include Index: www/tomcat6/files/tomcat6.in =================================================================== --- www/tomcat6/files/tomcat6.in (revision 313947) +++ www/tomcat6/files/tomcat6.in (working copy) @@ -55,7 +55,6 @@ # tomcat%%TOMCAT_VERSION%%_enable="${tomcat%%TOMCAT_VERSION%%_enable:-"NO"}" -tomcat%%TOMCAT_VERSION%%_java_version="${tomcat%%TOMCAT_VERSION%%_java_version:-"%%JAVA_VERSION%%"}" tomcat%%TOMCAT_VERSION%%_user="${tomcat%%TOMCAT_VERSION%%_user:-"%%USER%%"}" tomcat%%TOMCAT_VERSION%%_catalina_home="${tomcat%%TOMCAT_VERSION%%_catalina_home:-"%%TOMCAT_HOME%%"}" tomcat%%TOMCAT_VERSION%%_catalina_base="${tomcat%%TOMCAT_VERSION%%_catalina_base:-"%%TOMCAT_HOME%%"}" @@ -168,9 +167,7 @@ tomcat_check_pidfile() { debug "pid file ($_pidfile): no pid in file." return fi - if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid $java_class\$"`" ]; then - echo -n $_pid - fi + pgrep -F "$_pidfile" -Lf "[[:blank:]]+$java_class[[:blank:]]+start" } tomcat_wait_max_for_pid() { Index: www/tomcat6/pkg-plist =================================================================== --- www/tomcat6/pkg-plist (revision 313947) +++ www/tomcat6/pkg-plist (working copy) @@ -53,7 +53,6 @@ %%T%%/lib/tomcat-i18n-es.jar %%T%%/lib/tomcat-i18n-fr.jar %%T%%/lib/tomcat-i18n-ja.jar -%%T%%/lib/tools.jar %%T%%/temp/safeToDelete.tmp %%T%%/webapps/ROOT/RELEASE-NOTES.txt %%T%%/webapps/ROOT/WEB-INF/web.xml Index: www/tomcat7/Makefile =================================================================== --- www/tomcat7/Makefile (revision 313947) +++ www/tomcat7/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= tomcat PORTVERSION= 7.0.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= tomcat/tomcat-7/v${PORTVERSION}/bin @@ -14,10 +14,9 @@ COMMENT= Open-source Java web server by Apache, 7. LICENSE= AL2 -RUN_DEPENDS= jsvc:${PORTSDIR}/devel/jakarta-commons-daemon +RUN_DEPENDS= jsvc:${PORTSDIR}/devel/jakarta-commons-daemon \ + javavm:${PORTSDIR}/java/javavmwrapper -USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes APP_SHORTNAME= tomcat7 @@ -33,16 +32,13 @@ PLIST_SUB= T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} LATEST_LINK= ${APP_SHORTNAME} SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \ - TOMCAT_USER=${WWWOWN} \ - JAVA_HOME=${JAVA_HOME} + TOMCAT_USER=${WWWOWN} .include pre-patch: @${ECHO_MSG} "Installation settings:" @${ECHO_MSG} " Destination directory: ${TOMCAT_HOME}" - @${ECHO_MSG} " Location of JDK: ${JAVA_HOME}" - @${ECHO_MSG} " Location of Java port: ${JAVA_PORT}" post-patch: @${FIND} ${WRKSRC} -name '*.bat' -delete @@ -68,10 +64,6 @@ do-install: . endif .endfor - @${ECHO_MSG} -n ">> Creating symlink to tools.jar..." - @${LN} -sf ${JAVA_HOME}/lib/tools.jar ${TOMCAT_HOME}/lib/tools.jar - @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Fixing ownership settings..." @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TOMCAT_HOME}/conf ${TOMCAT_HOME}/logs \ ${TOMCAT_HOME}/temp ${TOMCAT_HOME}/webapps ${TOMCAT_HOME}/work @@ -81,4 +73,6 @@ do-install: @${FIND} ${TOMCAT_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_MSG} " [ DONE ]" + @${SED} -i "" -e '${PLIST_REINPLACE_STOPDAEMON}' ${TMPPLIST} + .include Index: www/tomcat7/files/tomcat7.in =================================================================== --- www/tomcat7/files/tomcat7.in (revision 313947) +++ www/tomcat7/files/tomcat7.in (working copy) @@ -43,7 +43,7 @@ # Set the JUL config file # # tomcat7_java_home (str): -# Set to "%%JAVA_HOME%%" by default. +# Set to JAVA_HOME via javavm(1) by default. # Specify the Java VM to use. # # tomcat7_classpath (str): @@ -81,7 +81,7 @@ rcvar=${name}_enable load_rc_config "${name}" eval "${rcvar}=\${${rcvar}:-'NO'}" -eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}" +eval "_tomcat_java_home=\${${name}_java_home:-$(env JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | awk -F= '$1~/^JAVA_HOME$/ { print $2 }')}" eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}" eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'" eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}" Index: www/tomcat7/pkg-plist =================================================================== --- www/tomcat7/pkg-plist (revision 313947) +++ www/tomcat7/pkg-plist (working copy) @@ -58,7 +58,6 @@ %%T%%/lib/tomcat-i18n-ja.jar %%T%%/lib/tomcat-jdbc.jar %%T%%/lib/tomcat-util.jar -%%T%%/lib/tools.jar %%T%%/temp/safeToDelete.tmp %%T%%/webapps/ROOT/RELEASE-NOTES.txt %%T%%/webapps/ROOT/WEB-INF/web.xml