update games/minetest to 5.3.0

- disable luajit and use plain lua (cmake is hard, and previous build was already broken and didn't use it)
- use jsoncpp from ports
- enable the testsuite

games/minetest/Makefile

@@ -1,22 +1,19 @@
-# $OpenBSD: Makefile,v 1.31 2020/05/26 20:01:01 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.32 2020/09/09 11:32:12 semarie Exp $
 
 COMMENT =		infinite-world block sandbox game
-# minetest_game is still 0.4.17
-# this is engine's bug fix release
-GAME_V =		0.4.17
-V =			${GAME_V}.1
+GAME_V =		5.3.0
+V =			${GAME_V}
 DISTNAME =		minetest-${V}
 CATEGORIES =		games x11
-REVISION =		5
 
-HOMEPAGE =		http://www.minetest.net/
+HOMEPAGE =		https://www.minetest.net/
 
 # source LGPLv2.1/ datas CC BY-SA 3.0
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
 WANTLIB += Xxf86vm bz2 c curl curses form freetype gmp iconv intl
-WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png pq
+WANTLIB += jsoncpp jpeg ${MODLUA_WANTLIB} m ogg openal png pq
 WANTLIB += spatialindex sqlite3 vorbis vorbisfile z
 
 COMPILER =		base-clang ports-gcc base-gcc
@@ -31,6 +28,7 @@ MODULES =		devel/cmake \
 
 CONFIGURE_ARGS =	-DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
 CONFIGURE_ARGS+=	-DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
+CONFIGURE_ARGS+=	-DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
 CONFIGURE_ARGS+=	-DBUILD_SERVER=TRUE
 CONFIGURE_ENV +=	CXXFLAGS="-I${X11BASE}/include"
 
@@ -39,25 +37,32 @@ BUILD_DEPENDS =		devel/gettext,-tools
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+3,-guic
 
-LIB_DEPENDS =		audio/openal \
+LIB_DEPENDS =		${MODLUA_LIB_DEPENDS} \
+			audio/openal \
+			devel/jsoncpp \
 			devel/gmp \
 			databases/sqlite3 \
 			databases/postgresql \
 			geo/spatialindex \
 			audio/libvorbis \
-			lang/luajit \
 			net/curl \
 			x11/irrlicht
 
-NO_TEST =		Yes
+TEST_DEPENDS =		${FULLPKGNAME}:${BUILD_PKGPATH}
+TEST_ENV +=		HOME=${WRKBUILD}/test
 
 # Use system cmake modules
-pre-configure:
+post-patch:
 	rm ${WRKSRC}/cmake/Modules/FindLua*
 
 post-install:
 	mv ${WRKDIR}/minetest_game-${GAME_V}/ \
-	${PREFIX}/share/minetest/games/minetest_game
+		${PREFIX}/share/minetest/games/minetest_game
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
 
+do-test:
+	mkdir -p ${WRKBUILD}/test
+	cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+		${LOCALBASE}/bin/minetest --run-unittests
+
 .include <bsd.port.mk>

games/minetest/distinfo

@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.17.1.tar.gz) = zSXUDFP0kjJe2r0vY5clD0CmHLn+Sh1N1usDDg0c61k=
-SHA256 (minetest-game-0.4.17.tar.gz) = 8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
-SIZE (minetest-0.4.17.1.tar.gz) = 7758675
-SIZE (minetest-game-0.4.17.tar.gz) = 1356784
+SHA256 (minetest-5.3.0.tar.gz) = ZdwgSfJMk/pURQDzEKYeKJwbj6R79gh3t0aiwnpyONY=
+SHA256 (minetest-game-5.3.0.tar.gz) = BsbB1Ll68hHdD6UYo+aKIF9ZTpgWpLJHfkjU0h0nji0=
+SIZE (minetest-5.3.0.tar.gz) = 10828893
+SIZE (minetest-game-5.3.0.tar.gz) = 1904865

games/minetest/patches/patch-cmake_Modules_FindGMP_cmake

@@ -1,16 +0,0 @@
-$OpenBSD: patch-cmake_Modules_FindGMP_cmake,v 1.1 2018/06/25 20:44:13 landry Exp $
-
-fix libgmp detection
-
-Index: cmake/Modules/FindGMP.cmake
---- cmake/Modules/FindGMP.cmake.orig
-+++ cmake/Modules/FindGMP.cmake
-@@ -3,7 +3,7 @@ mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR)
- set(USE_SYSTEM_GMP FALSE)
- 
- if(ENABLE_SYSTEM_GMP)
--	find_library(GMP_LIBRARY NAMES libgmp.so)
-+	find_library(GMP_LIBRARY NAMES gmp)
- 	find_path(GMP_INCLUDE_DIR NAMES gmp.h)
- 
- 	if(GMP_LIBRARY AND GMP_INCLUDE_DIR)

games/minetest/patches/patch-src_CMakeLists_txt

@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.13 2018/06/25 20:02:06 landry Exp $
-Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -756,14 +756,12 @@ else()
- 		set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
- 	endif()
- 
--	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
-+	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall")
- 	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
- 		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|FreeBSD)")
- 	set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
--	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
-+	set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
- 
- 	if(USE_GPROF)
- 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")

games/minetest/patches/patch-src_porting_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_porting_cpp,v 1.6 2020/09/09 11:32:12 semarie Exp $
+Define environ variable on OpenBSD.
+
+https://github.com/minetest/minetest/commit/9c7340104a7ec4007e3dfe0bb4482f3c8f9878e0
+
+Index: src/porting.cpp
+--- src/porting.cpp.orig
++++ src/porting.cpp
+@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software 
+ 
+ #include "porting.h"
+ 
+-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+ 	#include <sys/types.h>
+ 	#include <sys/sysctl.h>
+ 	extern char **environ;

games/minetest/patches/patch-src_unittest_test_threading_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_unittest_test_threading_cpp,v 1.1 2020/09/09 11:32:12 semarie Exp $
+Disable testThreadKill test - see https://github.com/minetest/minetest/issues/6065
+
+Index: src/unittest/test_threading.cpp
+--- src/unittest/test_threading.cpp.orig
++++ src/unittest/test_threading.cpp
+@@ -40,7 +40,7 @@ static TestThreading g_test_instance;
+ void TestThreading::runTests(IGameDef *gamedef)
+ {
+ 	TEST(testStartStopWait);
+-	TEST(testThreadKill);
++	//TEST(testThreadKill);
+ 	TEST(testAtomicSemaphoreThread);
+ }
+