Skip to content

Commit

Permalink
games/pysolfc: Update to 3.0.0
Browse files Browse the repository at this point in the history
* Update the installation/upgrade instructions in the pkg-message
  regarding the games/pysolfc-cardsets port, which has now been in the
  FreeBSD ports tree for some time and can be installed if further
  cardsets are to be used.

Changelog:

https://github.com/shlomif/PySolFC/blob/pysolfc-3.0.0/NEWS.asciidoc
  • Loading branch information
knobix committed Apr 6, 2024
1 parent 707ad76 commit 22d9d5b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 25 deletions.
6 changes: 3 additions & 3 deletions games/pysolfc/Makefile
@@ -1,5 +1,5 @@
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 \
Expand All @@ -20,7 +20,7 @@ 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} \
Expand Down Expand Up @@ -50,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-2.2.0
CARDSETDIR= PySolFC-Cardsets--Minimal-3.0.0
CARDSETDIST= ${CARDSETDIR}.tar.xz
MUSICDIR= PySol-Music-4.50
MUSICDIST= ${MUSICDIR:tl}.tar.xz
Expand Down
10 changes: 5 additions & 5 deletions 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
12 changes: 1 addition & 11 deletions games/pysolfc/files/patch-setup.py
Expand Up @@ -4,9 +4,7 @@
* 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."""
Expand All @@ -26,11 +24,3 @@

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',
18 changes: 12 additions & 6 deletions games/pysolfc/pkg-message
Expand Up @@ -2,12 +2,8 @@
{ 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
Expand Down Expand Up @@ -48,4 +44,14 @@ $ 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
}
]

0 comments on commit 22d9d5b

Please sign in to comment.