Sun May 1 09:45:42 2022 UTC ()
*: fix usage of versioned_dependencies

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


(wiz)
diff -r1.28 -r1.29 pkgsrc/devel/py-tox/Makefile
diff -r1.14 -r1.15 pkgsrc/filesystems/fuse-pcachefs/Makefile
diff -r1.6 -r1.7 pkgsrc/finance/py-trytond-account-payment/Makefile
diff -r1.13 -r1.14 pkgsrc/finance/py-trytond-account-payment-sepa/Makefile
diff -r1.3 -r1.4 pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile
diff -r1.5 -r1.6 pkgsrc/finance/py-trytond-account-statement/Makefile
diff -r1.142 -r1.143 pkgsrc/lang/coq/Makefile
diff -r1.11 -r1.12 pkgsrc/lang/coq/options.mk
diff -r1.8 -r1.9 pkgsrc/math/py-infinity/Makefile
diff -r1.1 -r1.2 pkgsrc/security/py27-cryptography/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/py-lsp-jsonrpc/Makefile
diff -r1.2 -r1.3 pkgsrc/www/py-flask-flatpages/options.mk
cvs diff -r1.28 -r1.29 pkgsrc/devel/py-tox/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-tox/Makefile 2022/02/18 06:22:59 1.28
+++ pkgsrc/devel/py-tox/Makefile 2022/05/01 09:45:41 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2022/02/18 06:22:59 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2022/05/01 09:45:41 wiz Exp $
2 2
3DISTNAME= tox-3.24.5 3DISTNAME= tox-3.24.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= devel python 5CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=t/tox/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=t/tox/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://tox.readthedocs.io/ 9HOMEPAGE= https://tox.readthedocs.io/
10COMMENT= Virtualenv-based automation of test activities 10COMMENT= Virtualenv-based automation of test activities
11LICENSE= mit 11LICENSE= mit
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>0:../../devel/py-setuptools_scm 13BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>0:../../devel/py-setuptools_scm
14DEPENDS+= ${PYPKGPREFIX}-filelock>=3.0.0:../../devel/py-filelock 14DEPENDS+= ${PYPKGPREFIX}-filelock>=3.0.0:../../devel/py-filelock
@@ -22,27 +22,27 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.4 @@ -22,27 +22,27 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.4
22TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun>=0.3.11:../../devel/py-freezegun 22TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun>=0.3.11:../../devel/py-freezegun
23TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2>=2.3.3:../../devel/py-pathlib2 23TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2>=2.3.3:../../devel/py-pathlib2
24TEST_DEPENDS+= ${PYPKGPREFIX}-psutil>=5.6.1:../../sysutils/py-psutil 24TEST_DEPENDS+= ${PYPKGPREFIX}-psutil>=5.6.1:../../sysutils/py-psutil
25TEST_DEPENDS+= ${PYPKGPREFIX}-test>=4.0.0:../../devel/py-test-cov 25TEST_DEPENDS+= ${PYPKGPREFIX}-test>=4.0.0:../../devel/py-test-cov
26TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov 26TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
27TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock>=1.10.0:../../devel/py-test-mock 27TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock>=1.10.0:../../devel/py-test-mock
28TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=1.0.0:../../devel/py-test-randomly 28TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=1.0.0:../../devel/py-test-randomly
29TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.22.2:../../devel/py-test-xdist 29TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.22.2:../../devel/py-test-xdist
30 30
31PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-filelock 31PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-filelock
32 32
33.include "../../lang/python/pyversion.mk" 33.include "../../lang/python/pyversion.mk"
34.if ${_PYTHON_VERSION} < 38 34.if ${_PYTHON_VERSION} < 38
35PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata 35DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
36.endif 36.endif
37 37
38USE_LANGUAGES= # none 38USE_LANGUAGES= # none
39 39
40USE_PKG_RESOURCES= yes 40USE_PKG_RESOURCES= yes
41 41
42post-install: 42post-install:
43 cd ${DESTDIR}${PREFIX}/bin && \ 43 cd ${DESTDIR}${PREFIX}/bin && \
44 ${MV} tox tox-${PYVERSSUFFIX} && \ 44 ${MV} tox tox-${PYVERSSUFFIX} && \
45 ${MV} tox-quickstart tox-quickstart-${PYVERSSUFFIX} || ${TRUE} 45 ${MV} tox-quickstart tox-quickstart-${PYVERSSUFFIX} || ${TRUE}
46 46
47do-test: 47do-test:
48 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} 48 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
cvs diff -r1.14 -r1.15 pkgsrc/filesystems/fuse-pcachefs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-pcachefs/Makefile 2022/01/09 20:06:05 1.14
+++ pkgsrc/filesystems/fuse-pcachefs/Makefile 2022/05/01 09:45:41 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2022/01/09 20:06:05 pho Exp $ 1# $NetBSD: Makefile,v 1.15 2022/05/01 09:45:41 wiz Exp $
2 2
3DISTNAME= fuse-pcachefs-0.3 3DISTNAME= fuse-pcachefs-0.3
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= ${MASTER_SITE_GITHUB:=ibizaman/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=ibizaman/}
7GITHUB_PROJECT= pcachefs 7GITHUB_PROJECT= pcachefs
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/ibizaman/pcachefs 10HOMEPAGE= https://github.com/ibizaman/pcachefs
11COMMENT= FUSE-based persistent caching filesystem 11COMMENT= FUSE-based persistent caching filesystem
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14USE_PKG_RESOURCES= yes 14USE_PKG_RESOURCES= yes
@@ -18,15 +18,14 @@ EGG_NAME= pCacheFS-${PKGVERSION_NOREV} @@ -18,15 +18,14 @@ EGG_NAME= pCacheFS-${PKGVERSION_NOREV}
18 18
19# It's not been ported to Python 3, and the upstream seems to be dead 19# It's not been ported to Python 3, and the upstream seems to be dead
20# atm. 20# atm.
21PYTHON_VERSIONS_ACCEPTED= 27 21PYTHON_VERSIONS_ACCEPTED= 27
22 22
23INSTALLATION_DIRS+= share/doc/${PKGBASE} 23INSTALLATION_DIRS+= share/doc/${PKGBASE}
24post-install: 24post-install:
25 ${INSTALL_DATA} "${WRKSRC}/README.md" \ 25 ${INSTALL_DATA} "${WRKSRC}/README.md" \
26 "${DESTDIR}${PREFIX}/share/doc/${PKGBASE}" 26 "${DESTDIR}${PREFIX}/share/doc/${PKGBASE}"
27 27
28.include "../../filesystems/py-fuse-bindings/buildlink3.mk" 28.include "../../filesystems/py-fuse-bindings/buildlink3.mk"
29.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
30.include "../../mk/fuse.buildlink3.mk" 30.include "../../mk/fuse.buildlink3.mk"
31.include "../../lang/python/versioned_dependencies.mk" 
32.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/finance/py-trytond-account-payment/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/py-trytond-account-payment/Makefile 2022/01/04 20:53:56 1.6
+++ pkgsrc/finance/py-trytond-account-payment/Makefile 2022/05/01 09:45:42 1.7
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2022/05/01 09:45:42 wiz Exp $
2TRYTON_MODULE_NAME= trytond_account_payment 2TRYTON_MODULE_NAME= trytond_account_payment
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../devel/py-trytond/Makefile.common" 4.include "../../devel/py-trytond/Makefile.common"
5CATEGORIES= finance python 5CATEGORIES= finance python
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.tryton.org/ 8HOMEPAGE= https://www.tryton.org/
9COMMENT= Account_payment module of the Tryton application platform 9COMMENT= Account_payment module of the Tryton application platform
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12DEPENDS+= ${PYPKGPREFIX}-trytond-currency>=${TRYTON_BASEVER}:../../finance/py-trytond-currency 12DEPENDS+= ${PYPKGPREFIX}-trytond-currency>=${TRYTON_BASEVER}:../../finance/py-trytond-currency
13DEPENDS+= ${PYPKGPREFIX}-trytond-account>=${TRYTON_BASEVER}:../../finance/py-trytond-account 13DEPENDS+= ${PYPKGPREFIX}-trytond-account>=${TRYTON_BASEVER}:../../finance/py-trytond-account
14DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company 14DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company
15DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party 15DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
16DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond 16DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
17 17
18USE_LANGUAGES= # none 18USE_LANGUAGES= # none
19 19
20REPLACE_PYTHON+= tests/test_account_payment.py 20REPLACE_PYTHON+= tests/test_account_payment.py
21 21
22.include "../../lang/python/application.mk" 22.include "../../lang/python/application.mk"
23.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
24.include "../../lang/python/versioned_dependencies.mk" 
25.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/finance/py-trytond-account-payment-sepa/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/py-trytond-account-payment-sepa/Makefile 2022/01/04 20:53:56 1.13
+++ pkgsrc/finance/py-trytond-account-payment-sepa/Makefile 2022/05/01 09:45:41 1.14
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.13 2022/01/04 20:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2022/05/01 09:45:41 wiz Exp $
2TRYTON_MODULE_NAME= trytond_account_payment_sepa 2TRYTON_MODULE_NAME= trytond_account_payment_sepa
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../devel/py-trytond/Makefile.common" 4.include "../../devel/py-trytond/Makefile.common"
5CATEGORIES= finance python 5CATEGORIES= finance python
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.tryton.org/ 8HOMEPAGE= https://www.tryton.org/
9COMMENT= Account payment SEPA module of the Tryton application platform 9COMMENT= Account payment SEPA module of the Tryton application platform
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment 12DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment
13DEPENDS+= ${PYPKGPREFIX}-trytond-bank>=${TRYTON_BASEVER}:../../finance/py-trytond-bank 13DEPENDS+= ${PYPKGPREFIX}-trytond-bank>=${TRYTON_BASEVER}:../../finance/py-trytond-bank
14DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company 14DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company
15DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party 15DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
16DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond 16DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
17DEPENDS+= ${PYPKGPREFIX}-genshi-[0-9]*:../../www/py-genshi 17DEPENDS+= ${PYPKGPREFIX}-genshi-[0-9]*:../../www/py-genshi
18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml 18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
19 19
20REPLACE_PYTHON+= tests/test_account_payment_sepa.py 20REPLACE_PYTHON+= tests/test_account_payment_sepa.py
21 21
22.include "../../lang/python/application.mk" 22.include "../../lang/python/application.mk"
23.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
24.include "../../lang/python/versioned_dependencies.mk" 
25.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile 2022/01/04 20:53:56 1.3
+++ pkgsrc/finance/py-trytond-account-payment-sepa-cfonb/Makefile 2022/05/01 09:45:41 1.4
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2022/05/01 09:45:41 wiz Exp $
2TRYTON_MODULE_NAME= trytond_account_payment_sepa_cfonb 2TRYTON_MODULE_NAME= trytond_account_payment_sepa_cfonb
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../devel/py-trytond/Makefile.common" 4.include "../../devel/py-trytond/Makefile.common"
5CATEGORIES= finance python 5CATEGORIES= finance python
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.tryton.org/ 8HOMEPAGE= https://www.tryton.org/
9COMMENT= Account payment SEPA CFONB module of the Tryton application platform 9COMMENT= Account payment SEPA CFONB module of the Tryton application platform
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment-sepa>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment-sepa 12DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment-sepa>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment-sepa
13DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment 13DEPENDS+= ${PYPKGPREFIX}-trytond-account-payment>=${TRYTON_BASEVER}:../../finance/py-trytond-account-payment
14DEPENDS+= ${PYPKGPREFIX}-trytond-bank>=${TRYTON_BASEVER}:../../finance/py-trytond-bank 14DEPENDS+= ${PYPKGPREFIX}-trytond-bank>=${TRYTON_BASEVER}:../../finance/py-trytond-bank
15DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company 15DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company
16DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party 16DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
17DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond 17DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
18 18
19REPLACE_PYTHON+= tests/test_account_payment_sepa_cfonb.py 19REPLACE_PYTHON+= tests/test_account_payment_sepa_cfonb.py
20 20
21.include "../../lang/python/application.mk" 21.include "../../lang/python/application.mk"
22.include "../../lang/python/egg.mk" 22.include "../../lang/python/egg.mk"
23.include "../../lang/python/versioned_dependencies.mk" 
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/finance/py-trytond-account-statement/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/py-trytond-account-statement/Makefile 2022/01/04 20:53:56 1.5
+++ pkgsrc/finance/py-trytond-account-statement/Makefile 2022/05/01 09:45:42 1.6
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2022/05/01 09:45:42 wiz Exp $
2TRYTON_MODULE_NAME= trytond_account_statement 2TRYTON_MODULE_NAME= trytond_account_statement
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../devel/py-trytond/Makefile.common" 4.include "../../devel/py-trytond/Makefile.common"
5CATEGORIES= finance python 5CATEGORIES= finance python
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.tryton.org/ 8HOMEPAGE= https://www.tryton.org/
9COMMENT= Account statement module of the Tryton application platform 9COMMENT= Account statement module of the Tryton application platform
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12DEPENDS+= ${PYPKGPREFIX}-trytond-currency>=${TRYTON_BASEVER}:../../finance/py-trytond-currency 12DEPENDS+= ${PYPKGPREFIX}-trytond-currency>=${TRYTON_BASEVER}:../../finance/py-trytond-currency
13DEPENDS+= ${PYPKGPREFIX}-trytond-account>=${TRYTON_BASEVER}:../../finance/py-trytond-account 13DEPENDS+= ${PYPKGPREFIX}-trytond-account>=${TRYTON_BASEVER}:../../finance/py-trytond-account
14DEPENDS+= ${PYPKGPREFIX}-trytond-account-invoice>=${TRYTON_BASEVER}:../../finance/py-trytond-account-invoice 14DEPENDS+= ${PYPKGPREFIX}-trytond-account-invoice>=${TRYTON_BASEVER}:../../finance/py-trytond-account-invoice
15DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company 15DEPENDS+= ${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company
16DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party 16DEPENDS+= ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
17DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond 17DEPENDS+= ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
18 18
19USE_LANGUAGES= # none 19USE_LANGUAGES= # none
20 20
21REPLACE_PYTHON+= tests/test_account_statement.py 21REPLACE_PYTHON+= tests/test_account_statement.py
22 22
23.include "../../lang/python/application.mk" 23.include "../../lang/python/application.mk"
24.include "../../lang/python/egg.mk" 24.include "../../lang/python/egg.mk"
25.include "../../lang/python/versioned_dependencies.mk" 
26.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.142 -r1.143 pkgsrc/lang/coq/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/coq/Makefile 2022/04/18 19:11:30 1.142
+++ pkgsrc/lang/coq/Makefile 2022/05/01 09:45:42 1.143
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: Makefile,v 1.142 2022/04/18 19:11:30 adam Exp $ 1# $NetBSD: Makefile,v 1.143 2022/05/01 09:45:42 wiz Exp $
2# 
3 2
4DISTNAME= coq-8.12.2 3DISTNAME= coq-8.12.2
5PKGREVISION= 4 4PKGREVISION= 4
6CATEGORIES= lang math 5CATEGORIES= lang math
7MASTER_SITES= ${MASTER_SITE_GITHUB:=coq/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=coq/}
8GITHUB_TAG= V${PKGVERSION_NOREV:S/_/+/} 7GITHUB_TAG= V${PKGVERSION_NOREV:S/_/+/}
9 8
10MAINTAINER= dholland@NetBSD.org 9MAINTAINER= dholland@NetBSD.org
11HOMEPAGE= https://coq.inria.fr/ 10HOMEPAGE= https://coq.inria.fr/
12COMMENT= Theorem prover which extracts programs from proofs 11COMMENT= Theorem prover which extracts programs from proofs
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV:S/+/-/} 14WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV:S/+/-/}
cvs diff -r1.11 -r1.12 pkgsrc/lang/coq/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/coq/options.mk 2021/02/09 22:37:43 1.11
+++ pkgsrc/lang/coq/options.mk 2022/05/01 09:45:42 1.12
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: options.mk,v 1.11 2021/02/09 22:37:43 dholland Exp $ 1# $NetBSD: options.mk,v 1.12 2022/05/01 09:45:42 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.coq 3PKG_OPTIONS_VAR= PKG_OPTIONS.coq
4PKG_SUPPORTED_OPTIONS= doc coqide 4PKG_SUPPORTED_OPTIONS= doc coqide
5PKG_SUGGESTED_OPTIONS= coqide 5PKG_SUGGESTED_OPTIONS= coqide
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mdoc) 9.if !empty(PKG_OPTIONS:Mdoc)
10CONFIGURE_ARGS+= -with-doc yes 10CONFIGURE_ARGS+= -with-doc yes
11PLIST.doc= yes 11PLIST.doc= yes
12 12
13BUILD_DEPENDS+= hevea>=1.10:../../textproc/hevea 13BUILD_DEPENDS+= hevea>=1.10:../../textproc/hevea
14 14
15# 15#
16# python 16# python
17# 17#
18 18
19PYTHON_VERSIONS_INCOMPATIBLE= 27 19PYTHON_VERSIONS_INCOMPATIBLE= 27
20PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool 
21.include "../../lang/python/tool.mk" 20.include "../../lang/python/tool.mk"
22SUBST_CLASSES+= sphinx-build 21SUBST_CLASSES+= sphinx-build
23SUBST_STAGE.sphinx-build= pre-configure 22SUBST_STAGE.sphinx-build= pre-configure
24SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build 23SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build
25SUBST_FILES.sphinx-build+= Makefile.doc configure.ml doc/dune 24SUBST_FILES.sphinx-build+= Makefile.doc configure.ml doc/dune
26SUBST_SED.sphinx-build+= -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g' 25SUBST_SED.sphinx-build+= -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
27 26
 27TOOL_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
