aboutsummaryrefslogtreecommitdiffstats
path: root/www/tomcat55
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2011-01-09 03:16:08 +0800
committerswills <swills@FreeBSD.org>2011-01-09 03:16:08 +0800
commitb9d067510916346f3bdf536e5c19b1903f6e7329 (patch)
tree72dc3973d2d40f0db9cb70a33090129a0fae1ff6 /www/tomcat55
parent5dbb21d40f060e991b77cc3bafee9047851b1e80 (diff)
downloadfreebsd-ports-gnome-b9d067510916346f3bdf536e5c19b1903f6e7329.tar.gz
freebsd-ports-gnome-b9d067510916346f3bdf536e5c19b1903f6e7329.tar.zst
freebsd-ports-gnome-b9d067510916346f3bdf536e5c19b1903f6e7329.zip
- Add cronolog-devel as an optional log processor
PR: ports/153505 Submitted by: Jason Helfman <jhelfman at experts-exchange.com> (maintainer) Approved by: wxs (mentor)
Diffstat (limited to 'www/tomcat55')
-rw-r--r--www/tomcat55/Makefile24
1 files changed, 18 insertions, 6 deletions
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index dda3d329d1e8..56d44cffa9d1 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -16,7 +16,8 @@ DISTFILES= apache-tomcat-${PORTVERSION}.tar.gz
MAINTAINER= jhelfman@experts-exchange.com
COMMENT= Open-source Java web server by Apache, 5.5.x branch
-OPTIONS= CRONOLOG "Use Cronolog for Tomcat Log Processing" Off
+OPTIONS= CRONOLOG "Use Cronolog for Log Processing" Off \
+ CRONOLOG_DEVEL "Use Cronlog-Devel for Log Processing" Off
USE_JAVA= yes
JAVA_VERSION?= 1.4+
@@ -82,17 +83,28 @@ PLIST_SUB+= JAVA14="@comment "
.endif
.if defined(WITH_CRONOLOG)
+RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog
+.endif
+
+.if defined(WITH_CRONOLOG_DEVEL)
+RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog-devel
+.endif
+
+.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) )
+LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog
+LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
+LOG_PROCESSOR_OPTS?= --link
REDIRECT?= "2\>\&1"
SUB_LIST+= LOG_PROCESSOR=${LOG_PROCESSOR} \
LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \
LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \
REDIRECT=${REDIRECT}
-RUN_DEPENDS+= cronolog:${PORTSDIR}/sysutils/cronolog
-LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
-LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog
-LOG_PROCESSOR_OPTS?= --link
.endif
+.if ( defined(WITH_CRONOLOG) && defined(WITH_CRONOLOG_DEVEL) )
+BROKEN= You can only define one log pre-processor application.
+.endif
+
pre-patch:
@${ECHO_MSG} "Installation settings:"
@${ECHO_MSG} " Destination directory: ${APP_HOME}"
@@ -106,7 +118,7 @@ pre-patch:
@${ECHO_MSG} " Logfile stderr: ${STDERR_LOG}"
post-patch:
-.if defined(WITH_CRONOLOG)
+.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) )
@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog
.endif