From owner-cvs-all@FreeBSD.ORG  Wed Jul 21 11:24:41 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 C320616A4CE; Wed, 21 Jul 2004 11:24:41 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A61F243D5A; Wed, 21 Jul 2004 11:24:41 +0000 (GMT)
	(envelope-from vs@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6LBOfrx044254;
	Wed, 21 Jul 2004 11:24:41 GMT
	(envelope-from vs@repoman.freebsd.org)
Received: (from vs@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6LBOfRP044253;
	Wed, 21 Jul 2004 11:24:41 GMT
	(envelope-from vs)
Message-Id: <200407211124.i6LBOfRP044253@repoman.freebsd.org>
From: Volker Stolz <vs@FreeBSD.org>
Date: Wed, 21 Jul 2004 11:24:41 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/databases/msql Makefile ports/databases/msql3
 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: Wed, 21 Jul 2004 11:24:41 -0000

vs          2004-07-21 11:24:41 UTC

  FreeBSD ports repository

  Modified files:
    databases/msql       Makefile 
    databases/msql3      Makefile 
  Log:
  Add CONFLICTS for msql <-> msql3
  
  PR:             ports/69355
  Submitted by:   Andrey Slusar (maintainer)
  
  Revision  Changes    Path
  1.62      +2 -0      ports/databases/msql/Makefile
  1.63      +2 -0      ports/databases/msql3/Makefile