[Midnightbsd-cvs] mports [16461] trunk/www/tomcat7/pkg-plist: tomcat 7.0.54

[laffer1 at midnightbsd.org]

Revision: 16461
          http://svnweb.midnightbsd.org/mports/?rev=16461
Author:   laffer1
Date:     2014-08-09 16:39:50 -0400 (Sat, 09 Aug 2014)
Log Message:
-----------
tomcat 7.0.54

Modified Paths:
--------------
    trunk/www/tomcat7/Makefile
    trunk/www/tomcat7/distinfo
    trunk/www/tomcat7/files/tomcat7.in
    trunk/www/tomcat7/pkg-plist

Property Changed:
----------------
    trunk/www/tomcat7/files/tomcat7.in

Modified: trunk/www/tomcat7/Makefile
===================================================================
--- trunk/www/tomcat7/Makefile	2014-08-09 20:38:02 UTC (rev 16460)
+++ trunk/www/tomcat7/Makefile	2014-08-09 20:39:50 UTC (rev 16461)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	7.0.50
+PORTVERSION=	7.0.54
 CATEGORIES=	www java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	tomcat/tomcat-7/v${PORTVERSION}/bin

Modified: trunk/www/tomcat7/distinfo
===================================================================
--- trunk/www/tomcat7/distinfo	2014-08-09 20:38:02 UTC (rev 16460)
+++ trunk/www/tomcat7/distinfo	2014-08-09 20:39:50 UTC (rev 16461)
@@ -1,2 +1,2 @@
-SHA256 (apache-tomcat-7.0.50.tar.gz) = 7be7b2d9e6626c81f2aa3d39a7e5b0e52e025d773cd29c4a0cf9e71b0d4c11e9
-SIZE (apache-tomcat-7.0.50.tar.gz) = 8313171
+SHA256 (apache-tomcat-7.0.54.tar.gz) = f0316c128881c4df384771dc0da8f8e80d861385798e57d22fd4068f48ab8724
+SIZE (apache-tomcat-7.0.54.tar.gz) = 8886891

Modified: trunk/www/tomcat7/files/tomcat7.in
===================================================================
--- trunk/www/tomcat7/files/tomcat7.in	2014-08-09 20:38:02 UTC (rev 16460)
+++ trunk/www/tomcat7/files/tomcat7.in	2014-08-09 20:39:50 UTC (rev 16461)
@@ -121,4 +121,15 @@
 	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"


Property changes on: trunk/www/tomcat7/files/tomcat7.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/tomcat7/pkg-plist
===================================================================
--- trunk/www/tomcat7/pkg-plist	2014-08-09 20:38:02 UTC (rev 16460)
+++ trunk/www/tomcat7/pkg-plist	2014-08-09 20:39:50 UTC (rev 16461)
@@ -44,7 +44,7 @@
 %%T%%/lib/catalina-ha.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.3.1.jar
+%%T%%/lib/ecj-P20140317-1600.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar