From nobody Sat Jun 15 17:13:00 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W1jQP0P9Yz5P78S; Sat, 15 Jun 2024 17:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W1jQN6sxRz4YKw; Sat, 15 Jun 2024 17:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718471581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNiITUrjvTUfylcrzBryT3T74Zk4phLTBR1NODzpP6E=; b=uwxTxQadOmULqQdvoC5WfwCxqVVkyjOQ8A+sH69pKo9pDEKzmmofDQZ4PHFt3nWdY+i1Xr 0XnjoCU8/cHV+IRgCE2/lqGgIy4H7V/f0Lq6+S4wMp+TaXXxHcUfkLzLjmHsR1CSjhkc2B 0ZrSzrzwoWY6QdX5HGaySVjvpJxJr6cEPG3mTARRXWhytn/hfRCZqc7lgOg52Y7OjFI2/U EGK/NzHN9nuPAAD4p0XslUnX1TwRa+MV3wC95kNnMMKDCk80LWzSajbkela9KI9BgEfFl1 C0kMWvhoDNADjX0+VWcf7ET99txgeol7OqaAM8DMoxNUuvKeCrxW7cnppoZPWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718471581; a=rsa-sha256; cv=none; b=Wh4QkYHymgtXFGylngENiUACB0i0TbIsZgsjpYaYaJmxZE1SFJxhTlH7KcbhxZCGy/ia6H 39FiGLACG8bUB9ekuuuaPFIHcTxWgjLFtnp0qQIYtMrZpAfs5mLyw2b065uj5+3nyEXLjC f5oNsIkW2HAnyjatCjKhUWP0udf2e1Ie/1bTivj4TCqVNh5k6fJxQPFRLCYKARLNRQbA2N utDV5OydFhQUgQxLd0YeEm7GrrtfgzxTQ0oXHzgs/Wb4nfqy42xYSIEoABzS/xkfQy4x9h xpl2E5Sq1pF4QbDQcvDWVnnQ3BI2vC5erfuxfwctWB7Ut4/mxzqtbjq8aN5vrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718471581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNiITUrjvTUfylcrzBryT3T74Zk4phLTBR1NODzpP6E=; b=VDA00QG5Z1VdZIS2tbIEHd5Rz/Rg6aISHWI27/AMq6Z5lz1X5anRzGY409UOg/ZxZLoc9h IcoXUWNkdMrUInNnk54f5TFbe1D6HemrJNcCMaDJFKpBTdeO/Rl1ntLW8HHhdWNKeNtO0X z+kYSVVjNtAY9wLVEBUdSgtQ+LSvUILpNOT/cS+OPyQY1R2D0oey//5jw/JPP3D6jfA5mS y01BA5qWhtEXXvICN2UQh6LWHNt5E4JWM9I/DTgQjhJOFY0zJVXxgzAG/B9LewZFsE0vC/ 5EWS7Z1TvrTMf08s6yOjpm/RqNurK0nI7yN8G6Mf18ug/DDLy7ONPUovl6HTjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W1jQN6Sypz1CMN; Sat, 15 Jun 2024 17:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45FHD0K3006561; Sat, 15 Jun 2024 17:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FHD0Zu006558; Sat, 15 Jun 2024 17:13:00 GMT (envelope-from git) Date: Sat, 15 Jun 2024 17:13:00 GMT Message-Id: <202406151713.45FHD0Zu006558@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: abe7fa2d1733 - main - games/freesynd: Update to 0.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abe7fa2d1733a28fcccef50cb967da197797d1f0 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=abe7fa2d1733a28fcccef50cb967da197797d1f0 commit abe7fa2d1733a28fcccef50cb967da197797d1f0 Author: Guido Falsi AuthorDate: 2024-06-15 17:12:34 +0000 Commit: Guido Falsi CommitDate: 2024-06-15 17:12:34 +0000 games/freesynd: Update to 0.8 - Add LICENSE --- games/freesynd/Makefile | 32 +++++++++++++++++------ games/freesynd/distinfo | 5 ++-- games/freesynd/files/patch-src_app.h | 21 --------------- games/freesynd/files/patch-src_dump.cpp | 11 -------- games/freesynd/files/patch-src_editor_editorapp.h | 19 -------------- games/freesynd/files/patch-src_freesynd.cpp | 11 -------- games/freesynd/files/patch-utils_src_file.cpp | 13 +++++++++ games/freesynd/pkg-plist | 24 ++++++++++------- 8 files changed, 54 insertions(+), 82 deletions(-) diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile index fdd5ca00042d..1732833dd7d8 100644 --- a/games/freesynd/Makefile +++ b/games/freesynd/Makefile @@ -1,22 +1,38 @@ PORTNAME= freesynd -PORTVERSION= 0.7.5 +DISTVERSION= 0.8 +DISTVERSIONSUFFIX= -Source CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +DISTNAME= Freesynd-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= madpilot@FreeBSD.org COMMENT= Reimplementation of the classic Bullfrog game Syndicate WWW= http://freesynd.sourceforge.net/ -LIB_DEPENDS= libpng.so:graphics/png +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:insource sdl -USE_SDL= sdl image mixer +LIB_DEPENDS= libpng16.so:graphics/png + +USES= cmake sdl zip +USE_SDL= image2 mixer2 sdl2 + +CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} SUB_FILES= pkg-message -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/src/freesynd ${STAGEDIR}${PREFIX}/bin - (cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}) +OPTIONS_DEFINE= DOXYGEN +OPTIONS_DEFAULT= DOXYGEN +OPTIONS_SUB= yes + +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen + +post-patch-DOXYGEN-off: + @${REINPLACE_CMD} -e '/find_package(Doxygen)/d' \ + ${WRKSRC}/CMakeLists.txt + +post-install: + @${MV} ${STAGEDIR}/${ETCDIR}/freesynd.ini \ + ${STAGEDIR}/${ETCDIR}/freesynd.ini.sample .include diff --git a/games/freesynd/distinfo b/games/freesynd/distinfo index 2798b60b8460..d35c92a3c29c 100644 --- a/games/freesynd/distinfo +++ b/games/freesynd/distinfo @@ -1,2 +1,3 @@ -SHA256 (freesynd-0.7.5.tar.gz) = 1a1611cdc3af5659fcc3f6c1db5e4895e67b5a7b22c55416ffeeedd6360080e3 -SIZE (freesynd-0.7.5.tar.gz) = 2622888 +TIMESTAMP = 1717944793 +SHA256 (Freesynd-0.8-Source.zip) = a73de4657c5d945e338a14b915ccd976c473f9da5a965f0dc22fb2a233a5158b +SIZE (Freesynd-0.8-Source.zip) = 6406015 diff --git a/games/freesynd/files/patch-src_app.h b/games/freesynd/files/patch-src_app.h deleted file mode 100644 index 1554bf2d04ce..000000000000 --- a/games/freesynd/files/patch-src_app.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/app.h.orig 2016-05-01 20:07:33 UTC -+++ src/app.h -@@ -153,13 +153,13 @@ class App : public Singleton < App > { (private) - private: - bool running_; - /*! A structure to hold general application informations.*/ -- std::auto_ptr context_; -+ std::unique_ptr context_; - /*! A structure to hold player informations.*/ -- std::auto_ptr session_; -+ std::unique_ptr session_; - /*! Controls the game logic. */ -- std::auto_ptr game_ctlr_; -- std::auto_ptr screen_; -- std::auto_ptr system_; -+ std::unique_ptr game_ctlr_; -+ std::unique_ptr screen_; -+ std::unique_ptr system_; - - std::string iniPath_; - diff --git a/games/freesynd/files/patch-src_dump.cpp b/games/freesynd/files/patch-src_dump.cpp deleted file mode 100644 index c10f5972ad65..000000000000 --- a/games/freesynd/files/patch-src_dump.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dump.cpp.orig 2016-05-01 20:07:33 UTC -+++ src/dump.cpp -@@ -584,7 +584,7 @@ int main(int argc, char *argv[]) { - } - - LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application...")) -- std::auto_ptr app(new EditorApp(disable_sound)); -+ std::unique_ptr app(new EditorApp(disable_sound)); - - if (app->initialize(iniPath)) { - LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application completed")) diff --git a/games/freesynd/files/patch-src_editor_editorapp.h b/games/freesynd/files/patch-src_editor_editorapp.h deleted file mode 100644 index 5459198c8641..000000000000 --- a/games/freesynd/files/patch-src_editor_editorapp.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/editor/editorapp.h.orig 2016-05-01 20:07:33 UTC -+++ src/editor/editorapp.h -@@ -122,12 +122,12 @@ class EditorApp : public Singleton < EditorApp > { (pr - private: - bool running_; - -- std::auto_ptr screen_; -- std::auto_ptr system_; -+ std::unique_ptr screen_; -+ std::unique_ptr system_; - /*! A structure to hold general application informations.*/ -- std::auto_ptr context_; -+ std::unique_ptr context_; - /*! Controls the game logic. */ -- std::auto_ptr game_ctlr_; -+ std::unique_ptr game_ctlr_; - - std::string iniPath_; - diff --git a/games/freesynd/files/patch-src_freesynd.cpp b/games/freesynd/files/patch-src_freesynd.cpp deleted file mode 100644 index abd822874ac6..000000000000 --- a/games/freesynd/files/patch-src_freesynd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/freesynd.cpp.orig 2016-05-01 20:07:33 UTC -+++ src/freesynd.cpp -@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) { - } - - LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application...")) -- std::auto_ptr app(new App(disable_sound)); -+ std::unique_ptr app(new App(disable_sound)); - - if (app->initialize(iniPath)) { - // setting the cheat codes diff --git a/games/freesynd/files/patch-utils_src_file.cpp b/games/freesynd/files/patch-utils_src_file.cpp new file mode 100644 index 000000000000..6e95bd66ef0b --- /dev/null +++ b/games/freesynd/files/patch-utils_src_file.cpp @@ -0,0 +1,13 @@ +--- utils/src/file.cpp.orig 2024-05-15 21:07:46 UTC ++++ 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 95b24748129a..64ccb5a12fae 100644 --- a/games/freesynd/pkg-plist +++ b/games/freesynd/pkg-plist @@ -1,11 +1,15 @@ bin/freesynd -%%DATADIR%%/data/cursors/cursors.png -%%DATADIR%%/data/lang/english.lng -%%DATADIR%%/data/lang/french.lng -%%DATADIR%%/data/lang/german.lng -%%DATADIR%%/data/lang/italian.lng -%%DATADIR%%/data/music/assassinate.ogg -%%DATADIR%%/data/music/intro.ogg -%%DATADIR%%/data/ref/original_data.crc -%%DATADIR%%/data/ref/research.dat -%%DATADIR%%/data/ref/weapons.dat +@sample %%ETCDIR%%/freesynd.ini.sample +%%DOCSDIR%%/changelog.gz +%%DOCSDIR%%/copyright +%%DATADIR%%/cursors/cursors.png +%%DATADIR%%/lang/english.lng +%%DATADIR%%/lang/french.lng +%%DATADIR%%/lang/german.lng +%%DATADIR%%/lang/italian.lng +%%DATADIR%%/music/assassinate.ogg +%%DATADIR%%/music/intro.ogg +%%DATADIR%%/ref/original_data.crc +%%DATADIR%%/ref/research.dat +%%DATADIR%%/ref/weapons.dat +%%DOXYGEN%%share/man/man6/freesynd.6.gz