Index: head/games/minetest/Makefile
===================================================================
--- head/games/minetest/Makefile	(revision 556908)
+++ head/games/minetest/Makefile	(revision 556909)
@@ -1,123 +1,123 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	minetest
 PORTVERSION=	5.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Near-infinite-world block sandbox game
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
-		libgmp.so:math/gmp
+		libgmp.so:math/gmp \
+		libjsoncpp.so:devel/jsoncpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
 
 USES=		cmake compiler:c11 iconv:wchar_t
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
-		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
+		-DENABLE_SYSTEM_JSONCPP=ON
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	CURL SOUND FREETYPE NCURSES LUAJIT \
 		DOCS EXAMPLES NLS
 OPTIONS_MULTI=	COMP
 OPTIONS_GROUP=	DATABASE
 
 COMP_DESC=		Software components
 OPTIONS_MULTI_COMP=	CLIENT SERVER
 
 DATABASE_DESC=		Database support
 OPTIONS_GROUP_DATABASE=	PGSQL LEVELDB REDIS SPATIAL
 
 OPTIONS_DEFAULT=	CLIENT SERVER \
 			CURL SOUND FREETYPE 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
 CLIENT_USES=		gl jpeg xorg
 CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
 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
 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
 
 LUAJIT_DESC=		LuaJIT support
 LUAJIT_CMAKE_BOOL=	ENABLE_LUAJIT REQUIRE_LUAJIT
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 
 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
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 .endif
 
 .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
 
 # 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
-# bundled jsoncpp is OK, see comment in cmake/Modules/FindJson.cmake
-#    (not sure if it affects FreeBSD, but too lazy to investigate)
+	@${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
 
 .include <bsd.port.mk>
Index: head/games/minetest/files/patch-src_CMakeLists.txt
===================================================================
--- head/games/minetest/files/patch-src_CMakeLists.txt	(revision 556908)
+++ head/games/minetest/files/patch-src_CMakeLists.txt	(revision 556909)
@@ -1,26 +1,25 @@
---- src/CMakeLists.txt.orig	2020-01-11 18:29:02 UTC
+--- src/CMakeLists.txt.orig	2020-07-09 20:04:20 UTC
 +++ src/CMakeLists.txt
-@@ -485,6 +485,7 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1)
+@@ -517,9 +517,13 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1)
+ 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
  endif()
  
- include_directories(
-+	${JSON_INCLUDE_DIR}
+-include_directories(
++include_directories(BEFORE
  	${PROJECT_BINARY_DIR}
  	${PROJECT_SOURCE_DIR}
++	${PROJECT_SOURCE_DIR}/script
++)
++
++include_directories(
  	${IRRLICHT_INCLUDE_DIR}
-@@ -495,7 +496,6 @@ include_directories(
- 	${SQLITE3_INCLUDE_DIR}
- 	${LUA_INCLUDE_DIR}
+ 	${ZLIB_INCLUDE_DIR}
+ 	${PNG_INCLUDE_DIR}
+@@ -529,7 +533,6 @@ include_directories(
  	${GMP_INCLUDE_DIR}
--	${JSON_INCLUDE_DIR}
+ 	${JSON_INCLUDE_DIR}
  	${X11_INCLUDE_DIR}
- 	${PROJECT_SOURCE_DIR}/script
+-	${PROJECT_SOURCE_DIR}/script
  )
-@@ -715,7 +715,6 @@ else()
  
- 	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
- 	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
--		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
- 	else()
- 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer")
- 	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
+ if(USE_GETTEXT)
Index: head/games/minetest/pkg-plist
===================================================================
--- head/games/minetest/pkg-plist	(revision 556908)
+++ head/games/minetest/pkg-plist	(revision 556909)
@@ -1,58 +1,58 @@
 %%CLIENT%%bin/minetest
 %%SERVER%%bin/minetestserver
 @sample etc/minetest.conf.example etc/minetest.conf
 man/man6/minetest.6.gz
 man/man6/minetestserver.6.gz
 share/applications/net.minetest.minetest.desktop
 share/icons/hicolor/128x128/apps/minetest.png
 share/icons/hicolor/scalable/apps/minetest.svg
-%%NLS%%share/locale/ar/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/da/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/de/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/dv/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/el/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/es/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/et/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/fil/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/gd/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/id/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/it/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ja_KS/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/jbo/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/kn/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/lo/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ms_Arab/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/my/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/sr_Cyrl/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/sw/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/th/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/minetest.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/ar/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/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/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/ja_KS/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/lo/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/ms/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/ms_Arab/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/my/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/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/sv/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/sw/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/th/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/tr/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/zh_CN/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/minetest.mo
 share/metainfo/net.minetest.minetest.appdata.xml