update to minetest-0.4.3, ok landry

This commit is contained in:
sthen 2012-11-26 16:03:31 +00:00
parent 558192782f
commit 43a0cf3210
6 changed files with 83 additions and 40 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
# $OpenBSD: Makefile,v 1.2 2012/11/26 16:03:31 sthen 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/
@ -13,17 +13,15 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
minetest-game-0.4.1${EXTRACT_SUFX}
minetest-game-0.4.3${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/
WRKDIST= ${WRKDIR}/celeron55-minetest-e3ddbe8/
MASTER_SITES = http://spacehopper.org/mirrors/
MODULES = devel/cmake \
devel/gettext
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+2,-guic
@ -36,7 +34,7 @@ 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/ \
mv ${WRKDIR}/minetest_game-0.4.3/ \
${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game

View File

@ -1,4 +1,4 @@
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) = njncKhK5sLn5/CBOOrvp91mOPRRS4135oVgRNSBfKWI=
SHA256 (minetest-game-0.4.3.tar.gz) = hiIWJ7IISM7ramD/s1XgDBztrUMnosUHkg0zPEM3t2A=
SIZE (minetest-0.4.3.tar.gz) = 2080698
SIZE (minetest-game-0.4.3.tar.gz) = 285477

View File

@ -1,12 +0,0 @@
$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
@@ -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(EXAMPLE_CONF_DIR ${DOCDIR})
set(XDG_APPS_DIR "share/applications")
set(ICONDIR "share/icons")

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2012/11/26 16:03:31 sthen Exp $
Properly link/find libintl/iconv
--- src/CMakeLists.txt.orig Sat Jul 21 22:14:23 2012
+++ src/CMakeLists.txt Sun Jul 22 13:59:34 2012
@@ -18,6 +18,8 @@ set(USE_GETTEXT 0)
--- src/CMakeLists.txt.orig Tue Sep 4 23:31:06 2012
+++ src/CMakeLists.txt Sat Nov 24 14:29:37 2012
@@ -14,6 +14,8 @@ set(USE_GETTEXT 0)
if(ENABLE_GETTEXT)
find_package(GettextLib)
@ -11,7 +11,7 @@ Properly link/find libintl/iconv
else()
MARK_AS_ADVANCED(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
endif()
@@ -297,7 +299,8 @@ if(BUILD_CLIENT)
@@ -296,7 +298,8 @@ if(BUILD_CLIENT)
${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
@ -21,7 +21,7 @@ Properly link/find libintl/iconv
${SOUND_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
@@ -312,6 +315,8 @@ if(BUILD_SERVER)
@@ -311,6 +314,8 @@ if(BUILD_SERVER)
target_link_libraries(
${PROJECT_NAME}server
${ZLIB_LIBRARIES}

View File

@ -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: patch-src_porting_cpp,v 1.2 2012/11/26 16:03:31 sthen Exp $
--- src/porting.cpp.orig Tue Sep 4 23:31:06 2012
+++ src/porting.cpp Sat Nov 24 14:31:04 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__)
+ #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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/11/26 16:03:31 sthen Exp $
@bin bin/minetest
@bin bin/minetestserver
@man man/man6/minetest.6
@ -20,6 +20,7 @@ share/minetest/builtin/auth.lua
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
@ -42,6 +43,9 @@ 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/creative/
share/minetest/games/minetest_game/mods/creative/README.txt
share/minetest/games/minetest_game/mods/creative/init.lua
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
@ -151,8 +155,11 @@ share/minetest/games/minetest_game/mods/default/textures/default_tool_woodpick.p
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_animated.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_ceiling_animated.png
share/minetest/games/minetest_game/mods/default/textures/default_torch_on_floor.png
share/minetest/games/minetest_game/mods/default/textures/default_torch_on_floor_animated.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
@ -172,6 +179,26 @@ 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/dye/
share/minetest/games/minetest_game/mods/dye/README.txt
share/minetest/games/minetest_game/mods/dye/depends.txt
share/minetest/games/minetest_game/mods/dye/init.lua
share/minetest/games/minetest_game/mods/dye/textures/
share/minetest/games/minetest_game/mods/dye/textures/dye_black.png
share/minetest/games/minetest_game/mods/dye/textures/dye_blue.png
share/minetest/games/minetest_game/mods/dye/textures/dye_brown.png
share/minetest/games/minetest_game/mods/dye/textures/dye_cyan.png
share/minetest/games/minetest_game/mods/dye/textures/dye_dark_green.png
share/minetest/games/minetest_game/mods/dye/textures/dye_dark_grey.png
share/minetest/games/minetest_game/mods/dye/textures/dye_green.png
share/minetest/games/minetest_game/mods/dye/textures/dye_grey.png
share/minetest/games/minetest_game/mods/dye/textures/dye_magenta.png
share/minetest/games/minetest_game/mods/dye/textures/dye_orange.png
share/minetest/games/minetest_game/mods/dye/textures/dye_pink.png
share/minetest/games/minetest_game/mods/dye/textures/dye_red.png
share/minetest/games/minetest_game/mods/dye/textures/dye_violet.png
share/minetest/games/minetest_game/mods/dye/textures/dye_white.png
share/minetest/games/minetest_game/mods/dye/textures/dye_yellow.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
@ -199,6 +226,39 @@ 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/minetest_game/mods/vessels/
share/minetest/games/minetest_game/mods/vessels/README.txt
share/minetest/games/minetest_game/mods/vessels/depends.txt
share/minetest/games/minetest_game/mods/vessels/init.lua
share/minetest/games/minetest_game/mods/vessels/textures/
share/minetest/games/minetest_game/mods/vessels/textures/alternates/
share/minetest/games/minetest_game/mods/vessels/textures/alternates/vessels_drinking_glass.png
share/minetest/games/minetest_game/mods/vessels/textures/alternates/vessels_glass_bottle.png
share/minetest/games/minetest_game/mods/vessels/textures/alternates/vessels_steel_bottle.png
share/minetest/games/minetest_game/mods/vessels/textures/vessels_drinking_glass.png
share/minetest/games/minetest_game/mods/vessels/textures/vessels_glass_bottle.png
share/minetest/games/minetest_game/mods/vessels/textures/vessels_glass_fragments.png
share/minetest/games/minetest_game/mods/vessels/textures/vessels_steel_bottle.png
share/minetest/games/minetest_game/mods/wool/
share/minetest/games/minetest_game/mods/wool/README.txt
share/minetest/games/minetest_game/mods/wool/depends.txt
share/minetest/games/minetest_game/mods/wool/init.lua
share/minetest/games/minetest_game/mods/wool/textures/
share/minetest/games/minetest_game/mods/wool/textures/wool_black.png
share/minetest/games/minetest_game/mods/wool/textures/wool_blue.png
share/minetest/games/minetest_game/mods/wool/textures/wool_brown.png
share/minetest/games/minetest_game/mods/wool/textures/wool_cyan.png
share/minetest/games/minetest_game/mods/wool/textures/wool_dark_green.png
share/minetest/games/minetest_game/mods/wool/textures/wool_dark_grey.png
share/minetest/games/minetest_game/mods/wool/textures/wool_green.png
share/minetest/games/minetest_game/mods/wool/textures/wool_grey.png
share/minetest/games/minetest_game/mods/wool/textures/wool_magenta.png
share/minetest/games/minetest_game/mods/wool/textures/wool_orange.png
share/minetest/games/minetest_game/mods/wool/textures/wool_pink.png
share/minetest/games/minetest_game/mods/wool/textures/wool_red.png
share/minetest/games/minetest_game/mods/wool/textures/wool_violet.png
share/minetest/games/minetest_game/mods/wool/textures/wool_white.png
share/minetest/games/minetest_game/mods/wool/textures/wool_yellow.png
share/minetest/games/minimal/
share/minetest/games/minimal/game.conf
share/minetest/games/minimal/mods/