diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 5c7fba00b638..b95f3964dfc7 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,84 +1,85 @@
 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 \
 		SF/${PORTNAME}/PySol-Music/${MUSICDIR}/:music
 DISTFILES=	${PYSOLFCDIST} \
 		${CARDSETDIST}:cardsets \
 		${MUSICDIST}:music
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Solitaire game, written in Python and the successor of PySol
 WWW=		https://pysolfc.sourceforge.io/
 
 LICENSE=	GPLv2+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =		${WRKDIR}/${CARDSETDIR}/cardset-2000/COPYRIGHT
 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} \
 		${PYTHON_PKGNAMEPREFIX}pysol-cards>0:games/py-pysol-cards@${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
 
 PLIST_FILES=	share/pixmaps/pysolfc.png
 DATADIR=	${PREFIX}/share/PySolFC
 WRKSRC=		${WRKDIR}/${PYSOLFCDIR}
 
 OPTIONS_DEFINE=	NLS PILLOW SOUND
 OPTIONS_DEFAULT=	PILLOW SOUND
 OPTIONS_SUB=	yes
 
 PILLOW_DESC=	Enhanced graphics support
 
 NLS_USES=	gettext
 
 PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
 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
 
 post-patch:
 	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
 	@${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \
 		-e 's|^Exec.*|Exec=${PORTNAME}|' \
 		${WRKSRC}/data/pysol.desktop
 	@${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \
 		${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's|^#%%NLS%%||' ${WRKSRC}/setup.py
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/pysol.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 post-install-SOUND-on:
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	(cd ${WRKDIR}/${MUSICDIR:tl}/data && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
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
@@ -1,26 +1,37 @@
 * Avoid staging issues by skipping directories that only contain
   subdirectories.
 
 * 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."""
      for path, _, files in os.walk(source):
          files = [os.path.join(path, f) for f in files]
 +        if (len(files) == 0):
 +            continue
          path = path.replace(source, destination, 1)
          yield (path, files)
  
 @@ -44,7 +46,7 @@ for d in ddirs:
      data_files += get_data_files(os.path.join('data', d),
                                   os.path.join(data_dir, d))
  
 -data_files += get_data_files('locale', locale_dir)
 +#%%NLS%%data_files += get_data_files('locale', locale_dir)
  
  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',