CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 13 Feb 2022 08:53:45 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb 13 08:53:45 UTC 2022

Modified Files:
        pkgsrc/audio/py-musique: Makefile
        pkgsrc/converters/py-zfec: Makefile
        pkgsrc/databases/py-carbon: Makefile
        pkgsrc/devel/py-buildbot-worker: Makefile
        pkgsrc/devel/py-doctor: Makefile
        pkgsrc/devel/py-jersey: Makefile
        pkgsrc/devel/py-pyutil: Makefile
        pkgsrc/devel/py-setuptools_trial: Makefile
        pkgsrc/devel/py-thrift: Makefile
        pkgsrc/devel/py-treq: Makefile
        pkgsrc/devel/py-tubes: Makefile
        pkgsrc/devel/py-txgithub: Makefile
        pkgsrc/devel/py-txrequests: Makefile
        pkgsrc/net/coherence: Makefile
        pkgsrc/net/py-foolscap: Makefile
        pkgsrc/net/py-twisted-docs: Makefile
        pkgsrc/net/py-txamqp: Makefile
        pkgsrc/news/hellanzb: Makefile
        pkgsrc/textproc/py-jsonschema: Makefile
        pkgsrc/www/py-klein: Makefile
        pkgsrc/www/py-nevow: Makefile

Log Message:
*: use versioned_dependencies for py-twisted


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/audio/py-musique/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/converters/py-zfec/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/py-carbon/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-buildbot-worker/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-doctor/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-jersey/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-pyutil/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-setuptools_trial/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-thrift/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-treq/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-tubes/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-txgithub/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-txrequests/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/coherence/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/py-foolscap/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/py-twisted-docs/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/py-txamqp/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/news/hellanzb/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-klein/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/py-nevow/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/py-musique/Makefile
diff -u pkgsrc/audio/py-musique/Makefile:1.72 pkgsrc/audio/py-musique/Makefile:1.73
--- pkgsrc/audio/py-musique/Makefile:1.72       Sat Jan 22 15:49:05 2022
+++ pkgsrc/audio/py-musique/Makefile    Sun Feb 13 08:53:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/01/22 15:49:05 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=      pymusique-0.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -16,7 +16,7 @@ NO_BIN_ON_FTP=                ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-mcrypt-[0-9]*:../../security/py-mcrypt
 DEPENDS+=      ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2

Index: pkgsrc/converters/py-zfec/Makefile
diff -u pkgsrc/converters/py-zfec/Makefile:1.30 pkgsrc/converters/py-zfec/Makefile:1.31
--- pkgsrc/converters/py-zfec/Makefile:1.30     Wed Jan  5 15:40:59 2022
+++ pkgsrc/converters/py-zfec/Makefile  Sun Feb 13 08:53:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/01/05 15:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=      zfec-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,8 @@ LICENSE=      gnu-gpl-v2
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=      ${PYPKGPREFIX}-pyutil>=3.0.0:../../devel/py-pyutil
 TEST_DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
-TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -34,5 +35,6 @@ post-install:
 .endfor
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-carbon/Makefile
diff -u pkgsrc/databases/py-carbon/Makefile:1.11 pkgsrc/databases/py-carbon/Makefile:1.12
--- pkgsrc/databases/py-carbon/Makefile:1.11    Mon Jan 10 21:56:04 2022
+++ pkgsrc/databases/py-carbon/Makefile Sun Feb 13 08:53:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/10 21:56:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:42 wiz Exp $
 
 DISTNAME=      carbon-0.9.15
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ HOMEPAGE=     https://launchpad.net/graphite
 COMMENT=       Backend storage application for graphite
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 DEPENDS+=      ${PYPKGPREFIX}-whisper>=${PKGVERSION_NOREV}:../../databases/py-whisper
 
 USE_LANGUAGES= # none

