svn commit: r373557 - in head/databases: mariadb-client mariadb-server

[John Marino]

Author: marino
Date: Fri Nov 28 11:33:14 2014
New Revision: 373557
URL: https://svnweb.freebsd.org/changeset/ports/373557
QAT: https://qat.redports.org/buildarchive/r373557/

Log:
  databases/mariadb-(server,client): Update conflicts
  
  PR:		194824
  Submitted by:	Bernard Spil
  Approved by:	maintainer timeout

Modified:
  head/databases/mariadb-client/Makefile
  head/databases/mariadb-server/Makefile

Modified: head/databases/mariadb-client/Makefile
==============================================================================
--- head/databases/mariadb-client/Makefile	Fri Nov 28 11:22:38 2014	(r373556)
+++ head/databases/mariadb-client/Makefile	Fri Nov 28 11:33:14 2014	(r373557)
@@ -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

Modified: head/databases/mariadb-server/Makefile
==============================================================================
--- head/databases/mariadb-server/Makefile	Fri Nov 28 11:22:38 2014	(r373556)
+++ head/databases/mariadb-server/Makefile	Fri Nov 28 11:33:14 2014	(r373557)
@@ -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