From owner-cvs-ports@FreeBSD.ORG  Thu Mar 18 12:50:10 2004
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6A33216A4CE; Thu, 18 Mar 2004 12:50:10 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4ABD943D46; Thu, 18 Mar 2004 12:50:10 -0800 (PST)
	(envelope-from dinoex@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2IKoAGe003870;
	Thu, 18 Mar 2004 12:50:10 -0800 (PST)
	(envelope-from dinoex@repoman.freebsd.org)
Received: (from dinoex@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2IKo95h003869;
	Thu, 18 Mar 2004 12:50:09 -0800 (PST)
	(envelope-from dinoex)
Message-Id: <200403182050.i2IKo95h003869@repoman.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 18 Mar 2004 12:50:09 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/www/apache13 Makefile ports/www/apache13+ipv6
 Makefile ports/www/apache13-fp Makefile ports/www/apache13-ssl
 Makefile ports/www/apache2 Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Mar 2004 20:50:10 -0000

dinoex      2004/03/18 12:50:09 PST

  FreeBSD ports repository

  Modified files:
    www/apache13         Makefile 
    www/apache13+ipv6    Makefile 
    www/apache13-fp      Makefile 
    www/apache13-ssl     Makefile 
    www/apache2          Makefile 
  Log:
  - CONFLICTS extended
  
  Revision  Changes    Path
  1.43      +4 -1      ports/www/apache13+ipv6/Makefile
  1.51      +4 -1      ports/www/apache13-fp/Makefile
  1.105     +4 -1      ports/www/apache13-ssl/Makefile
  1.145     +4 -1      ports/www/apache13/Makefile
  1.174     +4 -1      ports/www/apache2/Makefile