Index: pkgsrc/devel/py-buildbot-worker/Makefile
diff -u pkgsrc/devel/py-buildbot-worker/Makefile:1.11 pkgsrc/devel/py-buildbot-worker/Makefile:1.12
--- pkgsrc/devel/py-buildbot-worker/Makefile:1.11       Wed Jan  5 15:41:02 2022
+++ pkgsrc/devel/py-buildbot-worker/Makefile    Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/05 15:41:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      buildbot-worker-2.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=    Worker for the buildbot CI syst
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=17.9.0:../../net/py-twisted
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+
 USE_LANGUAGES= # none
 
 USE_PKG_RESOURCES=     yes
@@ -26,4 +27,5 @@ post-install:
        ${MV} buildbot_worker_windows_service buildbot_worker_windows_service-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-doctor/Makefile
diff -u pkgsrc/devel/py-doctor/Makefile:1.15 pkgsrc/devel/py-doctor/Makefile:1.16
--- pkgsrc/devel/py-doctor/Makefile:1.15        Tue Jan  4 20:53:01 2022
+++ pkgsrc/devel/py-doctor/Makefile     Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      pydoctor-16.3.0
 PKGNAME=       ${DISTNAME:S/py/${PYPKGPREFIX}-/}
@@ -12,7 +12,7 @@ COMMENT=      API doc generator
 LICENSE=       mit
 
 DEPENDS+=      epydoc-[0-9]*:../../devel/epydoc
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/devel/py-jersey/Makefile
diff -u pkgsrc/devel/py-jersey/Makefile:1.19 pkgsrc/devel/py-jersey/Makefile:1.20
--- pkgsrc/devel/py-jersey/Makefile:1.19        Tue Jan  4 20:53:13 2022
+++ pkgsrc/devel/py-jersey/Makefile     Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      jersey-0.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://pypi.python.org/pypi/j
 COMMENT=       Framework for building Twisted Python command-line interfaces
 LICENSE=       modified-bsd
 
