From owner-svn-ports-head@freebsd.org  Wed Jun 22 20:37:43 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 9EC6BAC5983;
 Wed, 22 Jun 2016 20:37:43 +0000 (UTC)
 (envelope-from pawel@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 6FB03175E;
 Wed, 22 Jun 2016 20:37:43 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5MKbgd2078972;
 Wed, 22 Jun 2016 20:37:42 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5MKbgUG078971;
 Wed, 22 Jun 2016 20:37:42 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201606222037.u5MKbgUG078971@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Wed, 22 Jun 2016 20:37:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417333 - head/databases/py-MySQLdb
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2016 20:37:43 -0000

Author: pawel
Date: Wed Jun 22 20:37:42 2016
New Revision: 417333
URL: https://svnweb.freebsd.org/changeset/ports/417333

Log:
  Register conflict with newly added databases/py-mysqlclient

Modified:
  head/databases/py-MySQLdb/Makefile

Modified: head/databases/py-MySQLdb/Makefile
==============================================================================
--- head/databases/py-MySQLdb/Makefile	Wed Jun 22 20:36:19 2016	(r417332)
+++ head/databases/py-MySQLdb/Makefile	Wed Jun 22 20:37:42 2016	(r417333)
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	farcepest
 GH_PROJECT=	${PORTNAME}1
 
-CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]*
+CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-mysqlclient-[0-9]*
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}