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?

--Kurt

Attachment: py2-setuptools.tgz
Description: application/tar-gz

Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2099
diff -u -p -r1.2099 Makefile
--- devel/Makefile      14 May 2021 21:51:14 -0000      1.2099
+++ devel/Makefile      16 May 2021 18:48:01 -0000
@@ -1588,7 +1588,7 @@
      SUBDIR += py-serial
      SUBDIR += py-serial,python3
      SUBDIR += py-setproctitle,python3
-     SUBDIR += py-setuptools
+     SUBDIR += py2-setuptools
      SUBDIR += py-setuptools,python3
      SUBDIR += py-setuptools_git
      SUBDIR += py-setuptools_git,python3
Index: lang/python/python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.131
diff -u -p -r1.131 python.port.mk
--- lang/python/python.port.mk  23 Feb 2021 22:04:35 -0000      1.131
+++ lang/python/python.port.mk  16 May 2021 18:48:01 -0000
@@ -131,7 +131,11 @@ _MODPY_PRE_BUILD_STEPS = :
 .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
 # The setuptools module provides a package locator (site.py) that is
 # required at runtime for the pkg_resources stuff to work
-MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}>=39.0.1v0
+.  if ${MODPY_MAJOR_VERSION} == 2
+MODPY_SETUPUTILS_DEPEND ?= devel/py2-setuptools
+.  else
+MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}
+.  endif
 
 MODPY_RUN_DEPENDS +=   ${MODPY_SETUPUTILS_DEPEND}
 BUILD_DEPENDS +=       ${MODPY_SETUPUTILS_DEPEND}

Reply via email to