CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 1 May 2022 09:45:42 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  1 09:45:42 UTC 2022

Modified Files:
        pkgsrc/devel/py-tox: Makefile
        pkgsrc/filesystems/fuse-pcachefs: Makefile
        pkgsrc/finance/py-trytond-account-payment: Makefile
        pkgsrc/finance/py-trytond-account-payment-sepa: Makefile
        pkgsrc/finance/py-trytond-account-payment-sepa-cfonb: Makefile
        pkgsrc/finance/py-trytond-account-statement: Makefile
        pkgsrc/lang/coq: Makefile options.mk
        pkgsrc/math/py-infinity: Makefile
        pkgsrc/security/py27-cryptography: Makefile
        pkgsrc/textproc/py-lsp-jsonrpc: Makefile
        pkgsrc/www/py-flask-flatpages: options.mk

Log Message:
*: fix usage of versioned_dependencies

Remove unused includes, fix dependencies where it's not included.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/py-tox/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/filesystems/fuse-pcachefs/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/finance/py-trytond-account-payment/Makefile
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/finance/py-trytond-account-payment-sepa/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/finance/py-trytond-account-statement/Makefile
cvs rdiff -u -r1.142 -r1.143 pkgsrc/lang/coq/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/coq/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/py-infinity/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/py27-cryptography/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-lsp-jsonrpc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-flask-flatpages/options.mk

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

Modified files:

Index: pkgsrc/devel/py-tox/Makefile
diff -u pkgsrc/devel/py-tox/Makefile:1.28 pkgsrc/devel/py-tox/Makefile:1.29
--- pkgsrc/devel/py-tox/Makefile:1.28   Fri Feb 18 06:22:59 2022
+++ pkgsrc/devel/py-tox/Makefile        Sun May  1 09:45:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/02/18 06:22:59 adam Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/01 09:45:41 wiz Exp $
 
 DISTNAME=      tox-3.24.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -32,7 +32,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-fi
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
+DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 .endif
 
 USE_LANGUAGES= # none

Index: pkgsrc/filesystems/fuse-pcachefs/Makefile
diff -u pkgsrc/filesystems/fuse-pcachefs/Makefile:1.14 pkgsrc/filesystems/fuse-pcachefs/Makefile:1.15
--- pkgsrc/filesystems/fuse-pcachefs/Makefile:1.14      Sun Jan  9 20:06:05 2022
+++ pkgsrc/filesystems/fuse-pcachefs/Makefile   Sun May  1 09:45:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/01/09 20:06:05 pho Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/01 09:45:41 wiz Exp $
 
 DISTNAME=      fuse-pcachefs-0.3
 PKGREVISION=   3
@@ -28,5 +28,4 @@ post-install:
 .include "../../filesystems/py-fuse-bindings/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/fuse.buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/finance/py-trytond-account-payment/Makefile
diff -u pkgsrc/finance/py-trytond-account-payment/Makefile:1.6 pkgsrc/finance/py-trytond-account-payment/Makefile:1.7
--- pkgsrc/finance/py-trytond-account-payment/Makefile:1.6      Tue Jan  4 20:53:56 2022
+++ pkgsrc/finance/py-trytond-account-payment/Makefile  Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/01 09:45:42 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_account_payment
 PKGREVISION= 1
 .include "../../devel/py-trytond/Makefile.common"
@@ -21,5 +21,4 @@ REPLACE_PYTHON+=      tests/test_account_paym
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/finance/py-trytond-account-payment-sepa/Makefile
diff -u pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.13 pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.14
--- pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.13        Tue Jan  4 20:53:56 2022
+++ pkgsrc/finance/py-trytond-account-payment-sepa/Makefile     Sun May  1 09:45:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/01 09:45:41 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_account_payment_sepa
 PKGREVISION= 1
 .include "../../devel/py-trytond/Makefile.common"
@@ -21,5 +21,4 @@ REPLACE_PYTHON+=      tests/test_account_paym
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile
diff -u pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile:1.3 pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile:1.4
--- pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile:1.3   Tue Jan  4 20:53:56 2022
+++ pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile       Sun May  1 09:45:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/01 09:45:41 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_account_payment_sepa_cfonb
 PKGREVISION= 1
 .include "../../devel/py-trytond/Makefile.common"
@@ -20,5 +20,4 @@ REPLACE_PYTHON+=      tests/test_account_paym
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/finance/py-trytond-account-statement/Makefile
diff -u pkgsrc/finance/py-trytond-account-statement/Makefile:1.5 pkgsrc/finance/py-trytond-account-statement/Makefile:1.6
--- pkgsrc/finance/py-trytond-account-statement/Makefile:1.5    Tue Jan  4 20:53:56 2022
+++ pkgsrc/finance/py-trytond-account-statement/Makefile        Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/01 09:45:42 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_account_statement
 PKGREVISION= 1
 .include "../../devel/py-trytond/Makefile.common"
