Index: mysql50-server/Makefile =================================================================== --- mysql50-server/Makefile (revision 310398) +++ mysql50-server/Makefile (working copy) @@ -106,7 +106,7 @@ 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 Index: mysql51-server/Makefile =================================================================== --- mysql51-server/Makefile (revision 310398) +++ mysql51-server/Makefile (working copy) @@ -96,7 +96,7 @@ 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 Index: mysql55-client/Makefile =================================================================== --- mysql55-client/Makefile (revision 310398) +++ mysql55-client/Makefile (working copy) @@ -18,7 +18,7 @@ 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 Index: mysql55-server/Makefile =================================================================== --- mysql55-server/Makefile (revision 310398) +++ mysql55-server/Makefile (working copy) @@ -60,7 +60,7 @@ 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 Index: percona55-client/Makefile =================================================================== --- percona55-client/Makefile (revision 310398) +++ percona55-client/Makefile (working copy) @@ -13,7 +13,7 @@ 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 Index: percona55-server/Makefile =================================================================== --- percona55-server/Makefile (revision 310398) +++ percona55-server/Makefile (working copy) @@ -63,7 +63,7 @@ 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 Index: mariadb-client/Makefile =================================================================== --- mariadb-client/Makefile (revision 310398) +++ mariadb-client/Makefile (working copy) @@ -16,7 +16,7 @@ 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 Index: mariadb-server/Makefile =================================================================== --- mariadb-server/Makefile (revision 310398) +++ mariadb-server/Makefile (working copy) @@ -22,7 +22,7 @@ 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