Date: Mon, 29 Apr 2013 23:27:41 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/178244: [patch] Update games/minetest to 0.4.6 Message-ID: <201304292327.r3TNRfxv034737@red.freebsd.org> Resent-Message-ID: <201304292330.r3TNU0xp070778@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178244
>Category: ports
>Synopsis: [patch] Update games/minetest to 0.4.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 29 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Kevin Zheng
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD sigma.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec 4 06:55:39 UTC 2012 root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update games/minetest to 0.4.6. In addition:
- Take out indefinite article in COMMENT
- Sort LIB_DEPENDS and remove ABI numbers
- Take out GH_TAGNAME, this is same as PORTVERSION
- Remove SERVER option, no longer works with upstream
- Use standard description for SOUND option
- Sort order of options mechanisms in Makefile (purely cosmetic)
- Remove old patches that were applied upstream
- Trim lines longer than 80 characters
Also, I happen to like this port so much that if the maintainer desires, I can take over maintainership.
In addition, games/minetest_game should be updated to 0.4.6 but SHOULD NOT yet. The newest version remove a few common mods and now requires minetest_common (a port we do not yet have) in order to work. The new server will work fine with the old game package, so I will update that stuff later.
>How-To-Repeat:
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN /usr/ports/games/minetest/Makefile minetest/Makefile
--- /usr/ports/games/minetest/Makefile 2013-04-26 05:44:28.000000000 -0500
+++ minetest/Makefile 2013-04-29 18:17:35.000000000 -0500
@@ -2,88 +2,76 @@
# $FreeBSD: games/minetest/Makefile 316596 2013-04-26 10:44:28Z ak $
PORTNAME= minetest
-PORTVERSION= 0.4.4
+PORTVERSION= 0.4.6
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= An Infiniminer/Minecraft inspired game
-
-LIB_DEPENDS= Irrlicht.1:${PORTSDIR}/x11-toolkits/irrlicht \
- sqlite3:${PORTSDIR}/databases/sqlite3
+COMMENT= Infinite-world block sandbox game
LICENSE= LGPL21
+LIB_DEPENDS= Irrlicht:${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= f85c116
+MAKE_JOBS_SAFE= yes
USES= cmake
+
CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \
-DCUSTOM_EXAMPLE_CONF_DIR="${EXAMPLESDIR}"
-MAKE_JOBS_SAFE= yes
PORTDOCS= *
PORTEXAMPLES= *
MAN6= minetest.6 minetestserver.6
-OPTIONS_DEFINE= CLIENT SERVER SOUND NLS DOCS EXAMPLES
-OPTIONS_DEFAULT=CLIENT SERVER SOUND NLS DOCS EXAMPLES
+OPTIONS_DEFINE= CLIENT DOCS EXAMPLES NLS SOUND
+OPTIONS_DEFAULT=CLIENT DOCS EXAMPLES NLS SOUND
CLIENT_DESC= Build client
-SERVER_DESC= Build server
-SOUND_DESC= Enable sound
.include <bsd.port.options.mk>
-.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
-
.if ${PORT_OPTIONS:MCLIENT}
-USE_GL= gl
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
+CMAKE_ARGS+= -DBUILD_CLIENT:BOOL=YES
+LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png
-CMAKE_ARGS+= -DBUILD_CLIENT=1
PLIST_SUB+= CLIENT=""
+USE_GL= gl
.else
-CMAKE_ARGS+= -DBUILD_CLIENT=0
+CMAKE_ARGS+= -DBUILD_CLIENT:BOOL=NO
PLIST_SUB+= CLIENT="@comment "
.endif
-.if ${PORT_OPTIONS:MSERVER}
-CMAKE_ARGS+= -DBUILD_SERVER=1
-PLIST_SUB+= SERVER=""
+.if ${PORT_OPTIONS:MNLS}
+CMAKE_ARGS+= -DENABLE_GETTEXT:BOOL=YES
+LDFLAGS+= -L${LOCALBASE}/lib
+PLIST_SUB+= NLS=""
+USES+= gettext
.else
-CMAKE_ARGS+= -DBUILD_SERVER=0
-PLIST_SUB+= SERVER="@comment "
+CMAKE_ARGS+= -DENABLE_GETTEXT:BOOL=NO
+PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MSOUND}
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
USE_OPENAL= yes
-LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
.else
CMAKE_ARGS+= -DENABLE_SOUND:BOOL=OFF
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
- ${WRKSRC}/cmake/Modules/FindIrrlicht.cmake
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
${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
+.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 -ruN /usr/ports/games/minetest/distinfo minetest/distinfo
--- /usr/ports/games/minetest/distinfo 2013-01-30 15:51:54.000000000 -0600
+++ minetest/distinfo 2013-04-29 16:56:29.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (minetest-0.4.4.tar.gz) = 127741d361e8642dd5b7e3aaad4b38bae4c19a5d1b8fac8f5acafbc2225f5de0
-SIZE (minetest-0.4.4.tar.gz) = 2104959
+SHA256 (minetest-0.4.6.tar.gz) = a6ea387b25181264eea43194be6137c1a54fac2873f0b811789ba0e24ff5b1b1
+SIZE (minetest-0.4.6.tar.gz) = 2578194
diff -ruN /usr/ports/games/minetest/files/patch-src-CMakeLists.txt minetest/files/patch-src-CMakeLists.txt
--- /usr/ports/games/minetest/files/patch-src-CMakeLists.txt 2013-01-30 15:51:54.000000000 -0600
+++ minetest/files/patch-src-CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
@@ -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 -ruN /usr/ports/games/minetest/pkg-descr minetest/pkg-descr
--- /usr/ports/games/minetest/pkg-descr 2013-01-30 15:51:54.000000000 -0600
+++ minetest/pkg-descr 2013-04-29 16:56:29.000000000 -0500
@@ -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/
+WWW: http://www.minetest.net/
diff -ruN /usr/ports/games/minetest/pkg-plist minetest/pkg-plist
--- /usr/ports/games/minetest/pkg-plist 2013-01-30 15:51:54.000000000 -0600
+++ minetest/pkg-plist 2013-04-29 18:12:03.000000000 -0500
@@ -1,11 +1,29 @@
+%%CLIENT%%%%DATADIR%%/textures/base/pack/fontdejavusansmono.png
+%%CLIENT%%%%DATADIR%%/textures/base/pack/fontlucida.png
+%%CLIENT%%%%DATADIR%%/textures/base/pack/logo.png
+%%CLIENT%%%%DATADIR%%/textures/base/pack/menubg.png
+%%CLIENT%%%%DATADIR%%/textures/base/pack/menufooter.png
+%%CLIENT%%%%DATADIR%%/textures/base/pack/menuheader.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%%%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/et/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/it/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ja/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ko/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ky/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/pl/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/pt/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ro/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/minetest.mo
+%%CLIENT%%%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/minetest.mo
%%CLIENT%%bin/minetest
-%%SERVER%%bin/minetestserver
-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
@@ -20,12 +38,15 @@
%%DATADIR%%/builtin/privileges.lua
%%DATADIR%%/builtin/serialize.lua
%%DATADIR%%/builtin/static_spawn.lua
+%%DATADIR%%/client/serverlist/.gitignore
%%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%%/fonts/liberationmono.ttf
+%%DATADIR%%/fonts/liberationsans.ttf
%%DATADIR%%/games/minimal/game.conf
%%DATADIR%%/games/minimal/mods/bucket/depends.txt
%%DATADIR%%/games/minimal/mods/bucket/init.lua
@@ -143,18 +164,46 @@
%%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
+bin/minetestserver
+share/applications/minetest.desktop
+share/icons/hicolor/scalable/apps/minetest-icon.svg
%%CLIENT%%@dirrm %%DATADIR%%/textures/base/pack
%%CLIENT%%@dirrm %%DATADIR%%/textures/base
%%CLIENT%%@dirrm %%DATADIR%%/textures
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/zh_CN/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/zh_CN
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ru
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ro/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ro
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pt/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pt
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pl/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pl
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ky/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ky
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ko/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ko
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ja/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ja
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/it/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/it
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/fr/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/fr
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/et/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/et
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/es/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/es
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/de/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/de
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/da/LC_MESSAGES
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/da
+%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale
+@dirrm share/icons/hicolor/scalable/apps
+@dirrm share/icons/hicolor/scalable
+@dirrm share/icons/hicolor
+@dirrm share/icons
+@dirrm share/applications
@dirrm %%DATADIR%%/games/minimal/mods/test
@dirrm %%DATADIR%%/games/minimal/mods/stairs
@dirrm %%DATADIR%%/games/minimal/mods/legacy/textures
@@ -169,15 +218,12 @@
@dirrm %%DATADIR%%/games/minimal/mods/bucket
@dirrm %%DATADIR%%/games/minimal/mods
@dirrm %%DATADIR%%/games/minimal
-@dirrm %%DATADIR%%/games
+@dirrmtry %%DATADIR%%/games
+@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%/client/shaders/test_shader_2
@dirrm %%DATADIR%%/client/shaders/test_shader_1
@dirrm %%DATADIR%%/client/shaders
+@dirrm %%DATADIR%%/client/serverlist
@dirrm %%DATADIR%%/client
@dirrm %%DATADIR%%/builtin
@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304292327.r3TNRfxv034737>