diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile index 0838008c2779..5ba0dde71b8c 100644 --- a/games/aquaria/Makefile +++ b/games/aquaria/Makefile @@ -1,79 +1,72 @@ PORTNAME= aquaria DISTVERSIONPREFIX= OSE-v -DISTVERSION= 1.002-22 -DISTVERSIONSUFFIX= -g84366ad -PORTREVISION= 13 +DISTVERSION= 1.002-35 +DISTVERSIONSUFFIX= -g98c51ac CATEGORIES= games -PATCH_SITES= https://github.com/AquariaOSE/Aquaria/commit/ -PATCHFILES= 021512337ea0bee698e950e44222fb391ae7cb91.patch:-p1 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@FreeBSD.org COMMENT= Underwater 2D fantasy action-adventure (game engine) WWW= https://github.com/AquariaOSE/Aquaria LICENSE= GPLv2+ -DEPRECATED= Does not build with CMake 4 -EXPIRATION_DATE=2026-11-30 - BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libftgl.so:graphics/ftgl \ libpng.so:graphics/png \ libtinyxml2.so:textproc/tinyxml2 USES= cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= AquariaOSE GH_PROJECT= Aquaria CMAKE_ARGS= -DAQUARIA_DEFAULT_DATA_DIR:PATH="${DATADIR}" CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_FTGL \ AQUARIA_INTERNAL_LUA \ AQUARIA_INTERNAL_OGGVORBIS \ AQUARIA_INTERNAL_OPENAL \ AQUARIA_INTERNAL_PNG \ AQUARIA_INTERNAL_SDL \ AQUARIA_INTERNAL_TINYXML2 \ AQUARIA_INTERNAL_ZLIB LDFLAGS+= -Wl,--as-needed # avoid overlinking (vorbis deps) LDFLAGS_i386= -Wl,-z,notext -Wl,--no-check-dynamic-relocations CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_transform is an experimental extension DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ "${DATADIR}/${PORTNAME}.png" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} SUB_FILES= pkg-message PLIST_FILES= bin/aquaria PORTDATA= * OPTIONS_DEFINE= SDL2 OPTIONS_DEFAULT=SDL2 SDL2_DESC= Use SDL 2.x instead of SDL 1.2.x SDL2_USE= SDL=sdl2 SDL2_USE_OFF= SDL=sdl SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2 EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ libogg-* libvorbis-* lua-* tinyxml2* do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .for d in game_scripts files (cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} \ "." ${STAGEDIR}${DATADIR}/override) .endfor .include diff --git a/games/aquaria/distinfo b/games/aquaria/distinfo index d26b1ffeb47f..dc1d25df18b0 100644 --- a/games/aquaria/distinfo +++ b/games/aquaria/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1663028357 -SHA256 (AquariaOSE-Aquaria-OSE-v1.002-22-g84366ad_GH0.tar.gz) = a2e0d965c1342b5d19ed7de821339f23bf550c07608169eed3538e86b9d01842 -SIZE (AquariaOSE-Aquaria-OSE-v1.002-22-g84366ad_GH0.tar.gz) = 5725171 -SHA256 (021512337ea0bee698e950e44222fb391ae7cb91.patch) = 1068433969d5661ae64c8a1c66f63b0095ebca40f5b0226d39311a6f79ad419c -SIZE (021512337ea0bee698e950e44222fb391ae7cb91.patch) = 641 +TIMESTAMP = 1789750145 +SHA256 (AquariaOSE-Aquaria-OSE-v1.002-35-g98c51ac_GH0.tar.gz) = 357e6c80cd522a5b98eeca44d3f094c1c466324a59615d85e19c52f723c212ef +SIZE (AquariaOSE-Aquaria-OSE-v1.002-35-g98c51ac_GH0.tar.gz) = 7592474 diff --git a/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp b/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp deleted file mode 100644 index bb0f43a859cc..000000000000 --- a/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp +++ /dev/null @@ -1,15 +0,0 @@ -Aquaria/ScriptInterface.cpp:10412:59: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] -#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix}, - ^ - ---- Aquaria/ScriptInterface.cpp.orig 2016-06-19 23:56:27 UTC -+++ Aquaria/ScriptInterface.cpp -@@ -10409,7 +10409,7 @@ static const struct { - #undef MK_ALIAS - #define MK_FUNC(base, getter, prefix, suffix) luaRegister(prefix##_##suffix), - #define MK_STR(s) #s --#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix}, -+#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix) "_" MK_STR(alias), l_##prefix##_##suffix}, - - EXPAND_FUNC_PROTOTYPES -