svn commit: r372220 - in head/databases: mysql56-client mysql56-server

[Alex Dupre]

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 at 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