- Update to 0.2.20110922_1

7 files changed, 120 insertions, 77 deletions

diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 4a78d61657fe..9db6765a12d8 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -6,40 +6,51 @@
 #
 
 PORTNAME=	minetest
-PORTVERSION=	r20110623
+DISTVERSION=	0.2.20110922_1
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
-#		https://bitbucket.org/celeron55/minetest/get/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An Infiniminer/Minecraft inspired game
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
-RUN_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+LIB_DEPENDS=	Irrlicht.1:${PORTSDIR}/x11-toolkits/irrlicht \
+		sqlite3:${PORTSDIR}/databases/sqlite3
 
-USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 
-WRKSRC=		${WRKDIR}/celeron55-minetest-9bc10c75dff2
+WRKSRC=		${WRKDIR}/celeron55-minetest-bdf5490
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS=	CLIENT	"Build client" on \
-		SERVER	"Build server" on \
+OPTIONS=	CLIENT "Build client" on \
+		SERVER "Build server" on \
 		OPTIMIZED_CFLAGS "Enabled additional optimizations" on
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if defined(WITHOUT_NLS)
+CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=NO
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
+PLIST_SUB+=	NLS=""
+.endif
+
+.if !defined(WITH_DEBUG)
+CFLAGS+=	-DNDEBUG
+CXXFLAGS+=	-DNDEBUG
+. if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -funroll-loops
 CXXFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -funroll-loops
+. endif
 .endif
 
 .if !defined(WITHOUT_CLIENT)
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png
 CMAKE_ARGS+=	-DBUILD_CLIENT=1
 PLIST_SUB+=	CLIENT=""
@@ -66,6 +77,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/changelog.txt ${DOCSDIR}/
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/games/minetest/distinfo b/games/minetest/distinfo
index 4de29aeaf510..9c8635ea4938 100644
--- a/games/minetest/distinfo
+++ b/games/minetest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minetest-r20110623.tar.bz2) = e87b6efdd1067f5116b54fb2237f21a6c196cbd0470a9599eb1109d96ce2201b
-SIZE (minetest-r20110623.tar.bz2) = 321021
+SHA256 (minetest-0.2.20110922_1.tar.gz) = b64fd204265b9a9416e533d5cadb8ea88d1e29244a429823c88e7dd40d9c0320
+SIZE (minetest-0.2.20110922_1.tar.gz) = 1736822
diff --git a/games/minetest/files/patch-CMakeLists.txt b/games/minetest/files/patch-CMakeLists.txt
index 162a96b033cd..205cb767736a 100644
--- a/games/minetest/files/patch-CMakeLists.txt
+++ b/games/minetest/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2011-06-23 15:10:46.000000000 +0400
-+++ CMakeLists.txt	2011-06-30 04:30:39.000000000 +0400
-@@ -59,8 +59,6 @@
- 	set(EXAMPLE_CONF_DIR "share/doc/minetest")
+--- CMakeLists.txt.orig	2011-07-31 16:54:54.000000000 +0400
++++ CMakeLists.txt	2011-08-01 21:51:29.000000000 +0400
+@@ -63,9 +63,6 @@
+ 	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
  endif()
  
 -install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+-install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 -install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
  
  #
diff --git a/games/minetest/files/patch-src-CMakeLists.txt b/games/minetest/files/patch-src-CMakeLists.txt
index faaed3aa15b2..8d73271f6e67 100644
--- a/games/minetest/files/patch-src-CMakeLists.txt
+++ b/games/minetest/files/patch-src-CMakeLists.txt
@@ -1,37 +1,69 @@
---- src/CMakeLists.txt.orig	2011-06-23 15:10:46.000000000 +0400
-+++ src/CMakeLists.txt	2011-06-30 18:07:30.000000000 +0400
-@@ -48,7 +48,7 @@
+--- src/CMakeLists.txt.orig	2011-09-22 21:47:47.000000000 +0400
++++ src/CMakeLists.txt	2011-09-24 18:23:37.000000000 +0400
+@@ -11,23 +11,25 @@
+ # this is only set to 1 if gettext is enabled _and_ available
+ set(USE_GETTEXT 0)
+ 
+-find_package(GettextLib)
++if(ENABLE_GETTEXT)
++	find_package(GettextLib)
+ 
+-if(GETTEXT_FOUND AND ENABLE_GETTEXT)
+-	message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
+-	message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
+-	if(WIN32)
+-		message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
+-		message(STATUS "gettext dll: ${GETTEXT_DLL}")
+-		message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
+-	endif()
+-	set(USE_GETTEXT 1)
+-	message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
+-elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT)
+-	MESSAGE(STATUS "GetText found but disabled;")
+-else(GETTEXT_FOUND AND ENABLE_GETTEXT)
++	if(GETTEXT_FOUND)
++		message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
++		message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
++		if(WIN32)
++			message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
++			message(STATUS "gettext dll: ${GETTEXT_DLL}")
++			message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
++		endif()
++		set(USE_GETTEXT 1)
++		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
++	else(GETTEXT_FOUND)
++		message(STATUS "GetText not found, disabling")
++	endif(GETTEXT_FOUND)
++else(ENABLE_GETTEXT)
+ 	message(STATUS "GetText disabled")
+-endif(GETTEXT_FOUND AND ENABLE_GETTEXT)
++endif(ENABLE_GETTEXT)
+ 
+ if(NOT MSVC)
+ 	set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
+@@ -74,7 +76,7 @@
  		endif(APPLE)
  	endif(BUILD_CLIENT)
  	find_package(ZLIB REQUIRED)
