- Update minetest and minetest_game to 0.4.8

- Support staging
- Add rc.d script for minetestserver

PR:		178244
Submitted by:	Kevin Zheng <kevinz5000@gmail.com>, Oleg Alexeenkov <proller@yandex-team.ru>

11 files changed, 132 insertions, 495 deletions

diff --git a/GIDs b/GIDs
index b26e4750a65e..243ff7bc0dbe 100644
--- a/GIDs
+++ b/GIDs
@@ -266,5 +266,6 @@ plex:*:972:
 boinc:*:973:
 radicale:*:974:
 unifi:*:975:
+minetest:*:976:
 nogroup:*:65533:
 nobody:*:65534:
diff --git a/UIDs b/UIDs
index 6c27ef362c29..0bd1a551508c 100644
--- a/UIDs
+++ b/UIDs
@@ -272,4 +272,5 @@ plex:*:972:972::0:0:Plex Media Server:/nonexistent:/usr/sbin/nologin
 boinc:*:973:973::0:0:BOINC user:/var/db/boinc:/usr/sbin/nologin
 radicale:*:974:974::0:0:Radicale daemon:/nonexistent:/usr/sbin/nologin
 unifi:*:975:975::0:0:Unifi Wireless Controller:/nonexistent:/usr/sbin/nologin
+minetest:*:976:976::0:0:& server:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 6383dbf464d0..dc90051d1321 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -2,88 +2,71 @@
 # $FreeBSD$
 
 PORTNAME=	minetest
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.8
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	An Infiniminer/Minecraft inspired game
-
-LIB_DEPENDS=	Irrlicht:${PORTSDIR}/x11-toolkits/irrlicht \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+COMMENT=	Infiniminer/Minecraft inspired game
 
 LICENSE=	LGPL21
 
+LIB_DEPENDS=	libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht \
+		sqlite3:${PORTSDIR}/databases/sqlite3
+
 USE_GITHUB=	yes
-GH_ACCOUNT=	celeron55
-GH_TAGNAME=	0.4.4
-GH_COMMIT=	ab06fca
+GH_ACCOUNT=	minetest
+GH_COMMIT=	122875c
 
 USES=		cmake
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
-		-DCUSTOM_EXAMPLE_CONF_DIR="${EXAMPLESDIR}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc"
 
+PORTDATA=	*
 PORTDOCS=	*
-PORTEXAMPLES=	*
 
-MAN6=		minetest.6 minetestserver.6
+OPTIONS_DEFINE=	CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES
+OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	CLIENT SERVER SOUND NLS DOCS EXAMPLES
-OPTIONS_DEFAULT=CLIENT SERVER SOUND NLS DOCS EXAMPLES
 CLIENT_DESC=	Build client
 SERVER_DESC=	Build server
+CURL_DESC=	Enable cURL support for fetching media
 SOUND_DESC=	Enable sound
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
+CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
+CLIENT_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+			libpng.so:${PORTSDIR}/graphics/png
+CLIENT_USE=		GL=gl XORG=x11
+SERVER_CMAKE_ON=	-DBUILD_SERVER=1
+SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
+CURL_CMAKE_ON=		-DENABLE_CURL=1
+CURL_CMAKE_OFF=		-DENABLE_CURL=0
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+NLS_CMAKE_ON=		-DENABLE_GETTEXT=1
+NLS_CMAKE_OFF=		-DENABLE_GETTEXT=0
+NLS_USES=		gettext
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
+SOUND_CMAKE_ON=		-DENABLE_SOUND=1
+SOUND_CMAKE_OFF=	-DENABLE_SOUND=0
 
