From owner-svn-ports-head@freebsd.org  Wed Jan 30 16:39:38 2019
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A09AF14C5FE4;
 Wed, 30 Jan 2019 16:39:38 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48CAA72E54;
 Wed, 30 Jan 2019 16:39:38 +0000 (UTC)
 (envelope-from miwi@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 3A5D821DC6;
 Wed, 30 Jan 2019 16:39:38 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0UGdc9c030537;
 Wed, 30 Jan 2019 16:39:38 GMT (envelope-from miwi@FreeBSD.org)
Received: (from miwi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0UGdcTs030536;
 Wed, 30 Jan 2019 16:39:38 GMT (envelope-from miwi@FreeBSD.org)
Message-Id: <201901301639.x0UGdcTs030536@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: miwi set sender to
 miwi@FreeBSD.org using -f
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 30 Jan 2019 16:39:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r491631 - head/devel/py-setuptools_scm/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: miwi
X-SVN-Commit-Paths: head/devel/py-setuptools_scm/files
X-SVN-Commit-Revision: 491631
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 48CAA72E54
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
 NEURAL_HAM_SHORT(-0.95)[-0.952,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-0.999,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
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, 30 Jan 2019 16:39:38 -0000

Author: miwi
Date: Wed Jan 30 16:39:37 2019
New Revision: 491631
URL: https://svnweb.freebsd.org/changeset/ports/491631

Log:
  - Fix update with portmaster
  
  PR:		235301
  Submitted by:	Maintainer
  Reported by:	Many
  Sponsored by:	iXsystems Inc.

Added:
  head/devel/py-setuptools_scm/files/
  head/devel/py-setuptools_scm/files/patch-setup.py   (contents, props changed)

Added: head/devel/py-setuptools_scm/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/py-setuptools_scm/files/patch-setup.py	Wed Jan 30 16:39:37 2019	(r491631)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2018-08-09 06:35:22 UTC
++++ setup.py
+@@ -22,7 +22,7 @@ def scm_config():
+     has_entrypoints = os.path.isdir(egg_info)
+     import pkg_resources
+ 
+-    sys.path.insert(0, src)
++    sys.path.insert(0, here)
+     pkg_resources.working_set.add_entry(src)
+     from setuptools_scm.hacks import parse_pkginfo
+     from setuptools_scm.git import parse as parse_git