From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 16 19:44:21 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A835106564A;
	Mon, 16 Jul 2012 19:44:21 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54C3B8FC1B;
	Mon, 16 Jul 2012 19:44:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GJiLuD075791;
	Mon, 16 Jul 2012 19:44:21 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GJiLuA075789;
	Mon, 16 Jul 2012 19:44:21 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201207161944.q6GJiLuA075789@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Mon, 16 Jul 2012 19:44:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r300974 - head/www/tomcat55
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 19:44:21 -0000

Author: jgh
Date: Mon Jul 16 19:44:20 2012
New Revision: 300974
URL: http://svn.freebsd.org/changeset/ports/300974

Log:
  - revert back to r300102, user isn't required a LOG option
  - bump portrevision
  
  Submitted by: pointhat@

Modified:
  head/www/tomcat55/Makefile

Modified: head/www/tomcat55/Makefile
==============================================================================
--- head/www/tomcat55/Makefile	Mon Jul 16 19:23:54 2012	(r300973)
+++ head/www/tomcat55/Makefile	Mon Jul 16 19:44:20 2012	(r300974)
@@ -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}/sysut
 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 \&"