4 files changed, 23 insertions, 27 deletions

diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index d9facd111a5d..e9284c986ee7 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -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:
diff --git a/www/tomcat7/distinfo b/www/tomcat7/distinfo
index 4d66029a1c47..6bd094d7ba9f 100644
--- a/www/tomcat7/distinfo
+++ b/www/tomcat7/distinfo
@@ -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
diff --git a/www/tomcat7/files/tomcat7.in b/www/tomcat7/files/tomcat7.in
index efb0fd278e58..7b1486288f38 100644
--- a/www/tomcat7/files/tomcat7.in
+++ b/www/tomcat7/files/tomcat7.in
@@ -121,4 +121,15 @@ command_args="-java-home '${_tomcat_java_home}' \
 	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"
diff --git a/www/tomcat7/pkg-plist b/www/tomcat7/pkg-plist
index 9463a52ccb61..f68a4122cca5 100644
--- a/www/tomcat7/pkg-plist
+++ b/www/tomcat7/pkg-plist
@@ -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