CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov  5 13:42:01 UTC 2023

Modified Files:
        pkgsrc/print/py-weasyprint0: Makefile
        pkgsrc/security/py27-cryptography: Makefile

Log Message:
*: use appropriate py-cffi


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/py-weasyprint0/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py27-cryptography/Makefile

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

Modified files:

Index: pkgsrc/print/py-weasyprint0/Makefile
diff -u pkgsrc/print/py-weasyprint0/Makefile:1.14 pkgsrc/print/py-weasyprint0/Makefile:1.15
--- pkgsrc/print/py-weasyprint0/Makefile:1.14   Sat Oct 28 07:57:06 2023
+++ pkgsrc/print/py-weasyprint0/Makefile        Sun Nov  5 13:42:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/10/28 07:57:06 kleink Exp $
+# $NetBSD: Makefile,v 1.15 2023/11/05 13:42:01 wiz Exp $
 
 DISTNAME=      WeasyPrint-0.42.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,7 @@ LICENSE=      modified-bsd
 DEPENDS+=      pango-[0-9]*:../../devel/pango
 DEPENDS+=      ${PYPKGPREFIX}-cairosvg>=1.0.20<2:../../converters/py27-cairosvg
 DEPENDS+=      ${PYPKGPREFIX}-cairocffi>=0.5:../../graphics/py-cairocffi
-DEPENDS+=      ${PYPKGPREFIX}-cffi>=0.6:../../devel/py-cffi
+DEPENDS+=      ${PYPKGPREFIX}-cffi>=0.6:../../devel/py27-cffi
 DEPENDS+=      ${PYPKGPREFIX}-cssselect2>=0.1:../../textproc/py27-cssselect2
 DEPENDS+=      ${PYPKGPREFIX}-html5lib>=0.999999999:../../textproc/py-html5lib
 DEPENDS+=      ${PYPKGPREFIX}-pdfrw>=0.4:../../textproc/py-pdfrw

Index: pkgsrc/security/py27-cryptography/Makefile
diff -u pkgsrc/security/py27-cryptography/Makefile:1.8 pkgsrc/security/py27-cryptography/Makefile:1.9
--- pkgsrc/security/py27-cryptography/Makefile:1.8      Tue Oct 24 22:10:57 2023
+++ pkgsrc/security/py27-cryptography/Makefile  Sun Nov  5 13:42:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/10/24 22:10:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2023/11/05 13:42:01 wiz Exp $
 
 DISTNAME=      cryptography-3.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ HOMEPAGE=     https://github.com/pyca/crypto
 COMMENT=       Cryptographic recipes and primitives for Python
 LICENSE=       apache-2.0 OR modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.11.4:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 # not available for python27
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-cryptography_vectors-[0-9]*:../../security/py-cryptography_vectors
@@ -21,6 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pytz-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test4
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis4
 
+PYTHON_VERSIONED_DEPENDENCIES= cffi
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYTHON_VERSION} == 207
@@ -32,5 +33,6 @@ 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"