From c68ea4b9804ef06cf6be28f47f63f44d1dcf73a1 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 21 Jan 2020 23:49:19 +0000 Subject: [PATCH] - Update to 5.1.1 --- games/minetest/Makefile | 4 +--- games/minetest/distinfo | 6 ++--- games/minetest/files/patch-src_CMakeLists.txt | 22 +++++++++++++++---- games/minetest/files/patch-src_main.cpp | 10 --------- 4 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 games/minetest/files/patch-src_main.cpp diff --git a/games/minetest/Makefile b/games/minetest/Makefile index f90b479e0125..b7020cfb67ad 100644 --- a/games/minetest/Makefile +++ b/games/minetest/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= minetest -PORTVERSION= 5.1.0 +PORTVERSION= 5.1.1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -11,8 +11,6 @@ COMMENT= Near-infinite-world block sandbox game LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt -BROKEN= fails to link - LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libgmp.so:math/gmp diff --git a/games/minetest/distinfo b/games/minetest/distinfo index 8373654f2dfa..de002107b5f6 100644 --- a/games/minetest/distinfo +++ b/games/minetest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571678906 -SHA256 (minetest-minetest-5.1.0_GH0.tar.gz) = ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 -SIZE (minetest-minetest-5.1.0_GH0.tar.gz) = 8939376 +TIMESTAMP = 1579389046 +SHA256 (minetest-minetest-5.1.1_GH0.tar.gz) = 65d483bce244827de174edcb30f7e453b06a7590da6cdeb7a2237ff6180c090b +SIZE (minetest-minetest-5.1.1_GH0.tar.gz) = 9002025 diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt index 7cc00e9423c9..045ce3e8ad48 100644 --- a/games/minetest/files/patch-src_CMakeLists.txt +++ b/games/minetest/files/patch-src_CMakeLists.txt @@ -1,8 +1,22 @@ -Fixes random crashes (especially reproducible when moving in dense -forests), still relevant for 5.0.1 ---- src/CMakeLists.txt.orig 2019-03-31 20:57:45 UTC +--- src/CMakeLists.txt.orig 2020-01-11 18:29:02 UTC +++ src/CMakeLists.txt -@@ -729,7 +729,6 @@ else() +@@ -485,6 +485,7 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1) + endif() + + include_directories( ++ ${JSON_INCLUDE_DIR} + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR} + ${IRRLICHT_INCLUDE_DIR} +@@ -495,7 +496,6 @@ include_directories( + ${SQLITE3_INCLUDE_DIR} + ${LUA_INCLUDE_DIR} + ${GMP_INCLUDE_DIR} +- ${JSON_INCLUDE_DIR} + ${X11_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/script + ) +@@ -715,7 +715,6 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops") if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") diff --git a/games/minetest/files/patch-src_main.cpp b/games/minetest/files/patch-src_main.cpp deleted file mode 100644 index 90057b6809d7..000000000000 --- a/games/minetest/files/patch-src_main.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/main.cpp.orig 2019-10-23 17:11:31 UTC -+++ src/main.cpp -@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include "irrlichttypes.h" - #include "irrlicht.h" // createDevice - #include "irrlichttypes_extrabloated.h" - #include "chat_interface.h"