CVS commit: pkgsrc/lang/py-cxfreeze

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec 19 13:59:32 UTC 2021

Modified Files:
        pkgsrc/lang/py-cxfreeze: Makefile distinfo
        pkgsrc/lang/py-cxfreeze/patches: patch-setup.py

Log Message:
py-cxfreeze: fix build with python 3.10

Clean up some pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/py-cxfreeze/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/py-cxfreeze/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/py-cxfreeze/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/lang/py-cxfreeze/Makefile
diff -u pkgsrc/lang/py-cxfreeze/Makefile:1.13 pkgsrc/lang/py-cxfreeze/Makefile:1.14
--- pkgsrc/lang/py-cxfreeze/Makefile:1.13       Fri Mar 20 11:57:56 2020
+++ pkgsrc/lang/py-cxfreeze/Makefile    Sun Dec 19 13:59:32 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2020/03/20 11:57:56 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/19 13:59:32 wiz Exp $
 
 DISTNAME=      cx_Freeze-5.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_F/f/}
-CATEGORIES=    devel python
+CATEGORIES=    lang python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/cx_Freeze/}
 
 MAINTAINER=    helgoman%users.sourceforge.net@localhost
@@ -12,6 +12,13 @@ LICENSE=     python-software-foundation
 
 REPLACE_PYTHON=        cx_Freeze/samples/PyQt5/PyQt5app.py
 
+SUBST_CLASSES+=                pyver
+SUBST_STAGE.pyver=     pre-configure
+SUBST_SED.pyver+=      -e 's/"cxfreeze"/"cxfreeze'${PYVERSSUFFIX}'"/'
+SUBST_SED.pyver+=      -e 's/"cxfreeze-quickstart"/"cxfreeze-quickstart'${PYVERSSUFFIX}'"/'
+SUBST_FILES.pyver+=    setup.py
+SUBST_MESSAGE.pyver=   Fixing path to scripts.
+
 post-extract:
        ${MV} ${WRKSRC}/cxfreeze ${WRKSRC}/cxfreeze${PYVERSSUFFIX}
        ${MV} ${WRKSRC}/cxfreeze-quickstart ${WRKSRC}/cxfreeze-quickstart${PYVERSSUFFIX}

Index: pkgsrc/lang/py-cxfreeze/distinfo
diff -u pkgsrc/lang/py-cxfreeze/distinfo:1.11 pkgsrc/lang/py-cxfreeze/distinfo:1.12
--- pkgsrc/lang/py-cxfreeze/distinfo:1.11       Tue Oct 26 10:51:49 2021
+++ pkgsrc/lang/py-cxfreeze/distinfo    Sun Dec 19 13:59:32 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:51:49 nia Exp $
+$NetBSD: distinfo,v 1.12 2021/12/19 13:59:32 wiz Exp $
 
 BLAKE2s (cx_Freeze-5.1.1.tar.gz) = 5184521918655ebfa48bb61d9a885247979e5f32ec3fb651987a6769c1c8a88c
 SHA512 (cx_Freeze-5.1.1.tar.gz) = 64f9c3b7f6c3003c1dc439fc2da7d0c13c5f146834e3ab8ece3921f1eb30c6e3eda480ccc84e61cc061597521b360cf8f5ef8e0bbcce1437157360c3d9c1adbc
 Size (cx_Freeze-5.1.1.tar.gz) = 61381 bytes
-SHA1 (patch-setup.py) = fa5613b9efb7a6a73618c4513f27d2b2f9b73857
+SHA1 (patch-setup.py) = 6d4d592acebc944bdfba33c5a63d83e57d85c630

Index: pkgsrc/lang/py-cxfreeze/patches/patch-setup.py
diff -u pkgsrc/lang/py-cxfreeze/patches/patch-setup.py:1.1 pkgsrc/lang/py-cxfreeze/patches/patch-setup.py:1.2
--- pkgsrc/lang/py-cxfreeze/patches/patch-setup.py:1.1  Fri Feb  9 08:04:41 2018
+++ pkgsrc/lang/py-cxfreeze/patches/patch-setup.py      Sun Dec 19 13:59:32 2021
@@ -1,9 +1,9 @@
-$NetBSD: patch-setup.py,v 1.1 2018/02/09 08:04:41 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2021/12/19 13:59:32 wiz Exp $
 
 Link with proper run-time library path,
 link with -lpthread on NetBSD.
 
---- setup.py.orig      2017-05-20 21:59:18.000000000 +0000
+--- setup.py.orig      2017-11-20 15:18:06.000000000 +0000
 +++ setup.py
 @@ -71,6 +71,7 @@ class build_ext(distutils.command.build_
          fileName = os.path.splitext(self.get_ext_filename(ext.name))[0]
@@ -27,7 +27,7 @@ link with -lpthread on NetBSD.
                  extra_postargs = extraArgs,
                  debug = self.debug)
  
-@@ -136,13 +139,17 @@ if sys.platform == "win32":
+@@ -136,7 +139,11 @@ if sys.platform == "win32":
  if sys.platform == "win32":
      libraries = ["imagehlp", "Shlwapi"]
  else:
@@ -40,10 +40,3 @@ link with -lpthread on NetBSD.
  utilModule = Extension("cx_Freeze.util", ["source/util.c"],
          libraries = libraries)
  
- # build base executables
- docFiles = "README.txt"
--scripts = ["cxfreeze", "cxfreeze-quickstart"]
-+scripts = ["cxfreeze" + sys.version[:3], "cxfreeze-quickstart" + sys.version[:3]]
- options = dict(bdist_rpm = dict(doc_files = docFiles),
-         install = dict(optimize = 1))
- depends = ["source/bases/Common.c"]