diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2021-06-15 19:57:00 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2021-06-15 20:02:39 +0000 |
commit | 08359d131104c03f1e73208cf81a82b1daabe4d4 (patch) | |
tree | 57805f92514633111c74d3ea7b72ef1e78cf9bed | |
parent | ebfc0b6ebc8a45665c7722815b1e3e6af89f3d54 (diff) | |
download | ports-08359d131104c03f1e73208cf81a82b1daabe4d4.tar.gz ports-08359d131104c03f1e73208cf81a82b1daabe4d4.zip |
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.
-rw-r--r-- | math/sage/Makefile | 4 | ||||
-rw-r--r-- | 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 <bsd.port.post.mk> 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 |