28BUILD_DEPENDS+= py[0-9]*-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme 28BUILD_DEPENDS+= py[0-9]*-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme
29BUILD_DEPENDS+= py[0-9]*-sphinxcontrib-bibtex-[0-9]*:../../textproc/py-sphinxcontrib-bibtex 29BUILD_DEPENDS+= py[0-9]*-sphinxcontrib-bibtex-[0-9]*:../../textproc/py-sphinxcontrib-bibtex
30BUILD_DEPENDS+= py[0-9]*-pybtex-[0-9]*:../../textproc/py-pybtex 30BUILD_DEPENDS+= py[0-9]*-pybtex-[0-9]*:../../textproc/py-pybtex
31BUILD_DEPENDS+= py[0-9]*-pybtex-docutils-[0-9]*:../../textproc/py-pybtex-docutils 31BUILD_DEPENDS+= py[0-9]*-pybtex-docutils-[0-9]*:../../textproc/py-pybtex-docutils
32BUILD_DEPENDS+= py[0-9]*-pexpect-[0-9]*:../../devel/py-pexpect 32BUILD_DEPENDS+= py[0-9]*-pexpect-[0-9]*:../../devel/py-pexpect
33BUILD_DEPENDS+= py[0-9]*-antlr4-[0-9]*:../../textproc/py-antlr4 33BUILD_DEPENDS+= py[0-9]*-antlr4-[0-9]*:../../textproc/py-antlr4
34BUILD_DEPENDS+= py[0-9]*-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 34BUILD_DEPENDS+= py[0-9]*-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
35 35
36# 36#
37# tex 37# tex
38# 38#
39 39
40BUILD_DEPENDS+= latexmk-[0-9]*:../../print/latexmk 40BUILD_DEPENDS+= latexmk-[0-9]*:../../print/latexmk
cvs diff -r1.8 -r1.9 pkgsrc/math/py-infinity/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-infinity/Makefile 2022/01/04 20:54:13 1.8
+++ pkgsrc/math/py-infinity/Makefile 2022/05/01 09:45:42 1.9
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2022/05/01 09:45:42 wiz Exp $
2 2
3DISTNAME= infinity-1.5 3DISTNAME= infinity-1.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= math python 6CATEGORIES= math python
7MASTER_SITES= ${MASTER_SITE_PYPI:=i/infinity/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=i/infinity/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/kvesteri/infinity 10HOMEPAGE= https://github.com/kvesteri/infinity
11COMMENT= All-in-one infinity value for Python 11COMMENT= All-in-one infinity value for Python
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8 14TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
15TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort 15TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
16TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six 16TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
17TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments 17TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
18TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.2.3:../../devel/py-test 18TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.2.3:../../devel/py-test
19 19
20USE_LANGUAGES= # none 20USE_LANGUAGES= # none
21 21
22PYTHON_VERSIONS_INCOMPATIBLE= 27 22PYTHON_VERSIONS_INCOMPATIBLE= 27
23 23
24do-test: 24do-test:
25 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} 25 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
26 26
27.include "../../lang/python/egg.mk" 27.include "../../lang/python/egg.mk"
28.include "../../lang/python/versioned_dependencies.mk" 
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/security/py27-cryptography/Makefile (expand / switch to unified diff)

