From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 28 22:10:10 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53371065670 for ; Tue, 28 Dec 2010 22:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 58D738FC1E for ; Tue, 28 Dec 2010 22:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBSMAAPC055081 for ; Tue, 28 Dec 2010 22:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBSMAAdG055080; Tue, 28 Dec 2010 22:10:10 GMT (envelope-from gnats) Resent-Date: Tue, 28 Dec 2010 22:10:10 GMT Resent-Message-Id: <201012282210.oBSMAAdG055080@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80FE21065670 for ; Tue, 28 Dec 2010 22:08:19 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id 601A38FC15 for ; Tue, 28 Dec 2010 22:08:19 +0000 (UTC) Received: from mail.experts-exchange.com (localhost [127.0.0.1]) by mail.experts-exchange.com (Postfix) with ESMTP id 0E313CA5E73 for ; Tue, 28 Dec 2010 14:08:19 -0800 (PST) Received: from mail.experts-exchange.com ([127.0.0.1]) by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OzinIhREm8-A for ; Tue, 28 Dec 2010 14:08:18 -0800 (PST) Received: from experts-exchange.com (unknown [192.168.103.122]) by mail.experts-exchange.com (Postfix) with SMTP id AFF9CCA5E71 for ; Tue, 28 Dec 2010 14:08:18 -0800 (PST) Received: (nullmailer pid 23876 invoked by uid 1001); Tue, 28 Dec 2010 22:05:09 -0000 Message-Id: <1293573909.293900.23875.nullmailer@experts-exchange.com> Date: Tue, 28 Dec 2010 14:05:09 -0800 From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/153505: [maintainer-update] [patch] www/tomcat55: add cronolog-devel as an optional log processor X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jason Helfman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Dec 2010 22:10:10 -0000 >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: