From: Rafael Sadowski Subject: Re: UPDATE: games/freesynd To: Rafael Sadowski Cc: ports@openbsd.org, Brian Callahan Date: Mon, 20 Oct 2025 16:30:01 +0200 On Mon Oct 20, 2025 at 11:18:35AM +0200, Rafael Sadowski wrote: > This update is cmake4 related. I would like to update freesynd to > 0.8 to unbreak with the upcoming cmake update. > > Rafael > New diff with a missing patch: diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile index ec145f966e6..d2546cf7ed2 100644 --- a/games/freesynd/Makefile +++ b/games/freesynd/Makefile @@ -1,7 +1,9 @@ COMMENT = open source reimplementation of Syndicate game -DISTNAME = freesynd-0.7.5 + +VERSION = 0.8 +PKGNAME = freesynd-${VERSION} +DISTNAME = Freesynd-${VERSION}-Source CATEGORIES = games x11 -REVISION = 0 HOMEPAGE = https://freesynd.sourceforge.io/ MAINTAINER = Brian Callahan @@ -9,18 +11,28 @@ MAINTAINER = Brian Callahan # GPLv2+ PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} SDL SDL_image SDL_mixer c m png +WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image SDL2_mixer c m png WANTLIB += z -CXXFLAGS_base-clang = -std=c++11 - SITES = ${SITE_SOURCEFORGE:=freesynd/} +EXTRACT_SUFX = .zip MODULES = devel/cmake -LIB_DEPENDS = devel/sdl-image \ - devel/sdl-mixer +LIB_DEPENDS = devel/sdl2 \ + devel/sdl2-image \ + devel/sdl2-mixer \ + graphics/png + +CONFIGURE_ARGS = -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \ + -DCMAKE_INSTALL_DOCDIR=${LOCALBASE}/share/doc/freesynd NO_TEST = Yes +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freesynd/ + mv ${WRKINST}${LOCALBASE}${SYSCONFDIR}/freesynd/freesynd.ini \ + ${PREFIX}/share/examples/freesynd/ + .include diff --git a/games/freesynd/distinfo b/games/freesynd/distinfo index 46fec90a150..6ed05420bd4 100644 --- a/games/freesynd/distinfo +++ b/games/freesynd/distinfo @@ -1,2 +1,2 @@ -SHA256 (freesynd-0.7.5.tar.gz) = GhYRzcOvVln8w/bB215IleZ7WnsixVQW/+7t1jYAgOM= -SIZE (freesynd-0.7.5.tar.gz) = 2622888 +SHA256 (Freesynd-0.8-Source.zip) = pz3kZXxdlF4zihS5FczZdsRz+dpall8Nwi+yojOlFYs= +SIZE (Freesynd-0.8-Source.zip) = 6406015 diff --git a/games/freesynd/patches/patch-utils_src_file_cpp b/games/freesynd/patches/patch-utils_src_file_cpp new file mode 100644 index 00000000000..cdf3902bb81 --- /dev/null +++ b/games/freesynd/patches/patch-utils_src_file_cpp @@ -0,0 +1,14 @@ +Index: utils/src/file.cpp +--- utils/src/file.cpp.orig ++++ utils/src/file.cpp +@@ -356,8 +356,8 @@ void File::setOriginalDataFolder(const std::string& pa + #if defined(__APPLE__) + // Under Mac, it can't be in the bundle as user should not access it + #else +- // Under Windows/unix it's in the same directory as our data +- dataPath_ = ourDataPath_; ++ // Under Windows/unix it's in the data subdirectory of our data ++ dataPath_ = ourDataPath_ / "data"; + #endif + } + LOG(Log::k_FLG_IO, "File", "setOriginalDataPath", ("set data path to %s", dataPath_.string().c_str())); diff --git a/games/freesynd/pkg/PLIST b/games/freesynd/pkg/PLIST index 937eb45446d..727029125fc 100644 --- a/games/freesynd/pkg/PLIST +++ b/games/freesynd/pkg/PLIST @@ -1,18 +1,24 @@ @bin bin/freesynd +etc/ +etc/freesynd/ +share/doc/freesynd/ +share/doc/freesynd/changelog.gz +share/doc/freesynd/copyright share/doc/pkg-readmes/${PKGSTEM} +share/examples/freesynd/ +share/examples/freesynd/freesynd.ini share/freesynd/ -share/freesynd/data/ -share/freesynd/data/cursors/ -share/freesynd/data/cursors/cursors.png -share/freesynd/data/lang/ -share/freesynd/data/lang/english.lng -share/freesynd/data/lang/french.lng -share/freesynd/data/lang/german.lng -share/freesynd/data/lang/italian.lng -share/freesynd/data/music/ -share/freesynd/data/music/assassinate.ogg -share/freesynd/data/music/intro.ogg -share/freesynd/data/ref/ -share/freesynd/data/ref/original_data.crc -share/freesynd/data/ref/research.dat -share/freesynd/data/ref/weapons.dat +share/freesynd/cursors/ +share/freesynd/cursors/cursors.png +share/freesynd/lang/ +share/freesynd/lang/english.lng +share/freesynd/lang/french.lng +share/freesynd/lang/german.lng +share/freesynd/lang/italian.lng +share/freesynd/music/ +share/freesynd/music/assassinate.ogg +share/freesynd/music/intro.ogg +share/freesynd/ref/ +share/freesynd/ref/original_data.crc +share/freesynd/ref/research.dat +share/freesynd/ref/weapons.dat