svn commit: r310554 - in head/databases: mariadb-client mariadb-server mysql50-server mysql51-server mysql55-client mysql55-server percona55-client percona55-server

[Florian Smeets]

Author: flo
Date: Thu Jan 17 16:43:07 2013
New Revision: 310554
URL: http://svnweb.freebsd.org/changeset/ports/310554

Log:
  Update CONFLCITS after the addition of percona55-* and mariadb55-*
  
  Approved by:	maintainer

Modified:
  head/databases/mariadb-client/Makefile   (contents, props changed)
  head/databases/mariadb-server/Makefile
  head/databases/mysql50-server/Makefile   (contents, props changed)
  head/databases/mysql51-server/Makefile   (contents, props changed)
  head/databases/mysql55-client/Makefile   (contents, props changed)
  head/databases/mysql55-server/Makefile   (contents, props changed)
  head/databases/percona55-client/Makefile
  head/databases/percona55-server/Makefile

Modified: head/databases/mariadb-client/Makefile
==============================================================================
--- head/databases/mariadb-client/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mariadb-client/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=		THREADSAFE
 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

Modified: head/databases/mariadb-server/Makefile
==============================================================================
--- head/databases/mariadb-server/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mariadb-server/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -22,7 +22,7 @@ LICENSE=	GPLv2
 
 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
 

Modified: head/databases/mysql50-server/Makefile
==============================================================================
--- head/databases/mysql50-server/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mysql50-server/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -106,7 +106,7 @@ WANT_MYSQL_VER=	50
 
 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
 

Modified: head/databases/mysql51-server/Makefile
==============================================================================
--- head/databases/mysql51-server/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mysql51-server/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -96,7 +96,7 @@ WANT_MYSQL_VER=	51
 
 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
 

Modified: head/databases/mysql55-client/Makefile
==============================================================================
--- head/databases/mysql55-client/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mysql55-client/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -18,7 +18,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 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
 

Modified: head/databases/mysql55-server/Makefile
==============================================================================
--- head/databases/mysql55-server/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/mysql55-server/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -60,7 +60,7 @@ WANT_MYSQL_VER=	55
 
 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
 

Modified: head/databases/percona55-client/Makefile
==============================================================================
--- head/databases/percona55-client/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/percona55-client/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -13,7 +13,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 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
 

Modified: head/databases/percona55-server/Makefile
==============================================================================
--- head/databases/percona55-server/Makefile	Thu Jan 17 16:05:38 2013	(r310553)
+++ head/databases/percona55-server/Makefile	Thu Jan 17 16:43:07 2013	(r310554)
@@ -63,7 +63,7 @@ WANT_MYSQL_VER=	55p
 
 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