CVS commit: pkgsrc/devel/py-makefun

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 17 15:40:51 UTC 2026

Modified Files:
        pkgsrc/devel/py-makefun: Makefile distinfo
Added Files:
        pkgsrc/devel/py-makefun/patches: patch-setup.py

Log Message:
py-makefun: fix build with setuptools 82


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-makefun/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-makefun/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-makefun/patches/patch-setup.py

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-makefun/Makefile
diff -u pkgsrc/devel/py-makefun/Makefile:1.8 pkgsrc/devel/py-makefun/Makefile:1.9
--- pkgsrc/devel/py-makefun/Makefile:1.8        Sat Aug  9 05:48:44 2025
+++ pkgsrc/devel/py-makefun/Makefile    Tue Feb 17 15:40:51 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2025/08/09 05:48:44 adam Exp $
+# $NetBSD: Makefile,v 1.9 2026/02/17 15:40:51 wiz Exp $
 
 DISTNAME=      makefun-1.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/makefun/}
 

Index: pkgsrc/devel/py-makefun/distinfo
diff -u pkgsrc/devel/py-makefun/distinfo:1.5 pkgsrc/devel/py-makefun/distinfo:1.6
--- pkgsrc/devel/py-makefun/distinfo:1.5        Sat Aug  9 05:48:44 2025
+++ pkgsrc/devel/py-makefun/distinfo    Tue Feb 17 15:40:51 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2025/08/09 05:48:44 adam Exp $
+$NetBSD: distinfo,v 1.6 2026/02/17 15:40:51 wiz Exp $
 
 BLAKE2s (makefun-1.16.0.tar.gz) = 28c622d30b2624ab5dc991e7af3d97a817ea124619695e2692a829aedf80146a
 SHA512 (makefun-1.16.0.tar.gz) = 42edad79771331e2fc664affd975f681787124da9cdd1ea25adcad51a7d20e8b5499c8043899ca6f30c9fbf23888c16e2f7476e0f5d136d8ca43a8d8c93d5eb9
 Size (makefun-1.16.0.tar.gz) = 73565 bytes
+SHA1 (patch-setup.py) = 043fc471e0d9293fa0f04ee75a36437b88469293

Added files:

Index: pkgsrc/devel/py-makefun/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-makefun/patches/patch-setup.py:1.1
--- /dev/null   Tue Feb 17 15:40:51 2026
+++ pkgsrc/devel/py-makefun/patches/patch-setup.py      Tue Feb 17 15:40:51 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-setup.py,v 1.1 2026/02/17 15:40:51 wiz Exp $
+
+https://github.com/smarie/python-makefun/issues/122
+
+--- setup.py.orig      2025-05-09 15:00:04.000000000 +0000
++++ setup.py
+@@ -16,10 +16,7 @@ from setuptools import setup
+ 
+ 
+ # (1) check required versions (from https://medium.com/@daveshawley/safely-using-setup-cfg-for-metadata-1babbe54c108)
+-import pkg_resources
+ 
+-pkg_resources.require("setuptools>=39.2")
+-pkg_resources.require("setuptools_scm")
+ 
+ 
+ # (2) Generate download url using git version
+@@ -34,22 +31,10 @@ args = {
+     "write_to": "src/makefun/_version.py",
+ }
+ # Use the 'version_file_template' directive if possible to avoid type hints and annotations (python <3.8)
+-setuptools_scm_version = pkg_resources.get_distribution("setuptools_scm").version
+ # for some reason importing packaging.version.Version here fails on python 3.5
+ # from packaging.version import Version
+ # if Version(setuptools_scm_version) >= Version('6'):
+-setuptools_scm_version_major = int(setuptools_scm_version.split(".")[0])
+-if setuptools_scm_version_major >= 6:
+-    # template_arg_name = "version_file_template" if Version(setuptools_scm_version) >= Version('8.1') else "write_to_template"
+-    # print(Version(setuptools_scm_version))
+-    # print(template_arg_name)
+-
+-    # Note that it was named 'write_to_template' earlier. But at that time it was not generating annotations so no need.
+-    args["write_to_template"] = """# file generated by setuptools_scm and customized
+ # don't change, don't track in version control
+-__version__ = version = '{version}'
+-__version_tuple__ = version_tuple = {version_tuple}
+-"""
+ # (3) Call setup() with as little args as possible
+ setup(
+     download_url=DOWNLOAD_URL,