git: 1e4c5ccf0edf - main - games/colobot: Update to 0.2.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Oct 2025 22:52:16 UTC
The branch main has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1e4c5ccf0edf7a3e0bc29f8d29d2ffa843ac3ef5
commit 1e4c5ccf0edf7a3e0bc29f8d29d2ffa843ac3ef5
Author: Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-10-23 22:36:22 +0000
Commit: Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-10-23 22:51:56 +0000
games/colobot: Update to 0.2.2
- Make sure the colobot-data tarball is always in sync with the sources.
- Depend on po4a for translations.
- Drop unneeded USE_LDCONFIG and remove stale patches.
---
games/colobot/Makefile | 19 ++++++------
games/colobot/distinfo | 10 +++----
games/colobot/files/patch-CMakeLists.txt | 35 ++++------------------
games/colobot/files/patch-data_CMakeLists.txt | 11 -------
.../files/patch-src_common_system_system.cpp | 4 +--
.../patch-src_common_system_system__linux.cpp | 11 -------
games/colobot/pkg-plist | 7 +++++
7 files changed, 30 insertions(+), 67 deletions(-)
diff --git a/games/colobot/Makefile b/games/colobot/Makefile
index 0c8256e469d6..c631804064bd 100644
--- a/games/colobot/Makefile
+++ b/games/colobot/Makefile
@@ -1,12 +1,13 @@
PORTNAME= colobot
DISTVERSIONPREFIX= ${PORTNAME}-gold-
-DISTVERSION= 0.2.0
-PORTREVISION= 14
+DISTVERSION= 0.2.2
DISTVERSIONSUFFIX= -alpha
CATEGORIES= games education
-MASTER_SITES= https://colobot.info/files/music/:music
+MASTER_SITES= https://github.com/colobot/colobot-data/archive/refs/tags/:data \
+ https://colobot.info/files/music/:music
# music files are identical, keep old distfile for now
-DISTFILES= colobot-music_ogg_0.1.12-alpha.tar.gz:music
+DISTFILES= colobot-gold-${DISTVERSION}${DISTVERSIONSUFFIX}.tar.gz:data \
+ colobot-music_ogg_0.1.12-alpha.tar.gz:music
MAINTAINER= makc@FreeBSD.org
COMMENT= Educational game aiming to teach programming to kids
@@ -15,7 +16,9 @@ WWW= https://colobot.info/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${LOCALBASE}/bin/xml:textproc/xmlstarlet
+BUILD_DEPENDS= ${LOCALBASE}/bin/xml:textproc/xmlstarlet \
+ p5-Pod-Parser>0:textproc/p5-Pod-Parser \
+ po4a:textproc/po4a
LIB_DEPENDS= libpng.so:graphics/png \
libsndfile.so:audio/libsndfile \
libvorbis.so:audio/libvorbis \
@@ -24,17 +27,15 @@ LIB_DEPENDS= libpng.so:graphics/png \
libphysfs.so:devel/physfs \
libboost_thread.so:devel/boost-libs
-USES= cmake compiler:c++11-lang gettext-runtime gettext-tools:build \
+USES= cmake compiler:c++17-lang gettext-runtime gettext-tools:build \
gl gnome localbase:ldflags openal perl5 python:build sdl \
shebangfix
USE_GL= gl glew glu
USE_GNOME= librsvg2:build
USE_PERL5= build
USE_SDL= image2 ttf2
-USE_LDCONFIG= yes
USE_GITHUB= yes
-GH_TUPLE= colobot:colobot-data:0ac8197:data
LDFLAGS_i386= -Wl,-znotext
SHEBANG_FILES= data/i18n-tools/scripts/process_translations.py
@@ -42,7 +43,7 @@ SHEBANG_FILES= data/i18n-tools/scripts/process_translations.py
BINARY_ALIAS= xmlstarlet=${LOCALBASE}/bin/xml
post-extract:
- @${MV} ${WRKDIR}/colobot-data-0ac8197/* ${WRKSRC}/data
+ @${MV} ${WRKDIR}/colobot-data-colobot-gold-${DISTVERSION}${DISTVERSIONSUFFIX}/* ${WRKSRC}/data
@${MV} ${WRKDIR}/*.ogg ${WRKDIR}/LICENSE.txt ${WRKSRC}/data/music/
post-patch:
diff --git a/games/colobot/distinfo b/games/colobot/distinfo
index a11cb5c8b7fd..d79f72df6901 100644
--- a/games/colobot/distinfo
+++ b/games/colobot/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1630259482
+TIMESTAMP = 1755381709
+SHA256 (colobot-gold-0.2.2-alpha.tar.gz) = 5c959a65ffc6047b656339bad425e2c050d3eb826e857dd80e2a03da0418c000
+SIZE (colobot-gold-0.2.2-alpha.tar.gz) = 57913175
SHA256 (colobot-music_ogg_0.1.12-alpha.tar.gz) = 55e89d244f1f63e2467ef71253ca881ee31279f02aac9ac4706ef26c466306e9
SIZE (colobot-music_ogg_0.1.12-alpha.tar.gz) = 55596353
-SHA256 (colobot-colobot-colobot-gold-0.2.0-alpha_GH0.tar.gz) = 633ce4ec9b54c657942453e769a2339befb2d0afff8b8b3589a73d005e097ab6
-SIZE (colobot-colobot-colobot-gold-0.2.0-alpha_GH0.tar.gz) = 1514455
-SHA256 (colobot-colobot-data-0ac8197_GH0.tar.gz) = b9d47f214fb98b00a87d20a2c2c0c97b9c21e944b879d32c31617cc5eecaa488
-SIZE (colobot-colobot-data-0ac8197_GH0.tar.gz) = 57792334
+SHA256 (colobot-colobot-colobot-gold-0.2.2-alpha_GH0.tar.gz) = 047eb2bc96725598d918c5b500928e3a08fa3e6e7e730a82169da4524b03ddad
+SIZE (colobot-colobot-colobot-gold-0.2.2-alpha_GH0.tar.gz) = 1331553
diff --git a/games/colobot/files/patch-CMakeLists.txt b/games/colobot/files/patch-CMakeLists.txt
index f0f2a9ddd173..900f19ab98f3 100644
--- a/games/colobot/files/patch-CMakeLists.txt
+++ b/games/colobot/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2021-08-21 20:57:34 UTC
+--- CMakeLists.txt.orig 2024-12-23 20:22:56 UTC
+++ CMakeLists.txt
-@@ -115,8 +115,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+@@ -121,8 +121,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
# Platform-dependent implementation of system.h
# On FreeBSD we can use *_other
@@ -11,36 +11,13 @@
# To avoid CMake warning
set(CMAKE_MACOSX_RPATH 1)
else()
-@@ -155,15 +155,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-
- message(STATUS "Detected GCC version 4.7+")
-
-- set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
-- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-+ set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-
-- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wsuggest-override")
-- endif()
--
-- set(RELEASE_CXX_FLAGS "-O2")
-- set(DEBUG_CXX_FLAGS "-g -O0")
- set(TEST_CXX_FLAGS "-pthread")
- add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -173,14 +166,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -176,9 +176,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang version 3.1+")
- if (${PLATFORM_FREEBSD})
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
- endif()
--
-- set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
-- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-- set(RELEASE_CXX_FLAGS "-O2")
-- set(DEBUG_CXX_FLAGS "-g -O0")
-+ set(NORMAL_CXX_FLAGS "-std=c++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- set(TEST_CXX_FLAGS "-pthread")
- add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+
+ set(NORMAL_CXX_FLAGS "-Wall -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
+ set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
diff --git a/games/colobot/files/patch-data_CMakeLists.txt b/games/colobot/files/patch-data_CMakeLists.txt
deleted file mode 100644
index 456d19b6661f..000000000000
--- a/games/colobot/files/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/CMakeLists.txt.orig 2019-02-23 19:01:32 UTC
-+++ data/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
- option(TRANSLATIONS "Enable translations of help and level files" ON)
-
- if(TRANSLATIONS)
-- find_package(PythonInterp 2.7 REQUIRED)
-+ find_package(PythonInterp REQUIRED)
- else()
- message(STATUS "Translations disabled; only English files will be installed")
- endif()
diff --git a/games/colobot/files/patch-src_common_system_system.cpp b/games/colobot/files/patch-src_common_system_system.cpp
index 88d93b0e2ee7..fda36181d426 100644
--- a/games/colobot/files/patch-src_common_system_system.cpp
+++ b/games/colobot/files/patch-src_common_system_system.cpp
@@ -1,4 +1,4 @@
---- src/common/system/system.cpp.orig 2021-08-21 20:57:34 UTC
+--- src/common/system/system.cpp.orig 2024-12-23 20:22:56 UTC
+++ src/common/system/system.cpp
@@ -24,7 +24,7 @@
@@ -9,7 +9,7 @@
#include "common/system/system_linux.h"
#elif defined(PLATFORM_MACOSX)
#include "common/system/system_macosx.h"
-@@ -43,7 +43,7 @@ std::unique_ptr<CSystemUtils> CSystemUtils::Create()
+@@ -44,7 +44,7 @@ std::unique_ptr<CSystemUtils> CSystemUtils::Create()
std::unique_ptr<CSystemUtils> instance;
#if defined(PLATFORM_WINDOWS)
instance = MakeUnique<CSystemUtilsWindows>();
diff --git a/games/colobot/files/patch-src_common_system_system__linux.cpp b/games/colobot/files/patch-src_common_system_system__linux.cpp
deleted file mode 100644
index f8c50217d45b..000000000000
--- a/games/colobot/files/patch-src_common_system_system__linux.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/system/system_linux.cpp.orig 2021-12-03 22:35:25 UTC
-+++ src/common/system/system_linux.cpp
-@@ -98,7 +98,7 @@ void CSystemUtilsLinux::InterpolateTimeStamp(SystemTim
-
- void CSystemUtilsLinux::GetCurrentTimeStamp(SystemTimeStamp *stamp)
- {
-- clock_gettime(CLOCK_MONOTONIC_RAW, &stamp->clockTime);
-+ clock_gettime(CLOCK_MONOTONIC, &stamp->clockTime);
- }
-
- long long CSystemUtilsLinux::TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after)
diff --git a/games/colobot/pkg-plist b/games/colobot/pkg-plist
index a7fd6f3659b7..3d8914146330 100644
--- a/games/colobot/pkg-plist
+++ b/games/colobot/pkg-plist
@@ -135,6 +135,7 @@ share/games/colobot/fonts/dvu_sans_bold.ttf
share/games/colobot/fonts/dvu_sans_italic.ttf
share/games/colobot/fonts/dvu_sans_mono.ttf
share/games/colobot/fonts/dvu_sans_mono_bold.ttf
+share/games/colobot/fonts/fonts.ini
share/games/colobot/help/B/authors.txt
share/games/colobot/help/B/battles.txt
share/games/colobot/help/B/cbot.txt
@@ -2591,6 +2592,8 @@ share/games/colobot/levels/missions/chapter003/level005/scene.txt
share/games/colobot/levels/missions/chapter003/planet.txt
share/games/colobot/levels/missions/chapter003/terrain.txt
share/games/colobot/levels/missions/chapter004/chaptertitle.txt
+share/games/colobot/levels/missions/chapter004/clear.txt
+share/games/colobot/levels/missions/chapter004/foggy.txt
share/games/colobot/levels/missions/chapter004/level001/help/help.B.txt
share/games/colobot/levels/missions/chapter004/level001/help/help.C.txt
share/games/colobot/levels/missions/chapter004/level001/help/help.D.txt
@@ -3261,6 +3264,8 @@ share/games/colobot/levels/plus/chapter003/level003/scene.txt
share/games/colobot/levels/plus/chapter003/planet.txt
share/games/colobot/levels/plus/chapter003/terrain.txt
share/games/colobot/levels/plus/chapter004/chaptertitle.txt
+share/games/colobot/levels/plus/chapter004/clear.txt
+share/games/colobot/levels/plus/chapter004/foggy.txt
share/games/colobot/levels/plus/chapter004/level001/help/help.B.txt
share/games/colobot/levels/plus/chapter004/level001/help/help.C.txt
share/games/colobot/levels/plus/chapter004/level001/help/help.D.txt
@@ -4236,6 +4241,7 @@ share/games/colobot/textures/res12.png
share/games/colobot/textures/res13.png
share/games/colobot/textures/res14.png
share/games/colobot/textures/res15.png
+share/games/colobot/textures/res16.png
share/games/colobot/textures/resae.png
share/games/colobot/textures/resas.png
share/games/colobot/textures/roca2.png
@@ -4256,5 +4262,6 @@ share/locale/fr/LC_MESSAGES/colobot.mo
share/locale/pl/LC_MESSAGES/colobot.mo
share/locale/pt/LC_MESSAGES/colobot.mo
share/locale/ru/LC_MESSAGES/colobot.mo
+share/man/fr/man6/colobot.6.gz
share/man/man6/colobot.6.gz
share/metainfo/info.colobot.Colobot.appdata.xml