Date: Mon, 16 Jul 2012 19:44:21 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r300974 - head/www/tomcat55 Message-ID: <201207161944.q6GJiLuA075789@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Mon Jul 16 19:44:20 2012 New Revision: 300974 URL: http://svn.freebsd.org/changeset/ports/300974 Log: - revert back to r300102, user isn't required a LOG option - bump portrevision Submitted by: pointhat@ Modified: head/www/tomcat55/Makefile Modified: head/www/tomcat55/Makefile ============================================================================== --- head/www/tomcat55/Makefile Mon Jul 16 19:23:54 2012 (r300973) +++ head/www/tomcat55/Makefile Mon Jul 16 19:44:20 2012 (r300974) @@ -7,7 +7,7 @@ PORTNAME= tomcat PORTVERSION= 5.5.35 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= tomcat/tomcat-5/v${PORTVERSION}/bin @@ -16,8 +16,10 @@ DISTNAME= apache-tomcat-${PORTVERSION} MAINTAINER= jgh@FreeBSD.org COMMENT= Open-source Java web server by Apache, 5.5.x branch +OPTIONS_DEFINE= LOG OPTIONS_SINGLE= LOG -OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL +OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL +LOG_DESC= Use Log Pre-Processor CRONOLOG_DESC= Use Cronolog for Log Processing CRONOLOG_DEVEL_DESC= Use Cronlog-Devel for Log Processing @@ -96,7 +98,7 @@ RUN_DEPENDS+= cronolog:${PORTSDIR}/sysut RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog-devel .endif -.if ( empty(PORT_OPTIONS:MCRONOLOG) && empty(PORT_OPTIONS:MCRONOLOG_DEVEL) ) +.if empty(PORT_OPTIONS:MLOG) LOG_ARGS?=">> \$${tomcat\%\%TOMCAT_VERSION\%\%_stdout_log} 2>> \$${tomcat\%\%TOMCAT_VERSION\%\%_stderr_log}" .else LOG_ARGS?="2>\&1 | ${LOCALBASE}/sbin/cronolog --link \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.out \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.\%Y_\%m_\%d.out >/dev/null 2>\&1 \&"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207161944.q6GJiLuA075789>