From owner-svn-ports-all@FreeBSD.ORG  Thu Nov  6 11:05:27 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 9EE16F73;
 Thu,  6 Nov 2014 11:05:27 +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 8BEC8C28;
 Thu,  6 Nov 2014 11:05:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA6B5RJn086936;
 Thu, 6 Nov 2014 11:05:27 GMT (envelope-from ale@FreeBSD.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA6B5RVp086931;
 Thu, 6 Nov 2014 11:05:27 GMT (envelope-from ale@FreeBSD.org)
Message-Id: <201411061105.sA6B5RVp086931@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ale set sender to ale@FreeBSD.org
 using -f
From: Alex Dupre <ale@FreeBSD.org>
Date: Thu, 6 Nov 2014 11:05:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372220 - in head/databases: mysql56-client mysql56-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: Thu, 06 Nov 2014 11:05:27 -0000

Author: ale
Date: Thu Nov  6 11:05:26 2014
New Revision: 372220
URL: https://svnweb.freebsd.org/changeset/ports/372220
QAT: https://qat.redports.org/buildarchive/r372220/

Log:
  Update CONFLICTS.
  
  PR:		194819
  Submitted by:	spil.oss@gmail.com

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

Modified: head/databases/mysql56-client/Makefile
==============================================================================
--- head/databases/mysql56-client/Makefile	Thu Nov  6 10:50:34 2014	(r372219)
+++ head/databases/mysql56-client/Makefile	Thu Nov  6 11:05:26 2014	(r372220)
@@ -12,7 +12,9 @@ PKGMESSAGE=	mustnotexist
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
+			mariadb*-client-* \
+			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Thu Nov  6 10:50:34 2014	(r372219)
+++ head/databases/mysql56-server/Makefile	Thu Nov  6 11:05:26 2014	(r372220)
@@ -47,7 +47,9 @@ WANT_MYSQL_VER=	56
 USES+=		perl5
 USE_PERL5=	run
 
-CONFLICTS_INSTALL=	mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
+			mariadb*-server-* \
+			percona*-server-*
 
 USE_RC_SUBR=	mysql-server