From 54e554e8b3d30cfa4330680834ec2e56aaee438c Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 28 Nov 2014 11:33:14 +0000 Subject: [PATCH] databases/mariadb-(server,client): Update conflicts PR: 194824 Submitted by: Bernard Spil Approved by: maintainer timeout --- databases/mariadb-client/Makefile | 5 ++++- databases/mariadb-server/Makefile | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index 8d589fd48825..3eed06103735 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -17,7 +17,10 @@ OPTIONS_DEFINE= THREADSAFE OPTIONS_DEFAULT= THREADSAFE THREADSAFE_DESC= Build thread-safe client -CONFLICTS= mysql[0-9][0-9]-client-* mariadb5.[0-24-9]-client-* mariadb[0-46-9][0-9]-client-* percona[0-9][0-9]-client-* +CONFLICTS= mariadb5[4-9]-client-* \ + mariadb1[0-9][0-9]-client-* \ + mysql*-client-* \ + percona*-client-* PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index bff5c9dcee1b..beb8ae830156 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -22,7 +22,10 @@ LICENSE= GPLv2 UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} -CONFLICTS?= mysql[0-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb5.[0-24-9]-server-* mariadb[0-46-9][0-9]-server-* +CONFLICTS?= mariadb5[4-9]-server-* \ + mariadb1[0-9][0-9]-server-* \ + mysql*-server-* \ + percona*-server-* GNU_CONFIGURE= yes USES+= libtool