From owner-svn-ports-head@FreeBSD.ORG  Tue Nov  4 16:44:34 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 835DAE6C;
 Tue,  4 Nov 2014 16:44:34 +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 6D87BC87;
 Tue,  4 Nov 2014 16:44:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4GiYpF078975;
 Tue, 4 Nov 2014 16:44:34 GMT (envelope-from ale@FreeBSD.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4GiY6R078974;
 Tue, 4 Nov 2014 16:44:34 GMT (envelope-from ale@FreeBSD.org)
Message-Id: <201411041644.sA4GiY6R078974@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: Tue, 4 Nov 2014 16:44:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372151 - head/databases/mysql51-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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2014 16:44:34 -0000

Author: ale
Date: Tue Nov  4 16:44:33 2014
New Revision: 372151
URL: https://svnweb.freebsd.org/changeset/ports/372151
QAT: https://qat.redports.org/buildarchive/r372151/

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

Modified:
  head/databases/mysql51-server/Makefile

Modified: head/databases/mysql51-server/Makefile
==============================================================================
--- head/databases/mysql51-server/Makefile	Tue Nov  4 16:32:34 2014	(r372150)
+++ head/databases/mysql51-server/Makefile	Tue Nov  4 16:44:33 2014	(r372151)
@@ -90,7 +90,9 @@ CXXFLAGS+=	-fno-exceptions
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	51
 
-CONFLICTS_INSTALL=	mysql5.[02-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql5[2-9]-server-* \
+			mariadb*-server-* \
+			percona*-server-*
 
 USE_RC_SUBR=	mysql-server
 
@@ -158,7 +160,9 @@ post-patch:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-CONFLICTS_INSTALL=	mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[02-9]-client-* \
+			mariadb*-client-* \
+			percona*-client-* 
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -186,7 +190,7 @@ WANT_MYSQL_VER=	51
 
 RUN_DEPENDS=	p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
 
-CONFLICTS_INSTALL=	mysql[0-46-9][0-9]-scripts-* mysql5.[02-9]-scripts-*
+CONFLICTS_INSTALL=	mariadb51-scripts-*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \