From owner-cvs-all@FreeBSD.ORG  Thu Mar 18 22:02:22 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 82A3B16A4CE; Thu, 18 Mar 2004 22:02:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 66AC143D54; Thu, 18 Mar 2004 22:02:22 -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 i2J62MGe044384;
	Thu, 18 Mar 2004 22:02:22 -0800 (PST)
	(envelope-from dinoex@repoman.freebsd.org)
Received: (from dinoex@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2J62M2X044380;
	Thu, 18 Mar 2004 22:02:22 -0800 (PST)
	(envelope-from dinoex)
Message-Id: <200403190602.i2J62M2X044380@repoman.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 18 Mar 2004 22:02:22 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/russian/apache13
	Makefileports/russian/apache13-modssl Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: 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: Fri, 19 Mar 2004 06:02:22 -0000

dinoex      2004/03/18 22:02:22 PST

  FreeBSD ports repository

  Modified files:
    russian/apache13     Makefile 
    russian/apache13-modssl Makefile 
  Log:
  - extend CONFLICTS
  
  Revision  Changes    Path
  1.44      +5 -0      ports/russian/apache13-modssl/Makefile
  1.40      +6 -1      ports/russian/apache13/Makefile