pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Mon Aug 31 23:07:07 UTC 2020
Modified Files:
pkgsrc/converters/py-cairosvg: Makefile
pkgsrc/devel/py-ZopeComponent: Makefile
pkgsrc/devel/py-ZopeConfiguration: Makefile
pkgsrc/devel/py-ZopeI18NMessageid: Makefile
pkgsrc/devel/py-ZopeInterface: Makefile
pkgsrc/devel/py-ZopeSchema: Makefile
pkgsrc/devel/py-ZopeTestrunner: Makefile
pkgsrc/devel/py-buildbot: Makefile
pkgsrc/devel/py-buildbot-pkg: Makefile
pkgsrc/devel/py-daemon: Makefile
pkgsrc/devel/py-google-api-core: Makefile
pkgsrc/devel/py-ipython: Makefile
pkgsrc/devel/py-ipython5: Makefile
pkgsrc/devel/py-lazy-object-proxy: Makefile
pkgsrc/devel/py-logilab-common: Makefile
pkgsrc/devel/py-protobuf: Makefile
pkgsrc/devel/py-tox: Makefile
pkgsrc/devel/py-zope.deferredimport: Makefile
pkgsrc/devel/py-zope.deprecation: Makefile
pkgsrc/emulators/fs-uae-arcade: Makefile
pkgsrc/emulators/fs-uae-launcher: Makefile
pkgsrc/filesystems/fuse-pcachefs: Makefile
pkgsrc/filesystems/py-fs: Makefile
pkgsrc/graphics/py-blockdiag: Makefile
pkgsrc/lang/py-python-lua: Makefile
pkgsrc/math/py-kiwisolver: Makefile
pkgsrc/math/py-numba: Makefile
pkgsrc/math/py-xarray: Makefile
pkgsrc/net/exabgp: Makefile
pkgsrc/net/py-junos-eznc: Makefile
pkgsrc/net/py-ncclient: Makefile
pkgsrc/net/py-onionbalance: Makefile
pkgsrc/net/py-twine: Makefile
pkgsrc/net/speedtest-cli: Makefile
pkgsrc/print/py-weasyprint: Makefile
pkgsrc/security/py-acme: Makefile
pkgsrc/security/py-certbot: Makefile
pkgsrc/security/py-certbot-apache: Makefile
pkgsrc/security/py-certbot-dns-digitalocean: Makefile
pkgsrc/security/py-certbot-dns-dnsimple: Makefile
pkgsrc/security/py-certbot-dns-dnsmadeeasy: Makefile
pkgsrc/security/py-certbot-dns-gehirn: Makefile
pkgsrc/security/py-certbot-dns-google: Makefile
pkgsrc/security/py-certbot-dns-linode: Makefile
pkgsrc/security/py-certbot-dns-luadns: Makefile
pkgsrc/security/py-certbot-dns-nsone: Makefile
pkgsrc/security/py-certbot-dns-ovh: Makefile
pkgsrc/security/py-certbot-dns-rfc2136: Makefile
pkgsrc/security/py-certbot-dns-route53: Makefile
pkgsrc/security/py-certbot-dns-sakuracloud: Makefile
pkgsrc/security/py-certbot-nginx: Makefile
pkgsrc/security/py-google-auth: Makefile
pkgsrc/security/py-josepy: Makefile
pkgsrc/textproc/py-diff-match-patch: Makefile
pkgsrc/textproc/py-jsonschema: Makefile
pkgsrc/textproc/py-manuel: Makefile
pkgsrc/textproc/py-markdown: Makefile
pkgsrc/textproc/py-rst2pdf: Makefile
pkgsrc/textproc/py-sphinx: Makefile
pkgsrc/www/py-zope.proxy: Makefile
pkgsrc/www/qutebrowser: Makefile
pkgsrc/x11/kitty: Makefile
Log Message:
*: switch to versioned_dependencies.mk for py-setuptools
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/converters/py-cairosvg/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-ZopeComponent/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-ZopeConfiguration/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-ZopeI18NMessageid/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/py-ZopeInterface/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-ZopeSchema/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-ZopeTestrunner/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-buildbot/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-buildbot-pkg/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-daemon/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-google-api-core/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-ipython/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-ipython5/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-lazy-object-proxy/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-logilab-common/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-tox/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-zope.deferredimport/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-zope.deprecation/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/fs-uae-arcade/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/fs-uae-launcher/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse-pcachefs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/py-fs/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/py-blockdiag/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/py-python-lua/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/py-kiwisolver/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/math/py-numba/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-xarray/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/exabgp/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-junos-eznc/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-ncclient/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-onionbalance/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-twine/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/speedtest-cli/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/py-weasyprint/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/py-acme/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/py-certbot/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/py-certbot-apache/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/py-certbot-dns-digitalocean/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-certbot-dns-dnsimple/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-certbot-dns-gehirn/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py-certbot-dns-google/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-certbot-dns-linode/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py-certbot-dns-luadns/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py-certbot-dns-nsone/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-certbot-dns-ovh/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/py-certbot-dns-rfc2136/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-certbot-dns-route53/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-certbot-dns-sakuracloud/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/py-certbot-nginx/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/py-google-auth/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/py-josepy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-diff-match-patch/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-manuel/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/py-markdown/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-rst2pdf/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/textproc/py-sphinx/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-zope.proxy/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/qutebrowser/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/kitty/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/converters/py-cairosvg/Makefile
diff -u pkgsrc/converters/py-cairosvg/Makefile:1.17 pkgsrc/converters/py-cairosvg/Makefile:1.18
--- pkgsrc/converters/py-cairosvg/Makefile:1.17 Tue May 19 13:59:19 2020
+++ pkgsrc/converters/py-cairosvg/Makefile Mon Aug 31 23:07:00 2020
@@ -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]
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-runne
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"
Index: pkgsrc/devel/py-ZopeComponent/Makefile
diff -u pkgsrc/devel/py-ZopeComponent/Makefile:1.9 pkgsrc/devel/py-ZopeComponent/Makefile:1.10
--- pkgsrc/devel/py-ZopeComponent/Makefile:1.9 Fri Aug 21 12:40:54 2020
+++ pkgsrc/devel/py-ZopeComponent/Makefile Mon Aug 31 23:07:00 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/devel/py-ZopeConfiguration/Makefile
diff -u pkgsrc/devel/py-ZopeConfiguration/Makefile:1.5 pkgsrc/devel/py-ZopeConfiguration/Makefile:1.6
--- pkgsrc/devel/py-ZopeConfiguration/Makefile:1.5 Mon Jun 8 13:29:22 2020
+++ pkgsrc/devel/py-ZopeConfiguration/Makefile Mon Aug 31 23:07:00 2020
@@ -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"
Index: pkgsrc/devel/py-ZopeI18NMessageid/Makefile
diff -u pkgsrc/devel/py-ZopeI18NMessageid/Makefile:1.5 pkgsrc/devel/py-ZopeI18NMessageid/Makefile:1.6
--- pkgsrc/devel/py-ZopeI18NMessageid/Makefile:1.5 Mon Jun 8 13:27:23 2020
+++ pkgsrc/devel/py-ZopeI18NMessageid/Makefile Mon Aug 31 23:07:00 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/devel/py-ZopeInterface/Makefile
diff -u pkgsrc/devel/py-ZopeInterface/Makefile:1.32 pkgsrc/devel/py-ZopeInterface/Makefile:1.33
--- pkgsrc/devel/py-ZopeInterface/Makefile:1.32 Mon Jun 8 13:18:06 2020
+++ pkgsrc/devel/py-ZopeInterface/Makefile Mon Aug 31 23:07:00 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/devel/py-ZopeSchema/Makefile
diff -u pkgsrc/devel/py-ZopeSchema/Makefile:1.4 pkgsrc/devel/py-ZopeSchema/Makefile:1.5
--- pkgsrc/devel/py-ZopeSchema/Makefile:1.4 Mon Jun 8 13:24:35 2020
+++ pkgsrc/devel/py-ZopeSchema/Makefile Mon Aug 31 23:07:00 2020
@@ -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"
Index: pkgsrc/devel/py-ZopeTestrunner/Makefile
diff -u pkgsrc/devel/py-ZopeTestrunner/Makefile:1.4 pkgsrc/devel/py-ZopeTestrunner/Makefile:1.5
--- pkgsrc/devel/py-ZopeTestrunner/Makefile:1.4 Fri Aug 21 12:42:13 2020
+++ pkgsrc/devel/py-ZopeTestrunner/Makefile Mon Aug 31 23:07:00 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/devel/py-buildbot/Makefile
diff -u pkgsrc/devel/py-buildbot/Makefile:1.23 pkgsrc/devel/py-buildbot/Makefile:1.24
--- pkgsrc/devel/py-buildbot/Makefile:1.23 Wed Feb 19 19:07:18 2020
+++ pkgsrc/devel/py-buildbot/Makefile Mon Aug 31 23:07:01 2020
@@ -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]*:../.
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
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"
Index: pkgsrc/devel/py-buildbot-pkg/Makefile
diff -u pkgsrc/devel/py-buildbot-pkg/Makefile:1.8 pkgsrc/devel/py-buildbot-pkg/Makefile:1.9
--- pkgsrc/devel/py-buildbot-pkg/Makefile:1.8 Wed Feb 19 19:07:19 2020
+++ pkgsrc/devel/py-buildbot-pkg/Makefile Mon Aug 31 23:07:01 2020
@@ -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"
Index: pkgsrc/devel/py-daemon/Makefile
diff -u pkgsrc/devel/py-daemon/Makefile:1.15 pkgsrc/devel/py-daemon/Makefile:1.16
--- pkgsrc/devel/py-daemon/Makefile:1.15 Thu May 14 19:39:03 2020
+++ pkgsrc/devel/py-daemon/Makefile Mon Aug 31 23:07:01 2020
@@ -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-daemo
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-
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"
Index: pkgsrc/devel/py-google-api-core/Makefile
diff -u pkgsrc/devel/py-google-api-core/Makefile:1.5 pkgsrc/devel/py-google-api-core/Makefile:1.6
--- pkgsrc/devel/py-google-api-core/Makefile:1.5 Mon Aug 24 08:40:18 2020
+++ pkgsrc/devel/py-google-api-core/Makefile Mon Aug 31 23:07:01 2020
@@ -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:
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"
Index: pkgsrc/devel/py-ipython/Makefile
diff -u pkgsrc/devel/py-ipython/Makefile:1.53 pkgsrc/devel/py-ipython/Makefile:1.54
--- pkgsrc/devel/py-ipython/Makefile:1.53 Sun Aug 9 00:00:56 2020
+++ pkgsrc/devel/py-ipython/Makefile Mon Aug 31 23:07:01 2020
@@ -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]*:
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]*:
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"
Index: pkgsrc/devel/py-ipython5/Makefile
diff -u pkgsrc/devel/py-ipython5/Makefile:1.6 pkgsrc/devel/py-ipython5/Makefile:1.7
--- pkgsrc/devel/py-ipython5/Makefile:1.6 Sun Jan 26 17:31:03 2020
+++ pkgsrc/devel/py-ipython5/Makefile Mon Aug 31 23:07:01 2020
@@ -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]*:
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"
Index: pkgsrc/devel/py-lazy-object-proxy/Makefile
diff -u pkgsrc/devel/py-lazy-object-proxy/Makefile:1.6 pkgsrc/devel/py-lazy-object-proxy/Makefile:1.7
--- pkgsrc/devel/py-lazy-object-proxy/Makefile:1.6 Wed Jul 29 12:07:15 2020
+++ pkgsrc/devel/py-lazy-object-proxy/Makefile Mon Aug 31 23:07:01 2020
@@ -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/pyt
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"
Index: pkgsrc/devel/py-logilab-common/Makefile
diff -u pkgsrc/devel/py-logilab-common/Makefile:1.19 pkgsrc/devel/py-logilab-common/Makefile:1.20
--- pkgsrc/devel/py-logilab-common/Makefile:1.19 Sat Jul 6 22:56:03 2019
+++ pkgsrc/devel/py-logilab-common/Makefile Mon Aug 31 23:07:01 2020
@@ -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/projec
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"
Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.31 pkgsrc/devel/py-protobuf/Makefile:1.32
--- pkgsrc/devel/py-protobuf/Makefile:1.31 Fri Aug 21 11:29:18 2020
+++ pkgsrc/devel/py-protobuf/Makefile Mon Aug 31 23:07:02 2020
@@ -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"
Index: pkgsrc/devel/py-tox/Makefile
diff -u pkgsrc/devel/py-tox/Makefile:1.19 pkgsrc/devel/py-tox/Makefile:1.20
--- pkgsrc/devel/py-tox/Makefile:1.19 Sat May 16 17:38:40 2020
+++ pkgsrc/devel/py-tox/Makefile Mon Aug 31 23:07:02 2020
@@ -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-rando
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
Index: pkgsrc/devel/py-zope.deferredimport/Makefile
diff -u pkgsrc/devel/py-zope.deferredimport/Makefile:1.3 pkgsrc/devel/py-zope.deferredimport/Makefile:1.4
--- pkgsrc/devel/py-zope.deferredimport/Makefile:1.3 Mon Jun 8 13:00:59 2020
+++ pkgsrc/devel/py-zope.deferredimport/Makefile Mon Aug 31 23:07:02 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/devel/py-zope.deprecation/Makefile
diff -u pkgsrc/devel/py-zope.deprecation/Makefile:1.4 pkgsrc/devel/py-zope.deprecation/Makefile:1.5
--- pkgsrc/devel/py-zope.deprecation/Makefile:1.4 Wed Jul 3 07:19:04 2019
+++ pkgsrc/devel/py-zope.deprecation/Makefile Mon Aug 31 23:07:02 2020
@@ -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/zopefoundat
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"
Index: pkgsrc/emulators/fs-uae-arcade/Makefile
diff -u pkgsrc/emulators/fs-uae-arcade/Makefile:1.9 pkgsrc/emulators/fs-uae-arcade/Makefile:1.10
--- pkgsrc/emulators/fs-uae-arcade/Makefile:1.9 Sat May 23 09:12:57 2020
+++ pkgsrc/emulators/fs-uae-arcade/Makefile Mon Aug 31 23:07:02 2020
@@ -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"
Index: pkgsrc/emulators/fs-uae-launcher/Makefile
diff -u pkgsrc/emulators/fs-uae-launcher/Makefile:1.16 pkgsrc/emulators/fs-uae-launcher/Makefile:1.17
--- pkgsrc/emulators/fs-uae-launcher/Makefile:1.16 Sat May 23 09:12:57 2020
+++ pkgsrc/emulators/fs-uae-launcher/Makefile Mon Aug 31 23:07:02 2020
@@ -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"
Index: pkgsrc/filesystems/fuse-pcachefs/Makefile
diff -u pkgsrc/filesystems/fuse-pcachefs/Makefile:1.8 pkgsrc/filesystems/fuse-pcachefs/Makefile:1.9
--- pkgsrc/filesystems/fuse-pcachefs/Makefile:1.8 Sun Nov 3 19:26:21 2019
+++ pkgsrc/filesystems/fuse-pcachefs/Makefile Mon Aug 31 23:07:02 2020
@@ -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/pc
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-b
.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"
Index: pkgsrc/filesystems/py-fs/Makefile
diff -u pkgsrc/filesystems/py-fs/Makefile:1.3 pkgsrc/filesystems/py-fs/Makefile:1.4
--- pkgsrc/filesystems/py-fs/Makefile:1.3 Sat May 16 17:42:41 2020
+++ pkgsrc/filesystems/py-fs/Makefile Mon Aug 31 23:07:02 2020
@@ -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:../
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"
Index: pkgsrc/graphics/py-blockdiag/Makefile
diff -u pkgsrc/graphics/py-blockdiag/Makefile:1.26 pkgsrc/graphics/py-blockdiag/Makefile:1.27
--- pkgsrc/graphics/py-blockdiag/Makefile:1.26 Wed Feb 19 17:50:25 2020
+++ pkgsrc/graphics/py-blockdiag/Makefile Mon Aug 31 23:07:02 2020
@@ -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"
Index: pkgsrc/lang/py-python-lua/Makefile
diff -u pkgsrc/lang/py-python-lua/Makefile:1.3 pkgsrc/lang/py-python-lua/Makefile:1.4
--- pkgsrc/lang/py-python-lua/Makefile:1.3 Sun Nov 3 19:04:05 2019
+++ pkgsrc/lang/py-python-lua/Makefile Mon Aug 31 23:07:03 2020
@@ -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/NeonMercur
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"
Index: pkgsrc/math/py-kiwisolver/Makefile
diff -u pkgsrc/math/py-kiwisolver/Makefile:1.2 pkgsrc/math/py-kiwisolver/Makefile:1.3
--- pkgsrc/math/py-kiwisolver/Makefile:1.2 Sat Jun 15 18:54:41 2019
+++ pkgsrc/math/py-kiwisolver/Makefile Mon Aug 31 23:07:03 2020
@@ -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/kiw
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"
Index: pkgsrc/math/py-numba/Makefile
diff -u pkgsrc/math/py-numba/Makefile:1.20 pkgsrc/math/py-numba/Makefile:1.21
--- pkgsrc/math/py-numba/Makefile:1.20 Fri Aug 21 20:33:15 2020
+++ pkgsrc/math/py-numba/Makefile Mon Aug 31 23:07:03 2020
@@ -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 comp
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"
Index: pkgsrc/math/py-xarray/Makefile
diff -u pkgsrc/math/py-xarray/Makefile:1.4 pkgsrc/math/py-xarray/Makefile:1.5
--- pkgsrc/math/py-xarray/Makefile:1.4 Wed Apr 15 22:49:41 2020
+++ pkgsrc/math/py-xarray/Makefile Mon Aug 31 23:07:03 2020
@@ -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]
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"
Index: pkgsrc/net/exabgp/Makefile
diff -u pkgsrc/net/exabgp/Makefile:1.33 pkgsrc/net/exabgp/Makefile:1.34
--- pkgsrc/net/exabgp/Makefile:1.33 Mon Aug 31 18:10:33 2020
+++ pkgsrc/net/exabgp/Makefile Mon Aug 31 23:07:03 2020
@@ -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"
Index: pkgsrc/net/py-junos-eznc/Makefile
diff -u pkgsrc/net/py-junos-eznc/Makefile:1.13 pkgsrc/net/py-junos-eznc/Makefile:1.14
--- pkgsrc/net/py-junos-eznc/Makefile:1.13 Mon Oct 16 12:03:57 2017
+++ pkgsrc/net/py-junos-eznc/Makefile Mon Aug 31 23:07:03 2020
@@ -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-
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]*:.
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"
Index: pkgsrc/net/py-ncclient/Makefile
diff -u pkgsrc/net/py-ncclient/Makefile:1.13 pkgsrc/net/py-ncclient/Makefile:1.14
--- pkgsrc/net/py-ncclient/Makefile:1.13 Tue Aug 4 18:05:21 2020
+++ pkgsrc/net/py-ncclient/Makefile Mon Aug 31 23:07:03 2020
@@ -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
USE_LANGUAGES= # none
+PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-onionbalance/Makefile
diff -u pkgsrc/net/py-onionbalance/Makefile:1.6 pkgsrc/net/py-onionbalance/Makefile:1.7
--- pkgsrc/net/py-onionbalance/Makefile:1.6 Mon May 25 05:58:16 2020
+++ pkgsrc/net/py-onionbalance/Makefile Mon Aug 31 23:07:03 2020
@@ -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
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"
Index: pkgsrc/net/py-twine/Makefile
diff -u pkgsrc/net/py-twine/Makefile:1.3 pkgsrc/net/py-twine/Makefile:1.4
--- pkgsrc/net/py-twine/Makefile:1.3 Tue Aug 11 18:44:01 2020
+++ pkgsrc/net/py-twine/Makefile Mon Aug 31 23:07:03 2020
@@ -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:
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
Index: pkgsrc/net/speedtest-cli/Makefile
diff -u pkgsrc/net/speedtest-cli/Makefile:1.7 pkgsrc/net/speedtest-cli/Makefile:1.8
--- pkgsrc/net/speedtest-cli/Makefile:1.7 Sat Aug 31 14:34:29 2019
+++ pkgsrc/net/speedtest-cli/Makefile Mon Aug 31 23:07:04 2020
@@ -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 wit
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"
Index: pkgsrc/print/py-weasyprint/Makefile
diff -u pkgsrc/print/py-weasyprint/Makefile:1.28 pkgsrc/print/py-weasyprint/Makefile:1.29
--- pkgsrc/print/py-weasyprint/Makefile:1.28 Sat May 9 13:10:35 2020
+++ pkgsrc/print/py-weasyprint/Makefile Mon Aug 31 23:07:04 2020
@@ -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:../..
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-runne
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"
Index: pkgsrc/security/py-acme/Makefile
diff -u pkgsrc/security/py-acme/Makefile:1.21 pkgsrc/security/py-acme/Makefile:1.22
--- pkgsrc/security/py-acme/Makefile:1.21 Sun May 17 19:34:12 2020
+++ pkgsrc/security/py-acme/Makefile Mon Aug 31 23:07:04 2020
@@ -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]*:../
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"
Index: pkgsrc/security/py-certbot/Makefile
diff -u pkgsrc/security/py-certbot/Makefile:1.25 pkgsrc/security/py-certbot/Makefile:1.26
--- pkgsrc/security/py-certbot/Makefile:1.25 Sun May 17 19:34:12 2020
+++ pkgsrc/security/py-certbot/Makefile Mon Aug 31 23:07:04 2020
@@ -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]*:../
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-[
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
Index: pkgsrc/security/py-certbot-apache/Makefile
diff -u pkgsrc/security/py-certbot-apache/Makefile:1.10 pkgsrc/security/py-certbot-apache/Makefile:1.11
--- pkgsrc/security/py-certbot-apache/Makefile:1.10 Thu Nov 14 18:28:17 2019
+++ pkgsrc/security/py-certbot-apache/Makefile Mon Aug 31 23:07:04 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-digitalocean/Makefile
diff -u pkgsrc/security/py-certbot-dns-digitalocean/Makefile:1.1 pkgsrc/security/py-certbot-dns-digitalocean/Makefile:1.2
--- pkgsrc/security/py-certbot-dns-digitalocean/Makefile:1.1 Mon Dec 30 19:41:31 2019
+++ pkgsrc/security/py-certbot-dns-digitalocean/Makefile Mon Aug 31 23:07:04 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-dnsimple/Makefile
diff -u pkgsrc/security/py-certbot-dns-dnsimple/Makefile:1.4 pkgsrc/security/py-certbot-dns-dnsimple/Makefile:1.5
--- pkgsrc/security/py-certbot-dns-dnsimple/Makefile:1.4 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-dnsimple/Makefile Mon Aug 31 23:07:04 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile
diff -u pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile:1.3 pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile:1.4
--- pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile:1.3 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-dnsmadeeasy/Makefile Mon Aug 31 23:07:04 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-gehirn/Makefile
diff -u pkgsrc/security/py-certbot-dns-gehirn/Makefile:1.3 pkgsrc/security/py-certbot-dns-gehirn/Makefile:1.4
--- pkgsrc/security/py-certbot-dns-gehirn/Makefile:1.3 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-gehirn/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-google/Makefile
diff -u pkgsrc/security/py-certbot-dns-google/Makefile:1.5 pkgsrc/security/py-certbot-dns-google/Makefile:1.6
--- pkgsrc/security/py-certbot-dns-google/Makefile:1.5 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-google/Makefile Mon Aug 31 23:07:05 2020
@@ -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-pyth
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"
Index: pkgsrc/security/py-certbot-dns-linode/Makefile
diff -u pkgsrc/security/py-certbot-dns-linode/Makefile:1.4 pkgsrc/security/py-certbot-dns-linode/Makefile:1.5
--- pkgsrc/security/py-certbot-dns-linode/Makefile:1.4 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-linode/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-luadns/Makefile
diff -u pkgsrc/security/py-certbot-dns-luadns/Makefile:1.8 pkgsrc/security/py-certbot-dns-luadns/Makefile:1.9
--- pkgsrc/security/py-certbot-dns-luadns/Makefile:1.8 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-luadns/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-nsone/Makefile
diff -u pkgsrc/security/py-certbot-dns-nsone/Makefile:1.8 pkgsrc/security/py-certbot-dns-nsone/Makefile:1.9
--- pkgsrc/security/py-certbot-dns-nsone/Makefile:1.8 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-nsone/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-ovh/Makefile
diff -u pkgsrc/security/py-certbot-dns-ovh/Makefile:1.9 pkgsrc/security/py-certbot-dns-ovh/Makefile:1.10
--- pkgsrc/security/py-certbot-dns-ovh/Makefile:1.9 Thu May 7 10:53:45 2020
+++ pkgsrc/security/py-certbot-dns-ovh/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-rfc2136/Makefile
diff -u pkgsrc/security/py-certbot-dns-rfc2136/Makefile:1.10 pkgsrc/security/py-certbot-dns-rfc2136/Makefile:1.11
--- pkgsrc/security/py-certbot-dns-rfc2136/Makefile:1.10 Thu May 7 10:53:46 2020
+++ pkgsrc/security/py-certbot-dns-rfc2136/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-route53/Makefile
diff -u pkgsrc/security/py-certbot-dns-route53/Makefile:1.9 pkgsrc/security/py-certbot-dns-route53/Makefile:1.10
--- pkgsrc/security/py-certbot-dns-route53/Makefile:1.9 Thu May 7 10:53:46 2020
+++ pkgsrc/security/py-certbot-dns-route53/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-dns-sakuracloud/Makefile
diff -u pkgsrc/security/py-certbot-dns-sakuracloud/Makefile:1.9 pkgsrc/security/py-certbot-dns-sakuracloud/Makefile:1.10
--- pkgsrc/security/py-certbot-dns-sakuracloud/Makefile:1.9 Thu May 7 10:53:46 2020
+++ pkgsrc/security/py-certbot-dns-sakuracloud/Makefile Mon Aug 31 23:07:05 2020
@@ -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:..
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"
Index: pkgsrc/security/py-certbot-nginx/Makefile
diff -u pkgsrc/security/py-certbot-nginx/Makefile:1.13 pkgsrc/security/py-certbot-nginx/Makefile:1.14
--- pkgsrc/security/py-certbot-nginx/Makefile:1.13 Fri Jul 10 10:24:23 2020
+++ pkgsrc/security/py-certbot-nginx/Makefile Mon Aug 31 23:07:06 2020
@@ -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:../
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/_intern
SUBST_VARS.paths= PKG_SYSCONFDIR
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/py-google-auth/Makefile
diff -u pkgsrc/security/py-google-auth/Makefile:1.24 pkgsrc/security/py-google-auth/Makefile:1.25
--- pkgsrc/security/py-google-auth/Makefile:1.24 Mon Aug 31 16:32:13 2020
+++ pkgsrc/security/py-google-auth/Makefile Mon Aug 31 23:07:06 2020
@@ -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-
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"
Index: pkgsrc/security/py-josepy/Makefile
diff -u pkgsrc/security/py-josepy/Makefile:1.6 pkgsrc/security/py-josepy/Makefile:1.7
--- pkgsrc/security/py-josepy/Makefile:1.6 Tue Aug 25 10:37:35 2020
+++ pkgsrc/security/py-josepy/Makefile Mon Aug 31 23:07:06 2020
@@ -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
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
Index: pkgsrc/textproc/py-diff-match-patch/Makefile
diff -u pkgsrc/textproc/py-diff-match-patch/Makefile:1.3 pkgsrc/textproc/py-diff-match-patch/Makefile:1.4
--- pkgsrc/textproc/py-diff-match-patch/Makefile:1.3 Wed Jul 15 14:10:14 2020
+++ pkgsrc/textproc/py-diff-match-patch/Makefile Mon Aug 31 23:07:06 2020
@@ -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-
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"
Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.14 pkgsrc/textproc/py-jsonschema/Makefile:1.15
--- pkgsrc/textproc/py-jsonschema/Makefile:1.14 Tue Dec 3 16:50:59 2019
+++ pkgsrc/textproc/py-jsonschema/Makefile Mon Aug 31 23:07:06 2020
@@ -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/json
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-
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"
Index: pkgsrc/textproc/py-manuel/Makefile
diff -u pkgsrc/textproc/py-manuel/Makefile:1.1 pkgsrc/textproc/py-manuel/Makefile:1.2
--- pkgsrc/textproc/py-manuel/Makefile:1.1 Tue Feb 12 09:10:31 2019
+++ pkgsrc/textproc/py-manuel/Makefile Mon Aug 31 23:07:06 2020
@@ -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/
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"
Index: pkgsrc/textproc/py-markdown/Makefile
diff -u pkgsrc/textproc/py-markdown/Makefile:1.20 pkgsrc/textproc/py-markdown/Makefile:1.21
--- pkgsrc/textproc/py-markdown/Makefile:1.20 Tue May 21 08:26:21 2019
+++ pkgsrc/textproc/py-markdown/Makefile Mon Aug 31 23:07:06 2020
@@ -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
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"
Index: pkgsrc/textproc/py-rst2pdf/Makefile
diff -u pkgsrc/textproc/py-rst2pdf/Makefile:1.7 pkgsrc/textproc/py-rst2pdf/Makefile:1.8
--- pkgsrc/textproc/py-rst2pdf/Makefile:1.7 Mon Jul 13 20:05:12 2020
+++ pkgsrc/textproc/py-rst2pdf/Makefile Mon Aug 31 23:07:06 2020
@@ -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]*:.
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"
Index: pkgsrc/textproc/py-sphinx/Makefile
diff -u pkgsrc/textproc/py-sphinx/Makefile:1.73 pkgsrc/textproc/py-sphinx/Makefile:1.74
--- pkgsrc/textproc/py-sphinx/Makefile:1.73 Mon Mar 9 18:38:59 2020
+++ pkgsrc/textproc/py-sphinx/Makefile Mon Aug 31 23:07:07 2020
@@ -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]
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"
Index: pkgsrc/www/py-zope.proxy/Makefile
diff -u pkgsrc/www/py-zope.proxy/Makefile:1.3 pkgsrc/www/py-zope.proxy/Makefile:1.4
--- pkgsrc/www/py-zope.proxy/Makefile:1.3 Mon Jun 8 12:48:52 2020
+++ pkgsrc/www/py-zope.proxy/Makefile Mon Aug 31 23:07:07 2020
@@ -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"
Index: pkgsrc/www/qutebrowser/Makefile
diff -u pkgsrc/www/qutebrowser/Makefile:1.4 pkgsrc/www/qutebrowser/Makefile:1.5
--- pkgsrc/www/qutebrowser/Makefile:1.4 Mon Aug 17 20:20:22 2020
+++ pkgsrc/www/qutebrowser/Makefile Mon Aug 31 23:07:07 2020
@@ -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]*:.
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"
Index: pkgsrc/x11/kitty/Makefile
diff -u pkgsrc/x11/kitty/Makefile:1.18 pkgsrc/x11/kitty/Makefile:1.19
--- pkgsrc/x11/kitty/Makefile:1.18 Mon Aug 17 20:20:28 2020
+++ pkgsrc/x11/kitty/Makefile Mon Aug 31 23:07:07 2020
@@ -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,sp
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"
Home |
Main Index |
Thread Index |
Old Index