@@ -22,5 +22,4 @@ REPLACE_PYTHON+=      tests/test_account_stat
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/coq/Makefile
diff -u pkgsrc/lang/coq/Makefile:1.142 pkgsrc/lang/coq/Makefile:1.143
--- pkgsrc/lang/coq/Makefile:1.142      Mon Apr 18 19:11:30 2022
+++ pkgsrc/lang/coq/Makefile    Sun May  1 09:45:42 2022
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2022/04/18 19:11:30 adam Exp $
-#
+# $NetBSD: Makefile,v 1.143 2022/05/01 09:45:42 wiz Exp $
 
 DISTNAME=      coq-8.12.2
 PKGREVISION=   4

Index: pkgsrc/lang/coq/options.mk
diff -u pkgsrc/lang/coq/options.mk:1.11 pkgsrc/lang/coq/options.mk:1.12
--- pkgsrc/lang/coq/options.mk:1.11     Tue Feb  9 22:37:43 2021
+++ pkgsrc/lang/coq/options.mk  Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2021/02/09 22:37:43 dholland Exp $
+# $NetBSD: options.mk,v 1.12 2022/05/01 09:45:42 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.coq
 PKG_SUPPORTED_OPTIONS= doc coqide
@@ -17,7 +17,6 @@ BUILD_DEPENDS+=                       hevea>=1.10:../../text
 #
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 .include "../../lang/python/tool.mk"
 SUBST_CLASSES+=                        sphinx-build
 SUBST_STAGE.sphinx-build=      pre-configure
@@ -25,6 +24,7 @@ SUBST_MESSAGE.sphinx-build=   Fix hardcode
 SUBST_FILES.sphinx-build+=     Makefile.doc configure.ml doc/dune
 SUBST_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
 
+TOOL_DEPENDS+=                 py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=                        py[0-9]*-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme
 BUILD_DEPENDS+=                        py[0-9]*-sphinxcontrib-bibtex-[0-9]*:../../textproc/py-sphinxcontrib-bibtex
 BUILD_DEPENDS+=                        py[0-9]*-pybtex-[0-9]*:../../textproc/py-pybtex

Index: pkgsrc/math/py-infinity/Makefile
diff -u pkgsrc/math/py-infinity/Makefile:1.8 pkgsrc/math/py-infinity/Makefile:1.9
--- pkgsrc/math/py-infinity/Makefile:1.8        Tue Jan  4 20:54:13 2022
+++ pkgsrc/math/py-infinity/Makefile    Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/01 09:45:42 wiz Exp $
 
 DISTNAME=      infinity-1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,5 +25,4 @@ 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/security/py27-cryptography/Makefile
diff -u pkgsrc/security/py27-cryptography/Makefile:1.1 pkgsrc/security/py27-cryptography/Makefile:1.2
--- pkgsrc/security/py27-cryptography/Makefile:1.1      Thu Apr 21 10:48:49 2022
+++ pkgsrc/security/py27-cryptography/Makefile  Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/21 10:48:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/01 09:45:42 wiz Exp $
 
 DISTNAME=      cryptography-3.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -29,6 +29,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-lsp-jsonrpc/Makefile
diff -u pkgsrc/textproc/py-lsp-jsonrpc/Makefile:1.2 pkgsrc/textproc/py-lsp-jsonrpc/Makefile:1.3
--- pkgsrc/textproc/py-lsp-jsonrpc/Makefile:1.2 Tue Jan  4 20:54:58 2022
+++ pkgsrc/textproc/py-lsp-jsonrpc/Makefile     Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/01 09:45:42 wiz Exp $
 
 DISTNAME=      python-lsp-jsonrpc-1.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -26,6 +26,5 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-coverage-[
 do-test:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} py.test-${PYVERSSUFFIX}
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-flask-flatpages/options.mk
diff -u pkgsrc/www/py-flask-flatpages/options.mk:1.2 pkgsrc/www/py-flask-flatpages/options.mk:1.3
--- pkgsrc/www/py-flask-flatpages/options.mk:1.2        Tue Apr  6 15:22:38 2021
+++ pkgsrc/www/py-flask-flatpages/options.mk    Sun May  1 09:45:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/04/06 15:22:38 adam Exp $
+# $NetBSD: options.mk,v 1.3 2022/05/01 09:45:42 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-flask-flatpages
 PKG_SUPPORTED_OPTIONS= pygments
@@ -7,5 +7,5 @@ PKG_SUGGESTED_OPTIONS+= pygments
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpygments)
-PYTHON_VERSIONED_DEPENDENCIES= pygments
+DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 .endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/audio/ncspot
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/audio/ncspot
Indexes:

Home | Main Index | Thread Index | Old Index