From owner-cvs-all@FreeBSD.ORG  Sun Apr 29 08:16:24 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 02DCB106564A;
	Sun, 29 Apr 2012 08:16:24 +0000 (UTC) (envelope-from dhn@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CAB338FC08;
	Sun, 29 Apr 2012 08:16:23 +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 q3T8GNgh028171;
	Sun, 29 Apr 2012 08:16:23 GMT (envelope-from dhn@repoman.freebsd.org)
Received: (from dhn@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q3T8GN66028170;
	Sun, 29 Apr 2012 08:16:23 GMT (envelope-from dhn)
Message-Id: <201204290816.q3T8GN66028170@repoman.freebsd.org>
From: Dennis Herrmann <dhn@FreeBSD.org>
Date: Sun, 29 Apr 2012 08:16:23 +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/mariadb-scripts 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, 29 Apr 2012 08:16:24 -0000

dhn         2012-04-29 08:16:23 UTC

  FreeBSD ports repository

  Modified files:
    databases/mariadb-scripts Makefile 
  Log:
  - Add CONFLICTS with databases/mytop
  
  Reported by:    Matthew Seaman <matthew@freebsd.org>
  
  Revision  Changes    Path
  1.13      +2 -1      ports/databases/mariadb-scripts/Makefile