cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- revert back to r300102, user isn't required a LOG option

Browse Source 
- bump portrevision

Submitted by: pointhat@
This commit is contained in:
Jason Helfman 2012-07-16 19:44:20 +00:00
parent 574f486400
commit d2e15d8ab0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=300974
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/tomcat55/Makefile
View File

@ -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}/sysutils/cronolog
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 \&"