diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index cd70d0a8d5a7..85f1e05064a5 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	pysolfc
-DISTVERSION=	2.21.0
+DISTVERSION=	3.0.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}
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${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}random2>=0:math/py-random2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
 USES=		python shebangfix tar:xz
 USE_PYTHON=	distutils noflavors autoplist
 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-2.2.0
+CARDSETDIR=	PySolFC-Cardsets--Minimal-3.0.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 976c8cf4373a..830da0c5af8a 100644
--- a/games/pysolfc/distinfo
+++ b/games/pysolfc/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1689168520
-SHA256 (pysolfc/PySolFC-2.21.0.tar.xz) = 5ceae3a4cc609d1a53ad29e2e26fae6c59dedee9a7d2d6af07f0289a2daa383b
-SIZE (pysolfc/PySolFC-2.21.0.tar.xz) = 20021468
-SHA256 (pysolfc/PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = 17e493dcbed080e22ca351ab907d01d6a9944aa7b7d86c20293b78c09c56a3e6
-SIZE (pysolfc/PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = 23145612
+TIMESTAMP = 1711972427
+SHA256 (pysolfc/PySolFC-3.0.0.tar.xz) = 5047ca10e8d5d635a0fbf7387c71b6c5e090e51a3ad2ab8a1bad649c0c3c9a17
+SIZE (pysolfc/PySolFC-3.0.0.tar.xz) = 33364860
+SHA256 (pysolfc/PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = faf70f5d1955cc46f2e840f7600df2933b06890fdc874b0bf5da446d1fab288b
+SIZE (pysolfc/PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 25188212
 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 e7e56762412c..c84bcde1e9a7 100644
--- a/games/pysolfc/files/patch-setup.py
+++ b/games/pysolfc/files/patch-setup.py
@@ -1,36 +1,26 @@
 * Avoid staging issues by skipping directories that only contain
   subdirectories.
 
 * Skip locale files if NLS is disabled (otherwise enable it via
   post-patch target).
 
-* The pycotap package is only required for testing.
-
---- setup.py.orig	2021-06-13 03:25:15 UTC
+--- setup.py.orig	2024-03-31 16:23:14 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'):
-@@ -74,7 +76,6 @@ kw = {
-     'install_requires': [
-         'attrs',
-         'configobj',
--        'pycotap',
-         'pysol_cards',
-         'random2',
-         'six',
diff --git a/games/pysolfc/pkg-message b/games/pysolfc/pkg-message
index bf0feec03850..cda6208222bf 100644
--- a/games/pysolfc/pkg-message
+++ b/games/pysolfc/pkg-message
@@ -1,51 +1,57 @@
 [
 { type: install
   message: <<EOD
 Please note that only the default set of cards was installed.  If you would
-like to install more cardsets, please proceed as follows:
-
-$ fetch https://netcologne.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2
-$ tar xf PySolFC-Cardsets-2.1.tar.bz2
-$ mkdir -p ~/.PySolFC/cardsets
-$ cp -r PySolFC-Cardsets-2.1/cardset-* ~/.PySolFC/cardsets/
+like to install more cardsets, please take a look at the games/pysolfc-cardsets
+port.
 EOD
 }
 { type: upgrade
   maximum_version: 2.12.0
   message: <<EOD
 Please note that the new version of PySolFC contains only a default set of
 cards.  If you should miss one or more cardsets, you can set them up as
 follows:
 
 $ fetch https://github.com/shlomif/PySolFC-Cardsets/archive/refs/tags/2.0.tar.gz
 $ tar xf 2.0.tar.gz
 $ cp -r PySolFC-Cardsets-2.0/cardsets* ~/.PySolFC/cardsets/
 EOD
 }
 { type: upgrade
   maximum_version: 2.16.0
   message: <<EOD
 Since PySolFC 2.16 a new high resolution default display was introduced.  It
 uses high resolution cardsets and scaling to offer an improved look on larger
 monitors.
 
 Please note that the new high-resolution options will not override your
 currently selected options for existing users.  If you want to use the new
 settings, you can delete or rename your options.cfg file.
 
 Also note that because of these changes, upgrading your version of PySolFC
 Cardsets is required even if you're using the minimal package.  If you are
 installing from pkg/ports, this will be handled automatically.
 
 If you're using the larger collection of cardsets, please use the following
 steps to upgrade your cardsets:
 
 $ mv ~/.PySolFC/cardsets ~/.PySolFC/cardsets.bak
 $ fetch https://netcologne.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2
 $ tar xf PySolFC-Cardsets-2.1.tar.bz2
 $ mkdir -p ~/.PySolFC/cardsets
 $ cp -r PySolFC-Cardsets-2.1/cardset-* ~/.PySolFC/cardsets/
 $ rm -r ~/.PySolFC/cardsets.bak
 EOD
 }
+{ type: upgrade
+  maximum_version: 3.0.0
+  message: <<EOD
+Additional cardsets are now also available via the games/pysolfc-cardsets
+port in the FreeBSD ports tree.
+
+A manual installation of the additional cardsets via several steps, as
+described a while ago, should therefore no longer be necessary.
+EOD
+}
 ]