CVS commit: pkgsrc/converters/py-confusable_homoglyphs

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov  5 23:44:05 UTC 2023

Modified Files:
        pkgsrc/converters/py-confusable_homoglyphs: Makefile PLIST distinfo
Added Files:
        pkgsrc/converters/py-confusable_homoglyphs/patches: patch-versioneer.py

Log Message:
py-confusable_homoglyphs: convert to wheel.mk

Fix build with Python 3.12.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/py-confusable_homoglyphs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/py-confusable_homoglyphs/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/py-confusable_homoglyphs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/py-confusable_homoglyphs/patches/patch-versioneer.py

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

Modified files:

Index: pkgsrc/converters/py-confusable_homoglyphs/Makefile
diff -u pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.7 pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.8
--- pkgsrc/converters/py-confusable_homoglyphs/Makefile:1.7     Mon Jan 31 09:48:35 2022
+++ pkgsrc/converters/py-confusable_homoglyphs/Makefile Sun Nov  5 23:44:05 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/01/31 09:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/11/05 23:44:05 wiz Exp $
 
 DISTNAME=      confusable_homoglyphs-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    converters python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/confusable_homoglyphs/}
 
@@ -11,16 +11,17 @@ HOMEPAGE=   https://github.com/vhf/confusa
 COMMENT=       Detect confusable usage of unicode homoglyphs
 LICENSE=       mit
 
-PYTHON_VERSIONED_DEPENDENCIES+=        click
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=      ${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
 
 USE_LANGUAGES= # none
 
-USE_PKG_RESOURCES=     yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin \
                && ${MV} confusable_homoglyphs confusable_homoglyphs-${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/py-confusable_homoglyphs/PLIST
diff -u pkgsrc/converters/py-confusable_homoglyphs/PLIST:1.3 pkgsrc/converters/py-confusable_homoglyphs/PLIST:1.4
--- pkgsrc/converters/py-confusable_homoglyphs/PLIST:1.3        Tue Dec  4 13:29:13 2018
+++ pkgsrc/converters/py-confusable_homoglyphs/PLIST    Sun Nov  5 23:44:05 2023
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2018/12/04 13:29:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/11/05 23:44:05 wiz Exp $
 bin/confusable_homoglyphs-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS.rst
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/confusable_homoglyphs/__init__.py
 ${PYSITELIB}/confusable_homoglyphs/__init__.pyc
 ${PYSITELIB}/confusable_homoglyphs/__init__.pyo

Index: pkgsrc/converters/py-confusable_homoglyphs/distinfo
diff -u pkgsrc/converters/py-confusable_homoglyphs/distinfo:1.5 pkgsrc/converters/py-confusable_homoglyphs/distinfo:1.6
--- pkgsrc/converters/py-confusable_homoglyphs/distinfo:1.5     Tue Oct 26 10:06:50 2021
+++ pkgsrc/converters/py-confusable_homoglyphs/distinfo Sun Nov  5 23:44:05 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:06:50 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/11/05 23:44:05 wiz Exp $
 
 BLAKE2s (confusable_homoglyphs-3.2.0.tar.gz) = 0f025fef9340a154bc75e351f53fffbe9ddb5f37af0ceccaaa375acbe1cf0276
 SHA512 (confusable_homoglyphs-3.2.0.tar.gz) = 0a46a5bc94393592f6fa088bbe2f95cc301972c55de08231f3607828fcd3c5cb462514b80013283ef8cd8d76eaa3e14258ac8f3433c9c2cd1a89bcebca8fa7f6
 Size (confusable_homoglyphs-3.2.0.tar.gz) = 161937 bytes
+SHA1 (patch-versioneer.py) = 3a8b5a2b650f935cd5173081b0f3d35375831f38

Added files:

Index: pkgsrc/converters/py-confusable_homoglyphs/patches/patch-versioneer.py
diff -u /dev/null pkgsrc/converters/py-confusable_homoglyphs/patches/patch-versioneer.py:1.1
--- /dev/null   Sun Nov  5 23:44:05 2023
+++ pkgsrc/converters/py-confusable_homoglyphs/patches/patch-versioneer.py      Sun Nov  5 23:44:05 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-versioneer.py,v 1.1 2023/11/05 23:44:05 wiz Exp $
+
+Fix build with Python 3.12.
+
+--- versioneer.py.orig 2016-09-13 17:59:12.000000000 +0000
++++ versioneer.py
+@@ -396,9 +396,9 @@ def get_config_from_root(root):
+     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+     # the top of versioneer.py for instructions on writing your setup.cfg .
+     setup_cfg = os.path.join(root, "setup.cfg")
+-    parser = configparser.SafeConfigParser()
++    parser = configparser.ConfigParser()
+     with open(setup_cfg, "r") as f:
+-        parser.readfp(f)
++        parser.read_file(f)
+     VCS = parser.get("versioneer", "VCS")  # mandatory
+ 
+     def get(parser, name):