From owner-dev-commits-ports-all@freebsd.org Tue Jun 15 20:02:50 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 35B5065230A; Tue, 15 Jun 2021 20:02:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G4K4B0v8Fz3DH6; Tue, 15 Jun 2021 20:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06E2967C3; Tue, 15 Jun 2021 20:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15FK2nZx079616; Tue, 15 Jun 2021 20:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15FK2nsm079615; Tue, 15 Jun 2021 20:02:49 GMT (envelope-from git) Date: Tue, 15 Jun 2021 20:02:49 GMT Message-Id: <202106152002.15FK2nsm079615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 08359d131104 - main - math/sage: chase the upgrade to py38-setuptools to 57.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08359d131104c03f1e73208cf81a82b1daabe4d4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 20:02:50 -0000 The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=08359d131104c03f1e73208cf81a82b1daabe4d4 commit 08359d131104c03f1e73208cf81a82b1daabe4d4 Author: Thierry Thomas AuthorDate: 2021-06-15 19:57:00 +0000 Commit: Thierry Thomas CommitDate: 2021-06-15 20:02:39 +0000 math/sage: chase the upgrade to py38-setuptools to 57.0.0 The latest upgrade of py38-setuptools to 57.0.0 introduced a conflict with some files installed by SageMath: remove them. --- math/sage/Makefile | 4 +++- math/sage/pkg-plist | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/math/sage/Makefile b/math/sage/Makefile index 38554cc805af..7257b88aa524 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -2,7 +2,7 @@ PORTNAME= sage PORTVERSION= 9.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= math MASTER_SITES= https://mirrors.xmission.com/sage/src/ \ http://mirrors.xmission.com/sage/src/ \ @@ -568,8 +568,10 @@ do-install: post-install: ${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/distutils-precedence.pth \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc + ${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_distutils_hack .include diff --git a/math/sage/pkg-plist b/math/sage/pkg-plist index 4085e75e210b..37a8b9a7f15f 100644 --- a/math/sage/pkg-plist +++ b/math/sage/pkg-plist @@ -49,11 +49,6 @@ include/ratpoints.h lib/libratpoints.a %%PYTHON_SITELIBDIR%%/__pycache__/sage_conf.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/__pycache__/sagetex.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/_distutils_hack/__init__.py -%%PYTHON_SITELIBDIR%%/_distutils_hack/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/_distutils_hack/__pycache__/override.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/_distutils_hack/override.py -%%PYTHON_SITELIBDIR%%/distutils-precedence.pth %%PYTHON_SITELIBDIR%%/sage-%%VER%%-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/sage/__init__.py %%PYTHON_SITELIBDIR%%/sage/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc