From owner-svn-ports-all@FreeBSD.ORG Tue Jun 3 11:06:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 435DF99D; Tue, 3 Jun 2014 11:06:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2280C2B7D; Tue, 3 Jun 2014 11:06:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53B6qGY008803; Tue, 3 Jun 2014 11:06:52 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53B6pU0008797; Tue, 3 Jun 2014 11:06:51 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201406031106.s53B6pU0008797@svn.freebsd.org> From: Alex Dupre Date: Tue, 3 Jun 2014 11:06:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356329 - in head/www/tomcat7: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2014 11:06:52 -0000 Author: ale Date: Tue Jun 3 11:06:50 2014 New Revision: 356329 URL: http://svnweb.freebsd.org/changeset/ports/356329 QAT: https://qat.redports.org/buildarchive/r356329/ Log: - Update to 7.0.54 release [1] - Add support for environment variables. PR: 190228 Submitted by: wombat@marsupial.org Modified: head/www/tomcat7/Makefile head/www/tomcat7/distinfo head/www/tomcat7/files/tomcat7.in head/www/tomcat7/pkg-plist Modified: head/www/tomcat7/Makefile ============================================================================== --- head/www/tomcat7/Makefile Tue Jun 3 11:04:02 2014 (r356328) +++ head/www/tomcat7/Makefile Tue Jun 3 11:06:50 2014 (r356329) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 7.0.53 +PORTVERSION= 7.0.54 CATEGORIES= www java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= tomcat/tomcat-7/v${PORTVERSION}/bin @@ -25,8 +25,7 @@ USE_RC_SUBR= ${PKGBASE} TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} TOMCAT_CONF_FILES= catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml -CONF_EXT= sample -PLIST_SUB= T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \ +PLIST_SUB= T=${TOMCAT_SUBDIR} \ WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \ @@ -44,7 +43,7 @@ pre-patch: post-patch: @${FIND} ${WRKSRC} -name '*.bat' -delete .for f in ${TOMCAT_CONF_FILES} - @${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT} + @${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.sample .endfor do-install: Modified: head/www/tomcat7/distinfo ============================================================================== --- head/www/tomcat7/distinfo Tue Jun 3 11:04:02 2014 (r356328) +++ head/www/tomcat7/distinfo Tue Jun 3 11:06:50 2014 (r356329) @@ -1,2 +1,2 @@ -SHA256 (apache-tomcat-7.0.53.tar.gz) = f5e79d70ca7962d11abfc753e47b68a11fdfb4a409e76e2b7bd0a945f80f87c9 -SIZE (apache-tomcat-7.0.53.tar.gz) = 8780629 +SHA256 (apache-tomcat-7.0.54.tar.gz) = f0316c128881c4df384771dc0da8f8e80d861385798e57d22fd4068f48ab8724 +SIZE (apache-tomcat-7.0.54.tar.gz) = 8886891 Modified: head/www/tomcat7/files/tomcat7.in ============================================================================== --- head/www/tomcat7/files/tomcat7.in Tue Jun 3 11:04:02 2014 (r356328) +++ head/www/tomcat7/files/tomcat7.in Tue Jun 3 11:06:50 2014 (r356329) @@ -121,4 +121,15 @@ command_args="-java-home '${_tomcat_java org.apache.catalina.startup.Bootstrap \ ${_tomcat_pipe_cmd}" +start_precmd="tomcat_prestart" + +tomcat_prestart() +{ + if [ -r "${_tomcat_catalina_base}/bin/setenv.sh" ]; then + . "${_tomcat_catalina_base}/bin/setenv.sh" + elif [ -r "%%TOMCAT_HOME%%/bin/setenv.sh" ]; then + . "%%TOMCAT_HOME%%/bin/setenv.sh" + fi +} + run_rc_command "$1" Modified: head/www/tomcat7/pkg-plist ============================================================================== --- head/www/tomcat7/pkg-plist Tue Jun 3 11:04:02 2014 (r356328) +++ head/www/tomcat7/pkg-plist Tue Jun 3 11:06:50 2014 (r356329) @@ -18,27 +18,13 @@ %%T%%/bin/tomcat-native.tar.gz %%T%%/bin/tool-wrapper.sh %%T%%/bin/version.sh -@unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; fi -%%T%%/conf/catalina.policy.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/catalina.policy ] || cp %D/%%T%%/conf/catalina.policy.%%CONF_EXT%% %D/%%T%%/conf/catalina.policy -@unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; fi -%%T%%/conf/catalina.properties.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/catalina.properties ] || cp %D/%%T%%/conf/catalina.properties.%%CONF_EXT%% %D/%%T%%/conf/catalina.properties -@unexec if cmp -s %D/%%T%%/conf/context.xml %D/%%T%%/conf/context.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/context.xml; else fi -%%T%%/conf/context.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/context.xml ] || cp %D/%%T%%/conf/context.xml.%%CONF_EXT%% %D/%%T%%/conf/context.xml -@unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; fi -%%T%%/conf/logging.properties.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/logging.properties ] || cp %D/%%T%%/conf/logging.properties.%%CONF_EXT%% %D/%%T%%/conf/logging.properties -@unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; fi -%%T%%/conf/server.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/server.xml ] || cp %D/%%T%%/conf/server.xml.%%CONF_EXT%% %D/%%T%%/conf/server.xml -@unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; fi -%%T%%/conf/tomcat-users.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/tomcat-users.xml ] || cp %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%% %D/%%T%%/conf/tomcat-users.xml -@unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; fi -%%T%%/conf/web.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/web.xml ] || cp %D/%%T%%/conf/web.xml.%%CONF_EXT%% %D/%%T%%/conf/web.xml +@sample %%T%%/conf/catalina.policy.sample +@sample %%T%%/conf/catalina.properties.sample +@sample %%T%%/conf/context.xml.sample +@sample %%T%%/conf/logging.properties.sample +@sample %%T%%/conf/server.xml.sample +@sample %%T%%/conf/tomcat-users.xml.sample +@sample %%T%%/conf/web.xml.sample %%T%%/lib/annotations-api.jar %%T%%/lib/catalina-ant.jar %%T%%/lib/catalina-ha.jar