diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 48d51bcfee0a..299d7e137c3e 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,78 +1,77 @@ PORTNAME= warzone2100 -DISTVERSION= 4.6.1 -PORTREVISION= 1 +DISTVERSION= 4.6.2 CATEGORIES= games MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME}_src DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Innovative 3D real-time strategy game WWW= https://wz2100.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= 7zz:archivers/7-zip \ a2x:textproc/asciidoc LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libminiupnpc.so:net/miniupnpc \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libopusfile.so:audio/opusfile \ libphysfs.so:devel/physfs \ libpng.so:graphics/png \ libprotobuf.so:devel/protobuf \ libsodium.so:security/libsodium \ libtheoradec.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis \ libzip.so:archivers/libzip RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USES= cmake bison compiler:c++11-lib gl openal:al pkgconfig \ sdl sqlite tar:xz USE_GL= gl -USE_SDL= sdl2 +USE_SDL= sdl3 CMAKE_ON= WZ_DISABLE_FETCHCONTENT_GIT_CLONE \ CMAKE_DISABLE_FIND_PACKAGE_Asciidoctor \ CMAKE_DISABLE_FIND_PACKAGE_Git \ FETCHCONTENT_FULLY_DISCONNECTED CMAKE_OFF= FMT_INSTALL \ WZ_DOWNLOAD_PREBUILT_PACKAGES \ WZ_ENABLE_WARNINGS_AS_ERRORS \ WZ_FORCE_MINIMAL_OPUSFILE CMAKE_ARGS= -DWZ_DISTRIBUTOR="FreeBSD ports" WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= VULKAN FRIBIDI DOCS NLS OPTIONS_DEFAULT=VULKAN FRIBIDI OPTIONS_SUB= yes NLS_USES= gettext NLS_CMAKE_BOOL= ENABLE_NLS VULKAN_DESC= Enable Vulkan backend VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \ ${LOCALBASE}/bin/glslc:graphics/shaderc VULKAN_CMAKE_BOOL= WZ_ENABLE_BACKEND_VULKAN FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Fribidi=TRUE post-patch: @${FIND} ${WRKSRC} -type f -iname "*cmake*" -exec \ ${REINPLACE_CMD} -i '' -e '/find_package(Git/d' {} \; post-extract: .for bundled in miniupnp SQLiteCpp/sqlite3 @${RM} -rf ${WRKSRC}/3rdparty/${bundled} .endfor @${RM} -rf ${WRKSRC}/lib/sound/3rdparty .include diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index 0221650058a9..4febbf23e3cc 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758122255 -SHA256 (warzone2100-4.6.1/warzone2100_src.tar.xz) = 26ac5538460243f8a149d31264da71caa4d33ef6a8010037eff24e77278ca50b -SIZE (warzone2100-4.6.1/warzone2100_src.tar.xz) = 492456208 +TIMESTAMP = 1765299530 +SHA256 (warzone2100-4.6.2/warzone2100_src.tar.xz) = 856216dabeaf2e03ae8f7e758c395b27d21889fe8b5fe45f3afce700fde7d71f +SIZE (warzone2100-4.6.2/warzone2100_src.tar.xz) = 491311612 diff --git a/games/warzone2100/files/patch-cmake_FindZIP.cmake b/games/warzone2100/files/patch-cmake_FindZIP.cmake deleted file mode 100644 index 62eb09120fae..000000000000 --- a/games/warzone2100/files/patch-cmake_FindZIP.cmake +++ /dev/null @@ -1,22 +0,0 @@ ---- cmake/FindZIP.cmake.orig 2021-04-18 18:28:41 UTC -+++ cmake/FindZIP.cmake -@@ -29,8 +29,8 @@ set(_PF32BIT "ProgramFiles(x86)") - # - - # Search for 7-Zip --find_program(ZIP_EXECUTABLE NAMES 7z 7za PATHS "$ENV{ProgramFiles}/7-Zip" "$ENV{${_PF32BIT}}/7-Zip" "$ENV{ProgramW6432}/7-Zip") --if(ZIP_EXECUTABLE MATCHES "7z|7za") -+find_program(ZIP_EXECUTABLE NAMES 7zz REQUIRED) -+if(ZIP_EXECUTABLE MATCHES "7zz") - # Test whether 7-Zip supports the "-bb0" option to disable log output - execute_process(COMMAND ${ZIP_EXECUTABLE} i -bb0 - RESULT_VARIABLE 7z_bb_result -@@ -110,7 +110,7 @@ function(COMPRESS_ZIP) - message( FATAL_ERROR "Unsupported compression level \"${_parsedArguments_COMPRESSION_LEVEL}\" (must be: 0, 1, 3, 5, 7, 9)" ) - endif() - -- if(ZIP_EXECUTABLE MATCHES "7z|7za") -+ if(ZIP_EXECUTABLE MATCHES "7zz") - set(_zipExecutableOptions a -tzip -mtc=off) - if(DEFINED _parsedArguments_COMPRESSION_LEVEL) - # 7z command-line option for compression level (when in ZIP mode) is: "-mx=#" diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt deleted file mode 100644 index 6f307e792659..000000000000 --- a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/sdl/CMakeLists.txt.orig 2022-11-02 16:53:49 UTC -+++ lib/sdl/CMakeLists.txt -@@ -55,14 +55,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 - find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET) - endif() - if(SDL2_FOUND) -- if (TARGET SDL2::SDL2-static) -- # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates -- get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES) -- test_link_to_sdl_target(SDL2::SDL2-static FALSE LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) -- if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) -- set(_sdl2_library SDL2::SDL2-static) -- endif() -- endif() - if (NOT _sdl2_library AND TARGET SDL2::SDL2) - # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates - get_target_property(_sdl2_include_dir SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES) diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist index 65f0635553e9..1492fd61b1f1 100644 --- a/games/warzone2100/pkg-plist +++ b/games/warzone2100/pkg-plist @@ -1,61 +1,64 @@ bin/warzone2100 share/man/man6/warzone2100.6.gz share/applications/net.wz2100.warzone2100.desktop share/icons/net.wz2100.warzone2100.png %%NLS%%share/locale/ar_SA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/bg_BG/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ca_ES/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ca_ES/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/cs/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/cs/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/da/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/de/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/de/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/el/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/eo/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/es/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/es/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/et_EE/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fa_IR/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fi/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fr/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/fr/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/fy/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ga/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/he_IL/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/hr/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/hu/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/hu/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/id/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/id/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/it/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/it/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/ko/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/la/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/lt/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/my_MM/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/nb/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/nl/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/nl/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/pl/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/pl/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/pt/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/ro/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ru/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ru/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/sk/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/sl/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/sr_CS/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/sr_CS/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/tr/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/tr/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/tt_RU/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/uk_UA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/uk_UA/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100_guide.mo share/metainfo/net.wz2100.warzone2100.metainfo.xml