Update to minetest-0.4.9.

ok abieber@
This commit is contained in:
bentley 2014-03-12 04:00:53 +00:00
parent efe21217dc
commit f4db651775
5 changed files with 88 additions and 55 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2013/12/02 16:25:08 espie Exp $
# $OpenBSD: Makefile,v 1.6 2014/03/12 04:00:53 bentley Exp $
COMMENT = infinite-world block sandbox game
V = 0.4.7
V = 0.4.9
DISTNAME = minetest-${V}
CATEGORIES = games x11
@ -28,7 +28,9 @@ LIB_DEPENDS = audio/openal \
BUILD_DEPENDS += x11/irrlicht
WANTLIB += GL GLU ICE SM X11 Xext Xxf86vm bz2 c curl jpeg m ogg openal
WANTLIB += png pthread sqlite3 stdc++ vorbis vorbisfile z
WANTLIB += png pthread sqlite3 stdc++ vorbis vorbisfile z GLESv2
NO_TEST = Yes
post-install:
mv ${WRKDIR}/minetest_game-${V}/ \

View File

@ -1,4 +1,4 @@
SHA256 (minetest-0.4.7.tar.gz) = K7H1Lpc0gGa3b0Sd0JnsoN4wxnPhP8RWKoW7ucfh5vI=
SHA256 (minetest-game-0.4.7.tar.gz) = XM0bF64HGLQESPtZQxy9ugkQB3X8T1+ornnh0yeojng=
SIZE (minetest-0.4.7.tar.gz) = 2775839
SIZE (minetest-game-0.4.7.tar.gz) = 645776
SHA256 (minetest-0.4.9.tar.gz) = wlivyrvQrU+BcKnQqSrw9CxLYAIAED5xX6OEq/x+X9s=
SHA256 (minetest-game-0.4.9.tar.gz) = 5RmT5gcO+38CwJDikI7QX31PIHo282fqD7m1pC6391E=
SIZE (minetest-0.4.9.tar.gz) = 5195292
SIZE (minetest-game-0.4.9.tar.gz) = 753416

View File

