FreeBSD Bugzilla – Attachment 133730 Details for
Bug 178244
[patch] Update games/minetest to 0.4.6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-minetest.diff.txt
patch-minetest.diff.txt (text/plain; charset=us-ascii), 14.46 KB, created by
Kevin Zheng
on 2013-06-02 22:22:13 UTC
(
hide
)
Description:
patch-minetest.diff.txt
Filename:
MIME Type:
Creator:
Kevin Zheng
Created:
2013-06-02 22:22:13 UTC
Size:
14.46 KB
patch
obsolete
>diff -ruN /usr/ports/games/minetest/Makefile ./Makefile >--- /usr/ports/games/minetest/Makefile 2013-04-26 05:44:28.000000000 -0500 >+++ ./Makefile 2013-04-30 17:31:10.000000000 -0500 >@@ -2,88 +2,111 @@ > # $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 \ >+ curl:${PORTSDIR}/ftp/curl \ >+ 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 SERVER SOUND >+OPTIONS_DEFAULT=CLIENT DOCS EXAMPLES NLS SERVER SOUND > CLIENT_DESC= Build client > SERVER_DESC= Build server >-SOUND_DESC= Enable sound > > .include <bsd.port.options.mk> > >+.if ${PORT_OPTIONS:MCLIENT} >+CMAKE_ARGS+= -DBUILD_CLIENT:BOOL=YES >+LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ >+ png15:${PORTSDIR}/graphics/png >+PLIST_SUB+= CLIENT="" >+USE_GL= gl >+.else >+CMAKE_ARGS+= -DBUILD_CLIENT:BOOL=NO >+PLIST_SUB+= CLIENT="@comment " >+.endif >+ > .if ${PORT_OPTIONS:MNLS} > CMAKE_ARGS+= -DENABLE_GETTEXT:BOOL=YES >-USES+= gettext > LDFLAGS+= -L${LOCALBASE}/lib > PLIST_SUB+= NLS="" >+USES+= gettext > .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 \ >- png15:${PORTSDIR}/graphics/png >-CMAKE_ARGS+= -DBUILD_CLIENT=1 >-PLIST_SUB+= CLIENT="" >-.else >-CMAKE_ARGS+= -DBUILD_CLIENT=0 >-PLIST_SUB+= CLIENT="@comment " >-.endif >- > .if ${PORT_OPTIONS:MSERVER} >-CMAKE_ARGS+= -DBUILD_SERVER=1 >+CMAKE_ARGS+= -DBUILD_SERVER:BOOL=YES > PLIST_SUB+= SERVER="" >+ >+USE_RC_SUBR= minetest >+#USERS?= minetest >+#GROUPS?= minetest >+ >+CFGFILE= ${PREFIX}/etc/${PORTNAME}.conf >+MINETEST_DIR?= /var/db/${PORTNAME} >+MINETEST_LOG?= /var/log/${PORTNAME} >+MINETEST_RUN?= /var/run/${PORTNAME} >+ >+SUB_LIST+= CFGFILE=${CFGFILE} \ >+ MINETEST_DIR=${MINETEST_DIR} \ >+ MINETEST_GRP=${GROUPS} \ >+ MINETEST_LOG=${MINETEST_LOG} \ >+ MINETEST_RUN=${MINETEST_RUN} \ >+ MINETEST_USR=${USERS} \ >+ PORTNAME=${PORTNAME} > .else >-CMAKE_ARGS+= -DBUILD_SERVER=0 >+CMAKE_ARGS+= -DBUILD_SERVER:BOOL=NO > PLIST_SUB+= SERVER="@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 >+.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 >-.if ! ${PORT_OPTIONS:MEXAMPLES} >- @${REINPLACE_CMD} -e '/install.*DESTINATION.*EXAMPLE_CONF_DIR/I d' ${WRKSRC}/CMakeLists.txt >+ >+post-install: >+.if ${PORT_OPTIONS:MEXAMPLES} >+ ${CP} ${EXAMPLESDIR}/minetest.conf.example ${CFGFILE}.sample >+ @if [ ! -f ${CFGFILE} ]; then \ >+ ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \ >+ fi > .endif > > .include <bsd.port.mk> >diff -ruN /usr/ports/games/minetest/distinfo ./distinfo >--- /usr/ports/games/minetest/distinfo 2013-01-30 15:51:54.000000000 -0600 >+++ ./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/minetest.in ./files/minetest.in >--- /usr/ports/games/minetest/files/minetest.in 1969-12-31 18:00:00.000000000 -0600 >+++ ./files/minetest.in 2013-05-04 12:44:04.000000000 -0500 >@@ -0,0 +1,92 @@ >+#!/bin/sh >+ >+# $FreeBSD$ >+# >+# PROVIDE: minetest >+# REQUIRE: LOGIN >+# KEYWORD: shutdown >+# >+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf >+# to enable this service: >+# >+# minetest_enable="YES" >+# >+# Additional configuration (optional): >+# >+# minetest_conffile="%%CFGFILE%%" >+# -- path to config file >+# minetest_pidfile="%%MINETEST_RUN%%/minetest.pid" >+# -- location of pidfile: must match setting >+# in ${minetest_conffile} >+# minetest_user="%%MINETEST_USR%%" >+# -- user to run as >+# minetest_group="%%MINETEST_GRP%%" >+# -- group to run as >+# minetest_logdir="%%MINETEST_LOG%%" >+# -- directory searchd writes logs to >+# minetest_dir="%%MINETEST_DIR%%" >+# -- working directory used by searchd et al: >+# must match setting in ${minetest_conffile} >+ >+. /etc/rc.subr >+ >+name=minetest >+rcvar=minetest_enable >+ >+load_rc_config ${name} >+ >+: ${minetest_enable="NO"} >+: ${minetest_conffile="%%CFGFILE%%"} >+: ${minetest_pidfile="%%MINETEST_RUN%%/minetest.pid"} >+: ${minetest_usr="%%MINETEST_USR%%"} >+: ${minetest_grp="%%MINETEST_GRP%%"} >+: ${minetest_logdir="%%MINETEST_LOG%%"} >+: ${minetest_dir="%%MINETEST_DIR%%"} >+: ${minetest_daemon_args:="-c -f -p ${minetest_pidfile} -u ${minetest_usr}"} >+: ${minetest_flag:="--logfile ${minetest_logdir}/debug.txt --world ${minetest_dir}/world ${minetest_extraflags}"} >+# --config ${minetest_conffile} >+ >+case "${minetest_flag}" in >+ *--config\ *) >+ echo "Warning \$minetest_flags includes --config option." \ >+ "Please use \$minetest_conffile instead." >+ ;; >+ *) >+ minetest_flag="--config ${minetest_conffile} ${minetest_flag}" >+ ;; >+esac >+ >+ >+command=/usr/sbin/daemon >+procname=%%PREFIX%%/bin/minetestserver >+command_args="${minetest_daemon_args} ${procname} ${minetest_flag}" >+pidfile=${minetest_pidfile} >+#required_files=${minetest_conffile} >+start_precmd=minetest_prestart >+ >+minetest_prestart () >+{ >+ piddir=$(dirname ${minetest_pidfile}) >+ if [ ! -d ${piddir} ]; then >+ mkdir -m 755 -p ${piddir} >+ chown -R ${minetest_usr}:${minetest_grp} ${piddir} >+ fi >+ if [ ! -d ${minetest_logdir} ]; then >+ mkdir -m 755 -p ${minetest_logdir} >+ chown -R ${minetest_usr}:${minetest_grp} \ >+ ${minetest_logdir} >+ fi >+ if [ ! -d ${minetest_dir} ]; then >+ mkdir -m 755 -p ${minetest_dir} ${minetest_dir}/data >+ chown -R ${minetest_usr}:${minetest_grp} \ >+ ${minetest_dir} >+ fi >+ #if [ ! -f ${minetest_conffile} ]; then >+ # touch ${minetest_conffile} >+ chown ${minetest_usr}:${minetest_grp} \ >+ ${minetest_conffile} >+ #fi >+} >+ >+ >+run_rc_command "$1" >diff -ruN /usr/ports/games/minetest/files/patch-src-CMakeLists.txt ./files/patch-src-CMakeLists.txt >--- /usr/ports/games/minetest/files/patch-src-CMakeLists.txt 2013-01-30 15:51:54.000000000 -0600 >+++ ./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 ./pkg-descr >--- /usr/ports/games/minetest/pkg-descr 2013-01-30 15:51:54.000000000 -0600 >+++ ./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 ./pkg-plist >--- /usr/ports/games/minetest/pkg-plist 2013-01-30 15:51:54.000000000 -0600 >+++ ./pkg-plist 2013-05-03 17:05:21.000000000 -0500 >@@ -1,11 +1,3 @@ >-%%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 +12,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 +138,75 @@ > %%DATADIR%%/games/minimal/mods/stairs/depends.txt > %%DATADIR%%/games/minimal/mods/stairs/init.lua > %%DATADIR%%/games/minimal/mods/test/init.lua >+%%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%%%%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/menulogo.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%%bin/minetest >+%%SERVER%%bin/minetestserver >+%%SERVER%%@unexec if cmp -s %D/etc/minetest.conf.sample %D/etc/minetest.conf; then rm -f %D/etc/minetest.conf; fi >+%%SERVER%%etc/minetest.conf.sample >+%%SERVER%%@exec if [ ! -f %D/etc/minetest.conf ] ; then cp -p %D/%F %B/minetest.conf; fi >+share/applications/minetest.desktop >+share/icons/hicolor/scalable/apps/minetest-icon.svg >+@dirrm share/icons/hicolor/scalable/apps >+@dirrm share/icons/hicolor/scalable >+@dirrm share/icons/hicolor >+@dirrm share/icons >+@dirrm share/applications > %%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 %%DATADIR%%/games/minimal/mods/test > @dirrm %%DATADIR%%/games/minimal/mods/stairs > @dirrm %%DATADIR%%/games/minimal/mods/legacy/textures >@@ -169,15 +221,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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 178244
:
133728
|
133729
| 133730 |
133731
|
133732