From owner-cvs-all@FreeBSD.ORG  Sun Jun 12 13:55:39 2011
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EC1C5106566C;
	Sun, 12 Jun 2011 13:55:39 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C54588FC0C;
	Sun, 12 Jun 2011 13:55:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p5CDtdY6042456;
	Sun, 12 Jun 2011 13:55:39 GMT
	(envelope-from crees@repoman.freebsd.org)
Received: (from crees@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p5CDtde0042455;
	Sun, 12 Jun 2011 13:55:39 GMT (envelope-from crees)
Message-Id: <201106121355.p5CDtde0042455@repoman.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 12 Jun 2011 13:55:39 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/www/tomcat6 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jun 2011 13:55:40 -0000

crees       2011-06-12 13:55:39 UTC

  FreeBSD ports repository

  Modified files:
    www/tomcat6          Makefile 
  Log:
  - Rename CONF_FILES variables to avoid conflict with incoming feature
  
  PR:             157165
  Approved by:    rene (mentor), maintainer timeout (ale, 25 days)
  
  Revision  Changes    Path
  1.63      +4 -3      ports/www/tomcat6/Makefile