From owner-svn-ports-all@freebsd.org  Fri Jun 15 07:34:50 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58CD410039BC;
 Fri, 15 Jun 2018 07:34:50 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 077127E1D7;
 Fri, 15 Jun 2018 07:34:50 +0000 (UTC)
 (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D62D1146F1;
 Fri, 15 Jun 2018 07:34:49 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5F7YnA9036727;
 Fri, 15 Jun 2018 07:34:49 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5F7Ynlb036726;
 Fri, 15 Jun 2018 07:34:49 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201806150734.w5F7Ynlb036726@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Fri, 15 Jun 2018 07:34:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r472430 - head/devel/py-odfpy
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: head/devel/py-odfpy
X-SVN-Commit-Revision: 472430
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.26
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: Fri, 15 Jun 2018 07:34:50 -0000

Author: yuri
Date: Fri Jun 15 07:34:49 2018
New Revision: 472430
URL: https://svnweb.freebsd.org/changeset/ports/472430

Log:
  devel/py-odfpy: Add CONFLICTS_BUILD line
  
  When py-setuptools_scm is installed, the build fails with this error:
  File Finder Failed for .git = setuptools_scm.git:list_files_in_archive
  
  Approved by:	portmgr blanket

Modified:
  head/devel/py-odfpy/Makefile

Modified: head/devel/py-odfpy/Makefile
==============================================================================
--- head/devel/py-odfpy/Makefile	Fri Jun 15 07:09:59 2018	(r472429)
+++ head/devel/py-odfpy/Makefile	Fri Jun 15 07:34:49 2018	(r472430)
@@ -14,6 +14,8 @@ COMMENT=	Python API and Tools to Manipulate OpenDocume
 LICENSE=	APACHE20 GPLv2
 LICENSE_COMB=	dual
 
+CONFLICTS_BUILD=	py${PYTHON_SUFFIX}-setuptools_scm
+
 USES=		python
 USE_PYTHON=	autoplist distutils