sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 10:56:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fix LOG_ARGS logic in single option, bump portrevision as this affects runtime

Browse source
This commit is contained in:
Jason Helfman 2012-07-13 17:32:13 +00:00
parent 71a667200b
commit 2f1621bf87
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=300880
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
www/tomcat55/Makefile
View file

@ -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 \&"