git: 19131ecac113 - main - games/blobby: Update to 1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 Jun 2023 10:29:25 UTC
The branch main has been updated by martymac:
URL: https://cgit.FreeBSD.org/ports/commit/?id=19131ecac113081319da7224cabb32b63f1c6485
commit 19131ecac113081319da7224cabb32b63f1c6485
Author: Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2023-06-16 10:28:05 +0000
Commit: Ganael LAPLANCHE <martymac@FreeBSD.org>
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 <ctime>
- #include <string>
-
- /*! \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 <cstring>
-+#include <iostream>
-
- #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