From 2f1621bf87d150a1f02da802d9ab707e25964b6e Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Fri, 13 Jul 2012 17:32:13 +0000 Subject: [PATCH] - fix LOG_ARGS logic in single option, bump portrevision as this affects runtime --- www/tomcat55/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile index 18e1928e0a4d..59c2e4358e21 100644 --- a/www/tomcat55/Makefile +++ b/www/tomcat55/Makefile @@ -7,6 +7,7 @@ PORTNAME= tomcat PORTVERSION= 5.5.35 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= tomcat/tomcat-5/v${PORTVERSION}/bin @@ -15,10 +16,8 @@ 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 -LOG_DESC= Use Log Pre-Processor +OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL CRONOLOG_DESC= Use Cronolog for Log Processing CRONOLOG_DEVEL_DESC= Use Cronlog-Devel for Log Processing @@ -97,7 +96,7 @@ RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog-devel .endif -.if empty(PORT_OPTIONS:MLOG) +.if ( empty(PORT_OPTIONS:MCRONOLOG) && empty(PORT_OPTIONS:MCRONOLOG_DEVEL) ) 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 \&"