pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: fix usage of versioned_dependencies
details: https://anonhg.NetBSD.org/pkgsrc/rev/b028f09df973
branches: trunk
changeset: 378269:b028f09df973
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun May 01 09:45:41 2022 +0000
description:
*: fix usage of versioned_dependencies
Remove unused includes, fix dependencies where it's not included.
diffstat:
devel/py-tox/Makefile | 4 ++--
filesystems/fuse-pcachefs/Makefile | 3 +--
finance/py-trytond-account-payment-sepa-cfonb/Makefile | 3 +--
finance/py-trytond-account-payment-sepa/Makefile | 3 +--
finance/py-trytond-account-payment/Makefile | 3 +--
finance/py-trytond-account-statement/Makefile | 3 +--
lang/coq/Makefile | 3 +--
lang/coq/options.mk | 4 ++--
math/py-infinity/Makefile | 3 +--
security/py27-cryptography/Makefile | 3 +--
textproc/py-lsp-jsonrpc/Makefile | 3 +--
www/py-flask-flatpages/options.mk | 4 ++--
12 files changed, 15 insertions(+), 24 deletions(-)
diffs (191 lines):
diff -r e14239959eaa -r b028f09df973 devel/py-tox/Makefile
--- a/devel/py-tox/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/devel/py-tox/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.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
diff -r e14239959eaa -r b028f09df973 filesystems/fuse-pcachefs/Makefile
--- a/filesystems/fuse-pcachefs/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/filesystems/fuse-pcachefs/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.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"
diff -r e14239959eaa -r b028f09df973 finance/py-trytond-account-payment-sepa-cfonb/Makefile
--- a/finance/py-trytond-account-payment-sepa-cfonb/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/finance/py-trytond-account-payment-sepa-cfonb/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e14239959eaa -r b028f09df973 finance/py-trytond-account-payment-sepa/Makefile
--- a/finance/py-trytond-account-payment-sepa/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/finance/py-trytond-account-payment-sepa/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e14239959eaa -r b028f09df973 finance/py-trytond-account-payment/Makefile
--- a/finance/py-trytond-account-payment/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/finance/py-trytond-account-payment/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e14239959eaa -r b028f09df973 finance/py-trytond-account-statement/Makefile
--- a/finance/py-trytond-account-statement/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/finance/py-trytond-account-statement/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e14239959eaa -r b028f09df973 lang/coq/Makefile
--- a/lang/coq/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/lang/coq/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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
diff -r e14239959eaa -r b028f09df973 lang/coq/options.mk
--- a/lang/coq/options.mk Sun May 01 09:33:19 2022 +0000
+++ b/lang/coq/options.mk Sun May 01 09:45:41 2022 +0000
@@ -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 @@
#
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_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
diff -r e14239959eaa -r b028f09df973 math/py-infinity/Makefile
--- a/math/py-infinity/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/math/py-infinity/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e14239959eaa -r b028f09df973 security/py27-cryptography/Makefile
--- a/security/py27-cryptography/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/security/py27-cryptography/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
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"
diff -r e14239959eaa -r b028f09df973 textproc/py-lsp-jsonrpc/Makefile
--- a/textproc/py-lsp-jsonrpc/Makefile Sun May 01 09:33:19 2022 +0000
+++ b/textproc/py-lsp-jsonrpc/Makefile Sun May 01 09:45:41 2022 +0000
@@ -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 @@
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"
diff -r e14239959eaa -r b028f09df973 www/py-flask-flatpages/options.mk
--- a/www/py-flask-flatpages/options.mk Sun May 01 09:33:19 2022 +0000
+++ b/www/py-flask-flatpages/options.mk Sun May 01 09:45:41 2022 +0000
@@ -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 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpygments)
-PYTHON_VERSIONED_DEPENDENCIES= pygments
+DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
.endif
Home |
Main Index |
Thread Index |
Old Index