Hi,
an update of games/minetest!
What say you?
\\anders
diff -uNr --exclude=CVS minetest.orig/Makefile minetest/Makefile
--- minetest.orig/Makefile Tue Sep 25 23:48:42 2012
+++ minetest/Makefile Tue Sep 25 22:27:03 2012
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
COMMENT = infinite-world block sandbox game
-DISTNAME = minetest-0.4.1
+DISTNAME = minetest-0.4.3
CATEGORIES = games x11
HOMEPAGE = http://www.minetest.net/
@@ -12,18 +12,16 @@
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- minetest-game-0.4.1${EXTRACT_SUFX}
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
-#https://github.com/celeron55/minetest_game/tarball/0.4.1
-#https://github.com/celeron55/minetest/tarball/0.4.1
-MASTER_SITES = http://rhaalovely.net/stuff/
+MASTER_SITES = https://github.com/celeron55/minetest/tarball/stable-0.4/
-WRKDIST= ${WRKDIR}/celeron55-minetest-e3ddbe8/
+WRKDIST= ${WRKDIR}/celeron55-minetest-9696ed3/
MODULES = devel/cmake \
devel/gettext
-CONFIGURE_ARGS = -DENABLE_GETTEXT=ON
+CONFIGURE_ARGS = -DENABLE_GETTEXT=ON \
+ -DRUN_IN_PLACE=0
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+2,-guic
@@ -34,10 +32,5 @@
WANTLIB += GL GLU ICE SM X11 Xext Xxf86vm bz2 c jpeg m ogg openal
WANTLIB += png pthread sqlite3 stdc++ vorbis vorbisfile z
-
-post-install:
- mv ${WRKDIR}/celeron55-minetest_game-6ba4f01/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
.include <bsd.port.mk>
diff -uNr --exclude=CVS minetest.orig/distinfo minetest/distinfo
--- minetest.orig/distinfo Tue Sep 25 23:48:42 2012
+++ minetest/distinfo Tue Sep 25 22:27:03 2012
@@ -1,4 +1,2 @@
-SHA256 (minetest-0.4.1.tar.gz) = +6ox5n9GsmNq38afSFSDdplBYg/XNCz9iaziJ4t93lc=
-SHA256 (minetest-game-0.4.1.tar.gz) = ywjLpGcie4ZXozNIok+EIJ4WLAVrqDhZh9ntaIY16fo=
-SIZE (minetest-0.4.1.tar.gz) = 2060872
-SIZE (minetest-game-0.4.1.tar.gz) = 255562
+SHA256 (minetest-0.4.3.tar.gz) = iZN4ujtpK/jaJpjaO/kbHea724v42TtO1FI9QoG7l3s=
+SIZE (minetest-0.4.3.tar.gz) = 2080827
diff -uNr --exclude=CVS minetest.orig/patches/patch-CMakeLists_txt minetest/patches/patch-CMakeLists_txt
--- minetest.orig/patches/patch-CMakeLists_txt Tue Sep 25 23:48:42 2012
+++ minetest/patches/patch-CMakeLists_txt Tue Sep 25 22:27:03 2012
@@ -1,12 +1,12 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
---- CMakeLists.txt.orig Fri Jul 20 17:23:37 2012
-+++ CMakeLists.txt Fri Jul 20 17:23:55 2012
+$OpenBSD$
+--- CMakeLists.txt.orig Sun Sep 23 01:57:36 2012
++++ CMakeLists.txt Sun Sep 23 01:58:00 2012
@@ -81,7 +81,7 @@ elseif(UNIX) # Linux, BSD etc
- set(SHAREDIR "share/${PROJECT_NAME}")
- set(BINDIR "bin")
- set(DOCDIR "share/doc/${PROJECT_NAME}")
-- set(MANDIR "share/man")
-+ set(MANDIR "man")
+ set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
+ set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
+ set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
+- set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
++ set(MANDIR "${CMAKE_INSTALL_PREFIX}/man")
set(EXAMPLE_CONF_DIR ${DOCDIR})
- set(XDG_APPS_DIR "share/applications")
- set(ICONDIR "share/icons")
+ set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
+ set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
diff -uNr --exclude=CVS minetest.orig/patches/patch-src_porting_cpp minetest/patches/patch-src_porting_cpp
--- minetest.orig/patches/patch-src_porting_cpp Tue Sep 25 23:48:42 2012
+++ minetest/patches/patch-src_porting_cpp Tue Sep 25 22:27:03 2012
@@ -1,15 +1,12 @@
-$OpenBSD: patch-src_porting_cpp,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
---- src/porting.cpp.orig Wed Jun 6 23:40:04 2012
-+++ src/porting.cpp Fri Jul 20 19:05:55 2012
-@@ -295,9 +295,9 @@ void initializePaths()
+$OpenBSD$
+--- src/porting.cpp.orig Tue Sep 25 21:54:06 2012
++++ src/porting.cpp Tue Sep 25 21:55:13 2012
+@@ -318,7 +318,7 @@ void initializePaths()
path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined (__OpenBSD__)
-- path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-+ path_share = std::string(CMAKE_INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
-
- #endif
diff -uNr --exclude=CVS minetest.orig/patches/patch-src_porting_cpp.orig minetest/patches/patch-src_porting_cpp.orig
--- minetest.orig/patches/patch-src_porting_cpp.orig Thu Jan 1 01:00:00 1970
+++ minetest/patches/patch-src_porting_cpp.orig Tue Sep 25 22:27:03 2012
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- src/porting.cpp.orig Tue Sep 25 21:30:33 2012
++++ src/porting.cpp Tue Sep 25 21:36:06 2012
+@@ -126,8 +126,8 @@ void signal_handler_init(void)
+ */
+
+ // Default to RUN_IN_PLACE style relative paths
+-std::string path_share = "..";
+-std::string path_user = "..";
++std::string path_share = "../runinplae";
++std::string path_user = "../runinplae";
+
+ std::string getDataPath(const char *subpath)
+ {
+@@ -200,19 +200,19 @@ void initializePaths()
+
+ pathRemoveFile(buf, '/');
+
+- path_share = std::string(buf) + "/..";
+- path_user = std::string(buf) + "/..";
++ path_share = std::string(buf) + "/../debug";
++ path_user = std::string(buf) + "/../debug";
+
+ /*
+ OS X
+ */
+- #elif defined(__APPLE__) || defined(__FreeBSD__)
++ #elif defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
+
+ //TODO: Get path of executable. This assumes working directory is bin/
+ dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
+ <<std::endl;
+- path_share = std::string("..");
+- path_user = std::string("..");
++ path_share = std::string("/usr/local/share/minetest");
++ path_user = std::string("~/.minetest");
+
+ #endif
+
diff -uNr --exclude=CVS minetest.orig/pkg/MESSAGE minetest/pkg/MESSAGE
--- minetest.orig/pkg/MESSAGE Thu Jan 1 01:00:00 1970
+++ minetest/pkg/MESSAGE Tue Sep 25 23:31:04 2012
@@ -0,0 +1 @@
+You may also want to install games/minetest_game
diff -uNr --exclude=CVS minetest.orig/pkg/PLIST minetest/pkg/PLIST
--- minetest.orig/pkg/PLIST Tue Sep 25 23:48:42 2012
+++ minetest/pkg/PLIST Tue Sep 25 22:27:03 2012
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
+@comment $OpenBSD$
@bin bin/minetest
@bin bin/minetestserver
@man man/man6/minetest.6
@@ -20,6 +20,7 @@
share/minetest/builtin/builtin.lua
share/minetest/builtin/chatcommands.lua
share/minetest/builtin/deprecated.lua
+share/minetest/builtin/detached_inventory.lua
share/minetest/builtin/item.lua
share/minetest/builtin/item_entity.lua
share/minetest/builtin/misc.lua
@@ -29,176 +30,6 @@
share/minetest/builtin/serialize.lua
share/minetest/builtin/static_spawn.lua
share/minetest/games/
-share/minetest/games/minetest_game/
-share/minetest/games/minetest_game/.gitignore
-share/minetest/games/minetest_game/README.txt
-share/minetest/games/minetest_game/game.conf
-share/minetest/games/minetest_game/mods/
-share/minetest/games/minetest_game/mods/bucket/
-share/minetest/games/minetest_game/mods/bucket/README.txt
-share/minetest/games/minetest_game/mods/bucket/depends.txt
-share/minetest/games/minetest_game/mods/bucket/init.lua
-share/minetest/games/minetest_game/mods/bucket/textures/
-share/minetest/games/minetest_game/mods/bucket/textures/bucket.png
-share/minetest/games/minetest_game/mods/bucket/textures/bucket_lava.png
-share/minetest/games/minetest_game/mods/bucket/textures/bucket_water.png
-share/minetest/games/minetest_game/mods/default/
-share/minetest/games/minetest_game/mods/default/README.txt
-share/minetest/games/minetest_game/mods/default/init.lua
-share/minetest/games/minetest_game/mods/default/leafdecay.lua
-share/minetest/games/minetest_game/mods/default/mapgen.lua
-share/minetest/games/minetest_game/mods/default/sounds/
-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_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_dug_node.1.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
-share/minetest/games/minetest_game/mods/default/sounds/default_gravel_footstep.1.ogg
-share/minetest/games/minetest_game/mods/default/sounds/default_gravel_footstep.2.ogg
-share/minetest/games/minetest_game/mods/default/sounds/default_gravel_footstep.3.ogg
-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_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/textures/
-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
-share/minetest/games/minetest_game/mods/default/textures/default_bookshelf.png
-share/minetest/games/minetest_game/mods/default/textures/default_brick.png
-share/minetest/games/minetest_game/mods/default/textures/default_cactus_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_cactus_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_chest_front.png
-share/minetest/games/minetest_game/mods/default/textures/default_chest_lock.png
-share/minetest/games/minetest_game/mods/default/textures/default_chest_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_chest_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_clay.png
-share/minetest/games/minetest_game/mods/default/textures/default_clay_brick.png
-share/minetest/games/minetest_game/mods/default/textures/default_clay_lump.png
-share/minetest/games/minetest_game/mods/default/textures/default_cloud.png
-share/minetest/games/minetest_game/mods/default/textures/default_coal_lump.png
-share/minetest/games/minetest_game/mods/default/textures/default_cobble.png
-share/minetest/games/minetest_game/mods/default/textures/default_desert_sand.png
-share/minetest/games/minetest_game/mods/default/textures/default_desert_stone.png
-share/minetest/games/minetest_game/mods/default/textures/default_dirt.png
-share/minetest/games/minetest_game/mods/default/textures/default_dry_shrub.png
-share/minetest/games/minetest_game/mods/default/textures/default_fence.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_bottom.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_fire_bg.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_fire_fg.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_front.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_front_active.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_furnace_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_glass.png
-share/minetest/games/minetest_game/mods/default/textures/default_grass.png
-share/minetest/games/minetest_game/mods/default/textures/default_grass_footsteps.png
-share/minetest/games/minetest_game/mods/default/textures/default_grass_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_gravel.png
-share/minetest/games/minetest_game/mods/default/textures/default_iron_lump.png
-share/minetest/games/minetest_game/mods/default/textures/default_junglegrass.png
-share/minetest/games/minetest_game/mods/default/textures/default_jungletree.png
-share/minetest/games/minetest_game/mods/default/textures/default_jungletree_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_ladder.png
-share/minetest/games/minetest_game/mods/default/textures/default_lava.png
-share/minetest/games/minetest_game/mods/default/textures/default_lava_flowing_animated.png
-share/minetest/games/minetest_game/mods/default/textures/default_lava_source_animated.png
-share/minetest/games/minetest_game/mods/default/textures/default_leaves.png
-share/minetest/games/minetest_game/mods/default/textures/default_mese.png
-share/minetest/games/minetest_game/mods/default/textures/default_mineral_coal.png
-share/minetest/games/minetest_game/mods/default/textures/default_mineral_iron.png
-share/minetest/games/minetest_game/mods/default/textures/default_mossycobble.png
-share/minetest/games/minetest_game/mods/default/textures/default_nc_back.png
-share/minetest/games/minetest_game/mods/default/textures/default_nc_front.png
-share/minetest/games/minetest_game/mods/default/textures/default_nc_rb.png
-share/minetest/games/minetest_game/mods/default/textures/default_nc_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_paper.png
-share/minetest/games/minetest_game/mods/default/textures/default_papyrus.png
-share/minetest/games/minetest_game/mods/default/textures/default_rail.png
-share/minetest/games/minetest_game/mods/default/textures/default_rail_crossing.png
-share/minetest/games/minetest_game/mods/default/textures/default_rail_curved.png
-share/minetest/games/minetest_game/mods/default/textures/default_rail_t_junction.png
-share/minetest/games/minetest_game/mods/default/textures/default_sand.png
-share/minetest/games/minetest_game/mods/default/textures/default_sandstone.png
-share/minetest/games/minetest_game/mods/default/textures/default_sapling.png
-share/minetest/games/minetest_game/mods/default/textures/default_scorched_stuff.png
-share/minetest/games/minetest_game/mods/default/textures/default_sign_wall.png
-share/minetest/games/minetest_game/mods/default/textures/default_steel_block.png
-share/minetest/games/minetest_game/mods/default/textures/default_steel_ingot.png
-share/minetest/games/minetest_game/mods/default/textures/default_stick.png
-share/minetest/games/minetest_game/mods/default/textures/default_stone.png
-share/minetest/games/minetest_game/mods/default/textures/default_tnt_bottom.png
-share/minetest/games/minetest_game/mods/default/textures/default_tnt_side.png
-share/minetest/games/minetest_game/mods/default/textures/default_tnt_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_mesepick.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_steelaxe.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_steelpick.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_steelshovel.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_steelsword.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_stoneaxe.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_stonepick.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_stoneshovel.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_stonesword.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_woodaxe.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_woodpick.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_woodshovel.png
-share/minetest/games/minetest_game/mods/default/textures/default_tool_woodsword.png
-share/minetest/games/minetest_game/mods/default/textures/default_torch.png
-share/minetest/games/minetest_game/mods/default/textures/default_torch_on_ceiling.png
-share/minetest/games/minetest_game/mods/default/textures/default_torch_on_floor.png
-share/minetest/games/minetest_game/mods/default/textures/default_tree.png
-share/minetest/games/minetest_game/mods/default/textures/default_tree_top.png
-share/minetest/games/minetest_game/mods/default/textures/default_water.png
-share/minetest/games/minetest_game/mods/default/textures/default_wood.png
-share/minetest/games/minetest_game/mods/default/textures/heart.png
-share/minetest/games/minetest_game/mods/default/textures/player.png
-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/doors/
-share/minetest/games/minetest_game/mods/doors/README.txt
-share/minetest/games/minetest_game/mods/doors/depends.txt
-share/minetest/games/minetest_game/mods/doors/init.lua
-share/minetest/games/minetest_game/mods/doors/textures/
-share/minetest/games/minetest_game/mods/doors/textures/door_wood.png
-share/minetest/games/minetest_game/mods/doors/textures/door_wood_a.png
-share/minetest/games/minetest_game/mods/doors/textures/door_wood_a_r.png
-share/minetest/games/minetest_game/mods/doors/textures/door_wood_b.png
-share/minetest/games/minetest_game/mods/doors/textures/door_wood_b_r.png
-share/minetest/games/minetest_game/mods/fire/
-share/minetest/games/minetest_game/mods/fire/README.txt
-share/minetest/games/minetest_game/mods/fire/init.lua
-share/minetest/games/minetest_game/mods/fire/sounds/
-share/minetest/games/minetest_game/mods/fire/sounds/fire_large.ogg
-share/minetest/games/minetest_game/mods/fire/sounds/fire_small.ogg
-share/minetest/games/minetest_game/mods/fire/textures/
-share/minetest/games/minetest_game/mods/fire/textures/fire_basic_flame.png
-share/minetest/games/minetest_game/mods/give_initial_stuff/
-share/minetest/games/minetest_game/mods/give_initial_stuff/depends.txt
-share/minetest/games/minetest_game/mods/give_initial_stuff/init.lua
-share/minetest/games/minetest_game/mods/legacy/
-share/minetest/games/minetest_game/mods/legacy/depends.txt
-share/minetest/games/minetest_game/mods/legacy/init.lua
-share/minetest/games/minetest_game/mods/legacy/textures/
-share/minetest/games/minetest_game/mods/legacy/textures/apple_iron.png
-share/minetest/games/minetest_game/mods/legacy/textures/cooked_rat.png
-share/minetest/games/minetest_game/mods/legacy/textures/dungeon_master.png
-share/minetest/games/minetest_game/mods/legacy/textures/fireball.png
-share/minetest/games/minetest_game/mods/legacy/textures/firefly.png
-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/stairs/
-share/minetest/games/minetest_game/mods/stairs/README.txt
-share/minetest/games/minetest_game/mods/stairs/depends.txt
-share/minetest/games/minetest_game/mods/stairs/init.lua
share/minetest/games/minimal/
share/minetest/games/minimal/game.conf
share/minetest/games/minimal/mods/
@@ -342,7 +173,3 @@
share/minetest/textures/base/pack/unknown_block.png
share/minetest/textures/base/pack/unknown_item.png
share/minetest/textures/base/pack/unknown_object.png
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
