On Sun, May 16, 2021 at 02:50:45PM -0400, Kurt Mosiejczuk wrote:
> We're now running into python ports that need newer setuptools than the
> version we have in tree as the last version that supports python2.
> This "new" port clones the current version off into devel/py2-setuptools.
> After committing this and the associated glue (also attached) we can look
> at updating devel/py-setuptools to a more recent version.
> Feedback?
The one port that seems to need tweaking if this goes in is devel/py-test.
It's the only one that explicitly includes py-setuptools as a RUN_DEPENDS
but still actually has a python2 FLAVOR.
So here's the diff that would fix that.
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-test/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 19 Feb 2021 23:13:02 -0000 1.37
+++ Makefile 16 May 2021 18:55:43 -0000
@@ -5,7 +5,7 @@ COMMENT= cross-project testing tool for
MODPY_EGG_VERSION = 4.4.0
DISTNAME= pytest-${MODPY_EGG_VERSION}
PKGNAME= py-test-${MODPY_EGG_VERSION}
-REVISION= 2
+REVISION= 3
CATEGORIES= devel
@@ -31,11 +31,13 @@ RUN_DEPENDS = devel/py-atomicwrites${MO
devel/py-more-itertools${MODPY_FLAVOR} \
devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
devel/py-py${MODPY_FLAVOR} \
- devel/py-setuptools${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
RUN_DEPENDS += devel/py-funcsigs \
- devel/py-pathlib2
+ devel/py-pathlib2 \
+ devel/py2-setuptools
+.else
+RUN_DEPENDS += devel/py-setuptools${MODPY_FLAVOR}
.endif
TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
