games/minetest: update 5.4.1 → 5.5.0

5 files changed, 18 insertions, 54 deletions

diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 16231068d41b..4d3d2ff3cca6 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	minetest
-PORTVERSION=	5.4.1
-PORTREVISION=	2
+PORTVERSION=	5.5.0
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -10,10 +9,12 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
-		libjsoncpp.so:devel/jsoncpp
+		libjsoncpp.so:devel/jsoncpp \
+		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c11 iconv:wchar_t sqlite
 USE_GITHUB=	yes
+GH_TUPLE=	minetest:irrlicht:d3132e0:irrlicht/lib/irrlichtmt
 
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
 		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
@@ -26,7 +27,7 @@ PORTSCOUT=	skipv:5.4.2-android
 PORTDATA=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	CURL SOUND FREETYPE NCURSES LUAJIT \
+OPTIONS_DEFINE=	CURL SOUND NCURSES LUAJIT \
 		DOCS EXAMPLES NLS
 OPTIONS_MULTI=	COMP
 OPTIONS_GROUP=	DATABASE
@@ -38,13 +39,13 @@ DATABASE_DESC=		Database support
 OPTIONS_GROUP_DATABASE=	PGSQL LEVELDB REDIS SPATIAL
 
 OPTIONS_DEFAULT=	CLIENT SERVER \
-			CURL SOUND FREETYPE NCURSES LUAJIT
+			CURL SOUND NCURSES LUAJIT
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build client
 CLIENT_CMAKE_BOOL=	BUILD_CLIENT
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
-			libIrrlicht.so:x11-toolkits/irrlicht
+			libfreetype.so:print/freetype2
 CLIENT_USES=		gl jpeg xorg
 CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
 SERVER_DESC=		Build server
@@ -55,9 +56,6 @@ CURL_CMAKE_BOOL=	ENABLE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 SOUND_DESC=		Enable sound
 SOUND_CMAKE_BOOL=	ENABLE_SOUND
-FREETYPE_DESC=		Support for TrueType fonts with unicode
-FREETYPE_CMAKE_BOOL=	ENABLE_FREETYPE
-FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 NCURSES_DESC=		Enable ncurses console
 NCURSES_CMAKE_BOOL=	ENABLE_CURSES
 NCURSES_USES=		ncurses
@@ -96,14 +94,6 @@ USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 .endif
 
-# hacky way to not bring irrlicht and X11 depends for server only
-.if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
-BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
-IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
-CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
-.endif
-
 post-extract:
 # make sure no bundled gmp is used
 	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
diff --git a/games/minetest/distinfo b/games/minetest/distinfo
index f2e09c07a58f..55f381a19a18 100644
--- a/games/minetest/distinfo
+++ b/games/minetest/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1618146422
-SHA256 (minetest-minetest-5.4.1_GH0.tar.gz) = de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e
-SIZE (minetest-minetest-5.4.1_GH0.tar.gz) = 11209289
+TIMESTAMP = 1644232113
+SHA256 (minetest-minetest-5.5.0_GH0.tar.gz) = 8b9bef6054c8895cc3329ae6d05cb355eef9c7830600d82dc9eaa4664f87c8f9
+SIZE (minetest-minetest-5.5.0_GH0.tar.gz) = 9558895
+SHA256 (minetest-irrlicht-d3132e0_GH0.tar.gz) = 0a26c999af70994f6680ae5e589e4d5231cb0a989a73f0b63e6bc924f5cf7721
+SIZE (minetest-irrlicht-d3132e0_GH0.tar.gz) = 4158424
diff --git a/games/minetest/files/extra-patch-irrlichtdepend b/games/minetest/files/extra-patch-irrlichtdepend
deleted file mode 100644
index d3b9998681a3..000000000000
--- a/games/minetest/files/extra-patch-irrlichtdepend
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2015-08-20 02:02:00 UTC
-+++ CMakeLists.txt
-@@ -55,7 +55,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
- 
- 
- # This is done here so that relative search paths are more reasonable
--find_package(Irrlicht)
-+set(IRRLICHT_LIBRARY "")
- 
- 
- # Installation
diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 83617a6d4002..000000000000
--- a/games/minetest/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git src/CMakeLists.txt src/CMakeLists.txt
-index 9526e88f9..06cb0d604 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -758,7 +758,14 @@ else()
- 		check_c_source_compiles("#ifndef __aarch64__\n#error\n#endif\nint main(){}" IS_AARCH64)
- 		if(IS_AARCH64)
- 			# Move text segment below LuaJIT's 47-bit limit (see issue #9367)
--			SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment=0x200000000")
-+			if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+				# XXX: lld linke needs another option; not sure how to check for lld specifically,
-+				# so just checking for FreeBSD (which uses lld) for now. I'm also not sure if its
-+				# equivalent replacement and haven't runtested it, but it at least builds
-+				SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--image-base=0x200000000")
-+			else()
-+				SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment=0x200000000")
-+			endif()
- 		endif()
- 	endif()
- 
diff --git a/games/minetest/pkg-plist b/games/minetest/pkg-plist
index 522fdee62908..2d8bc350bc8f 100644
--- a/games/minetest/pkg-plist
+++ b/games/minetest/pkg-plist
@@ -12,27 +12,28 @@ share/icons/hicolor/scalable/apps/minetest.svg
 %%CLIENT%%%%NLS%%share/locale/cs/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/dv/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/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/gd/LC_MESSAGES/minetest.mo
 %%CLIENT%%%%NLS%%share/locale/gl/LC_MESSAGES/minetest.mo
-%%CLIENT%%%%NLS%%share/locale/hi/LC_MESSAGES/minetest.mo
 %%CLIENT%%%%NLS%%share/locale/hu/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/kk/LC_MESSAGES/minetest.mo
-%%CLIENT%%%%NLS%%share/locale/kn/LC_MESSAGES/minetest.mo
 %%CLIENT%%%%NLS%%share/locale/ko/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/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
@@ -49,8 +50,10 @@ share/icons/hicolor/scalable/apps/minetest.svg
 %%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/minetest.mo
 %%CLIENT%%%%NLS%%share/locale/sw/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/metainfo/net.minetest.minetest.appdata.xml