- Update to 0.4.14

- Tweak depends

6 files changed, 73 insertions, 26 deletions

diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index e6e921e28f5f..9c05903dbdd8 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minetest
-PORTVERSION=	0.4.13
+PORTVERSION=	0.4.14
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -43,7 +43,7 @@ CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
 			libIrrlicht.so:x11-toolkits/irrlicht
 CLIENT_USES=		jpeg
-CLIENT_USE=		GL=gl XORG=x11
+CLIENT_USE=		GL=gl XORG=x11,xext
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
 CURL_CMAKE_ON=		-DENABLE_CURL=1
@@ -75,7 +75,8 @@ SPATIAL_CMAKE_OFF=	-DENABLE_SPATIAL=0
 
 .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
 USES+=		openal
-LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
@@ -92,6 +93,10 @@ CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_unittest_test__serialization.cpp
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
diff --git a/games/minetest/distinfo b/games/minetest/distinfo
index 745b8c537874..029e4b03a44d 100644
--- a/games/minetest/distinfo
+++ b/games/minetest/distinfo
@@ -1,2 +1,3 @@
-SHA256 (minetest-minetest-0.4.13_GH0.tar.gz) = d77ee70c00a923c3ed2355536997f064a95143d0949a7fc92d725d079edef9f7
-SIZE (minetest-minetest-0.4.13_GH0.tar.gz) = 8367119
+TIMESTAMP = 1463406391
+SHA256 (minetest-minetest-0.4.14_GH0.tar.gz) = 203de4d41a60466126ab92ca85f726d88d0084f2e78393da239e7416cb847054
+SIZE (minetest-minetest-0.4.14_GH0.tar.gz) = 8637454
diff --git a/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp b/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp
new file mode 100644
index 000000000000..4f35e8add133
--- /dev/null
+++ b/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp
@@ -0,0 +1,47 @@
+--- src/unittest/test_serialization.cpp.orig	2016-05-15 12:49:15 UTC
++++ src/unittest/test_serialization.cpp
+@@ -295,7 +295,7 @@ void TestSerialization::testStreamRead()
+ 	UASSERT(readU8(is) == 0x11);
+ 	UASSERT(readU16(is) == 0x2233);
+ 	UASSERT(readU32(is) == 0x44556677);
+-	UASSERT(readU64(is) == 0x8899AABBCCDDEEFF);
++	UASSERT(readU64(is) == 0x8899AABBCCDDEEFFULL);
+ 
+ 	UASSERT(readS8(is) == -128);
+ 	UASSERT(readS16(is) == 30000);
+@@ -336,7 +336,7 @@ void TestSerialization::testStreamWrite(
+ 	writeU8(os, 0x11);
+ 	writeU16(os, 0x2233);
+ 	writeU32(os, 0x44556677);
+-	writeU64(os, 0x8899AABBCCDDEEFF);
++	writeU64(os, 0x8899AABBCCDDEEFFULL);
+ 
+ 	writeS8(os, -128);
+ 	writeS16(os, 30000);
+@@ -382,7 +382,7 @@ void TestSerialization::testVecPut()
+ 	putU8(&buf, 0x11);
+ 	putU16(&buf, 0x2233);
+ 	putU32(&buf, 0x44556677);
+-	putU64(&buf, 0x8899AABBCCDDEEFF);
++	putU64(&buf, 0x8899AABBCCDDEEFFULL);
+ 
+ 	putS8(&buf, -128);
+ 	putS16(&buf, 30000);
+@@ -464,7 +464,7 @@ void TestSerialization::testBufReader()
+ 	UASSERT(buf.getU8() == 0x11);
+ 	UASSERT(buf.getU16() == 0x2233);
+ 	UASSERT(buf.getU32() == 0x44556677);
+-	UASSERT(buf.getU64() == 0x8899AABBCCDDEEFF);
++	UASSERT(buf.getU64() == 0x8899AABBCCDDEEFFULL);
+ 	UASSERT(buf.getS8() == -128);
+ 	UASSERT(buf.getS16() == 30000);
+ 	UASSERT(buf.getS32() == -6);
+@@ -576,7 +576,7 @@ void TestSerialization::testBufReader()
+ 	UASSERT(u8_data == 0x11);
+ 	UASSERT(u16_data == 0x2233);
+ 	UASSERT(u32_data == 0x44556677);
+-	UASSERT(u64_data == 0x8899AABBCCDDEEFF);
++	UASSERT(u64_data == 0x8899AABBCCDDEEFFULL);
+ 	UASSERT(s8_data == -128);
+ 	UASSERT(s16_data == 30000);
+ 	UASSERT(s32_data == -6);
diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..7fb7c0511b5e
--- /dev/null
+++ b/games/minetest/files/patch-src_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- src/CMakeLists.txt.orig	2016-05-15 12:49:15 UTC
++++ src/CMakeLists.txt
+@@ -309,11 +309,6 @@ else()
+ 		set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+ 	endif(APPLE)
+ 
+-	# This way Xxf86vm is found on OpenBSD too
+-	find_library(XXF86VM_LIBRARY Xxf86vm)
+-	mark_as_advanced(XXF86VM_LIBRARY)
+-	set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+-
+ 	# Prefer local iconv if installed
+ 	find_library(ICONV_LIBRARY iconv)
+ 	mark_as_advanced(ICONV_LIBRARY)
diff --git a/games/minetest/files/patch-src_unittest_test__serialization.cpp b/games/minetest/files/patch-src_unittest_test__serialization.cpp
deleted file mode 100644
index c44cf071de27..000000000000
--- a/games/minetest/files/patch-src_unittest_test__serialization.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/unittest/test_serialization.cpp.orig	2015-08-20 02:02:00 UTC
-+++ src/unittest/test_serialization.cpp
-@@ -289,7 +289,7 @@ void TestSerialization::testStreamRead()
- 	UASSERT(readU8(is) == 0x11);
- 	UASSERT(readU16(is) == 0x2233);
- 	UASSERT(readU32(is) == 0x44556677);
--	UASSERT(readU64(is) == 0x8899AABBCCDDEEFF);
-+	UASSERT(readU64(is) == 0x8899AABBCCDDEEFFULL);
- 
- 	UASSERT(readS8(is) == -128);
- 	UASSERT(readS16(is) == 30000);
-@@ -330,7 +330,7 @@ void TestSerialization::testStreamWrite(
- 	writeU8(os, 0x11);
- 	writeU16(os, 0x2233);
- 	writeU32(os, 0x44556677);
--	writeU64(os, 0x8899AABBCCDDEEFF);
-+	writeU64(os, 0x8899AABBCCDDEEFFULL);
- 
- 	writeS8(os, -128);
- 	writeS16(os, 30000);
diff --git a/games/minetest/pkg-plist b/games/minetest/pkg-plist
index 1b070b1d1f7d..878f0c1811a3 100644
--- a/games/minetest/pkg-plist
+++ b/games/minetest/pkg-plist
@@ -5,4 +5,4 @@ man/man6/minetest.6.gz
 man/man6/minetestserver.6.gz
 share/applications/minetest.desktop
 share/appdata/minetest.appdata.xml
-share/icons/hicolor/scalable/apps/minetest-icon.svg
+share/icons/hicolor/scalable/apps/minetest.svg