Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -554,10 +554,16 @@ _CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .if defined(_PYTHON_FEATURE_DISTUTILS) && \ - ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools + ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools &&\ + ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools44 +.if ${PYTHON_VER} == 2.7 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} +.else BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} .endif +.endif # distutils support PYSETUP?= setup.py Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -5125,6 +5125,7 @@ SUBDIR += py-setuptools SUBDIR += py-setuptools-git SUBDIR += py-setuptools-pkg + SUBDIR += py-setuptools44 SUBDIR += py-setuptools_hg SUBDIR += py-setuptools_scm SUBDIR += py-setuptools_scm_git_archive Index: devel/py-setuptools/Makefile =================================================================== --- devel/py-setuptools/Makefile +++ devel/py-setuptools/Makefile @@ -1,6 +1,5 @@ PORTNAME= setuptools -PORTVERSION= 44.0.0 -PORTREVISION= 1 +PORTVERSION= 57.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:2.7+ zip +USES= python:3.6+ USE_PYTHON= allflavors autoplist concurrent distutils MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 Index: devel/py-setuptools/distinfo =================================================================== --- devel/py-setuptools/distinfo +++ devel/py-setuptools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578923982 -SHA256 (python/setuptools-44.0.0.zip) = e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 -SIZE (python/setuptools-44.0.0.zip) = 858893 +TIMESTAMP = 1622043161 +SHA256 (python/setuptools-57.0.0.tar.gz) = 401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535 +SIZE (python/setuptools-57.0.0.tar.gz) = 2144749 Index: devel/py-setuptools44/Makefile =================================================================== --- devel/py-setuptools44/Makefile +++ devel/py-setuptools44/Makefile @@ -4,6 +4,7 @@ CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 44 DIST_SUBDIR= python # note: before committing to this port, contact portmgr to arrange for an @@ -15,7 +16,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:2.7+ zip +USES= python:2.7 zip USE_PYTHON= allflavors autoplist concurrent distutils MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 Index: devel/py-setuptools44/files/easy-install.pth.dist =================================================================== --- /dev/null +++ devel/py-setuptools44/files/easy-install.pth.dist @@ -0,0 +1,2 @@ +import sys; sys.__plen = len(sys.path) +import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) Index: devel/py-setuptools44/files/pkg-message.in =================================================================== --- /dev/null +++ devel/py-setuptools44/files/pkg-message.in @@ -0,0 +1,8 @@ +[ +{ type: install + message: <