-#BUILD_DEPENDS+=       ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
-DEPENDS+=              ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
+#BUILD_DEPENDS+=       ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted19
+DEPENDS+=              ${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted19
 DEPENDS+=              ${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.1.5

Index: pkgsrc/devel/py-pyutil/Makefile
diff -u pkgsrc/devel/py-pyutil/Makefile:1.26 pkgsrc/devel/py-pyutil/Makefile:1.27
--- pkgsrc/devel/py-pyutil/Makefile:1.26        Wed Jan  5 15:41:07 2022
+++ pkgsrc/devel/py-pyutil/Makefile     Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:07 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      pyutil-3.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-simplejson>=2.1.0:../../converters/py-simplejson
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=1.3.0:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-twisted>=15.5.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
 
 USE_LANGUAGES= # none
 
@@ -25,4 +26,5 @@ post-extract:
        ${FIND} ${WRKSRC} -name __pycache__ -or -name '*.pyc' -exec ${RM} -R {} +
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools_trial/Makefile
diff -u pkgsrc/devel/py-setuptools_trial/Makefile:1.18 pkgsrc/devel/py-setuptools_trial/Makefile:1.19
--- pkgsrc/devel/py-setuptools_trial/Makefile:1.18      Tue Jan  4 20:53:39 2022
+++ pkgsrc/devel/py-setuptools_trial/Makefile   Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/01/04 20:53:39 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,12 @@ HOMEPAGE=   https://github.com/rutsky/setu
 COMMENT=       Setuptools plugin for Twisted-based unit tests
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/pyversion.mk"
@@ -24,4 +25,5 @@ DEPENDS+=     ${PYPKGPREFIX}-pathlib2-[0-9]*
 .endif
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-thrift/Makefile
diff -u pkgsrc/devel/py-thrift/Makefile:1.5 pkgsrc/devel/py-thrift/Makefile:1.6
--- pkgsrc/devel/py-thrift/Makefile:1.5 Tue Jan  4 20:53:44 2022
+++ pkgsrc/devel/py-thrift/Makefile     Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/13 08:53:43 wiz Exp $
 
 PKGREVISION= 1
 .include "../../devel/thrift/Makefile.version"
@@ -11,10 +11,12 @@ EXTRACT_ELEMENTS=   ${DISTNAME}/lib/py
 
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.7.2:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
-TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
 
 USE_LANGUAGES= c c++
 PYSETUPSUBDIR= lib/py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-treq/Makefile
diff -u pkgsrc/devel/py-treq/Makefile:1.5 pkgsrc/devel/py-treq/Makefile:1.6
--- pkgsrc/devel/py-treq/Makefile:1.5   Sat Feb  5 14:26:37 2022
+++ pkgsrc/devel/py-treq/Makefile       Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/05 14:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      treq-22.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,9 +14,11 @@ DEPENDS+=    ${PYPKGPREFIX}-attrs-[0-9]*:..
 DEPENDS+=      ${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.1.0:../../devel/py-requests
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=16.4.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-tubes/Makefile
diff -u pkgsrc/devel/py-tubes/Makefile:1.2 pkgsrc/devel/py-tubes/Makefile:1.3
--- pkgsrc/devel/py-tubes/Makefile:1.2  Tue Jan  4 20:53:45 2022
+++ pkgsrc/devel/py-tubes/Makefile      Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/13 08:53:43 wiz Exp $
 
 GITHUB_PROJECT=        tubes
 GITHUB_TAG=    v0.2.0
@@ -16,10 +16,12 @@ LICENSE=    mit
 
 DEPENDS+=      ${PYPKGPREFIX}-characteristic-[0-9]*:../../devel/py-characteristic
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
 
 WRKSRC=                ${WRKDIR}/tubes-0.2.0
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-txgithub/Makefile
diff -u pkgsrc/devel/py-txgithub/Makefile:1.3 pkgsrc/devel/py-txgithub/Makefile:1.4
--- pkgsrc/devel/py-txgithub/Makefile:1.3       Tue Jan  4 20:53:46 2022
+++ pkgsrc/devel/py-txgithub/Makefile   Sun Feb 13 08:53:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/13 08:53:43 wiz Exp $
 
 DISTNAME=      txgithub-15.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@ COMMENT=      GitHub API client using Twisted
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=12.3.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@ post-install:
                ${MV} gist gist-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-txrequests/Makefile
diff -u pkgsrc/devel/py-txrequests/Makefile:1.3 pkgsrc/devel/py-txrequests/Makefile:1.4
--- pkgsrc/devel/py-txrequests/Makefile:1.3     Tue Jan  4 20:53:46 2022
+++ pkgsrc/devel/py-txrequests/Makefile Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      txrequests-0.9.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,11 @@ COMMENT=     Asynchronous Python HTTP Reques
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-requests>=1.2.0:../../devel/py-requests
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=9.0.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/coherence/Makefile
diff -u pkgsrc/net/coherence/Makefile:1.23 pkgsrc/net/coherence/Makefile:1.24
--- pkgsrc/net/coherence/Makefile:1.23  Wed Jan  5 15:41:15 2022
+++ pkgsrc/net/coherence/Makefile       Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/05 15:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      Coherence-0.6.6.2
 PKGNAME=       coherence-0.6.6.2
@@ -12,7 +12,7 @@ COMMENT=      Media server framework
 
 USE_LANGUAGES= # none
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted19
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.6.6.2
 

Index: pkgsrc/net/py-foolscap/Makefile
diff -u pkgsrc/net/py-foolscap/Makefile:1.38 pkgsrc/net/py-foolscap/Makefile:1.39
--- pkgsrc/net/py-foolscap/Makefile:1.38        Wed Jan  5 15:41:16 2022
+++ pkgsrc/net/py-foolscap/Makefile     Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/01/05 15:41:16 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      foolscap-21.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,8 @@ LICENSE=      mit
 
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=16.0:../../net/py-twisted
+
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
 
 # \todo Restore tests
 #TEST_TARGET=  test
@@ -33,4 +34,5 @@ post-install:
                ${DESTDIR}${PREFIX}/share/doc/py-foolscap
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-twisted-docs/Makefile
diff -u pkgsrc/net/py-twisted-docs/Makefile:1.18 pkgsrc/net/py-twisted-docs/Makefile:1.19
--- pkgsrc/net/py-twisted-docs/Makefile:1.18    Wed Apr 13 19:45:38 2016
+++ pkgsrc/net/py-twisted-docs/Makefile Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/04/13 19:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:44 wiz Exp $
 
 PKGNAME=       py-${DISTNAME:S/Twisted/twisted-docs/}
 COMMENT=       Framework for writing networked applications (documentation)
@@ -14,6 +14,8 @@ PLIST_SRC=    ${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=     ${HTMLDIR}
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 do-install:
        cd ${DOC_SRCDIR} && pax -rw -pp * ${DESTDIR}${PREFIX}/${HTMLDIR}
        cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}

Index: pkgsrc/net/py-txamqp/Makefile
diff -u pkgsrc/net/py-txamqp/Makefile:1.11 pkgsrc/net/py-txamqp/Makefile:1.12
--- pkgsrc/net/py-txamqp/Makefile:1.11  Mon Jan 10 20:52:10 2022
+++ pkgsrc/net/py-txamqp/Makefile       Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/10 20:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      txAMQP-0.8.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,10 +11,12 @@ HOMEPAGE=   https://github.com/txamqp/txam
 COMMENT=       Python library for communicating with AMQP using Twisted
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/news/hellanzb/Makefile
diff -u pkgsrc/news/hellanzb/Makefile:1.23 pkgsrc/news/hellanzb/Makefile:1.24
--- pkgsrc/news/hellanzb/Makefile:1.23  Mon Jan 10 18:18:22 2022
+++ pkgsrc/news/hellanzb/Makefile       Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/10 18:18:22 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/02/13 08:53:44 wiz Exp $
 #
 .include "../../news/hellanzb/Makefile.version"
 
@@ -13,7 +13,7 @@ HOMEPAGE=             https://github.com/pjenvey/he
 COMMENT=               Command line nntp file grabber
 LICENSE=               modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=1.3:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted>=1.3:../../net/py-twisted19
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=      par2>=0.4:../../archivers/par2
 DEPENDS+=      unrar>=3.5.4:../../archivers/unrar

Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.20 pkgsrc/textproc/py-jsonschema/Makefile:1.21
--- pkgsrc/textproc/py-jsonschema/Makefile:1.20 Tue Jan 25 09:05:11 2022
+++ pkgsrc/textproc/py-jsonschema/Makefile      Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/01/25 09:05:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      jsonschema-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@ LICENSE=      modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-pyrsistent>=0.14.0:../../devel/py-pyrsistent
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -26,6 +25,7 @@ PYTHON_VERSIONED_DEPENDENCIES+=       importli
 USE_PKG_RESOURCES=     yes
 
 PYTHON_VERSIONED_DEPENDENCIES+=        setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/www/py-klein/Makefile
diff -u pkgsrc/www/py-klein/Makefile:1.4 pkgsrc/www/py-klein/Makefile:1.5
--- pkgsrc/www/py-klein/Makefile:1.4    Tue Jan  4 20:55:31 2022
+++ pkgsrc/www/py-klein/Makefile        Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:55:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      klein-20.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,11 +16,13 @@ DEPENDS+=   ${PYPKGPREFIX}-attrs-[0-9]*:..
 DEPENDS+=      ${PYPKGPREFIX}-hyperlink-[0-9]*:../../www/py-hyperlink
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-tubes-[0-9]*:../../devel/py-tubes
-DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=      ${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
+PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-nevow/Makefile
diff -u pkgsrc/www/py-nevow/Makefile:1.33 pkgsrc/www/py-nevow/Makefile:1.34
--- pkgsrc/www/py-nevow/Makefile:1.33   Wed Jan  5 20:07:11 2022
+++ pkgsrc/www/py-nevow/Makefile        Sun Feb 13 08:53:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2022/01/05 20:07:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2022/02/13 08:53:44 wiz Exp $
 
 DISTNAME=      Nevow-0.14.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://github.com/twisted/nev
 COMMENT=       Next-generation web application templating system
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=13.0:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted>=13.0:../../net/py-twisted19
 
 USE_LANGUAGES=         # none

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/py-twisted
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/py-twisted
Indexes:

Home | Main Index | Thread Index | Old Index