From c6ff8e49701320169a29e921651e17c4ce77a4b1 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Mon, 14 Aug 2017 05:37:21 +0000 Subject: 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 --- databases/mysql56-server/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'databases/mysql56-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-* -- cgit v1.2.3