CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul  3 12:13:07 UTC 2022

Modified Files:
        pkgsrc/devel/py-binaryornot: Makefile
        pkgsrc/devel/py-requests: Makefile
        pkgsrc/textproc/py-html5-parser: Makefile
        pkgsrc/textproc/py-pysrt: Makefile

Log Message:
*: use versioned_dependencies.mk for py-chardet


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-binaryornot/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-requests/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-html5-parser/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-pysrt/Makefile

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-binaryornot/Makefile
diff -u pkgsrc/devel/py-binaryornot/Makefile:1.5 pkgsrc/devel/py-binaryornot/Makefile:1.6
--- pkgsrc/devel/py-binaryornot/Makefile:1.5    Tue Jan  4 20:52:52 2022
+++ pkgsrc/devel/py-binaryornot/Makefile        Sun Jul  3 12:13:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/03 12:13:07 wiz Exp $
 
 DISTNAME=      binaryornot-0.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,10 @@ HOMEPAGE=    https://github.com/audreyr/bin
 COMMENT=       Guess whether a file is binary or text
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-chardet>=3.0.2:../../converters/py-chardet
+PYTHON_VERSIONED_DEPENDENCIES= chardet
 
 USE_LANGUAGES= # none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-requests/Makefile
diff -u pkgsrc/devel/py-requests/Makefile:1.53 pkgsrc/devel/py-requests/Makefile:1.54
--- pkgsrc/devel/py-requests/Makefile:1.53      Thu Apr 21 11:00:00 2022
+++ pkgsrc/devel/py-requests/Makefile   Sun Jul  3 12:13:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2022/04/21 11:00:00 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2022/07/03 12:13:07 wiz Exp $
 
 DISTNAME=      requests-2.27.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,7 @@ REPLACE_PYTHON+=      requests/certs.py
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-chardet>=3.0.2:../../converters/py-chardet
+DEPENDS+=      ${PYPKGPREFIX}-chardet>=3.0.2:../../converters/py-chardet4
 TEST_DEPENDS=  # none; py-test-httpbin is incompatible with py27
 do-test:
 .else

Index: pkgsrc/textproc/py-html5-parser/Makefile
diff -u pkgsrc/textproc/py-html5-parser/Makefile:1.13 pkgsrc/textproc/py-html5-parser/Makefile:1.14
--- pkgsrc/textproc/py-html5-parser/Makefile:1.13       Mon Apr 18 19:12:11 2022
+++ pkgsrc/textproc/py-html5-parser/Makefile    Sun Jul  3 12:13:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/04/18 19:12:11 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/07/03 12:13:07 wiz Exp $
 
 DISTNAME=      html5-parser-0.4.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,11 +12,13 @@ COMMENT=    Fast, standards-compliant, C-ba
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
-DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.8.0:../../textproc/py-lxml
 
+PYTHON_VERSIONED_DEPENDENCIES+=        chardet
+
 USE_TOOLS+=    pkg-config
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-pysrt/Makefile
diff -u pkgsrc/textproc/py-pysrt/Makefile:1.4 pkgsrc/textproc/py-pysrt/Makefile:1.5
--- pkgsrc/textproc/py-pysrt/Makefile:1.4       Wed Jan  5 15:41:26 2022
+++ pkgsrc/textproc/py-pysrt/Makefile   Sun Jul  3 12:13:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/07/03 12:13:07 wiz Exp $
 
 DISTNAME=      pysrt-1.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://github.com/byroot/pysr
 COMMENT=       Python parser for SubRip (srt) files
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+PYTHON_VERSIONED_DEPENDENCIES+=        chardet
 
 USE_LANGUAGES= # none
 
@@ -21,5 +21,6 @@ post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} srt srt-${PYVERSSUFFIX} || ${TRUE}
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"