@ -1,8 +1,7 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2013/08/07 08:02:48 jsg Exp $
Properly link/find libintl/iconv
--- src/CMakeLists.txt.orig Fri Jun 7 03:14:26 2013
+++ src/CMakeLists.txt Sun Jul 21 00:57:20 2013
@@ -30,6 +30,8 @@ set(USE_GETTEXT 0)
$OpenBSD: patch-src_CMakeLists_txt,v 1.4 2014/03/12 04:00:53 bentley Exp $
--- src/CMakeLists.txt.orig Mon Feb 3 03:19:43 2014
+++ src/CMakeLists.txt Mon Feb 3 03:22:05 2014
@@ -29,6 +29,8 @@ set(USE_GETTEXT 0)
if(ENABLE_GETTEXT)
find_package(GettextLib)
@ -11,7 +10,7 @@ Properly link/find libintl/iconv
else()
MARK_AS_ADVANCED(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
endif()
@@ -161,7 +163,12 @@ else()
@@ -160,7 +162,12 @@ else()
endif(APPLE)
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
@ -25,7 +24,7 @@ Properly link/find libintl/iconv
#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
# This way Xxf86vm is found on OpenBSD too
find_library(XXF86VM_LIBRARY Xxf86vm)
@@ -388,7 +395,8 @@ if(BUILD_CLIENT)
@@ -430,7 +437,8 @@ if(BUILD_CLIENT)
${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
@ -33,22 +32,19 @@ Properly link/find libintl/iconv
+ ${ICONV_LIBRARIES}
+ ${LIBINTL_LIBRARIES}
${SOUND_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
@@ -418,10 +426,11 @@ if(BUILD_SERVER)
target_link_libraries(
${PROJECT_NAME}server
${LUA_LIBRARY}
@@ -465,7 +473,8 @@ if(BUILD_SERVER)
${ZLIB_LIBRARIES}
+ ${ICONV_LIBRARIES}
+ ${LIBINTL_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
${JSON_LIBRARY}
- ${GETTEXT_LIBRARY}
+ ${ICONV_LIBRARIES}
+ ${LIBINTL_LIBRARIES}
${LUA_LIBRARY}
${PLATFORM_LIBS}
)
@@ -486,7 +495,7 @@ else()
@@ -533,7 +542,7 @@ else()
set(ARCH i386)
endif()

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_porting_cpp,v 1.3 2013/08/07 08:02:48 jsg Exp $
--- src/porting.cpp.orig Fri Jun 7 03:14:26 2013
+++ src/porting.cpp Sat Jul 20 23:36:04 2013
@@ -477,7 +477,7 @@ void initializePaths()
path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2013/08/07 08:02:49 jsg Exp $
@comment $OpenBSD: PLIST,v 1.4 2014/03/12 04:00:53 bentley Exp $
@bin bin/minetest
@bin bin/minetestserver
@man man/man6/minetest.6
@ -12,6 +12,8 @@ share/doc/minetest/minetest.conf.example
share/icons/hicolor/scalable/apps/minetest-icon.svg
share/minetest/
share/minetest/builtin/
share/minetest/builtin/async_env.lua
share/minetest/builtin/async_event.lua
share/minetest/builtin/auth.lua
share/minetest/builtin/builtin.lua
share/minetest/builtin/chatcommands.lua
@ -19,31 +21,51 @@ share/minetest/builtin/deprecated.lua
share/minetest/builtin/detached_inventory.lua
share/minetest/builtin/falling.lua
share/minetest/builtin/features.lua
share/minetest/builtin/filterlist.lua
share/minetest/builtin/gamemgr.lua
share/minetest/builtin/item.lua
share/minetest/builtin/item_entity.lua
share/minetest/builtin/mainmenu.lua
share/minetest/builtin/misc.lua
share/minetest/builtin/misc_helpers.lua
share/minetest/builtin/misc_register.lua
share/minetest/builtin/mm_menubar.lua
share/minetest/builtin/mm_textures.lua
share/minetest/builtin/modmgr.lua
share/minetest/builtin/modstore.lua
share/minetest/builtin/privileges.lua
share/minetest/builtin/serialize.lua
share/minetest/builtin/static_spawn.lua
share/minetest/builtin/vector.lua
share/minetest/builtin/voxelarea.lua
share/minetest/client/
share/minetest/client/serverlist/
share/minetest/client/serverlist/.gitignore
share/minetest/client/shaders/
share/minetest/client/shaders/test_shader_1/
share/minetest/client/shaders/test_shader_1/base.txt
share/minetest/client/shaders/test_shader_1/opengl_fragment.glsl
share/minetest/client/shaders/test_shader_1/opengl_vertex.glsl
share/minetest/client/shaders/test_shader_2/
share/minetest/client/shaders/test_shader_2/base.txt
share/minetest/client/shaders/test_shader_2/opengl_fragment.glsl
share/minetest/client/shaders/test_shader_2/opengl_vertex.glsl
share/minetest/client/shaders/test_shader_3/
share/minetest/client/shaders/test_shader_3/base.txt
share/minetest/client/shaders/test_shader_3/opengl_fragment.glsl
share/minetest/client/shaders/test_shader_3/opengl_vertex.glsl
share/minetest/client/shaders/alpha_shader/
share/minetest/client/shaders/alpha_shader/base.txt
share/minetest/client/shaders/alpha_shader/opengl_fragment.glsl
share/minetest/client/shaders/alpha_shader/opengl_vertex.glsl
share/minetest/client/shaders/leaves_shader/
share/minetest/client/shaders/leaves_shader/base.txt
share/minetest/client/shaders/leaves_shader/opengl_fragment.glsl
share/minetest/client/shaders/leaves_shader/opengl_vertex.glsl
share/minetest/client/shaders/liquids_shader/
share/minetest/client/shaders/liquids_shader/base.txt
share/minetest/client/shaders/liquids_shader/opengl_fragment.glsl
share/minetest/client/shaders/liquids_shader/opengl_vertex.glsl
share/minetest/client/shaders/plants_shader/
share/minetest/client/shaders/plants_shader/base.txt
share/minetest/client/shaders/plants_shader/opengl_fragment.glsl
share/minetest/client/shaders/plants_shader/opengl_vertex.glsl
share/minetest/client/shaders/solids_shader/
share/minetest/client/shaders/solids_shader/base.txt
share/minetest/client/shaders/solids_shader/opengl_fragment.glsl
share/minetest/client/shaders/solids_shader/opengl_vertex.glsl
share/minetest/fonts/
share/minetest/fonts/DroidSansFallbackFull.ttf
share/minetest/fonts/fontdejavusansmono.png
share/minetest/fonts/fontlucida.png
share/minetest/fonts/liberationmono.ttf
share/minetest/fonts/liberationsans.ttf
share/minetest/games/
@ -94,13 +116,19 @@ share/minetest/games/minetest_game/mods/default/sounds/
share/minetest/games/minetest_game/mods/default/sounds/default_break_glass.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_break_glass.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_break_glass.3.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_cool_lava.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_cool_lava.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_cool_lava.3.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_choppy.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_cracky.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_crumbly.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_crumbly.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_crumbly.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_dig_immediate.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dirt_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dirt_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dug_node.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_dug_node.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_glass_footstep.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_grass_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_grass_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_grass_footstep.3.ogg
@ -110,10 +138,21 @@ share/minetest/games/minetest_game/mods/default/sounds/default_gravel_footstep.3
share/minetest/games/minetest_game/mods/default/sounds/default_gravel_footstep.4.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_hard_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_hard_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_hard_footstep.3.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_place_node.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_place_node.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_place_node.3.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_place_node_hard.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_place_node_hard.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_sand_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_sand_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_snow_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_snow_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_snow_footstep.3.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_wood_footstep.1.ogg
share/minetest/games/minetest_game/mods/default/sounds/default_wood_footstep.2.ogg
share/minetest/games/minetest_game/mods/default/textures/
share/minetest/games/minetest_game/mods/default/textures/bubble.png
share/minetest/games/minetest_game/mods/default/textures/crack_anylength.png
share/minetest/games/minetest_game/mods/default/textures/default_apple.png
share/minetest/games/minetest_game/mods/default/textures/default_book.png
@ -260,6 +299,7 @@ share/minetest/games/minetest_game/mods/default/textures/player_back.png
share/minetest/games/minetest_game/mods/default/textures/treeprop.png
share/minetest/games/minetest_game/mods/default/textures/wieldhand.png
share/minetest/games/minetest_game/mods/default/tools.lua
share/minetest/games/minetest_game/mods/default/trees.lua
share/minetest/games/minetest_game/mods/doors/
share/minetest/games/minetest_game/mods/doors/README.txt
share/minetest/games/minetest_game/mods/doors/depends.txt
@ -367,7 +407,6 @@ share/minetest/games/minetest_game/mods/legacy/textures/oerkki1.png
share/minetest/games/minetest_game/mods/legacy/textures/oerkki1_damaged.png
share/minetest/games/minetest_game/mods/legacy/textures/rat.png
share/minetest/games/minetest_game/mods/screwdriver/
share/minetest/games/minetest_game/mods/screwdriver/depends.txt
share/minetest/games/minetest_game/mods/screwdriver/init.lua
share/minetest/games/minetest_game/mods/screwdriver/readme.txt
share/minetest/games/minetest_game/mods/screwdriver/textures/
@ -435,6 +474,7 @@ share/minetest/games/minimal/mods/default/mapgen.lua
share/minetest/games/minimal/mods/default/sounds/
share/minetest/games/minimal/mods/default/sounds/default_grass_footstep.1.ogg
share/minetest/games/minimal/mods/default/textures/
share/minetest/games/minimal/mods/default/textures/bubble.png
share/minetest/games/minimal/mods/default/textures/crack_anylength.png
share/minetest/games/minimal/mods/default/textures/default_apple.png
share/minetest/games/minimal/mods/default/textures/default_book.png
@ -551,15 +591,15 @@ share/minetest/games/minimal/mods/stairs/init.lua
share/minetest/games/minimal/mods/test/
share/minetest/games/minimal/mods/test/init.lua
share/minetest/locale/
share/minetest/locale/cs/
share/minetest/locale/cs/LC_MESSAGES/
share/minetest/locale/cs/LC_MESSAGES/minetest.mo
share/minetest/locale/da/
share/minetest/locale/da/LC_MESSAGES/
share/minetest/locale/da/LC_MESSAGES/minetest.mo
share/minetest/locale/de/
share/minetest/locale/de/LC_MESSAGES/
share/minetest/locale/de/LC_MESSAGES/minetest.mo
share/minetest/locale/du/
share/minetest/locale/du/LC_MESSAGES/
share/minetest/locale/du/LC_MESSAGES/minetest.mo
share/minetest/locale/es/
share/minetest/locale/es/LC_MESSAGES/
share/minetest/locale/es/LC_MESSAGES/minetest.mo
@ -569,6 +609,9 @@ share/minetest/locale/et/LC_MESSAGES/minetest.mo
share/minetest/locale/fr/
share/minetest/locale/fr/LC_MESSAGES/
share/minetest/locale/fr/LC_MESSAGES/minetest.mo
share/minetest/locale/hu/
share/minetest/locale/hu/LC_MESSAGES/
share/minetest/locale/hu/LC_MESSAGES/minetest.mo
share/minetest/locale/it/
share/minetest/locale/it/LC_MESSAGES/
share/minetest/locale/it/LC_MESSAGES/minetest.mo
@ -581,6 +624,9 @@ share/minetest/locale/ko/LC_MESSAGES/minetest.mo
share/minetest/locale/ky/
share/minetest/locale/ky/LC_MESSAGES/
share/minetest/locale/ky/LC_MESSAGES/minetest.mo
share/minetest/locale/lt/
share/minetest/locale/lt/LC_MESSAGES/
share/minetest/locale/lt/LC_MESSAGES/minetest.mo
share/minetest/locale/nb/
share/minetest/locale/nb/LC_MESSAGES/
share/minetest/locale/nb/LC_MESSAGES/minetest.mo
@ -611,10 +657,11 @@ share/minetest/locale/zh_CN/LC_MESSAGES/minetest.mo
share/minetest/textures/
share/minetest/textures/base/
share/minetest/textures/base/pack/
share/minetest/textures/base/pack/fontdejavusansmono.png
share/minetest/textures/base/pack/fontlucida.png
share/minetest/textures/base/pack/disable_img.png
share/minetest/textures/base/pack/enable_img.png
share/minetest/textures/base/pack/logo.png
share/minetest/textures/base/pack/menu_header.png
share/minetest/textures/base/pack/no_screenshot.png
share/minetest/textures/base/pack/smoke_puff.png
share/minetest/textures/base/pack/sunrisebg.png
share/minetest/textures/base/pack/unknown_item.png