--	set(PLATFORM_LIBS -lpthread)
-+	set(PLATFORM_LIBS -pthread)
+-	set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
++	set(PLATFORM_LIBS -pthread ${CMAKE_DL_LIBS})
  	#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
  	# This way Xxf86vm is found on OpenBSD too
  	find_library(XXF86VM_LIBRARY Xxf86vm)
-@@ -192,16 +192,12 @@
- 		set(RELEASE_WARNING_FLAGS "")
- 	endif()
- 	
--	if(NOT APPLE)
--		set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
--	endif()
--	
- 	if(APPLE)
- 		set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
+@@ -250,7 +252,7 @@
  		set(ARCH i386)
  	endif()
  
 -	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
-+	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -Wall -pipe")
++	set(CMAKE_CXX_FLAGS_RELEASE "${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -Wall") 
  	set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
  
  	if(USE_GPROF)
-@@ -223,7 +219,6 @@
+@@ -272,7 +274,6 @@
  #
  
  # Example configuration file
 -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
  
  if(BUILD_CLIENT)
- 	install(TARGETS minetest DESTINATION ${BINDIR})
+ 	install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
diff --git a/games/minetest/files/patch-src-debug.cpp b/games/minetest/files/patch-src-debug.cpp
deleted file mode 100644
index bc035d596ca8..000000000000
--- a/games/minetest/files/patch-src-debug.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/debug.cpp.orig	2011-06-18 23:31:24.000000000 +0400
-+++ src/debug.cpp	2011-06-23 19:58:10.000000000 +0400
-@@ -70,7 +70,7 @@
- {
- 	DEBUGPRINT("\nIn thread %x:\n"
- 			"%s:%d: %s: Assertion '%s' failed.\n",
--			(unsigned int)get_current_thread_id(),
-+			(unsigned int)(intptr_t)get_current_thread_id(),
- 			file, line, function, assertion);
- 	
- 	debug_stacks_print();
-@@ -96,7 +96,7 @@
- void DebugStack::print(FILE *file, bool everything)
- {
- 	fprintf(file, "DEBUG STACK FOR THREAD %x:\n",
--			(unsigned int)threadid);
-+			(unsigned int)(intptr_t)threadid);
- 
- 	for(int i=0; i<stack_max_i; i++)
- 	{
diff --git a/games/minetest/files/patch-src-porting.cpp b/games/minetest/files/patch-src-porting.cpp
deleted file mode 100644
index 803599ab7c96..000000000000
--- a/games/minetest/files/patch-src-porting.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/porting.cpp.orig	2011-06-18 23:31:24.000000000 +0400
-+++ src/porting.cpp	2011-06-19 13:53:48.000000000 +0400
-@@ -194,17 +194,10 @@
- 	/*
- 		Linux
- 	*/
--	#elif defined(linux)
-+	#elif defined(linux) || defined (__FreeBSD__)
- 		#include <unistd.h>
- 	
--	char buf[BUFSIZ];
--	memset(buf, 0, BUFSIZ);
--	// Get path to executable
--	assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
--	
--	pathRemoveFile(buf, '/');
--
--	path_data = std::string(buf) + "/../share/" + APPNAME;
-+	path_data = std::string("/usr/local/share/") + APPNAME;
- 	//path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
- 	
- 	path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
diff --git a/games/minetest/pkg-plist b/games/minetest/pkg-plist
index 608a58f75fdd..ec2ee6fe31f2 100644
--- a/games/minetest/pkg-plist
+++ b/games/minetest/pkg-plist
@@ -1,11 +1,27 @@
 %%CLIENT%%bin/minetest
 %%SERVER%%bin/minetestserver
+%%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
+%%CLIENT%%%%DATADIR%%/apple.png
+%%CLIENT%%%%DATADIR%%/apple_iron.png
+%%CLIENT%%%%DATADIR%%/book.png
+%%CLIENT%%%%DATADIR%%/bookshelf.png
+%%CLIENT%%%%DATADIR%%/brick.png
+%%CLIENT%%%%DATADIR%%/cactus_side.png
+%%CLIENT%%%%DATADIR%%/cactus_top.png
 %%CLIENT%%%%DATADIR%%/chest_front.png
 %%CLIENT%%%%DATADIR%%/chest_side.png
 %%CLIENT%%%%DATADIR%%/chest_top.png
+%%CLIENT%%%%DATADIR%%/clay.png
+%%CLIENT%%%%DATADIR%%/clay_brick.png
 %%CLIENT%%%%DATADIR%%/cloud.png
 %%CLIENT%%%%DATADIR%%/cobble.png
+%%CLIENT%%%%DATADIR%%/cooked_rat.png
 %%CLIENT%%%%DATADIR%%/crack.png
+%%CLIENT%%%%DATADIR%%/fence.png
+%%CLIENT%%%%DATADIR%%/firefly.png
 %%CLIENT%%%%DATADIR%%/fontlucida.png
 %%CLIENT%%%%DATADIR%%/furnace_front.png
 %%CLIENT%%%%DATADIR%%/furnace_side.png
@@ -13,21 +29,41 @@
 %%CLIENT%%%%DATADIR%%/grass.png
 %%CLIENT%%%%DATADIR%%/grass_footsteps.png
 %%CLIENT%%%%DATADIR%%/grass_side.png
+%%CLIENT%%%%DATADIR%%/gravel.png
 %%CLIENT%%%%DATADIR%%/heart.png
-%%CLIENT%%%%DATADIR%%/item_fence.png
+%%CLIENT%%%%DATADIR%%/junglegrass.png
+%%CLIENT%%%%DATADIR%%/jungletree.png
+%%CLIENT%%%%DATADIR%%/jungletree_top.png
+%%CLIENT%%%%DATADIR%%/ladder.png
+%%CLIENT%%%%DATADIR%%/lava.png
 %%CLIENT%%%%DATADIR%%/leaves.png
+%%CLIENT%%%%DATADIR%%/lump_of_clay.png
 %%CLIENT%%%%DATADIR%%/lump_of_coal.png
 %%CLIENT%%%%DATADIR%%/lump_of_iron.png
 %%CLIENT%%%%DATADIR%%/menulogo.png
 %%CLIENT%%%%DATADIR%%/mese.png
 %%CLIENT%%%%DATADIR%%/mineral_coal.png
 %%CLIENT%%%%DATADIR%%/mineral_iron.png
+%%CLIENT%%%%DATADIR%%/mossycobble.png
 %%CLIENT%%%%DATADIR%%/mud.png
+%%CLIENT%%%%DATADIR%%/nc_back.png
+%%CLIENT%%%%DATADIR%%/nc_front.png
+%%CLIENT%%%%DATADIR%%/nc_rb.png
+%%CLIENT%%%%DATADIR%%/nc_side.png
 %%CLIENT%%%%DATADIR%%/oerkki1.png
+%%CLIENT%%%%DATADIR%%/oerkki1_damaged.png
+%%CLIENT%%%%DATADIR%%/paper.png
+%%CLIENT%%%%DATADIR%%/papyrus.png
 %%CLIENT%%%%DATADIR%%/player.png
 %%CLIENT%%%%DATADIR%%/player_back.png
+%%CLIENT%%%%DATADIR%%/rail.png
+%%CLIENT%%%%DATADIR%%/rail_crossing.png
+%%CLIENT%%%%DATADIR%%/rail_curved.png
+%%CLIENT%%%%DATADIR%%/rail_t_junction.png
 %%CLIENT%%%%DATADIR%%/rat.png
 %%CLIENT%%%%DATADIR%%/sand.png
+%%CLIENT%%%%DATADIR%%/sandstone.png
+%%CLIENT%%%%DATADIR%%/scorched_stuff.png
 %%CLIENT%%%%DATADIR%%/sign.png
 %%CLIENT%%%%DATADIR%%/sign_back.png
 %%CLIENT%%%%DATADIR%%/sign_wall.png
@@ -48,18 +84,22 @@
 %%CLIENT%%%%DATADIR%%/tool_steelaxe.png
 %%CLIENT%%%%DATADIR%%/tool_steelpick.png
 %%CLIENT%%%%DATADIR%%/tool_steelshovel.png
+%%CLIENT%%%%DATADIR%%/tool_steelsword.png
 %%CLIENT%%%%DATADIR%%/tool_stoneaxe.png
 %%CLIENT%%%%DATADIR%%/tool_stonepick.png
 %%CLIENT%%%%DATADIR%%/tool_stoneshovel.png
+%%CLIENT%%%%DATADIR%%/tool_stonesword.png
 %%CLIENT%%%%DATADIR%%/tool_woodaxe.png
 %%CLIENT%%%%DATADIR%%/tool_woodpick.png
 %%CLIENT%%%%DATADIR%%/tool_woodshovel.png
+%%CLIENT%%%%DATADIR%%/tool_woodsword.png
 %%CLIENT%%%%DATADIR%%/torch.png
 %%CLIENT%%%%DATADIR%%/torch_on_ceiling.png
 %%CLIENT%%%%DATADIR%%/torch_on_floor.png
 %%CLIENT%%%%DATADIR%%/tree.png
 %%CLIENT%%%%DATADIR%%/tree_top.png
 %%CLIENT%%%%DATADIR%%/treeprop.png
+%%CLIENT%%%%DATADIR%%/unknown_block.png
 %%CLIENT%%%%DATADIR%%/water.png
 %%CLIENT%%%%DATADIR%%/wood.png
 %%CLIENT%%@dirrm %%DATADIR%%