Date: Tue, 28 Dec 2010 14:05:09 -0800 From: Jason Helfman <jhelfman@experts-exchange.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/153505: [maintainer-update] [patch] www/tomcat55: add cronolog-devel as an optional log processor Message-ID: <1293573909.293900.23875.nullmailer@experts-exchange.com> Resent-Message-ID: <201012282210.oBSMAAdG055080@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153505 >Category: ports >Synopsis: [maintainer-update] [patch] www/tomcat55: add cronolog-devel as an optional log processor >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 28 22:10:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jason Helfman >Release: FreeBSD 8.1-RELEASE i386 >Organization: Experts Exchange, LLC. >Environment: System: FreeBSD eggman.experts-exchange.com 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: No issue. Add an additional log processor. >How-To-Repeat: >Fix: diff -ur tomcat55.orig/Makefile tomcat55/Makefile --- tomcat55.orig/Makefile 2010-12-11 17:09:28.000000000 -0800 +++ tomcat55/Makefile 2010-12-28 13:39:02.000000000 -0800 @@ -7,7 +7,7 @@ PORTNAME= tomcat PORTVERSION= 5.5.31 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= tomcat/tomcat-5/v${PORTVERSION}/bin @@ -16,7 +16,8 @@ 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+ @@ -93,6 +94,18 @@ LOG_PROCESSOR_OPTS?= --link .endif +.if defined(WITH_CRONOLOG_DEVEL) +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-devel +LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out" +LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog +LOG_PROCESSOR_OPTS?= --link +.endif + pre-patch: @${ECHO_MSG} "Installation settings:" @${ECHO_MSG} " Destination directory: ${APP_HOME}" @@ -106,7 +119,7 @@ @${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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1293573909.293900.23875.nullmailer>