On Thu, Jan 18, 2024 at 01:25:35PM -0500, Daniel Dickman wrote: > The latest upstream commit drops legacy Python 2 support code.
Interesting that they are refactoring this much while the project goal seems to be the move to a Godot4-based engine [1]. > Following this update we can drop the RDEP on py-future. However testing > this change revealed that fifengine was missing an RDEP on py-future. The > fix for fifengine is already in the tree, but I updated the fifengine RDEP > here to 0.4.2p4 to make sure py-future continues to stay around at > runtime. Not sure if specifying the min version of fifengine is necessary if -current only has the latest version anyway. Installation should anyway be done with pkg_add -U if packages aren't up-to-date... > The TDEP on py-nose was removed upstream in commit 3a808be which switched > to pytest. (But tests are still broken as they do not support pytest 4+ > yet.) > > Also switch to using MODPY_SETUPTOOLS=Yes which seems to work (possibly > after upstream commit 50397fa. > > ok? Tested and builds and works, but I'm getting a slightly different PLIST. I also understand the difference between REVISION and the version in PKGNAME such that REVISION is for when the port changes with same upstream version generally, and PKGNAME changes with change in upstream version (cf. packages-specs(7)). If this is accurate, using a more recent GH_COMMIT would mean changing the PKGNAME. I would propose updating it to 2019.1pl0 and dropping REVISION... Per bsd.port.mk(5), NO_TEST shouldn't be used for ports with existing, but failing tests. Therefore, I suggest removing the NO_TEST line. My own adjusted diff is below, but it builds and runs so with or without the changes I'm suggesting, ok thfr@. [1] https://github.com/unknown-horizons/godot-port > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/unknown-horizons/Makefile,v > diff -u -p -u -r1.12 Makefile > --- Makefile 28 Sep 2023 00:23:24 -0000 1.12 > +++ Makefile 18 Jan 2024 18:16:52 -0000 > @@ -3,11 +3,11 @@ COMMENT = economic historical real-time > MODPY_EGG_VERSION = 2019.1 > DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} > PKGNAME = unknown-horizons-${MODPY_EGG_VERSION} > -REVISION = 3 > +REVISION = 4 > > GH_ACCOUNT = unknown-horizons > GH_PROJECT = unknown-horizons > -GH_COMMIT = d106648463a391a86779b63a2e643ea8301f2683 > +GH_COMMIT = e50348da5ed3044957b56525d8e9816b8815d3f1 > > CATEGORIES = games > > @@ -18,7 +18,9 @@ PERMIT_PACKAGE = Yes > > MODULES = lang/python \ > textproc/intltool > + > MODPY_ADJ_FILES = unknown-horizons > +MODPY_SETUPTOOLS = Yes > MODPY_PYTEST = Yes > > SEPARATE_BUILD = Yes > @@ -29,12 +31,10 @@ BUILD_DEPENDS = devel/gettext,-tools \ > graphics/py-Pillow${MODPY_FLAVOR} \ > sysutils/py-distro > RUN_DEPENDS = devel/desktop-file-utils \ > - devel/py-future${MODPY_FLAVOR} \ > - games/fifengine>=0.4.2p3 \ > + games/fifengine>=0.4.2p4 \ > textproc/py-yaml${MODPY_FLAVOR} > TEST_DEPENDS = devel/py-greenlet${MODPY_FLAVOR} \ > devel/py-mock${MODPY_FLAVOR} \ > - devel/py-nose${MODPY_FLAVOR} \ > textproc/py-polib${MODPY_FLAVOR} \ > textproc/py-yaml${MODPY_FLAVOR} > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/games/unknown-horizons/distinfo,v > diff -u -p -u -r1.3 distinfo > --- distinfo 28 Sep 2023 00:23:25 -0000 1.3 > +++ distinfo 18 Jan 2024 18:16:52 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (unknown-horizons-2019.1-d1066484.tar.gz) = > iQRU8UJ55nfR2/2UCovDBl7I4DP/QywHLQJFr2AGWOc= > -SIZE (unknown-horizons-2019.1-d1066484.tar.gz) = 267534197 > +SHA256 (unknown-horizons-2019.1-e50348da.tar.gz) = > BEJz4GrCu1WdZldiKyQsv0LzpvnycpO8R6guxYm14OM= > +SIZE (unknown-horizons-2019.1-e50348da.tar.gz) = 267530463 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/games/unknown-horizons/pkg/PLIST,v > diff -u -p -u -r1.5 PLIST > --- pkg/PLIST 28 Sep 2023 00:23:25 -0000 1.5 > +++ pkg/PLIST 18 Jan 2024 18:16:54 -0000 > @@ -1,5 +1,9 @@ > bin/unknown-horizons > -lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info > +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/horizons/ > lib/python${MODPY_VERSION}/site-packages/horizons/__init__.py > > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/horizons/${MODPY_PYCACHE}/ > Index: Makefile =================================================================== RCS file: /cvs/ports/games/unknown-horizons/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 28 Sep 2023 00:23:24 -0000 1.12 +++ Makefile 19 Jan 2024 03:27:36 -0000 @@ -1,13 +1,13 @@ COMMENT = economic historical real-time strategy game +V = ${MODPY_EGG_VERSION}pl0 MODPY_EGG_VERSION = 2019.1 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} -PKGNAME = unknown-horizons-${MODPY_EGG_VERSION} -REVISION = 3 +PKGNAME = unknown-horizons-${V} GH_ACCOUNT = unknown-horizons GH_PROJECT = unknown-horizons -GH_COMMIT = d106648463a391a86779b63a2e643ea8301f2683 +GH_COMMIT = e50348da5ed3044957b56525d8e9816b8815d3f1 CATEGORIES = games @@ -18,7 +18,9 @@ PERMIT_PACKAGE = Yes MODULES = lang/python \ textproc/intltool + MODPY_ADJ_FILES = unknown-horizons +MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes SEPARATE_BUILD = Yes @@ -29,17 +31,15 @@ BUILD_DEPENDS = devel/gettext,-tools \ graphics/py-Pillow${MODPY_FLAVOR} \ sysutils/py-distro RUN_DEPENDS = devel/desktop-file-utils \ - devel/py-future${MODPY_FLAVOR} \ - games/fifengine>=0.4.2p3 \ + games/fifengine>=0.4.2p4 \ textproc/py-yaml${MODPY_FLAVOR} + +# tests currently broken, see +# https://github.com/unknown-horizons/unknown-horizons/issues/2938 TEST_DEPENDS = devel/py-greenlet${MODPY_FLAVOR} \ devel/py-mock${MODPY_FLAVOR} \ - devel/py-nose${MODPY_FLAVOR} \ textproc/py-polib${MODPY_FLAVOR} \ textproc/py-yaml${MODPY_FLAVOR} - -#https://github.com/unknown-horizons/unknown-horizons/issues/2938 -NO_TEST = Yes post-install: .for i in actionsets.json atlas.sql tilesets.json Index: distinfo =================================================================== RCS file: /cvs/ports/games/unknown-horizons/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 28 Sep 2023 00:23:25 -0000 1.3 +++ distinfo 19 Jan 2024 03:27:36 -0000 @@ -1,2 +1,2 @@ -SHA256 (unknown-horizons-2019.1-d1066484.tar.gz) = iQRU8UJ55nfR2/2UCovDBl7I4DP/QywHLQJFr2AGWOc= -SIZE (unknown-horizons-2019.1-d1066484.tar.gz) = 267534197 +SHA256 (unknown-horizons-2019.1-e50348da.tar.gz) = BEJz4GrCu1WdZldiKyQsv0LzpvnycpO8R6guxYm14OM= +SIZE (unknown-horizons-2019.1-e50348da.tar.gz) = 267530463 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/unknown-horizons/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 28 Sep 2023 00:23:25 -0000 1.5 +++ pkg/PLIST 19 Jan 2024 03:27:39 -0000 @@ -1,5 +1,9 @@ bin/unknown-horizons -lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/UnknownHorizons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/horizons/ lib/python${MODPY_VERSION}/site-packages/horizons/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/horizons/${MODPY_PYCACHE}/
