diff --git a/games/minetest/Makefile b/games/minetest/Makefile index 1d73d911f5b9..4a832dee1c9b 100644 --- a/games/minetest/Makefile +++ b/games/minetest/Makefile @@ -1,117 +1,113 @@ PORTNAME= minetest -PORTVERSION= 5.8.0 -PORTREVISION= 1 +PORTVERSION= 5.9.0 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Near-infinite-world block sandbox game WWW= https://www.minetest.net/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt LIB_DEPENDS= libgmp.so:math/gmp \ libjsoncpp.so:devel/jsoncpp \ libzstd.so:archivers/zstd USES= cmake compiler:c++17-lang cpe iconv:wchar_t sqlite USE_GITHUB= yes -# check https://github.com/minetest/minetest/releases for applicable irrlichmt version -GH_TUPLE= minetest:irrlicht:1.9.0mt13:irrlicht/lib/irrlichtmt - CMAKE_ARGS= -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \ CMAKE_ON= ENABLE_SYSTEM_JSONCPP CMAKE_OFF= BUILD_DOCUMENTATION TEST_ENV= ${MAKE_ENV} LC_ALL=C.UTF-8 LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * OPTIONS_DEFINE= CURL SOUND NCURSES LUAJIT TEST \ DOCS EXAMPLES NLS OPTIONS_MULTI= COMP OPTIONS_GROUP= DATABASE OPTIONS_MULTI_COMP= CLIENT SERVER OPTIONS_GROUP_DATABASE= PGSQL LEVELDB REDIS SPATIAL OPTIONS_DEFAULT= CLIENT SERVER \ CURL SOUND NCURSES LUAJIT OPTIONS_SUB= yes COMP_DESC= Software components DATABASE_DESC= Database support CLIENT_DESC= Build client CLIENT_CMAKE_BOOL= BUILD_CLIENT CLIENT_LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 CLIENT_USES= gl jpeg xorg CLIENT_USE= GL=gl XORG=x11,xext,xi SERVER_DESC= Build server SERVER_CMAKE_BOOL= BUILD_SERVER CURL_DESC= Enable cURL support for fetching media CURL_CMAKE_BOOL= ENABLE_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl SOUND_DESC= Enable sound SOUND_CMAKE_BOOL= ENABLE_SOUND NCURSES_DESC= Enable ncurses console NCURSES_CMAKE_BOOL= ENABLE_CURSES NCURSES_USES= ncurses LUAJIT_DESC= LuaJIT support LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT REQUIRE_LUAJIT LUAJIT_USES= luajit:luajit-openresty PGSQL_USES= pgsql PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL LEVELDB_DESC= Enable LevelDB backend LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb REDIS_DESC= Enable Redis backend REDIS_CMAKE_BOOL= ENABLE_REDIS REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis SPATIAL_DESC= Enable SpatialIndex AreaStore backend SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL NLS_CMAKE_BOOL= ENABLE_GETTEXT NLS_USES= gettext NLS_LDFLAGS= -L${LOCALBASE}/lib TEST_CMAKE_BOOL= BUILD_UNITTESTS .include .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} USES+= openal LIB_DEPENDS+= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg .endif .if ${PORT_OPTIONS:MSERVER} USE_RC_SUBR= ${PORTNAME} USERS= ${PORTNAME} GROUPS= ${PORTNAME} .endif post-extract: # make sure no bundled gmp is used @${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp # bundled lua is OK, there's no option to use system one post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake do-test-TEST-on: .if ${PORT_OPTIONS:MCLIENT} cd ${WRKDIR} && ${SETENV} ${TEST_ENV} ${STAGEDIR}${PREFIX}/bin/minetest --run-unittests .endif .if ${PORT_OPTIONS:MSERVER} cd ${WRKDIR} && ${SETENV} ${TEST_ENV} ${STAGEDIR}${PREFIX}/bin/minetestserver --run-unittests .endif .include diff --git a/games/minetest/distinfo b/games/minetest/distinfo index 5995527e81f2..203c9caf5d49 100644 --- a/games/minetest/distinfo +++ b/games/minetest/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1709305325 -SHA256 (minetest-minetest-5.8.0_GH0.tar.gz) = 610c85a24d77acdc3043a69d777bed9e6c00169406ca09df22ad490fe0d68c0c -SIZE (minetest-minetest-5.8.0_GH0.tar.gz) = 10419348 -SHA256 (minetest-irrlicht-1.9.0mt13_GH0.tar.gz) = 2fde8e27144988210b9c0ff1e202905834d9d25aaa63ce452763fd7171096adc -SIZE (minetest-irrlicht-1.9.0mt13_GH0.tar.gz) = 754056 +TIMESTAMP = 1723465022 +SHA256 (minetest-minetest-5.9.0_GH0.tar.gz) = 070bc292a0b7fc60d7ff0a14b364c8229c5cbe38296a80f948ea2c2591545a5c +SIZE (minetest-minetest-5.9.0_GH0.tar.gz) = 11984514 diff --git a/games/minetest/files/patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp b/games/minetest/files/patch-irr_src_CIrrDeviceLinux.cpp similarity index 61% rename from games/minetest/files/patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp rename to games/minetest/files/patch-irr_src_CIrrDeviceLinux.cpp index 04adbc660dfb..0715079f6989 100644 --- a/games/minetest/files/patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp +++ b/games/minetest/files/patch-irr_src_CIrrDeviceLinux.cpp @@ -1,13 +1,15 @@ ---- lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.cpp.orig 2023-10-27 15:48:29 UTC -+++ lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.cpp +https://github.com/minetest/minetest/pull/14962 + +--- irr/src/CIrrDeviceLinux.cpp.orig 2024-08-11 15:54:55 UTC ++++ irr/src/CIrrDeviceLinux.cpp @@ -45,6 +45,10 @@ #include #endif +#ifdef _IRR_COMPILE_WITH_X11_ +#include // for getpid() +#endif + #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ #include #include diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt deleted file mode 100644 index c9391d6c1612..000000000000 --- a/games/minetest/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with CMake >= 3.28.0. FREETYPE_LIBRARY has not officially been -part of the user-facing interface of the FindFreetype module since CMake -2.6.0 [1] and has only been coincidentally defined up until this point. - -[1] https://gitlab.kitware.com/cmake/cmake/-/commit/d18fb61c76c720ec5b1ac2cc4f30a5beaf071c33 - ---- src/CMakeLists.txt.orig 2023-04-08 16:04:52 UTC -+++ src/CMakeLists.txt -@@ -542,7 +542,7 @@ if(BUILD_CLIENT) - ${GMP_LIBRARY} - ${JSON_LIBRARY} - ${LUA_BIT_LIBRARY} -- ${FREETYPE_LIBRARY} -+ ${FREETYPE_LIBRARIES} - ${PLATFORM_LIBS} - ) - if(NOT USE_LUAJIT) diff --git a/games/minetest/pkg-plist b/games/minetest/pkg-plist index d030f586da88..21d08db3e0c9 100644 --- a/games/minetest/pkg-plist +++ b/games/minetest/pkg-plist @@ -1,67 +1,69 @@ %%CLIENT%%bin/minetest %%SERVER%%bin/minetestserver @sample etc/minetest.conf.example etc/minetest.conf share/applications/net.minetest.minetest.desktop share/icons/hicolor/128x128/apps/minetest.png share/icons/hicolor/scalable/apps/minetest.svg %%CLIENT%%%%NLS%%share/locale/be/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/bg/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ca/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/cs/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/cy/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/de/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/el/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/eo/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/es/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/et/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/eu/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/fa/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/fi/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/fil/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/fr/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ga/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/gd/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/gl/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/hu/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ia/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/id/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/it/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ja/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/jbo/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/jv/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/kk/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ko/LC_MESSAGES/minetest.mo +%%CLIENT%%%%NLS%%share/locale/kv/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ky/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/lt/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/lv/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/lzh/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/mi/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/mn/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/mr/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ms/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/nb/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/nl/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/nn/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/oc/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/pl/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/pt/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ro/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/ru/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sk/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sr_Cyrl/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sr_Latn/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/sw/LC_MESSAGES/minetest.mo +%%CLIENT%%%%NLS%%share/locale/tok/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/tr/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/tt/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/uk/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/vi/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/yue/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/minetest.mo %%CLIENT%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/minetest.mo share/man/man6/minetest.6.gz share/man/man6/minetestserver.6.gz -share/metainfo/net.minetest.minetest.appdata.xml +share/metainfo/net.minetest.minetest.metainfo.xml