MySQL ports: Extend CONFLICTS_INSTALL in conflicting ports.

databases/mysqlwsrep56-server has been present for some time and
databases/mysqlwsrep57-server has been added recently. Both ports
conflict with other MySQL server ports and this has been reflected
in databases/mysqlwsrep5[67]-server/Makefile but must also be
reflected in all conflicting ports' Makefiles as well.

The conflicting ports are:
databases/mariadb100-server
databases/mariadb101-server
databases/mariadb102-server
databases/mariadb55-server
databases/mysql55-server
databases/mysql56-server
databases/mysql57-server
databases/mysql80-server
databases/percona55-server
databases/percona56-server
databases/percona57-server

There is not going to be mysqlwsrep*-client* ports (because the vanilla
mysql*-client* ports suffice), so the entry in CONFLICTS just reads
mysqlwsrep*.

PR:		220791
Submitted by:	vd
Approved by:	brnrd, ale (maintainer timeout), feld (maintainer timeout), flo, mmokhi, koobs

11 files changed, 11 insertions, 0 deletions

diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 4c9158a77c2d..36ad8259b6e3 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -71,6 +71,7 @@ DATADIR=	${PREFIX}/share/mysql
 CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 
 .if !defined(CLIENT_ONLY)
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 6ab7d2e2fe08..b982a0f6a0a4 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -102,6 +102,7 @@ DATADIR=	${PREFIX}/share/mysql
 CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
 
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index d7ab71245c8e..251cc9550bf0 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -113,6 +113,7 @@ DATADIR=	${PREFIX}/share/mysql
 CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
 
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 4d8560efac93..752c642e4141 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -75,6 +75,7 @@ USE_LDCONFIG|=	${PREFIX}/lib/mysql/plugin
 CONFLICTS_INSTALL=	mariadb5[0-46-9]-server-* \
 			mariadb1*-server-* \
 			mysql[0-9]*-server-* \
+			mysqlwsrep* \
 			percona[0-9]*-server-*
 
 USE_RC_SUBR=	mysql-server
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 0a395b2ebe29..6e18a85ea628 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -63,6 +63,7 @@ USE_MYSQL=	yes
 WANT_MYSQL_VER=	55
 
 CONFLICTS_INSTALL=	mysql5[0-46-9]-server-* \
+			mysqlwsrep* \
 			mariadb*-server-* \
 			percona*-server-*
 
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index a58fb73421f1..9619b70111ab 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -78,6 +78,7 @@ USES+=		mysql:56
 
 CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
 			mysql[0-46-9][0-9]-server-* \
+			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-server-*
 
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 5bbf0d196e65..75f72e0cd90e 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -81,6 +81,7 @@ USES+=		mysql:57
 
 CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
 			mysql[0-46-9][0-9]-server-* \
+			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-server-*
 
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 8a131b3ab81d..0ce957f36169 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -80,6 +80,7 @@ USES+=		mysql:80
 
 CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 			mysql[0-79][0-9]-server-* \
+			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-server-*
 
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index f6e4bf09da30..2d1b67055a2f 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -60,6 +60,7 @@ CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 USES+=mysql:55p
 
 CONFLICTS_INSTALL=	mysql*-server-* \
+			mysqlwsrep* \
 			mariadb*-server-* \
 			percona5[0-46-9]-server-*
 
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index 40bb4f02deb1..1719d526a2ce 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -71,6 +71,7 @@ USES+=		libedit
 USES+=mysql:56p
 
 CONFLICTS_INSTALL=	mysql*-server-* \
+			mysqlwsrep* \
 			mariadb*-server-* \
 			percona5[0-57-9]-server-*
 
diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile
index 31ab44835982..d174ad1a1e0d 100644
--- a/databases/percona57-server/Makefile
+++ b/databases/percona57-server/Makefile
@@ -101,6 +101,7 @@ TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
 USES+=mysql:57p
 
 CONFLICTS_INSTALL=	mysql*-server-* \
+			mysqlwsrep* \
 			mariadb*-server-* \
 			percona5[0-68-9]-server-*