Date: Mon, 14 Aug 2017 05:37:21 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447926 - in head/databases: mariadb100-server mariadb101-server mariadb102-server mariadb55-server mysql55-server mysql56-server mysql57-server mysql80-server percona55-server percona5... Message-ID: <201708140537.v7E5bL24075677@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Mon Aug 14 05:37:21 2017 New Revision: 447926 URL: https://svnweb.freebsd.org/changeset/ports/447926 Log: 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 Modified: head/databases/mariadb100-server/Makefile head/databases/mariadb101-server/Makefile head/databases/mariadb102-server/Makefile head/databases/mariadb55-server/Makefile head/databases/mysql55-server/Makefile head/databases/mysql56-server/Makefile head/databases/mysql57-server/Makefile head/databases/mysql80-server/Makefile head/databases/percona55-server/Makefile head/databases/percona56-server/Makefile head/databases/percona57-server/Makefile Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mariadb100-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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) Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mariadb101-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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 Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mariadb102-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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 Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mariadb55-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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 Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mysql55-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -63,6 +63,7 @@ USE_MYSQL= yes WANT_MYSQL_VER= 55 CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \ + mysqlwsrep* \ mariadb*-server-* \ percona*-server-* Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mysql56-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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-* Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mysql57-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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-* Modified: head/databases/mysql80-server/Makefile ============================================================================== --- head/databases/mysql80-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/mysql80-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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-* Modified: head/databases/percona55-server/Makefile ============================================================================== --- head/databases/percona55-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/percona55-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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-* Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/percona56-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -71,6 +71,7 @@ USES+= libedit USES+=mysql:56p CONFLICTS_INSTALL= mysql*-server-* \ + mysqlwsrep* \ mariadb*-server-* \ percona5[0-57-9]-server-* Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona57-server/Makefile Mon Aug 14 02:46:31 2017 (r447925) +++ head/databases/percona57-server/Makefile Mon Aug 14 05:37:21 2017 (r447926) @@ -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-*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708140537.v7E5bL24075677>