-.if ${PORT_OPTIONS:MNLS}
-CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=YES
-USES+=		gettext
-LDFLAGS+=	-L${LOCALBASE}/lib
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=NO
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCLIENT}
-USE_GL=		gl
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
-CMAKE_ARGS+=	-DBUILD_CLIENT=1
-PLIST_SUB+=	CLIENT=""
-.else
-CMAKE_ARGS+=	-DBUILD_CLIENT=0
-PLIST_SUB+=	CLIENT="@comment "
+.if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
+USE_OPENAL+=	yes
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
-CMAKE_ARGS+=	-DBUILD_SERVER=1
-PLIST_SUB+=	SERVER=""
-.else
-CMAKE_ARGS+=	-DBUILD_SERVER=0
-PLIST_SUB+=	SERVER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSOUND}
-USE_OPENAL=	yes
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
-.else
-CMAKE_ARGS+=	-DENABLE_SOUND:BOOL=OFF
+USE_RC_SUBR=	${PORTNAME}
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/cmake/Modules/FindIrrlicht.cmake
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/cmake/Modules/*.cmake
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|; /find_/ s|LUA_|NO&|g' \
 		${WRKSRC}/src/CMakeLists.txt
-#	@${REINPLACE_CMD} -e 's|share/man|man|; /EXAMPLE_CONF_DIR/ s|..DOCDIR.|"${EXAMPLESDIR}"|' \
-#		${WRKSRC}/CMakeLists.txt
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/install.*DESTINATION.*DOCDIR/I d' ${WRKSRC}/CMakeLists.txt
-.endif
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	@${REINPLACE_CMD} -e '/install.*DESTINATION.*EXAMPLE_CONF_DIR/I d' ${WRKSRC}/CMakeLists.txt
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/minetest/distinfo b/games/minetest/distinfo
index bcc9d87b0f95..3c1ea51c5f93 100644
--- a/games/minetest/distinfo
+++ b/games/minetest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minetest-0.4.4.tar.gz) = 127741d361e8642dd5b7e3aaad4b38bae4c19a5d1b8fac8f5acafbc2225f5de0
-SIZE (minetest-0.4.4.tar.gz) = 2104959
+SHA256 (minetest-0.4.8.tar.gz) = 657329dd4733801617f32f110e527ce6e0fc93d30168683842f881414d28c309
+SIZE (minetest-0.4.8.tar.gz) = 5157034
diff --git a/games/minetest/files/minetest.in b/games/minetest/files/minetest.in
new file mode 100644
index 000000000000..cee509a83010
--- /dev/null
+++ b/games/minetest/files/minetest.in
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: minetest
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable minetest server
+#
+# minetest_enable (bool):  Set to "NO" by default
+#                          Set it to "YES" to enable minetest server
+# minetest_conffile (str): Path to config file (required).
+#                          (default: /usr/local/etc/minetest.conf)
+# minetest_rundir (str):   Path to directory holding a pidfile.
+#                          (default: /var/run/minetest)
+# minetest_user (str):     User to run as
+#                          (default: minetest)
+# minetest_group (str):    Group to run as
+#                          (default: minetest)
+# minetest_logdir (str):   Path to log directory
+#                          (default: /var/log/minetest)
+# minetest_dbdir (str):    Path to world database directory
+#                          (default: /var/db/minetest)
+
+. /etc/rc.subr
+
+name=minetest
+rcvar=minetest_enable
+
+load_rc_config ${name}
+
+: ${minetest_enable="NO"}
+: ${minetest_config="/usr/local/etc/minetest.conf"}
+: ${minetest_rundir="/var/run/minetest"}
+: ${minetest_user="minetest"}
+: ${minetest_group="minetest"}
+: ${minetest_logdir="/var/log/minetest"}
+: ${minetest_dbdir="/var/db/minetest"}
+: ${minetest_args:="--logfile ${minetest_logdir}/debug.log --world ${minetest_dbdir}/world ${minetest_flags}"}
+
+pidfile=
+
+case "${minetest_args}" in
+*--config\ *)
+	echo "Warning \$minetest_args includes --config option." \
+	     "Please use \$minetest_conffile instead."
+	;;
+*)
+	minetest_args="--config ${minetest_config} ${minetest_args}"
+	;;
+esac
+
+command=/usr/sbin/daemon
+procname=/usr/local/bin/minetestserver
+pidfile=${minetest_rundir}/minetest.pid
+command_args="-c -f -p ${pidfile} ${procname} ${minetest_args}"
+required_files=${minetest_config}
+start_precmd=minetest_prestart
+
+minetest_prestart () {
+	if [ ! -d ${minetest_rundir} ]; then
+		mkdir -m 755 -p ${minetest_rundir}
+		chown -R ${minetest_user}:${minetest_group} ${minetest_rundir}
+	fi
+	if [ ! -d ${minetest_logdir} ]; then
+		mkdir -m 755 -p ${minetest_logdir}
+		chown -R ${minetest_user}:${minetest_group} ${minetest_logdir}
+	fi
+	if [ ! -d ${minetest_dbdir} ]; then
+		mkdir -m 755 -p ${minetest_dbdir}/data
+		chown -R ${minetest_user}:${minetest_group} ${minetest_dbdir}
+	fi
+}
+
+run_rc_command "$1"
diff --git a/games/minetest/files/patch-src-CMakeLists.txt b/games/minetest/files/patch-src-CMakeLists.txt
deleted file mode 100644
index b797e95e8538..000000000000
--- a/games/minetest/files/patch-src-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/CMakeLists.txt.orig	2013-01-30 04:11:11.427933414 +0400
-+++ src/CMakeLists.txt	2013-01-30 04:11:49.504933655 +0400
-@@ -316,6 +316,7 @@
- 		${ZLIB_LIBRARIES}
- 		${JTHREAD_LIBRARY}
- 		${SQLITE3_LIBRARY}
-+		${GETTEXT_LIBRARY}
- 		${LUA_LIBRARY}
- 		${PLATFORM_LIBS}
- 	)
diff --git a/games/minetest/pkg-descr b/games/minetest/pkg-descr
index 3e641104d751..83367ff33c64 100644
--- a/games/minetest/pkg-descr
+++ b/games/minetest/pkg-descr
@@ -1,3 +1,4 @@
-An InfiniMiner/Minecraft inspired game.
+Minetest is an infinite-world block sandbox game and a game engine,
+inspired by InfiniMiner, Minecraft and the like.
 
 WWW: http://minetest.net/
diff --git a/games/minetest/pkg-plist b/games/minetest/pkg-plist
index 07ca8b155094..35baa66e8195 100644
--- a/games/minetest/pkg-plist
+++ b/games/minetest/pkg-plist
@@ -1,181 +1,12 @@
 %%CLIENT%%bin/minetest
 %%SERVER%%bin/minetestserver
+@unexec if cmp -s %D/etc/minetest.conf.example %D/etc/minetest.conf; then rm -f %D/etc/minetest.conf; fi
+etc/minetest.conf.example
+@exec if [ ! -f %B/minetest.conf ]; then cp -p %D/%F %B/minetest.conf; fi
+man/man6/minetest.6.gz
+man/man6/minetestserver.6.gz
 share/applications/minetest.desktop
 share/icons/hicolor/scalable/apps/minetest-icon.svg
-%%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/minetest.mo
-%%CLIENT%%%%NLS%%share/locale/de/LC_MESSAGES/minetest.mo
-%%CLIENT%%%%NLS%%share/locale/fr/LC_MESSAGES/minetest.mo
-%%CLIENT%%%%NLS%%share/locale/it/LC_MESSAGES/minetest.mo
-%%DATADIR%%/builtin/auth.lua
-%%DATADIR%%/builtin/builtin.lua
-%%DATADIR%%/builtin/chatcommands.lua
-%%DATADIR%%/builtin/deprecated.lua
-%%DATADIR%%/builtin/detached_inventory.lua
-%%DATADIR%%/builtin/falling.lua
-%%DATADIR%%/builtin/item.lua
-%%DATADIR%%/builtin/item_entity.lua
-%%DATADIR%%/builtin/misc.lua
-%%DATADIR%%/builtin/misc_helpers.lua
-%%DATADIR%%/builtin/misc_register.lua
-%%DATADIR%%/builtin/privileges.lua
-%%DATADIR%%/builtin/serialize.lua
-%%DATADIR%%/builtin/static_spawn.lua
-%%DATADIR%%/client/shaders/test_shader_1/base.txt
-%%DATADIR%%/client/shaders/test_shader_1/opengl_fragment.glsl
-%%DATADIR%%/client/shaders/test_shader_1/opengl_vertex.glsl
-%%DATADIR%%/client/shaders/test_shader_2/base.txt
-%%DATADIR%%/client/shaders/test_shader_2/opengl_fragment.glsl
-%%DATADIR%%/client/shaders/test_shader_2/opengl_vertex.glsl
-%%DATADIR%%/games/minimal/game.conf
-%%DATADIR%%/games/minimal/mods/bucket/depends.txt
-%%DATADIR%%/games/minimal/mods/bucket/init.lua
-%%DATADIR%%/games/minimal/mods/bucket/textures/bucket.png
-%%DATADIR%%/games/minimal/mods/bucket/textures/bucket_lava.png
-%%DATADIR%%/games/minimal/mods/bucket/textures/bucket_water.png
-%%DATADIR%%/games/minimal/mods/default/init.lua
-%%DATADIR%%/games/minimal/mods/default/mapgen.lua
-%%DATADIR%%/games/minimal/mods/default/sounds/default_grass_footstep.1.ogg
-%%DATADIR%%/games/minimal/mods/default/textures/crack_anylength.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_apple.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_book.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_bookshelf.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_brick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_cactus_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_cactus_top.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_chest_front.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_chest_lock.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_chest_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_chest_top.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_clay.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_clay_brick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_clay_lump.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_cloud.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_coal_lump.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_cobble.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_dirt.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_fence.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_furnace_fire_bg.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_furnace_fire_fg.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_furnace_front.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_furnace_front_active.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_furnace_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_glass.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_grass.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_grass_footsteps.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_grass_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_gravel.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_iron_lump.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_junglegrass.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_jungletree.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_jungletree_top.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_ladder.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_lava.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_lava_flowing_animated.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_lava_source_animated.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_leaves.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_mese.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_mineral_coal.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_mineral_iron.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_mossycobble.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_nc_back.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_nc_front.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_nc_rb.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_nc_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_paper.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_papyrus.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_rail.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_rail_crossing.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_rail_curved.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_rail_t_junction.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_sand.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_sandstone.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_sapling.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_scorched_stuff.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_sign_wall.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_steel_block.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_steel_ingot.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_stick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_stone.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tnt_bottom.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tnt_side.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tnt_top.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_mesepick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_steelaxe.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_steelpick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_steelshovel.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_steelsword.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_stoneaxe.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_stonepick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_stoneshovel.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_stonesword.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_woodaxe.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_woodpick.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_woodshovel.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tool_woodsword.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_torch.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_torch_on_ceiling.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_torch_on_floor.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tree.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_tree_top.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_water.png
-%%DATADIR%%/games/minimal/mods/default/textures/default_wood.png
-%%DATADIR%%/games/minimal/mods/default/textures/heart.png
-%%DATADIR%%/games/minimal/mods/default/textures/player.png
-%%DATADIR%%/games/minimal/mods/default/textures/player_back.png
-%%DATADIR%%/games/minimal/mods/default/textures/treeprop.png
-%%DATADIR%%/games/minimal/mods/default/textures/wieldhand.png
-%%DATADIR%%/games/minimal/mods/experimental/depends.txt
-%%DATADIR%%/games/minimal/mods/experimental/init.lua
-%%DATADIR%%/games/minimal/mods/experimental/textures/experimental_dummyball.png
-%%DATADIR%%/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png
-%%DATADIR%%/games/minimal/mods/give_initial_stuff/depends.txt
-%%DATADIR%%/games/minimal/mods/give_initial_stuff/init.lua
-%%DATADIR%%/games/minimal/mods/legacy/depends.txt
-%%DATADIR%%/games/minimal/mods/legacy/init.lua
-%%DATADIR%%/games/minimal/mods/legacy/textures/apple_iron.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/cooked_rat.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/dungeon_master.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/fireball.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/firefly.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/oerkki1.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/oerkki1_damaged.png
-%%DATADIR%%/games/minimal/mods/legacy/textures/rat.png
-%%DATADIR%%/games/minimal/mods/stairs/depends.txt
-%%DATADIR%%/games/minimal/mods/stairs/init.lua
-%%DATADIR%%/games/minimal/mods/test/init.lua
-%%CLIENT%%%%DATADIR%%/textures/base/pack/fontdejavusansmono.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/fontlucida.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/menubg.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/menulogo.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/smoke_puff.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/sunrisebg.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_block.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_item.png
-%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_object.png
-%%CLIENT%%@dirrm %%DATADIR%%/textures/base/pack
-%%CLIENT%%@dirrm %%DATADIR%%/textures/base
-%%CLIENT%%@dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/games/minimal/mods/test
-@dirrm %%DATADIR%%/games/minimal/mods/stairs
-@dirrm %%DATADIR%%/games/minimal/mods/legacy/textures
-@dirrm %%DATADIR%%/games/minimal/mods/legacy
-@dirrm %%DATADIR%%/games/minimal/mods/give_initial_stuff
-@dirrm %%DATADIR%%/games/minimal/mods/experimental/textures
-@dirrm %%DATADIR%%/games/minimal/mods/experimental
-@dirrm %%DATADIR%%/games/minimal/mods/default/textures
-@dirrm %%DATADIR%%/games/minimal/mods/default/sounds
-@dirrm %%DATADIR%%/games/minimal/mods/default
-@dirrm %%DATADIR%%/games/minimal/mods/bucket/textures
-@dirrm %%DATADIR%%/games/minimal/mods/bucket
-@dirrm %%DATADIR%%/games/minimal/mods
-@dirrm %%DATADIR%%/games/minimal
-@dirrm %%DATADIR%%/games
-@dirrm %%DATADIR%%/client/shaders/test_shader_2
-@dirrm %%DATADIR%%/client/shaders/test_shader_1
-@dirrm %%DATADIR%%/client/shaders
-@dirrm %%DATADIR%%/client
-@dirrm %%DATADIR%%/builtin
-@dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor
diff --git a/games/minetest_game/Makefile b/games/minetest_game/Makefile
index 8b2b6c49a532..1cdaf40a1b6d 100644
--- a/games/minetest_game/Makefile
+++ b/games/minetest_game/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minetest_game
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.8
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -14,15 +14,14 @@ RUN_DEPENDS=	minetest:${PORTSDIR}/games/minetest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
-GH_TAGNAME=	0.4.4
-GH_COMMIT=	3928ecc
+GH_COMMIT=	51de423
 
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/minetest/games/${PORTNAME}
+PORTDATA=	*
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} '*' ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/games/minetest_game/distinfo b/games/minetest_game/distinfo
index e937db3af20e..c55a4cea615e 100644
--- a/games/minetest_game/distinfo
+++ b/games/minetest_game/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minetest_game-0.4.4.tar.gz) = aaed4ea81b0b301c6e6fe440d494cbc6d3cfa3bbcf9516bf53cd44d4b4bea1a9
-SIZE (minetest_game-0.4.4.tar.gz) = 451453
+SHA256 (minetest_game-0.4.8.tar.gz) = a323beed31db267c220fbab2621ae025d623b32be34ac28bbdd6ef7d15feea1c
+SIZE (minetest_game-0.4.8.tar.gz) = 751763
diff --git a/games/minetest_game/pkg-plist b/games/minetest_game/pkg-plist
deleted file mode 100644
index fa7cafb765c3..000000000000
--- a/games/minetest_game/pkg-plist
+++ /dev/null
@@ -1,245 +0,0 @@
-%%DATADIR%%/README.txt
-%%DATADIR%%/game.conf
-%%DATADIR%%/mods/bucket/README.txt
-%%DATADIR%%/mods/bucket/depends.txt
-%%DATADIR%%/mods/bucket/init.lua
-%%DATADIR%%/mods/bucket/textures/bucket.png
-%%DATADIR%%/mods/bucket/textures/bucket_lava.png
-%%DATADIR%%/mods/bucket/textures/bucket_water.png
-%%DATADIR%%/mods/creative/README.txt
-%%DATADIR%%/mods/creative/init.lua
-%%DATADIR%%/mods/default/README.txt
-%%DATADIR%%/mods/default/init.lua
-%%DATADIR%%/mods/default/leafdecay.lua
-%%DATADIR%%/mods/default/mapgen.lua
-%%DATADIR%%/mods/default/models/character.blend
-%%DATADIR%%/mods/default/models/character.png
-%%DATADIR%%/mods/default/models/character.x
-%%DATADIR%%/mods/default/player.lua
-%%DATADIR%%/mods/default/sounds/default_break_glass.1.ogg
-%%DATADIR%%/mods/default/sounds/default_break_glass.2.ogg
-%%DATADIR%%/mods/default/sounds/default_break_glass.3.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_choppy.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_cracky.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_crumbly.1.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_crumbly.2.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_dig_immediate.ogg
-%%DATADIR%%/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg
-%%DATADIR%%/mods/default/sounds/default_dug_node.1.ogg
-%%DATADIR%%/mods/default/sounds/default_grass_footstep.1.ogg
-%%DATADIR%%/mods/default/sounds/default_grass_footstep.2.ogg
-%%DATADIR%%/mods/default/sounds/default_grass_footstep.3.ogg
-%%DATADIR%%/mods/default/sounds/default_gravel_footstep.1.ogg
-%%DATADIR%%/mods/default/sounds/default_gravel_footstep.2.ogg
-%%DATADIR%%/mods/default/sounds/default_gravel_footstep.3.ogg
-%%DATADIR%%/mods/default/sounds/default_gravel_footstep.4.ogg
-%%DATADIR%%/mods/default/sounds/default_hard_footstep.1.ogg
-%%DATADIR%%/mods/default/sounds/default_hard_footstep.2.ogg
-%%DATADIR%%/mods/default/sounds/default_place_node.1.ogg
-%%DATADIR%%/mods/default/sounds/default_place_node.2.ogg
-%%DATADIR%%/mods/default/sounds/default_place_node.3.ogg
-%%DATADIR%%/mods/default/textures/crack_anylength.png
-%%DATADIR%%/mods/default/textures/default_apple.png
-%%DATADIR%%/mods/default/textures/default_book.png
-%%DATADIR%%/mods/default/textures/default_bookshelf.png
-%%DATADIR%%/mods/default/textures/default_brick.png
-%%DATADIR%%/mods/default/textures/default_cactus_side.png
-%%DATADIR%%/mods/default/textures/default_cactus_top.png
-%%DATADIR%%/mods/default/textures/default_chest_front.png
-%%DATADIR%%/mods/default/textures/default_chest_lock.png
-%%DATADIR%%/mods/default/textures/default_chest_side.png
-%%DATADIR%%/mods/default/textures/default_chest_top.png
-%%DATADIR%%/mods/default/textures/default_clay.png
-%%DATADIR%%/mods/default/textures/default_clay_brick.png
-%%DATADIR%%/mods/default/textures/default_clay_lump.png
-%%DATADIR%%/mods/default/textures/default_cloud.png
-%%DATADIR%%/mods/default/textures/default_coal_lump.png
-%%DATADIR%%/mods/default/textures/default_cobble.png
-%%DATADIR%%/mods/default/textures/default_desert_sand.png
-%%DATADIR%%/mods/default/textures/default_desert_stone.png
-%%DATADIR%%/mods/default/textures/default_dirt.png
-%%DATADIR%%/mods/default/textures/default_dry_shrub.png
-%%DATADIR%%/mods/default/textures/default_fence.png
-%%DATADIR%%/mods/default/textures/default_furnace_bottom.png
-%%DATADIR%%/mods/default/textures/default_furnace_fire_bg.png
-%%DATADIR%%/mods/default/textures/default_furnace_fire_fg.png
-%%DATADIR%%/mods/default/textures/default_furnace_front.png
-%%DATADIR%%/mods/default/textures/default_furnace_front_active.png
-%%DATADIR%%/mods/default/textures/default_furnace_side.png
-%%DATADIR%%/mods/default/textures/default_furnace_top.png
-%%DATADIR%%/mods/default/textures/default_glass.png
-%%DATADIR%%/mods/default/textures/default_grass.png
-%%DATADIR%%/mods/default/textures/default_grass_footsteps.png
-%%DATADIR%%/mods/default/textures/default_grass_side.png
-%%DATADIR%%/mods/default/textures/default_gravel.png
-%%DATADIR%%/mods/default/textures/default_iron_lump.png
-%%DATADIR%%/mods/default/textures/default_junglegrass.png
-%%DATADIR%%/mods/default/textures/default_jungletree.png
-%%DATADIR%%/mods/default/textures/default_jungletree_top.png
-%%DATADIR%%/mods/default/textures/default_ladder.png
-%%DATADIR%%/mods/default/textures/default_lava.png
-%%DATADIR%%/mods/default/textures/default_lava_flowing_animated.png
-%%DATADIR%%/mods/default/textures/default_lava_source_animated.png
-%%DATADIR%%/mods/default/textures/default_leaves.png
-%%DATADIR%%/mods/default/textures/default_mese.png
-%%DATADIR%%/mods/default/textures/default_mineral_coal.png
-%%DATADIR%%/mods/default/textures/default_mineral_iron.png
-%%DATADIR%%/mods/default/textures/default_mossycobble.png
-%%DATADIR%%/mods/default/textures/default_nc_back.png
-%%DATADIR%%/mods/default/textures/default_nc_front.png
-%%DATADIR%%/mods/default/textures/default_nc_rb.png
-%%DATADIR%%/mods/default/textures/default_nc_side.png
-%%DATADIR%%/mods/default/textures/default_paper.png
-%%DATADIR%%/mods/default/textures/default_papyrus.png
-%%DATADIR%%/mods/default/textures/default_rail.png
-%%DATADIR%%/mods/default/textures/default_rail_crossing.png
-%%DATADIR%%/mods/default/textures/default_rail_curved.png
-%%DATADIR%%/mods/default/textures/default_rail_t_junction.png
-%%DATADIR%%/mods/default/textures/default_sand.png
-%%DATADIR%%/mods/default/textures/default_sandstone.png
-%%DATADIR%%/mods/default/textures/default_sapling.png
-%%DATADIR%%/mods/default/textures/default_scorched_stuff.png
-%%DATADIR%%/mods/default/textures/default_sign_wall.png
-%%DATADIR%%/mods/default/textures/default_steel_block.png
-%%DATADIR%%/mods/default/textures/default_steel_ingot.png
-%%DATADIR%%/mods/default/textures/default_stick.png
-%%DATADIR%%/mods/default/textures/default_stone.png
-%%DATADIR%%/mods/default/textures/default_tnt_bottom.png
-%%DATADIR%%/mods/default/textures/default_tnt_side.png
-%%DATADIR%%/mods/default/textures/default_tnt_top.png
-%%DATADIR%%/mods/default/textures/default_tool_mesepick.png
-%%DATADIR%%/mods/default/textures/default_tool_steelaxe.png
-%%DATADIR%%/mods/default/textures/default_tool_steelpick.png
-%%DATADIR%%/mods/default/textures/default_tool_steelshovel.png
-%%DATADIR%%/mods/default/textures/default_tool_steelsword.png
-%%DATADIR%%/mods/default/textures/default_tool_stoneaxe.png
-%%DATADIR%%/mods/default/textures/default_tool_stonepick.png
-%%DATADIR%%/mods/default/textures/default_tool_stoneshovel.png
-%%DATADIR%%/mods/default/textures/default_tool_stonesword.png
-%%DATADIR%%/mods/default/textures/default_tool_woodaxe.png
-%%DATADIR%%/mods/default/textures/default_tool_woodpick.png
-%%DATADIR%%/mods/default/textures/default_tool_woodshovel.png
-%%DATADIR%%/mods/default/textures/default_tool_woodsword.png
-%%DATADIR%%/mods/default/textures/default_torch.png
-%%DATADIR%%/mods/default/textures/default_torch_animated.png
-%%DATADIR%%/mods/default/textures/default_torch_on_ceiling.png
-%%DATADIR%%/mods/default/textures/default_torch_on_ceiling_animated.png
-%%DATADIR%%/mods/default/textures/default_torch_on_floor.png
-%%DATADIR%%/mods/default/textures/default_torch_on_floor_animated.png
-%%DATADIR%%/mods/default/textures/default_tree.png
-%%DATADIR%%/mods/default/textures/default_tree_top.png
-%%DATADIR%%/mods/default/textures/default_water.png
-%%DATADIR%%/mods/default/textures/default_water_flowing_animated.png
-%%DATADIR%%/mods/default/textures/default_water_source_animated.png
-%%DATADIR%%/mods/default/textures/default_wood.png
-%%DATADIR%%/mods/default/textures/heart.png
-%%DATADIR%%/mods/default/textures/player.png
-%%DATADIR%%/mods/default/textures/player_back.png
-%%DATADIR%%/mods/default/textures/treeprop.png
-%%DATADIR%%/mods/default/textures/wieldhand.png
-%%DATADIR%%/mods/doors/README.txt
-%%DATADIR%%/mods/doors/depends.txt
-%%DATADIR%%/mods/doors/init.lua
-%%DATADIR%%/mods/doors/textures/door_brown.png
-%%DATADIR%%/mods/doors/textures/door_grey.png
-%%DATADIR%%/mods/doors/textures/door_steel.png
-%%DATADIR%%/mods/doors/textures/door_steel_a.png
-%%DATADIR%%/mods/doors/textures/door_steel_b.png
-%%DATADIR%%/mods/doors/textures/door_wood.png
-%%DATADIR%%/mods/doors/textures/door_wood_a.png
-%%DATADIR%%/mods/doors/textures/door_wood_b.png
-%%DATADIR%%/mods/dye/README.txt
-%%DATADIR%%/mods/dye/depends.txt
-%%DATADIR%%/mods/dye/init.lua
-%%DATADIR%%/mods/dye/textures/dye_black.png
-%%DATADIR%%/mods/dye/textures/dye_blue.png
-%%DATADIR%%/mods/dye/textures/dye_brown.png
-%%DATADIR%%/mods/dye/textures/dye_cyan.png
-%%DATADIR%%/mods/dye/textures/dye_dark_green.png
-%%DATADIR%%/mods/dye/textures/dye_dark_grey.png
-%%DATADIR%%/mods/dye/textures/dye_green.png
-%%DATADIR%%/mods/dye/textures/dye_grey.png
-%%DATADIR%%/mods/dye/textures/dye_magenta.png
-%%DATADIR%%/mods/dye/textures/dye_orange.png
-%%DATADIR%%/mods/dye/textures/dye_pink.png
-%%DATADIR%%/mods/dye/textures/dye_red.png
-%%DATADIR%%/mods/dye/textures/dye_violet.png
-%%DATADIR%%/mods/dye/textures/dye_white.png
-%%DATADIR%%/mods/dye/textures/dye_yellow.png
-%%DATADIR%%/mods/fire/README.txt
-%%DATADIR%%/mods/fire/init.lua
-%%DATADIR%%/mods/fire/sounds/fire_large.ogg
-%%DATADIR%%/mods/fire/sounds/fire_small.ogg
-%%DATADIR%%/mods/fire/textures/fire_basic_flame.png
-%%DATADIR%%/mods/fire/textures/fire_basic_flame_animated.png
-%%DATADIR%%/mods/give_initial_stuff/depends.txt
-%%DATADIR%%/mods/give_initial_stuff/init.lua
-%%DATADIR%%/mods/legacy/depends.txt
-%%DATADIR%%/mods/legacy/init.lua
-%%DATADIR%%/mods/legacy/textures/apple_iron.png
-%%DATADIR%%/mods/legacy/textures/cooked_rat.png
-%%DATADIR%%/mods/legacy/textures/dungeon_master.png
-%%DATADIR%%/mods/legacy/textures/fireball.png
-%%DATADIR%%/mods/legacy/textures/firefly.png
-%%DATADIR%%/mods/legacy/textures/oerkki1.png
-%%DATADIR%%/mods/legacy/textures/oerkki1_damaged.png
-%%DATADIR%%/mods/legacy/textures/rat.png
-%%DATADIR%%/mods/stairs/README.txt
-%%DATADIR%%/mods/stairs/depends.txt
-%%DATADIR%%/mods/stairs/init.lua
-%%DATADIR%%/mods/vessels/README.txt
-%%DATADIR%%/mods/vessels/depends.txt
-%%DATADIR%%/mods/vessels/init.lua
-%%DATADIR%%/mods/vessels/textures/alternates/vessels_drinking_glass.png
-%%DATADIR%%/mods/vessels/textures/alternates/vessels_glass_bottle.png
-%%DATADIR%%/mods/vessels/textures/alternates/vessels_steel_bottle.png
-%%DATADIR%%/mods/vessels/textures/vessels_drinking_glass.png
-%%DATADIR%%/mods/vessels/textures/vessels_drinking_glass_inv.png
-%%DATADIR%%/mods/vessels/textures/vessels_glass_bottle.png
-%%DATADIR%%/mods/vessels/textures/vessels_glass_bottle_inv.png
-%%DATADIR%%/mods/vessels/textures/vessels_glass_fragments.png
-%%DATADIR%%/mods/vessels/textures/vessels_steel_bottle.png
-%%DATADIR%%/mods/vessels/textures/vessels_steel_bottle_inv.png
-%%DATADIR%%/mods/wool/README.txt
-%%DATADIR%%/mods/wool/depends.txt
-%%DATADIR%%/mods/wool/init.lua
-%%DATADIR%%/mods/wool/textures/wool_black.png
-%%DATADIR%%/mods/wool/textures/wool_blue.png
-%%DATADIR%%/mods/wool/textures/wool_brown.png
-%%DATADIR%%/mods/wool/textures/wool_cyan.png
-%%DATADIR%%/mods/wool/textures/wool_dark_green.png
-%%DATADIR%%/mods/wool/textures/wool_dark_grey.png
-%%DATADIR%%/mods/wool/textures/wool_green.png
-%%DATADIR%%/mods/wool/textures/wool_grey.png
-%%DATADIR%%/mods/wool/textures/wool_magenta.png
-%%DATADIR%%/mods/wool/textures/wool_orange.png
-%%DATADIR%%/mods/wool/textures/wool_pink.png
-%%DATADIR%%/mods/wool/textures/wool_red.png
-%%DATADIR%%/mods/wool/textures/wool_violet.png
-%%DATADIR%%/mods/wool/textures/wool_white.png
-%%DATADIR%%/mods/wool/textures/wool_yellow.png
-@dirrm %%DATADIR%%/mods/wool/textures
-@dirrm %%DATADIR%%/mods/wool
-@dirrm %%DATADIR%%/mods/vessels/textures/alternates
-@dirrm %%DATADIR%%/mods/vessels/textures
-@dirrm %%DATADIR%%/mods/vessels
-@dirrm %%DATADIR%%/mods/stairs
-@dirrm %%DATADIR%%/mods/legacy/textures
-@dirrm %%DATADIR%%/mods/legacy
-@dirrm %%DATADIR%%/mods/give_initial_stuff
-@dirrm %%DATADIR%%/mods/fire/textures
-@dirrm %%DATADIR%%/mods/fire/sounds
-@dirrm %%DATADIR%%/mods/fire
-@dirrm %%DATADIR%%/mods/dye/textures
-@dirrm %%DATADIR%%/mods/dye
-@dirrm %%DATADIR%%/mods/doors/textures
-@dirrm %%DATADIR%%/mods/doors
-@dirrm %%DATADIR%%/mods/default/textures
-@dirrm %%DATADIR%%/mods/default/sounds
-@dirrm %%DATADIR%%/mods/default/models
-@dirrm %%DATADIR%%/mods/default
-@dirrm %%DATADIR%%/mods/creative
-@dirrm %%DATADIR%%/mods/bucket/textures
-@dirrm %%DATADIR%%/mods/bucket
-@dirrm %%DATADIR%%/mods
-@dirrm %%DATADIR%%