From owner-svn-ports-all@freebsd.org  Wed Jul  5 19:36:37 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5282BD8F7C9;
 Wed,  5 Jul 2017 19:36:37 +0000 (UTC) (envelope-from vd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2173A6A21A;
 Wed,  5 Jul 2017 19:36:37 +0000 (UTC) (envelope-from vd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v65Jaa1c068087;
 Wed, 5 Jul 2017 19:36:36 GMT (envelope-from vd@FreeBSD.org)
Received: (from vd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v65JaabF068086;
 Wed, 5 Jul 2017 19:36:36 GMT (envelope-from vd@FreeBSD.org)
Message-Id: <201707051936.v65JaabF068086@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org
 using -f
From: Vasil Dimov <vd@FreeBSD.org>
Date: Wed, 5 Jul 2017 19:36:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445094 - head/databases/mysqlwsrep56-server
X-SVN-Group: ports-head
X-SVN-Commit-Author: vd
X-SVN-Commit-Paths: head/databases/mysqlwsrep56-server
X-SVN-Commit-Revision: 445094
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jul 2017 19:36:37 -0000

Author: vd
Date: Wed Jul  5 19:36:36 2017
New Revision: 445094
URL: https://svnweb.freebsd.org/changeset/ports/445094

Log:
  databases/mysqlwsrep56-server: Fix CONFLICTS_INSTALL
  
  Should also conflict with mysql56-server.

Modified:
  head/databases/mysqlwsrep56-server/Makefile

Modified: head/databases/mysqlwsrep56-server/Makefile
==============================================================================
--- head/databases/mysqlwsrep56-server/Makefile	Wed Jul  5 19:08:15 2017	(r445093)
+++ head/databases/mysqlwsrep56-server/Makefile	Wed Jul  5 19:36:36 2017	(r445094)
@@ -64,8 +64,7 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsre
 .endif
 
 CONFLICTS_INSTALL=	mariadb*-server-* \
-			mysql5[0-57-9]-server-* \
-			mysql8*-server-* \
+			mysql[0-9]*-server-* \
 			percona*-server-*
 
 USE_RC_SUBR=	mysql-server