Index: games/minetest/Makefile
===================================================================
--- games/minetest/Makefile	(revision 502236)
+++ games/minetest/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minetest
-PORTVERSION=	0.4.17.1
+PORTVERSION=	5.0.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -25,10 +25,14 @@
 PORTDATA=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL PGSQL
-OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT
+OPTIONS_DEFINE=	CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL \
+		PGSQL GAME
+OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT GAME
 OPTIONS_SUB=	yes
 
+OPTIONS_MULTI=	EXECUTABLES
+OPTIONS_MULTI_EXECUTABLES= CLIENT SERVER
+
 CLIENT_DESC=	Build client
 SERVER_DESC=	Build server
 CURL_DESC=	Enable cURL support for fetching media
@@ -38,13 +42,14 @@
 FREETYPE_DESC=	Support for TrueType fonts with unicode
 LUAJIT_DESC=	LuaJIT support
 SPATIAL_DESC=	Enable SpatialIndex AreaStore backend
+GAME_DESC=	Depend on minetest_game
 
 CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
 CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
 			libIrrlicht.so:x11-toolkits/irrlicht
-CLIENT_USES=		jpeg
-CLIENT_USE=		GL=gl XORG=x11,xext
+CLIENT_USES=		jpeg gl
+CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
 SERVER_CMAKE_BOOL=	BUILD_SERVER
 CURL_CMAKE_BOOL=	ENABLE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
@@ -64,6 +69,7 @@
 SPATIAL_CMAKE_BOOL=	ENABLE_SPATIAL
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_BOOL=	ENABLE_POSTGRESQL
+GAME_RUN_DEPENDS=	minetest_game>0:games/minetest_game
 
 .include <bsd.port.options.mk>
 
@@ -79,6 +85,7 @@
 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
Index: games/minetest/distinfo
===================================================================
--- games/minetest/distinfo	(revision 502236)
+++ games/minetest/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528743956
-SHA256 (minetest-minetest-0.4.17.1_GH0.tar.gz) = cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59
-SIZE (minetest-minetest-0.4.17.1_GH0.tar.gz) = 7758675
+TIMESTAMP = 1558454881
+SHA256 (minetest-minetest-5.0.1_GH0.tar.gz) = aa771cf178ad1b436d5723e5d6dd24e42b5d56f1cfe9c930f6426b7f24bb1635
+SIZE (minetest-minetest-5.0.1_GH0.tar.gz) = 8761122
Index: games/minetest/files/patch-src_CMakeLists.txt
===================================================================
--- games/minetest/files/patch-src_CMakeLists.txt	(revision 502236)
+++ games/minetest/files/patch-src_CMakeLists.txt	(working copy)
@@ -1,10 +1,10 @@
---- src/CMakeLists.txt.orig	2018-06-03 15:35:20 UTC
-+++ src/CMakeLists.txt
-@@ -758,7 +758,6 @@ else()
+--- src/CMakeLists.txt.orig	2019-05-21 14:57:25.632170000 -0700
++++ src/CMakeLists.txt	2019-05-21 14:57:39.814841000 -0700
+@@ -729,7 +729,6 @@
  
  	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
- 	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
+ 	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|FreeBSD)")
+ 	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
Index: games/minetest_game/Makefile
===================================================================
--- games/minetest_game/Makefile	(revision 502220)
+++ games/minetest_game/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minetest_game
-PORTVERSION=	0.4.17
+PORTVERSION=	5.0.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -10,8 +10,6 @@
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	minetest:games/minetest
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
 
Index: games/minetest_game/distinfo
===================================================================
--- games/minetest_game/distinfo	(revision 502220)
+++ games/minetest_game/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528129310
-SHA256 (minetest-minetest_game-0.4.17_GH0.tar.gz) = f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d
-SIZE (minetest-minetest_game-0.4.17_GH0.tar.gz) = 1356784
+TIMESTAMP = 1558454933
+SHA256 (minetest-minetest_game-5.0.1_GH0.tar.gz) = 965d2cf3ac8c822bc9e60fb8f508182fb2f24dde46f46b000caf225ebe2ec519
+SIZE (minetest-minetest_game-5.0.1_GH0.tar.gz) = 1509625