From owner-cvs-all@FreeBSD.ORG  Sun Feb  5 10:13:56 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: 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 8012216A420;
	Sun,  5 Feb 2006 10:13:56 +0000 (GMT) (envelope-from ale@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E83F43D68;
	Sun,  5 Feb 2006 10:13:55 +0000 (GMT) (envelope-from ale@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15ADtS8019713;
	Sun, 5 Feb 2006 10:13:55 GMT (envelope-from ale@repoman.freebsd.org)
Received: (from ale@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15ADtgZ019712;
	Sun, 5 Feb 2006 10:13:55 GMT (envelope-from ale)
Message-Id: <200602051013.k15ADtgZ019712@repoman.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Sun, 5 Feb 2006 10:13:54 +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/databases/p5-DBD-mysql50 Makefile
 ports/databases/mysql50-server Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 05 Feb 2006 10:13:56 -0000

ale         2006-02-05 10:13:54 UTC

  FreeBSD ports repository

  Modified files:
    databases/p5-DBD-mysql50 Makefile 
    databases/mysql50-server Makefile 
  Log:
  Update CONFLICTS after MySQL 5.1 import.
  
  Revision  Changes    Path
  1.208     +4 -4      ports/databases/mysql50-server/Makefile
  1.6       +1 -1      ports/databases/p5-DBD-mysql50/Makefile