git: c0dc899ce539 - main - games/pysolfc: Update to 3.4.0

From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Mon, 16 Jun 2025 04:33:23 UTC
The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c0dc899ce539d72b434d0012c960da622192fed6

commit c0dc899ce539d72b434d0012c960da622192fed6
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2025-06-16 04:28:57 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2025-06-16 04:28:57 +0000

    games/pysolfc: Update to 3.4.0
    
    * Switch to the PEP517 build framework while I'm here.
    
    Changelog:
    
    https://github.com/shlomif/PySolFC/blob/pysolfc-3.4.0/NEWS.asciidoc
---
 games/pysolfc/Makefile             |  9 +++++----
 games/pysolfc/distinfo             | 10 +++++-----
 games/pysolfc/files/patch-setup.py | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 5c7fba00b638..b95f3964dfc7 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pysolfc
-DISTVERSION=	3.2.0
-PORTREVISION=	1
+DISTVERSION=	3.4.0
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
 		SF/${PORTNAME}/PySolFC-Cardsets/minimal/:cardsets \
@@ -21,6 +20,8 @@ LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING
 LICENSE_DISTFILES_GPLv2+ =	${CARDSETDIST} ${MUSICDIST}
 LICENSE_DISTFILES_GPLv3+ =	${PYSOLFCDIST}
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=18.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} \
@@ -28,7 +29,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=18.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 USES=		python shebangfix tar:xz
-USE_PYTHON=	distutils noflavors autoplist
+USE_PYTHON=	autoplist noflavors pep517
 SHEBANG_FILES=	data/themes/clearlooks/convert_imgs.sh
 NO_ARCH=	yes
 
@@ -49,7 +50,7 @@ SOUND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
 
 PYSOLFCDIR=	PySolFC-${DISTVERSION}
 PYSOLFCDIST=	${PYSOLFCDIR}${EXTRACT_SUFX}
-CARDSETDIR=	PySolFC-Cardsets--Minimal-3.0.0
+CARDSETDIR=	PySolFC-Cardsets--Minimal-3.1.0
 CARDSETDIST=	${CARDSETDIR}.tar.xz
 MUSICDIR=	PySol-Music-4.50
 MUSICDIST=	${MUSICDIR:tl}.tar.xz
diff --git a/games/pysolfc/distinfo b/games/pysolfc/distinfo
index 8c806fee2257..f34f1b9f08d2 100644
--- a/games/pysolfc/distinfo
+++ b/games/pysolfc/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1737893461
-SHA256 (pysolfc/PySolFC-3.2.0.tar.xz) = cda078ba2e82eb0e47d48e5f4a887bfa0e8d5be100bd119fb68d6fb87b4dbad0
-SIZE (pysolfc/PySolFC-3.2.0.tar.xz) = 32808092
-SHA256 (pysolfc/PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = faf70f5d1955cc46f2e840f7600df2933b06890fdc874b0bf5da446d1fab288b
-SIZE (pysolfc/PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 25188212
+TIMESTAMP = 1749974967
+SHA256 (pysolfc/PySolFC-3.4.0.tar.xz) = 677a79c29c228cd70ffc028615f2c05971e29638ca37cfa4c17a31b2ba477a59
+SIZE (pysolfc/PySolFC-3.4.0.tar.xz) = 32914516
+SHA256 (pysolfc/PySolFC-Cardsets--Minimal-3.1.0.tar.xz) = f894b667936382cf721105a08b6cc41b8b87aac8386117868f749f32f8e67a9d
+SIZE (pysolfc/PySolFC-Cardsets--Minimal-3.1.0.tar.xz) = 25083116
 SHA256 (pysolfc/pysol-music-4.50.tar.xz) = 3cfade86db88c1d97589c50441808ee082e68256be788012503818c42728783d
 SIZE (pysolfc/pysol-music-4.50.tar.xz) = 2144764
diff --git a/games/pysolfc/files/patch-setup.py b/games/pysolfc/files/patch-setup.py
index c84bcde1e9a7..2a0712ba81cb 100644
--- a/games/pysolfc/files/patch-setup.py
+++ b/games/pysolfc/files/patch-setup.py
@@ -4,7 +4,9 @@
 * Skip locale files if NLS is disabled (otherwise enable it via
   post-patch target).
 
---- setup.py.orig	2024-03-31 16:23:14 UTC
+* Normalize the bdist wheel name to avoid staging errors.
+
+--- setup.py.orig	2024-12-22 21:32:17 UTC
 +++ setup.py
 @@ -14,6 +14,8 @@ def get_data_files(source, destination):
      destination using the data_files keyword of setuptools.setup."""
@@ -24,3 +26,12 @@
  
  if os.name == 'posix':
      for size in os.listdir('data/images/icons'):
+@@ -65,7 +67,7 @@ kw = {
+ '''
+ 
+ kw = {
+-    'name': 'PySolFC',
++    'name': 'pysolfc',
+     'version': VERSION,
+     'url': PACKAGE_URL,
+     'author': 'Skomoroh',