Update CONFLCITS after the addition of percona55-* and mariadb55-*

Approved by:	maintainer

8 files changed, 8 insertions, 8 deletions

diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile
index 44a21bfba653..508193c96b8b 100644
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=		THREADSAFE
 OPTIONS_DEFAULT=	THREADSAFE
 THREADSAFE_DESC=	Build thread-safe client
 
-CONFLICTS=	mysql-client-[0-9]*
+CONFLICTS=	mysql-client-[0-9]* mariadb-client-5.[0-24-9].* percona-client-5.*
 
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 1d00223bfb60..e655ca65ed3a 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -22,7 +22,7 @@ LICENSE=	GPLv2
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-CONFLICTS?=	mysql-server-[0-9]*
+CONFLICTS?=	mysql-server-[0-9]* percona-server-[0-9]* mariadb-server-5.[0-24-9].* mariadb-server-[0-46-9].*
 
 GNU_CONFIGURE=	yes
 
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 8d95ded6264c..d97fbc9e1bdd 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -106,7 +106,7 @@ WANT_MYSQL_VER=	50
 
 LATEST_LINK=	mysql50-server
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[1-9].*
+CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[1-9].* mariadb-server-5.* percona-server-5.*
 
 USE_RC_SUBR=	mysql-server
 
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index b3d7e732c8c9..1452df57d714 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -96,7 +96,7 @@ WANT_MYSQL_VER=	51
 
 LATEST_LINK=	mysql51-server
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[02-9].*
+CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[02-9].* mariadb-server-5.* percona-server-5.*
 
 USE_RC_SUBR=	mysql-server
 
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index a58a46a97ce0..b0eea8d5c26f 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -18,7 +18,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LATEST_LINK=	mysql55-client
 
-CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-46-9].*
+CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.* percona-client-5.*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 34131b70adfc..30726b42b645 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -60,7 +60,7 @@ WANT_MYSQL_VER=	55
 
 LATEST_LINK=	mysql55-server
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-46-9].*
+CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-46-9].* mariadb-server-5.* percona-server-5.*
 
 USE_RC_SUBR=	mysql-server
 
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 882e2a3a419b..63e987da8000 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -13,7 +13,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LATEST_LINK=	percona55-client
 
-CONFLICTS_INSTALL=	mysql-client-[345].* percona-client-5.[0-46-9].*
+CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-46-9].*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index b6ad7e088e46..f7db2c82a7b5 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -63,7 +63,7 @@ WANT_MYSQL_VER=	55p
 
 LATEST_LINK=	percona55-server
 
-CONFLICTS_INSTALL=	mysql-server-[345].* percona-server-5.[0-46-9].*
+CONFLICTS_INSTALL=	mysql-server-[345].* percona-server-5.[0-46-9].* mariadb-server-[0-9].*
 
 USE_RC_SUBR=	mysql-server