diff options
62 files changed, 224 insertions, 133 deletions
diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile index c6ea27280de..4091b0e1c36 100644 --- a/converters/py-cairosvg/Makefile +++ b/converters/py-cairosvg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2020/05/19 13:59:19 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2020/08/31 23:07:00 wiz Exp $ DISTNAME= CairoSVG-2.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-cairocffi-[0-9]*:../../graphics/py-cairocffi DEPENDS+= ${PYPKGPREFIX}-cssselect2-[0-9]*:../../textproc/py-cssselect2 DEPENDS+= ${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml DEPENDS+= ${PYPKGPREFIX}-tinycss2-[0-9]*:../../textproc/py-tinycss2 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 @@ -24,6 +23,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner BUILD_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build USE_LANGUAGES= # none @@ -31,4 +31,5 @@ post-install: cd ${DESTDIR}${PREFIX}/bin && ${MV} cairosvg cairosvg${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeComponent/Makefile b/devel/py-ZopeComponent/Makefile index 700f315d809..dcf8260596c 100644 --- a/devel/py-ZopeComponent/Makefile +++ b/devel/py-ZopeComponent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/08/21 12:40:54 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.component-4.6.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.c/ZopeC/} @@ -10,12 +10,14 @@ HOMEPAGE= https://github.com/zopefoundation/zope.component COMMENT= Zope Component Architecture modules LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-zope.deferredimport>=4.2.1:../../devel/py-zope.deferredimport DEPENDS+= ${PYPKGPREFIX}-zope.deprecation>=4.3.0:../../devel/py-zope.deprecation DEPENDS+= ${PYPKGPREFIX}-ZopeEvent-[0-9]*:../../devel/py-ZopeEvent DEPENDS+= ${PYPKGPREFIX}-zope.hookable>=4.2.0:../../devel/py-zope.hookable DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=4.1.0:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeConfiguration/Makefile b/devel/py-ZopeConfiguration/Makefile index ae3d78ff194..a7d4d2e389a 100644 --- a/devel/py-ZopeConfiguration/Makefile +++ b/devel/py-ZopeConfiguration/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/06/08 13:29:22 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.configuration-4.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.c/ZopeC/} @@ -13,12 +13,14 @@ LICENSE= zpl-2.1 DEPENDS+= ${PYPKGPREFIX}-ZopeI18NMessageid-[0-9]*:../../devel/py-ZopeI18NMessageid DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface DEPENDS+= ${PYPKGPREFIX}-ZopeSchema>=4.9.0:../../devel/py-ZopeSchema -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools TEST_DEPENDS+= ${PYPKGPREFIX}-manuel-[0-9]*:../../textproc/py-manuel TEST_DEPENDS+= ${PYPKGPREFIX}-ZopeTestrunner-[0-9]*:../../devel/py-ZopeTestrunner TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeI18NMessageid/Makefile b/devel/py-ZopeI18NMessageid/Makefile index d027a8c93c1..8ae81d7a352 100644 --- a/devel/py-ZopeI18NMessageid/Makefile +++ b/devel/py-ZopeI18NMessageid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/06/08 13:27:23 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.i18nmessageid-5.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.i18nm/ZopeI18NM/} @@ -10,8 +10,10 @@ HOMEPAGE= https://github.com/zopefoundation/zope.i18nmessageid COMMENT= Zope Message Identifiers for internationalization LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeInterface/Makefile b/devel/py-ZopeInterface/Makefile index a1998ff7606..4ee8631c283 100644 --- a/devel/py-ZopeInterface/Makefile +++ b/devel/py-ZopeInterface/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2020/06/08 13:18:06 adam Exp $ +# $NetBSD: Makefile,v 1.33 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.interface-5.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.i/ZopeI/} @@ -10,9 +10,11 @@ HOMEPAGE= https://github.com/zopefoundation/zope.interface COMMENT= The zope.interface package used in Zope 3 and Twisted LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools TEST_DEPENDS+= ${PYPKGPREFIX}-ZopeEvent-[0-9]*:../../devel/py-ZopeEvent TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeSchema/Makefile b/devel/py-ZopeSchema/Makefile index 195c1f55092..cf3cc2219e3 100644 --- a/devel/py-ZopeSchema/Makefile +++ b/devel/py-ZopeSchema/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/06/08 13:24:35 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.schema-6.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.s/ZopeS/} @@ -12,10 +12,12 @@ LICENSE= zpl-2.1 DEPENDS+= ${PYPKGPREFIX}-ZopeEvent-[0-9]*:../../devel/py-ZopeEvent DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=5.0.0:../../devel/py-ZopeInterface -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools TEST_DEPENDS+= ${PYPKGPREFIX}-ZopeI18NMessageid-[0-9]*:../../devel/py-ZopeI18NMessageid TEST_DEPENDS+= ${PYPKGPREFIX}-ZopeTestrunner-[0-9]*:../../devel/py-ZopeTestrunner TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeTestrunner/Makefile b/devel/py-ZopeTestrunner/Makefile index 6d4f0aa4c76..34103f73a17 100644 --- a/devel/py-ZopeTestrunner/Makefile +++ b/devel/py-ZopeTestrunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/08/21 12:42:13 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:00 wiz Exp $ DISTNAME= zope.testrunner-5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.t/ZopeT/} @@ -10,11 +10,13 @@ HOMEPAGE= https://github.com/zopefoundation/zope.testrunner COMMENT= Zope testrunner script LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-zope.exceptions-[0-9]*:../../devel/py-zope.exceptions DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-buildbot-pkg/Makefile b/devel/py-buildbot-pkg/Makefile index c6da506a6c7..0ff31796cc0 100644 --- a/devel/py-buildbot-pkg/Makefile +++ b/devel/py-buildbot-pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/02/19 19:07:19 adam Exp $ +# $NetBSD: Makefile,v 1.9 2020/08/31 23:07:01 wiz Exp $ DISTNAME= buildbot-pkg-2.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,12 +10,13 @@ HOMEPAGE= https://buildbot.net/ COMMENT= Packaging tools for the buildbot CI system LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-setuptools>=21.2.1:../../devel/py-setuptools - USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + # override default versioning based on time stamp MAKE_ENV+= BUILDBOT_VERSION=${PKGVERSION_NOREV} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 442b8c315a3..4f5a443bcd2 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2020/02/19 19:07:18 adam Exp $ +# $NetBSD: Makefile,v 1.24 2020/08/31 23:07:01 wiz Exp $ DISTNAME= buildbot-2.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-JWT-[0-9]*:../../textproc/py-JWT DEPENDS+= ${PYPKGPREFIX}-autobahn>=0.16.0:../../www/py-autobahn DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.5:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.1:../../textproc/py-jinja2 -DEPENDS+= ${PYPKGPREFIX}-setuptools>=8.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.1.0:../../databases/py-sqlalchemy DEPENDS+= ${PYPKGPREFIX}-sqlalchemy-migrate>=0.9:../../databases/py-sqlalchemy-migrate DEPENDS+= ${PYPKGPREFIX}-twisted>=17.9.0:../../net/py-twisted @@ -31,6 +30,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-txrequests-[0-9]*:../../devel/py-txrequests PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none post-install: @@ -39,4 +40,5 @@ post-install: ${MV} buildbot_windows_service buildbot_windows_service-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile index bc9f2242940..8782f6c8b1b 100644 --- a/devel/py-daemon/Makefile +++ b/devel/py-daemon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2020/05/14 19:39:03 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2020/08/31 23:07:01 wiz Exp $ DISTNAME= python-daemon-2.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -10,7 +10,6 @@ HOMEPAGE= https://pagure.io/python-daemon/ COMMENT= Library to implement a well-behaved Unix daemon process LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-lockfile>=0.10:../../devel/py-lockfile BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils BUILD_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine @@ -20,8 +19,10 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2>=0.5.1:../../devel/py-unittest2 PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-google-api-core/Makefile b/devel/py-google-api-core/Makefile index e4f9b0457fa..0778ac9c074 100644 --- a/devel/py-google-api-core/Makefile +++ b/devel/py-google-api-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/08/24 08:40:18 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2020/08/31 23:07:01 wiz Exp $ DISTNAME= google-api-core-1.22.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,12 +16,12 @@ DEPENDS+= ${PYPKGPREFIX}-grpcio>=1.29.0:../../net/py-grpcio DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.4.0:../../devel/py-protobuf DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-requests>=2.18.0:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-setuptools>=34.0.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none @@ -29,4 +29,5 @@ do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile index 4c31f6abfe1..15913e32852 100644 --- a/devel/py-ipython/Makefile +++ b/devel/py-ipython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2020/08/09 00:00:56 joerg Exp $ +# $NetBSD: Makefile,v 1.54 2020/08/31 23:07:01 wiz Exp $ DISTNAME= ipython-7.17.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect DEPENDS+= ${PYPKGPREFIX}-pickleshare-[0-9]*:../../databases/py-pickleshare DEPENDS+= ${PYPKGPREFIX}-prompt_toolkit>=3.0.1:../../devel/py-prompt_toolkit2 DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments -DEPENDS+= ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-traitlets>=4.2:../../devel/py-traitlets .include "../../mk/bsd.prefs.mk" @@ -28,6 +27,7 @@ DEPENDS+= ${PYPKGPREFIX}-appnope-[0-9]*:../../sysutils/py-appnope USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 36 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools post-install: cd ${DESTDIR}${PREFIX} && \ @@ -37,4 +37,5 @@ post-install: ${MV} ${PKGMANDIR}/man1/ipython.1 ${PKGMANDIR}/man1/ipython-${PYVERSSUFFIX}.1 || ${TRUE} .include "../../lang/python/distutils.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ipython5/Makefile b/devel/py-ipython5/Makefile index 8933c328ea5..78a7d31a763 100644 --- a/devel/py-ipython5/Makefile +++ b/devel/py-ipython5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/01/26 17:31:03 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:01 wiz Exp $ DISTNAME= ipython-5.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,11 +23,12 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect DEPENDS+= ${PYPKGPREFIX}-pickleshare-[0-9]*:../../databases/py-pickleshare DEPENDS+= ${PYPKGPREFIX}-prompt_toolkit>=1.0.4:../../devel/py-prompt_toolkit DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments -DEPENDS+= ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-simplegeneric>0.8:../../devel/py-simplegeneric DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-traitlets>=4.2:../../devel/py-traitlets +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none post-install: @@ -36,4 +37,5 @@ post-install: ${MV} bin/ipython bin/ipython${PYVERSSUFFIX} && \ ${MV} ${PKGMANDIR}/man1/ipython.1 ${PKGMANDIR}/man1/ipython${PYVERSSUFFIX}.1 || ${TRUE} +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-lazy-object-proxy/Makefile b/devel/py-lazy-object-proxy/Makefile index e7f73ad7d25..9dd5ae3848b 100644 --- a/devel/py-lazy-object-proxy/Makefile +++ b/devel/py-lazy-object-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/07/29 12:07:15 adam Exp $ +# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:01 wiz Exp $ DISTNAME= lazy-object-proxy-1.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,9 +10,11 @@ HOMEPAGE= https://github.com/ionelmc/python-lazy-object-proxy COMMENT= Fast and thorough lazy object proxy LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools>=30.3.0:../../devel/py-setuptools BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.3.1:../../devel/py-setuptools_scm BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile index 530d02eab62..37f5455df02 100644 --- a/devel/py-logilab-common/Makefile +++ b/devel/py-logilab-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/07/06 22:56:03 adam Exp $ +# $NetBSD: Makefile,v 1.20 2020/08/31 23:07:01 wiz Exp $ DISTNAME= logilab-common-1.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,9 +10,10 @@ HOMEPAGE= https://www.logilab.org/project/logilab-common COMMENT= Useful miscellaneous modules used by Logilab projects LICENSE= gnu-lgpl-v2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools>=1.4.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.4.0:../../lang/py-six +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Interix" @@ -30,4 +31,5 @@ post-install: ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/logilab-pytest-${PYVERSSUFFIX}.1 .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile index 83d71f5e0ba..4882d8be478 100644 --- a/devel/py-protobuf/Makefile +++ b/devel/py-protobuf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2020/08/21 11:29:18 adam Exp $ +# $NetBSD: Makefile,v 1.32 2020/08/31 23:07:02 wiz Exp $ DISTNAME= protobuf-3.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} @@ -11,16 +11,18 @@ COMMENT= Python bindings for protobuf LICENSE= modified-bsd TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.9:../../lang/py-six TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.32.0:../../devel/py-wheel USE_LANGUAGES+= c c++11 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + MAKE_ENV+= PROTOC=${PREFIX}/bin/protoc PYSETUPBUILDARGS= --cpp_implementation PYSETUPINSTALLARGS= --cpp_implementation .include "../../devel/protobuf/buildlink3.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index c7f9ccc1ecc..680ed9f7c34 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2020/05/16 17:38:40 adam Exp $ +# $NetBSD: Makefile,v 1.20 2020/08/31 23:07:02 wiz Exp $ DISTNAME= tox-3.12.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-filelock>=3.0.0:../../devel/py-filelock DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.3.0<1.0:../../devel/py-pluggy DEPENDS+= ${PYPKGPREFIX}-py>=1.4.17:../../devel/py-py -DEPENDS+= ${PYPKGPREFIX}-setuptools>=30.0.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.0.0:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-toml>=0.9.4:../../textproc/py-toml DEPENDS+= ${PYPKGPREFIX}-virtualenv>=1.11.2:../../devel/py-virtualenv @@ -27,7 +26,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=1.2.3:../../devel/py-test-randomly TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.3.0:../../devel/py-test-timeout TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.22.2:../../devel/py-test-xdist -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test setuptools + USE_LANGUAGES= # none diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile index e4123f46577..14dde60b94e 100644 --- a/devel/py-zope.deferredimport/Makefile +++ b/devel/py-zope.deferredimport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/06/08 13:00:59 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:02 wiz Exp $ DISTNAME= zope.deferredimport-4.3.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,10 +10,12 @@ HOMEPAGE= https://github.com/zopefoundation/zope.deferredimport COMMENT= Imports names that will only be resolved when used in the code LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-zope.proxy-[0-9]*:../../www/py-zope.proxy +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-zope.deprecation/Makefile b/devel/py-zope.deprecation/Makefile index 0d19de83218..d16311058a2 100644 --- a/devel/py-zope.deprecation/Makefile +++ b/devel/py-zope.deprecation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/07/03 07:19:04 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:02 wiz Exp $ DISTNAME= zope.deprecation-4.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,9 +10,10 @@ HOMEPAGE= https://github.com/zopefoundation/zope.deprecation COMMENT= Zope hookable LICENSE= zpl-2.1 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/fs-uae-arcade/Makefile b/emulators/fs-uae-arcade/Makefile index 543fb1d29ca..176939e56f0 100644 --- a/emulators/fs-uae-arcade/Makefile +++ b/emulators/fs-uae-arcade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/05/23 09:12:57 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/08/31 23:07:02 wiz Exp $ DISTNAME= fs-uae-arcade-3.0.5 CATEGORIES= emulators @@ -11,7 +11,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= fs-uae>=${PKGVERSION_NOREV}:../../emulators/fs-uae DEPENDS+= ${PYPKGPREFIX}-lhafile-[0-9]*:../../archivers/py-lhafile -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-qt5>=5.4:../../x11/py-qt5 .include "../../mk/bsd.prefs.mk" @@ -24,6 +23,7 @@ INSTALL_TARGET= install-data USE_TOOLS+= gmake msgfmt PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools PYSETUPINSTALLARGS= --install-lib=${PREFIX:Q}/share/fs-uae-arcade PYSETUPINSTALLARGS+= --install-scripts=${PREFIX:Q}/share/fs-uae-arcade @@ -49,4 +49,5 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile index fedebd24d09..73345d31e13 100644 --- a/emulators/fs-uae-launcher/Makefile +++ b/emulators/fs-uae-launcher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2020/05/23 09:12:57 adam Exp $ +# $NetBSD: Makefile,v 1.17 2020/08/31 23:07:02 wiz Exp $ DISTNAME= fs-uae-launcher-3.0.5 CATEGORIES= emulators @@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= fs-uae>=${PKGVERSION_NOREV}:../../emulators/fs-uae DEPENDS+= ${PYPKGPREFIX}-lhafile-[0-9]*:../../archivers/py-lhafile DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-qt5>=5.4:../../x11/py-qt5 .include "../../mk/bsd.prefs.mk" @@ -25,6 +24,7 @@ INSTALL_TARGET= install-data USE_TOOLS+= gmake msgfmt PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools PYSETUPINSTALLARGS= --install-lib=${PREFIX:Q}/share/fs-uae-launcher PYSETUPINSTALLARGS+= --install-scripts=${PREFIX:Q}/share/fs-uae-launcher @@ -50,4 +50,5 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/filesystems/fuse-pcachefs/Makefile b/filesystems/fuse-pcachefs/Makefile index 533ae8c40d8..9db004c96f6 100644 --- a/filesystems/fuse-pcachefs/Makefile +++ b/filesystems/fuse-pcachefs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/11/03 19:26:21 rillig Exp $ -# +# $NetBSD: Makefile,v 1.9 2020/08/31 23:07:02 wiz Exp $ DISTNAME= fuse-pcachefs-0.0.20160203 PKGREVISION= 1 @@ -13,7 +12,7 @@ HOMEPAGE= https://github.com/ibizaman/pcachefs COMMENT= FUSE-based persistent caching filesystem LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build EGG_NAME= pCacheFS-0.2 PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings @@ -21,4 +20,5 @@ PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings .include "../../filesystems/py-fuse-bindings/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/fuse.buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/filesystems/py-fs/Makefile b/filesystems/py-fs/Makefile index 3f016a38051..d9b181482ae 100644 --- a/filesystems/py-fs/Makefile +++ b/filesystems/py-fs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/05/16 17:42:41 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:02 wiz Exp $ DISTNAME= fs-2.4.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,6 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-appdirs>=1.4.3:../../devel/py-appdirs DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.10:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-pyftpdlib-[0-9]*:../../net/py-pyftpdlib @@ -27,7 +26,10 @@ DEPENDS+= ${PYPKGPREFIX}-typing>=3.6:../../devel/py-typing PYSETUPTESTTARGET= pytest .endif +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 34c90d8d4da..992edca49a0 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2020/02/19 17:50:25 adam Exp $ +# $NetBSD: Makefile,v 1.27 2020/08/31 23:07:02 wiz Exp $ DISTNAME= blockdiag-2.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-funcparserlib>=0.3.6:../../devel/py-funcparserlib DEPENDS+= ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-webcolors-[0-9]*:../../www/py-webcolors TEST_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock @@ -24,6 +23,7 @@ USE_LANGUAGES= # none INSTALLATION_DIRS+= ${PKGMANDIR}/man1 PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools post-install: cd ${DESTDIR}${PREFIX}/bin && \ @@ -32,4 +32,5 @@ post-install: ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/blockdiag-${PYVERSSUFFIX}.1 .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/py-python-lua/Makefile b/lang/py-python-lua/Makefile index 107f02cbf43..4ba05ae2f67 100644 --- a/lang/py-python-lua/Makefile +++ b/lang/py-python-lua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/11/03 19:04:05 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:03 wiz Exp $ DISTNAME= python-lua PKGNAME= ${PYPKGPREFIX}-python-lua-20170109 @@ -14,12 +14,12 @@ HOMEPAGE= https://github.com/NeonMercury/python-lua COMMENT= Simple python to lua translator LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml>=3.12:../../textproc/py-yaml USE_LANGUAGES= #none PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build REPLACE_PYTHON= pythonlua/*.py tests/*.py *.py AUTO_MKDIRS= yes @@ -30,5 +30,5 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" - +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-kiwisolver/Makefile b/math/py-kiwisolver/Makefile index 83b9c9eeaa0..34f17a26a1f 100644 --- a/math/py-kiwisolver/Makefile +++ b/math/py-kiwisolver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/06/15 18:54:41 adam Exp $ +# $NetBSD: Makefile,v 1.3 2020/08/31 23:07:03 wiz Exp $ DISTNAME= kiwisolver-1.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,9 +10,10 @@ HOMEPAGE= https://github.com/nucleic/kiwi COMMENT= Fast implementation of the Cassowary constraint solver LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= c c++ .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-numba/Makefile b/math/py-numba/Makefile index 524510d89b9..76577b40f05 100644 --- a/math/py-numba/Makefile +++ b/math/py-numba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2020/08/21 20:33:15 adam Exp $ +# $NetBSD: Makefile,v 1.21 2020/08/31 23:07:03 wiz Exp $ DISTNAME= numba-0.51.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,11 +11,11 @@ COMMENT= NumPy aware dynamic Python compiler using LLVM LICENSE= 2-clause-bsd DEPENDS+= ${PYPKGPREFIX}-llvmlite>=0.33.0:../../devel/py-llvmlite -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools USE_LANGUAGES= c c++ PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools post-install: .for cmd in numba pycc @@ -25,4 +25,5 @@ post-install: .include "../../lang/python/egg.mk" .include "../../math/py-numpy/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-xarray/Makefile b/math/py-xarray/Makefile index 444c26c55ca..4f7bdc5238a 100644 --- a/math/py-xarray/Makefile +++ b/math/py-xarray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/04/15 22:49:41 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:03 wiz Exp $ DISTNAME= xarray-0.15.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,11 +14,12 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-numpy>=1.0:../../math/py-numpy DEPENDS+= ${PYPKGPREFIX}-pandas>=0.18.1:../../math/py-pandas -DEPENDS+= ${PYPKGPREFIX}-setuptools>=41.2:../../devel/py-setuptools USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-pandads +PYTHON_VERSIONED_DEPENDENCIES+= setuptools .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile index 83ba27ab91f..06fb1e35b78 100644 --- a/net/exabgp/Makefile +++ b/net/exabgp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2020/08/31 18:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2020/08/31 23:07:03 wiz Exp $ VERSION= 3.4.23 DISTNAME= ${VERSION} @@ -19,7 +19,8 @@ WRKSRC= ${WRKDIR}/exabgp-${VERSION} USE_TOOLS+= perl:run DEPENDS+= ${PYPKGPREFIX}-ipaddr>=0:../../devel/py-ipaddr -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools + +PYTHON_VERSIONED_DEPENDENCIES+= setuptools REPLACE_PERL+= etc/exabgp/processes/dynamic-1.pl REPLACE_PERL+= etc/exabgp/processes/watchdog-1.pl @@ -77,4 +78,5 @@ post-install: .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" .include "../../lang/python/pyversion.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-junos-eznc/Makefile b/net/py-junos-eznc/Makefile index f6ca3cbaa8c..2118ccd710b 100644 --- a/net/py-junos-eznc/Makefile +++ b/net/py-junos-eznc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/10/16 12:03:57 adam Exp $ +# $NetBSD: Makefile,v 1.14 2020/08/31 23:07:03 wiz Exp $ DISTNAME= junos-eznc-2.1.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/Juniper/py-junos-eznc COMMENT= Python library to manage JunOS devices LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-setuptools>0.6:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.15.2:../../security/py-paramiko DEPENDS+= ${PYPKGPREFIX}-ncclient>=0.5.3:../../net/py-ncclient DEPENDS+= ${PYPKGPREFIX}-jinja2>2.7.1:../../textproc/py-jinja2 @@ -23,6 +22,8 @@ DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES+= setuptools .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-ncclient/Makefile b/net/py-ncclient/Makefile index e956390ec83..127d03d79d7 100644 --- a/net/py-ncclient/Makefile +++ b/net/py-ncclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2020/08/04 18:05:21 adam Exp $ +# $NetBSD: Makefile,v 1.14 2020/08/31 23:07:03 wiz Exp $ DISTNAME= ncclient-0.6.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-lxml>=3.3.0:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.15.0:../../security/py-paramiko -DEPENDS+= ${PYPKGPREFIX}-setuptools>0.6:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six .include "../../lang/python/pyversion.mk" @@ -22,5 +21,8 @@ DEPENDS+= ${PYPKGPREFIX}-selectors2>=2.0.1:../../devel/py-selectors2 USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-onionbalance/Makefile b/net/py-onionbalance/Makefile index 38850b7caab..0106835892a 100644 --- a/net/py-onionbalance/Makefile +++ b/net/py-onionbalance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/05/25 05:58:16 adam Exp $ +# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:03 wiz Exp $ DISTNAME= OnionBalance-0.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -14,7 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-stem>=1.8:../../devel/py-stem DEPENDS+= ${PYPKGPREFIX}-yaml>=4.2:../../textproc/py-yaml TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock @@ -29,6 +28,7 @@ USE_LANGUAGES= # none PYSETUPTESTTARGET= pytest PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools post-install: cd ${DESTDIR}${PREFIX}/bin && \ @@ -36,4 +36,5 @@ post-install: ${MV} onionbalance-config onionbalance-config-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-twine/Makefile b/net/py-twine/Makefile index 764d9947d37..7c68694912f 100644 --- a/net/py-twine/Makefile +++ b/net/py-twine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/08/11 18:44:01 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:03 wiz Exp $ DISTNAME= twine-1.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,10 +14,10 @@ DEPENDS+= ${PYPKGPREFIX}-pkginfo>=1.4.2:../../devel/py-pkginfo DEPENDS+= ${PYPKGPREFIX}-readme_renderer>=21.0:../../textproc/py-readme_renderer DEPENDS+= ${PYPKGPREFIX}-requests>=2.17:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-toolbelt>=0.9.1:../../devel/py-requests-toolbelt -DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.7.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-tqdm>=4.14:../../misc/py-tqdm -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-tqdm USE_LANGUAGES= # none diff --git a/net/speedtest-cli/Makefile b/net/speedtest-cli/Makefile index 2d74a086b6c..a1a2ec04303 100644 --- a/net/speedtest-cli/Makefile +++ b/net/speedtest-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/08/31 14:34:29 nia Exp $ +# $NetBSD: Makefile,v 1.8 2020/08/31 23:07:04 wiz Exp $ DISTNAME= speedtest-cli-2.1.2 CATEGORIES= net @@ -11,10 +11,11 @@ COMMENT= Command line client for use with speedtest.net LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools REPLACE_PYTHON= *.py +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + INSTALLATION_DIRS+= ${PKGMANDIR}/man1 post-install: @@ -23,4 +24,5 @@ post-install: .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/py-weasyprint/Makefile b/print/py-weasyprint/Makefile index 8ea942d21d0..fbad6927fdb 100644 --- a/print/py-weasyprint/Makefile +++ b/print/py-weasyprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2020/05/09 13:10:35 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2020/08/31 23:07:04 wiz Exp $ DISTNAME= WeasyPrint-51 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-cffi>=0.6:../../devel/py-cffi DEPENDS+= ${PYPKGPREFIX}-cssselect2>=0.1:../../textproc/py-cssselect2 DEPENDS+= ${PYPKGPREFIX}-html5lib>=0.999999999:../../textproc/py-html5lib DEPENDS+= ${PYPKGPREFIX}-pyphen>=0.9.1:../../textproc/py-pyphen -DEPENDS+= ${PYPKGPREFIX}-setuptools>=39.2.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-tinycss2>=0.5:../../textproc/py-tinycss2 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 @@ -27,6 +26,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none post-install: @@ -34,4 +35,5 @@ post-install: ${MV} weasyprint weasyprint-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile index 813ebe9243e..1b9dae42277 100644 --- a/security/py-acme/Makefile +++ b/security/py-acme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2020/05/17 19:34:12 adam Exp $ +# $NetBSD: Makefile,v 1.22 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -15,11 +15,11 @@ DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-requests>2.10:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-toolbelt>=0.3.0:../../devel/py-requests-toolbelt DEPENDS+= ${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" diff --git a/security/py-certbot-apache/Makefile b/security/py-certbot-apache/Makefile index e53dc833aa9..b255797381d 100644 --- a/security/py-certbot-apache/Makefile +++ b/security/py-certbot-apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/11/14 18:28:17 adam Exp $ +# $NetBSD: Makefile,v 1.11 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,9 +11,11 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-augeas-[0-9]*:../../sysutils/py-augeas DEPENDS+= ${PYPKGPREFIX}-certbot>=0.39.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeComponent-[0-9]*:../../devel/py-ZopeComponent DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-digitalocean/Makefile b/security/py-certbot-dns-digitalocean/Makefile index f8807aca193..c68b4c087b8 100644 --- a/security/py-certbot-dns-digitalocean/Makefile +++ b/security/py-certbot-dns-digitalocean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/12/30 19:41:31 triaxx Exp $ +# $NetBSD: Makefile,v 1.2 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,9 +11,11 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=0.39.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-digitalocean>=1.11:../../net/py-digitalocean DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-dnsimple/Makefile b/security/py-certbot-dns-dnsimple/Makefile index 779263edc2a..425eb67f892 100644 --- a/security/py-certbot-dns-dnsimple/Makefile +++ b/security/py-certbot-dns-dnsimple/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-dnsmadeeasy/Makefile b/security/py-certbot-dns-dnsmadeeasy/Makefile index 1496ea1fb90..5838ac0d8ae 100644 --- a/security/py-certbot-dns-dnsmadeeasy/Makefile +++ b/security/py-certbot-dns-dnsmadeeasy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.2.1:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-gehirn/Makefile b/security/py-certbot-dns-gehirn/Makefile index 440ddfd0f90..c8fd812d072 100644 --- a/security/py-certbot-dns-gehirn/Makefile +++ b/security/py-certbot-dns-gehirn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.1.22:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-google/Makefile b/security/py-certbot-dns-google/Makefile index c8418c89db7..850254da808 100644 --- a/security/py-certbot-dns-google/Makefile +++ b/security/py-certbot-dns-google/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -13,10 +13,11 @@ DEPENDS+= ${PYPKGPREFIX}-google-api-python-client>=1.5.5:../../www/py-google-api DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2 DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock DEPENDS+= ${PYPKGPREFIX}-oauth2client>=4.0:../../security/py-oauth2client -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-google-api-python-client +PYTHON_VERSIONED_DEPENDENCIES+= setuptools .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-linode/Makefile b/security/py-certbot-dns-linode/Makefile index 186ec4ee17b..13e3786adb6 100644 --- a/security/py-certbot-dns-linode/Makefile +++ b/security/py-certbot-dns-linode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.2.3:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-luadns/Makefile b/security/py-certbot-dns-luadns/Makefile index 7bd6b44f1fb..8980003fde0 100644 --- a/security/py-certbot-dns-luadns/Makefile +++ b/security/py-certbot-dns-luadns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.9 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.2.1:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-nsone/Makefile b/security/py-certbot-dns-nsone/Makefile index e848ae5bf77..0797fd9a430 100644 --- a/security/py-certbot-dns-nsone/Makefile +++ b/security/py-certbot-dns-nsone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.9 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.2.1:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-ovh/Makefile b/security/py-certbot-dns-ovh/Makefile index 1c49872e366..cc4d34fc4ca 100644 --- a/security/py-certbot-dns-ovh/Makefile +++ b/security/py-certbot-dns-ovh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/05/07 10:53:45 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.7.14:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-rfc2136/Makefile b/security/py-certbot-dns-rfc2136/Makefile index e1741ce3800..4bfa9ae0f5f 100644 --- a/security/py-certbot-dns-rfc2136/Makefile +++ b/security/py-certbot-dns-rfc2136/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/05/07 10:53:46 adam Exp $ +# $NetBSD: Makefile,v 1.11 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-route53/Makefile b/security/py-certbot-dns-route53/Makefile index 98eb5591040..dcb5fbaae4e 100644 --- a/security/py-certbot-dns-route53/Makefile +++ b/security/py-certbot-dns-route53/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/05/07 10:53:46 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3 DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-dns-sakuracloud/Makefile b/security/py-certbot-dns-sakuracloud/Makefile index 0632e341fa3..eb5ee7d19c9 100644 --- a/security/py-certbot-dns-sakuracloud/Makefile +++ b/security/py-certbot-dns-sakuracloud/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/05/07 10:53:46 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/08/31 23:07:05 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -11,8 +11,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-lexicon>=2.1.23:../../net/py-lexicon DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile index 1f72674b7c1..e8a24f6debb 100644 --- a/security/py-certbot-nginx/Makefile +++ b/security/py-certbot-nginx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2020/07/10 10:24:23 adam Exp $ +# $NetBSD: Makefile,v 1.14 2020/08/31 23:07:06 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -12,9 +12,10 @@ DEPENDS+= ${PYPKGPREFIX}-acme>=1.4.0:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=1.4.0:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock DEPENDS+= ${PYPKGPREFIX}-pyparsing>=1.5.5:../../devel/py-pyparsing -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + PKG_SYSCONFVAR= nginx SUBST_CLASSES+= paths @@ -24,4 +25,5 @@ SUBST_FILES.paths= certbot_nginx/_internal/constants.py SUBST_VARS.paths= PKG_SYSCONFDIR .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index c7fdf4f066d..622d28e839b 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2020/05/17 19:34:12 adam Exp $ +# $NetBSD: Makefile,v 1.26 2020/08/31 23:07:04 wiz Exp $ .include "../../security/py-certbot/Makefile.common" @@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock DEPENDS+= ${PYPKGPREFIX}-parsedatetime>=1.3:../../time/py-parsedatetime DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-ZopeComponent-[0-9]*:../../devel/py-ZopeComponent DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface # Needed for the test target @@ -26,7 +25,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools BUILD_DEFS+= VARBASE diff --git a/security/py-google-auth/Makefile b/security/py-google-auth/Makefile index 86092d5e091..dd08f85ded2 100644 --- a/security/py-google-auth/Makefile +++ b/security/py-google-auth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2020/08/31 16:32:13 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2020/08/31 23:07:06 wiz Exp $ DISTNAME= google-auth-1.21.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-asn1-modules>=0.2.1:../../security/py-asn1-modules DEPENDS+= ${PYPKGPREFIX}-cachetools>=2.0.0:../../devel/py-cachetools DEPENDS+= ${PYPKGPREFIX}-rsa>=3.1.4:../../security/py-rsa -DEPENDS+= ${PYPKGPREFIX}-setuptools>=40.3.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock @@ -27,6 +26,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun TEST_DEPENDS+= ${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-cachetools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none @@ -34,4 +34,5 @@ do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile index 81260c25cdc..36bd4ab36a0 100644 --- a/security/py-josepy/Makefile +++ b/security/py-josepy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/08/25 10:37:35 adam Exp $ +# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:06 wiz Exp $ DISTNAME= josepy-1.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,6 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-cryptography>=0.8:../../security/py-cryptography -DEPENDS+= ${PYPKGPREFIX}-setuptools>=1.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.0:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 @@ -21,7 +20,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-cache>=1.0:../../devel/py-test-cache TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8>=0.5:../../devel/py-test-flake8 -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools USE_LANGUAGES= # none diff --git a/textproc/py-diff-match-patch/Makefile b/textproc/py-diff-match-patch/Makefile index b9a7eaba446..b31bc4c8bb3 100644 --- a/textproc/py-diff-match-patch/Makefile +++ b/textproc/py-diff-match-patch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/15 14:10:14 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:06 wiz Exp $ DISTNAME= diff-match-patch-20200713 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/diff-match-patch-python/diff-match-patch COMMENT= Robust algorithms for synchronizing plain text LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools>=38.6.0:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build USE_LANGUAGES= # none @@ -23,4 +23,5 @@ do-test: .endif .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile index 6bd6fde3f28..85c9d242cc9 100644 --- a/textproc/py-jsonschema/Makefile +++ b/textproc/py-jsonschema/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/12/03 16:50:59 adam Exp $ +# $NetBSD: Makefile,v 1.15 2020/08/31 23:07:06 wiz Exp $ DISTNAME= jsonschema-3.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/Julian/jsonschema COMMENT= Implementation of JSON Schema for Python LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs DEPENDS+= ${PYPKGPREFIX}-pyrsistent>=0.14.0:../../devel/py-pyrsistent DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools @@ -24,6 +23,8 @@ DEPENDS+= ${PYPKGPREFIX}-functools32-[0-9]*:../../devel/py-functools32 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} jsonschema jsonschema-${PYVERSSUFFIX} || ${TRUE} @@ -32,4 +33,5 @@ do-test: cd ${WRKSRC}/jsonschema && ${PYTHONBIN} -m unittest discover -v .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-manuel/Makefile b/textproc/py-manuel/Makefile index 6a0ba97ef40..1bd4ae6dbc5 100644 --- a/textproc/py-manuel/Makefile +++ b/textproc/py-manuel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/02/12 09:10:31 adam Exp $ +# $NetBSD: Makefile,v 1.2 2020/08/31 23:07:06 wiz Exp $ DISTNAME= manuel-1.10.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,11 +10,13 @@ HOMEPAGE= https://github.com/benji-york/manuel COMMENT= Build tested documentation LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index ea6fef24712..295f34d609a 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/05/21 08:26:21 adam Exp $ +# $NetBSD: Makefile,v 1.21 2020/08/31 23:07:06 wiz Exp $ DISTNAME= Markdown-3.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -10,9 +10,10 @@ HOMEPAGE= https://Python-Markdown.github.io/ COMMENT= XHTML generator using a simple markup LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-setuptools>=36:../../devel/py-setuptools TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none post-install: @@ -20,4 +21,5 @@ post-install: ${MV} markdown_py markdown_py${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-rst2pdf/Makefile b/textproc/py-rst2pdf/Makefile index 3e2061befae..2123bbba709 100644 --- a/textproc/py-rst2pdf/Makefile +++ b/textproc/py-rst2pdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/07/13 20:05:12 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2020/08/31 23:07:06 wiz Exp $ DISTNAME= rst2pdf-0.97 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,11 +15,12 @@ DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-pdfrw-[0-9]*:../../textproc/py-pdfrw DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments DEPENDS+= ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-smartypants-[0-9]*:../../textproc/py-smartypants TEST_DEPENDS+= ${PYPKGPREFIX}-PDF2-[0-9]*:../../print/py-PDF2 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools + USE_LANGUAGES= # none post-install: @@ -27,4 +28,5 @@ post-install: ${MV} rst2pdf rst2pdf-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index ae0b704cea7..ed304a13e3e 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2020/03/09 18:38:59 adam Exp $ +# $NetBSD: Makefile,v 1.74 2020/08/31 23:07:07 wiz Exp $ DISTNAME= Sphinx-2.4.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -19,7 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging DEPENDS+= ${PYPKGPREFIX}-pygments>=2.0:../../textproc/py-pygments DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-snowballstemmer>=1.1:../../textproc/py-snowballstemmer DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-applehelp-[0-9]*:../../textproc/py-sphinxcontrib-applehelp DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-devhelp-[0-9]*:../../textproc/py-sphinxcontrib-devhelp @@ -35,6 +34,7 @@ USE_LANGUAGES= # none USE_TOOLS+= makeinfo PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONED_DEPENDENCIES+= setuptools do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests @@ -47,4 +47,5 @@ post-install: ${MV} sphinx-quickstart sphinx-quickstart-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-zope.proxy/Makefile b/www/py-zope.proxy/Makefile index f8eecf258e3..f5bcb3d5a16 100644 --- a/www/py-zope.proxy/Makefile +++ b/www/py-zope.proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/06/08 12:48:52 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:07 wiz Exp $ DISTNAME= zope.proxy-4.3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,9 @@ COMMENT= Generic Transparent Proxies LICENSE= zpl-2.1 DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface -DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools + +PYTHON_VERSIONED_DEPENDENCIES+= setuptools .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile index 91232f9844d..4cc64118db8 100644 --- a/www/qutebrowser/Makefile +++ b/www/qutebrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/08/17 20:20:22 leot Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/31 23:07:07 wiz Exp $ DISTNAME= qutebrowser-1.13.1 PKGREVISION= 1 @@ -20,7 +20,8 @@ DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml -TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:tool + TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -30,4 +31,5 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/egg.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" .include "../../x11/py-qt5/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index ee7704dfd9c..719bb4de59f 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2020/08/17 20:20:28 leot Exp $ +# $NetBSD: Makefile,v 1.19 2020/08/31 23:07:07 wiz Exp $ DISTNAME= kitty-0.16.0 PKGREVISION= 3 @@ -24,7 +24,7 @@ BUILDLINK_TRANSFORM+= rm:-flto # comes with ncurses. USE_NCURSES= yes -TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools:tool SUBST_CLASSES+= python SUBST_STAGE.python= pre-build @@ -35,7 +35,7 @@ SUBST_SED.python+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},g" INSTALLATION_DIRS+= ${PKGMANDIR}/man1 PYTHON_VERSIONS_INCOMPATIBLE= 27 -PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool +PYTHON_VERSIONED_DEPENDENCIES+= sphinx:tool do-build: cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package @@ -75,4 +75,5 @@ do-install: .include "../../mk/pthread.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" |