--- pkgsrc/security/py27-cryptography/Makefile 2022/04/21 10:48:49 1.1
+++ pkgsrc/security/py27-cryptography/Makefile 2022/05/01 09:45:42 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2022/04/21 10:48:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2022/05/01 09:45:42 wiz Exp $
2 2
3DISTNAME= cryptography-3.3.2 3DISTNAME= cryptography-3.3.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= security python 6CATEGORIES= security python
7MASTER_SITES= ${MASTER_SITE_PYPI:=c/cryptography/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=c/cryptography/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/pyca/cryptography 10HOMEPAGE= https://github.com/pyca/cryptography
11COMMENT= Cryptographic recipes and primitives for Python 11COMMENT= Cryptographic recipes and primitives for Python
12LICENSE= apache-2.0 OR modified-bsd 12LICENSE= apache-2.0 OR modified-bsd
13 13
14DEPENDS+= ${PYPKGPREFIX}-cffi>=1.11.4:../../devel/py-cffi 14DEPENDS+= ${PYPKGPREFIX}-cffi>=1.11.4:../../devel/py-cffi
@@ -19,16 +19,15 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-cryptograp @@ -19,16 +19,15 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-cryptograp
19# not available for python27 19# not available for python27
20#TEST_DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601 20#TEST_DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
21TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend 21TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
22TEST_DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 22TEST_DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
23TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test4 23TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test4
24TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis4 24TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis4
25 25
26PYTHON_VERSIONS_ACCEPTED= 27 26PYTHON_VERSIONS_ACCEPTED= 27
27 27
28do-test: 28do-test:
29 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} 29 cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
30 30
31.include "../../lang/python/egg.mk" 31.include "../../lang/python/egg.mk"
32.include "../../lang/python/versioned_dependencies.mk" 
33.include "../../security/openssl/buildlink3.mk" 32.include "../../security/openssl/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/py-lsp-jsonrpc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-lsp-jsonrpc/Makefile 2022/01/04 20:54:58 1.2
+++ pkgsrc/textproc/py-lsp-jsonrpc/Makefile 2022/05/01 09:45:42 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2022/05/01 09:45:42 wiz Exp $
2 2
3DISTNAME= python-lsp-jsonrpc-1.0.0 3DISTNAME= python-lsp-jsonrpc-1.0.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= textproc net devel 6CATEGORIES= textproc net devel
7MASTER_SITES= ${MASTER_SITE_PYPI:=p/python-lsp-jsonrpc/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/python-lsp-jsonrpc/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/python-lsp/python-lsp-jsonrpc 10HOMEPAGE= https://github.com/python-lsp/python-lsp-jsonrpc
11COMMENT= Asynchronous JSON RPC server for Python (fork of python-jsonrpc-server) 11COMMENT= Asynchronous JSON RPC server for Python (fork of python-jsonrpc-server)
12LICENSE= mit 12LICENSE= mit
13 13
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
@@ -16,16 +16,15 @@ USE_LANGUAGES= # none @@ -16,16 +16,15 @@ USE_LANGUAGES= # none
16PYTHON_VERSIONS_INCOMPATIBLE= 27 # textproc/py-ujson 16PYTHON_VERSIONS_INCOMPATIBLE= 27 # textproc/py-ujson
17 17
18DEPENDS+= ${PYPKGPREFIX}-ujson>=3.0.0:../../textproc/py-ujson 18DEPENDS+= ${PYPKGPREFIX}-ujson>=3.0.0:../../textproc/py-ujson
19TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 19TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
20TEST_DEPENDS+= ${PYPKGPREFIX}-pylint-[0-9]*:../../devel/py-pylint 20TEST_DEPENDS+= ${PYPKGPREFIX}-pylint-[0-9]*:../../devel/py-pylint
21TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle 21TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
22TEST_DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes 22TEST_DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes
23TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov 23TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
24TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage 24TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
25 25
26do-test: 26do-test:
27 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} py.test-${PYVERSSUFFIX} 27 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} py.test-${PYVERSSUFFIX}
28 28
29.include "../../lang/python/versioned_dependencies.mk" 
30.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
31.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/py-flask-flatpages/options.mk (expand / switch to unified diff)

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