Page MenuHomeFreeBSD
Files F147552515

D46236.diff
No OneTemporary
Actions

D46236.diff
View Options

diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -161,7 +161,7 @@
# default: <empty>
#
# PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel.
-# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
+# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}*.whl
#
# PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}.
# default: ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
@@ -754,7 +754,7 @@
# PEP-517 support
PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING}
PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR}
-PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
+PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}*.whl
PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
# nose support
@@ -988,7 +988,7 @@
@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
@cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
@${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \
- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST}
+ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST}
@${REINPLACE_CMD} \
-e '/\.pyc$$/d' \
-e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,31 +1,46 @@
PORTNAME= setuptools
-PORTVERSION= 63.1.0
-PORTREVISION= 3
+DISTVERSION= 81.0.0
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
-PATCH_SITES= https://github.com/pypa/${PORTNAME}/commit/
-PATCHFILES= 6653e747c3815b140156249205397ef3719581ee.patch:-p1
-
# note: before committing a new major version, contact portmgr to
# arrange for an experimental ports run. Untested commits may be
# backed out.
MAINTAINER= python@FreeBSD.org
COMMENT= Python packages installer
-WWW= https://github.com/pypa/setuptools \
- https://pypi.org/project/setuptools/
+WWW= https://setuptools.pypa.io/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel044<0.46.0:devel/py-wheel044@${PY_FLAVOR}
+BUILD_DEPENDS= ${_CORE_DEPENDS}
+RUN_DEPENDS= ${_CORE_DEPENDS}
USES= cpe python
-USE_PYTHON= allflavors autoplist concurrent pep517 # pytest to return later
-
CPE_VENDOR= python
+USE_PYTHON= allflavors autoplist concurrent pep517 pytest
+
+_CORE_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=24.2:devel/py-packaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}more-itertools>=8.8:devel/py-more-itertools@${PY_FLAVOR} \
+ ${PY_TOMLI} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0.43.0:devel/py-wheel@${PY_FLAVOR}
+
+# circular dependencies
+#_CORE_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco.text>=3.7:devel/py-jaraco.text@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}platformdirs>=4.2.2:devel/py-platformdirs@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=4:devel/py-jaraco.functools@${PY_FLAVOR}
+
+# remove vendored packages of those already installed via pkg(8)
+_DIST_EXCLUDES= packaging* \
+ more_itertools* \
+ wheel* \
+ tomli* \
+ typing_extensions* \
+ importlib_metadata* \
+ zipp*
+EXTRACT_AFTER_ARGS= ${_DIST_EXCLUDES:S,^,--exclude setuptools/_vendor/,}
NO_ARCH= yes
diff --git a/devel/py-setuptools/distinfo b/devel/py-setuptools/distinfo
--- a/devel/py-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1744292398
-SHA256 (python/setuptools-63.1.0.tar.gz) = 16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793
-SIZE (python/setuptools-63.1.0.tar.gz) = 2599380
-SHA256 (python/6653e747c3815b140156249205397ef3719581ee.patch) = fbdb0cdeee1d38829b73cadd95445815c9b5566b7e803b8bd39586f6d4afe077
-SIZE (python/6653e747c3815b140156249205397ef3719581ee.patch) = 1262
+TIMESTAMP = 1770878654
+SHA256 (python/setuptools-81.0.0.tar.gz) = 487b53915f52501f0a79ccfd0c02c165ffe06631443a886740b91af4b7a5845a
+SIZE (python/setuptools-81.0.0.tar.gz) = 1198299

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 8:29 PM (12 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29587995
Default Alt Text
D46236.diff (4 KB)

Event Timeline