From owner-svn-ports-all@FreeBSD.ORG  Fri Nov 28 11:33:15 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E8E8CCEC;
 Fri, 28 Nov 2014 11:33:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5217AB0;
 Fri, 28 Nov 2014 11:33:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASBXFSA062238;
 Fri, 28 Nov 2014 11:33:15 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASBXFkF062234;
 Fri, 28 Nov 2014 11:33:15 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201411281133.sASBXFkF062234@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Fri, 28 Nov 2014 11:33:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373557 - in head/databases: mariadb-client mariadb-server
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Nov 2014 11:33:16 -0000

Author: marino
Date: Fri Nov 28 11:33:14 2014
New Revision: 373557
URL: https://svnweb.freebsd.org/changeset/ports/373557
QAT: https://qat.redports.org/buildarchive/r373557/

Log:
  databases/mariadb-(server,client): Update conflicts
  
  PR:		194824
  Submitted by:	Bernard Spil
  Approved by:	maintainer timeout

Modified:
  head/databases/mariadb-client/Makefile
  head/databases/mariadb-server/Makefile

Modified: head/databases/mariadb-client/Makefile
==============================================================================
--- head/databases/mariadb-client/Makefile	Fri Nov 28 11:22:38 2014	(r373556)
+++ head/databases/mariadb-client/Makefile	Fri Nov 28 11:33:14 2014	(r373557)
@@ -17,7 +17,10 @@ OPTIONS_DEFINE=		THREADSAFE
 OPTIONS_DEFAULT=	THREADSAFE
 THREADSAFE_DESC=	Build thread-safe client
 
-CONFLICTS=	mysql[0-9][0-9]-client-* mariadb5.[0-24-9]-client-* mariadb[0-46-9][0-9]-client-* percona[0-9][0-9]-client-*
+CONFLICTS=	mariadb5[4-9]-client-* \
+		mariadb1[0-9][0-9]-client-* \
+		mysql*-client-* \
+		percona*-client-* 
 
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist

Modified: head/databases/mariadb-server/Makefile
==============================================================================
--- head/databases/mariadb-server/Makefile	Fri Nov 28 11:22:38 2014	(r373556)
+++ head/databases/mariadb-server/Makefile	Fri Nov 28 11:33:14 2014	(r373557)
@@ -22,7 +22,10 @@ LICENSE=	GPLv2
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-CONFLICTS?=	mysql[0-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb5.[0-24-9]-server-* mariadb[0-46-9][0-9]-server-*
+CONFLICTS?=	mariadb5[4-9]-server-* \
+		mariadb1[0-9][0-9]-server-* \
+		mysql*-server-* \
+		percona*-server-*
 
 GNU_CONFIGURE=	yes
 USES+=		libtool