From nobody Fri Jun 16 10:29:25 2023 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 4QjFl95gHGz4dM1q; Fri, 16 Jun 2023 10:29:25 +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 4QjFl959nzz4QTs; Fri, 16 Jun 2023 10:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686911365; 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=1lQ1Nz031jnvuS4e2IM0d7S5edjJhTPTfWU5vITt4FE=; b=MHoOP5XhxkMA9hOjLoRyFyAUx8GCghmTzibMxdutEADrJLw2L7VPvHdsTuwn9GrZaw2uDX MjL7qhQie563dEOw3C57KSjbE7T1d4E3rPcYRdQusRemCa9dHuAdYcIuv2BGH+TyyBBomU oZRC6P8U92VvNVabqdokn7U/Rj3O9hAAN5yuynHOzaeo2l/tbcVwXe28sRMb1cwTeROCx1 PEYWbiPZxnIy2saGbRCD2+UbyPPxAjg1FMtPUsu9/hlyTMhQrLuaIuq20M1cnL3p2q/v+h 57cjI7Y9RZvsKSxX8E71wMEZki/Q6/rMmNMMtne/J/9nU0nuB+jcofXWDKYqfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686911365; 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=1lQ1Nz031jnvuS4e2IM0d7S5edjJhTPTfWU5vITt4FE=; b=NlQbLW/bi25yFh0NDPBnG4iuaESRgUkXAMcrgCgDaN4swUos/Vqd1rHHltf/MyAAGR8Y7b /CqCuEswQ5MdgIaSn8i+4MfanjQ3TYo4TiUWj5xK8d347TOJkQBWg+TwrvRobwPNUHEDIG o21Cv4t2OkviB5tuT4X5tNTh3nFXQl4EzOmjb2t3Ggdjy+YcZ2g+3NGhd5huZ7r/HXh44m Pxk//tjDDbwgMjiZGgvxMwi6HAjVvYc8O1UdJn6FqC8jE9FOGTwhMecLlIGhZuaHay/j7m lc+r5LlIWZ75AtxFqrJIW4G75Y7thJ3z4Uw2g9yUy1VDJUTSm4j9GEs5kCCd1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686911365; a=rsa-sha256; cv=none; b=GhMq5I7nlq2iRx7w7z8NLXNmSCYL+UkLs5+XNdgtzFDLNUtUH/OqbQ9AkXKL7L3jGxUgIS v0lbqZL2SEFL7wha9BO98EejLB7pP6CpK4srY1WpidkgptqK3fOniaMUe862hAFxn8xhzS 5F5EfxNIACEDYRuhrWt7lW7E0Ye/wSgT7hb4A0ZTx1hwkjtWVbnkBmvvtf6pwFN1QxbHZe l3lCu30stbZsV4v4Ycv5yWyP+JvjMujnnGxTORjSkqhoPfHMS00ou4wXkGjn/+BOXHLI33 83Emay9fK9ptNth+ZiUwqYR1NCKu5SI7h8kaAyO8xdjvHmKZjWH9jWrjKnroFQ== 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 4QjFl94Dm8zPGZ; Fri, 16 Jun 2023 10:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35GATPc6047215; Fri, 16 Jun 2023 10:29:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35GATPcs047214; Fri, 16 Jun 2023 10:29:25 GMT (envelope-from git) Date: Fri, 16 Jun 2023 10:29:25 GMT Message-Id: <202306161029.35GATPcs047214@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 19131ecac113 - main - games/blobby: Update to 1.1 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19131ecac113081319da7224cabb32b63f1c6485 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=19131ecac113081319da7224cabb32b63f1c6485 commit 19131ecac113081319da7224cabb32b63f1c6485 Author: Ganael LAPLANCHE AuthorDate: 2023-06-16 10:28:05 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-06-16 10:29:15 +0000 games/blobby: Update to 1.1 While here, do a bit of cleanup: - Switch to Github - Update WWW entry - Re-enable aarch64 builds (not tested) --- games/blobby/Makefile | 28 +++++++------------------ games/blobby/distinfo | 6 +++--- games/blobby/files/patch-config.h.in | 7 ------- games/blobby/files/patch-data-CMakeLists.txt | 10 ++++----- games/blobby/files/patch-src-CMakeLists.txt | 11 ++++++++++ games/blobby/files/patch-src-Clock.h | 10 --------- games/blobby/files/patch-src_NetworkMessage.cpp | 10 --------- games/blobby/pkg-plist | 9 ++++++++ 8 files changed, 36 insertions(+), 55 deletions(-) diff --git a/games/blobby/Makefile b/games/blobby/Makefile index d45056c40ad6..680812a90f0b 100644 --- a/games/blobby/Makefile +++ b/games/blobby/Makefile @@ -1,21 +1,15 @@ PORTNAME= blobby -PORTVERSION= 1.0 -PORTREVISION= 16 +PORTVERSION= 1.1 PORTEPOCH= 1 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/${PORTVERSION} -DISTNAME= blobby2-linux-${PORTVERSION} MAINTAINER= martymac@FreeBSD.org COMMENT= Official continuation of the famous Blobby Volley 1.x game -WWW= http://blobby.sourceforge.net +WWW= http://blobbyvolley.de LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -NOT_FOR_ARCHS= aarch64 -NOT_FOR_ARCHS_REASON= fails to compile: I can't tell what endian-ness to use for your architecture - LIB_DEPENDS= libphysfs.so:devel/physfs BUILD_DEPENDS= zip:archivers/zip \ ${LOCALBASE}/include/boost/crc.hpp:devel/boost-libs @@ -25,24 +19,18 @@ USES= cmake compiler:c++11-lang dos2unix gl localbase:ldflags \ USE_SDL= sdl2 USE_GL= gl +USE_GITHUB= yes +GH_ACCOUNT= danielknobe +GH_PROJECT= blobbyvolley2 +GH_TAGNAME= v${PORTVERSION} + DOS2UNIX_REGEX= .*\.(c|h|cpp) CMAKE_ARGS= -DDATADIR:PATH="${DATADIR}" -WRKSRC= ${WRKDIR}/blobby-${PORTVERSION} -PORTDOCS= AUTHORS ChangeLog README TODO - -DESKTOP_ENTRIES="Blobby Volley" \ - "" \ - "${DATADIR}/Icon.bmp" \ - "${PORTNAME}" \ - "Game;ArcadeGame;" \ - "" +PORTDOCS= AUTHORS ChangeLog README.md OPTIONS_DEFINE= DOCS -post-install: - ${INSTALL_DATA} ${WRKSRC}/data/Icon.bmp ${STAGEDIR}${DATADIR}/ - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/games/blobby/distinfo b/games/blobby/distinfo index 397cecb597fd..2363402e5aa2 100644 --- a/games/blobby/distinfo +++ b/games/blobby/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479124820 -SHA256 (blobby2-linux-1.0.tar.gz) = ba7a049e298aaa2014c1e1ac1faf3b0256b4c66266cd4db06e7939e8695bf5e2 -SIZE (blobby2-linux-1.0.tar.gz) = 1772918 +TIMESTAMP = 1686770986 +SHA256 (danielknobe-blobbyvolley2-1.1-v1.1_GH0.tar.gz) = 6ff6a62d13fb171b2c6535d692277cf3fe8f3a6081d1956b26b0f655170817f4 +SIZE (danielknobe-blobbyvolley2-1.1-v1.1_GH0.tar.gz) = 1927400 diff --git a/games/blobby/files/patch-config.h.in b/games/blobby/files/patch-config.h.in deleted file mode 100644 index 4dfe380eb273..000000000000 --- a/games/blobby/files/patch-config.h.in +++ /dev/null @@ -1,7 +0,0 @@ ---- config.h.in.orig 2010-03-10 07:19:26.023348777 +0000 -+++ config.h.in 2010-03-10 07:20:03.718760903 +0000 -@@ -20,3 +20,4 @@ - #pragma once - - #define BLOBBY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define GAMEDATADIR "${DATADIR}" diff --git a/games/blobby/files/patch-data-CMakeLists.txt b/games/blobby/files/patch-data-CMakeLists.txt index 11bffefcfb45..dbf94dd84c2a 100644 --- a/games/blobby/files/patch-data-CMakeLists.txt +++ b/games/blobby/files/patch-data-CMakeLists.txt @@ -1,9 +1,9 @@ ---- data/CMakeLists.txt.orig 2012-08-07 18:08:04.000000000 +0200 -+++ data/CMakeLists.txt 2012-08-07 18:08:28.000000000 +0200 -@@ -33,5 +33,5 @@ - if (WIN32) +--- data/CMakeLists.txt.orig 2023-06-11 17:26:52 UTC ++++ data/CMakeLists.txt +@@ -41,5 +41,5 @@ set(install_files + if (WIN32 OR SWITCH) install(FILES ${install_files} DESTINATION data) elseif (UNIX) - install(FILES ${install_files} DESTINATION share/blobby) + install(FILES ${install_files} DESTINATION ${DATADIR}) - endif (WIN32) + endif (WIN32 OR SWITCH) diff --git a/games/blobby/files/patch-src-CMakeLists.txt b/games/blobby/files/patch-src-CMakeLists.txt new file mode 100644 index 000000000000..b4aaf530d6c7 --- /dev/null +++ b/games/blobby/files/patch-src-CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2023-06-11 17:26:52 UTC ++++ src/CMakeLists.txt +@@ -97,7 +97,7 @@ if (OPENGL_FOUND) + endif (OPENGL_FOUND) + + if (UNIX AND (NOT ANDROID)) +- add_definitions("-DBLOBBY_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/blobby\"") ++ add_definitions("-DBLOBBY_DATA_DIR=\"${DATADIR}\"") + endif() + + set(BLOBBY_COMMON_LIBS lua::lua blobnet::blobnet tinyxml2::tinyxml2 PhysFS::PhysFS SDL2::SDL2main SDL2::SDL2 Boost::boost) diff --git a/games/blobby/files/patch-src-Clock.h b/games/blobby/files/patch-src-Clock.h deleted file mode 100644 index bbc4f4872dad..000000000000 --- a/games/blobby/files/patch-src-Clock.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Clock.h.orig 2013-10-28 17:23:32.000000000 +0100 -+++ src/Clock.h 2013-10-28 17:28:11.000000000 +0100 -@@ -19,6 +19,7 @@ - - #pragma once - -+#include - #include - - /*! \class Clock diff --git a/games/blobby/files/patch-src_NetworkMessage.cpp b/games/blobby/files/patch-src_NetworkMessage.cpp deleted file mode 100644 index 0fe62c5b1cb1..000000000000 --- a/games/blobby/files/patch-src_NetworkMessage.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/NetworkMessage.cpp.orig 2014-03-22 13:31:21 UTC -+++ src/NetworkMessage.cpp -@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite - - /* includes */ - #include -+#include - - #include "UserConfig.h" - #include "SpeedController.h" diff --git a/games/blobby/pkg-plist b/games/blobby/pkg-plist index 6f4e96892cb6..5d32b7e5aacb 100644 --- a/games/blobby/pkg-plist +++ b/games/blobby/pkg-plist @@ -1,13 +1,22 @@ bin/blobby bin/blobby-server +share/icons/hicolor/128x128/apps/blobby.png +share/metainfo/blobby.appdata.xml +share/applications/blobby.desktop +%%DATADIR%%/api.lua +%%DATADIR%%/bot_api.lua %%DATADIR%%/Icon.bmp %%DATADIR%%/backgrounds.zip %%DATADIR%%/config.xml %%DATADIR%%/gfx.zip %%DATADIR%%/inputconfig.xml +%%DATADIR%%/lang_cs.xml %%DATADIR%%/lang_de.xml %%DATADIR%%/lang_en.xml +%%DATADIR%%/lang_es.xml %%DATADIR%%/lang_fr.xml +%%DATADIR%%/lang_it.xml +%%DATADIR%%/rules_api.lua %%DATADIR%%/rules.zip %%DATADIR%%/scripts.zip %%DATADIR%%/server.xml