svn commit: r416060 - in head/games/minetest: . files

Dmitry Marakasov amdmi3 at FreeBSD.org
Sat May 28 18:38:06 UTC 2016 

Author: amdmi3
Date: Sat May 28 18:38:05 2016
New Revision: 416060
URL: https://svnweb.freebsd.org/changeset/ports/416060

Log:
  - Update to 0.4.14
  - Tweak depends

Added:
  head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp
     - copied, changed from r416059, head/games/minetest/files/patch-src_unittest_test__serialization.cpp
  head/games/minetest/files/patch-src_CMakeLists.txt   (contents, props changed)
Deleted:
  head/games/minetest/files/patch-src_unittest_test__serialization.cpp
Modified:
  head/games/minetest/Makefile
  head/games/minetest/distinfo
  head/games/minetest/pkg-plist

Modified: head/games/minetest/Makefile
==============================================================================
--- head/games/minetest/Makefile	Sat May 28 18:38:00 2016	(r416059)
+++ head/games/minetest/Makefile	Sat May 28 18:38:05 2016	(r416060)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minetest
-PORTVERSION=	0.4.13
+PORTVERSION=	0.4.14
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3 at 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:STRI
 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

Modified: head/games/minetest/distinfo
==============================================================================
--- head/games/minetest/distinfo	Sat May 28 18:38:00 2016	(r416059)
+++ head/games/minetest/distinfo	Sat May 28 18:38:05 2016	(r416060)
@@ -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

Copied and modified: head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp (from r416059, head/games/minetest/files/patch-src_unittest_test__serialization.cpp)
==============================================================================
--- head/games/minetest/files/patch-src_unittest_test__serialization.cpp	Sat May 28 18:38:00 2016	(r416059, copy source)
+++ head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp	Sat May 28 18:38:05 2016	(r416060)
@@ -1,6 +1,6 @@
---- src/unittest/test_serialization.cpp.orig	2015-08-20 02:02:00 UTC
+--- src/unittest/test_serialization.cpp.orig	2016-05-15 12:49:15 UTC
 +++ src/unittest/test_serialization.cpp
-@@ -289,7 +289,7 @@ void TestSerialization::testStreamRead()
+@@ -295,7 +295,7 @@ void TestSerialization::testStreamRead()
  	UASSERT(readU8(is) == 0x11);
  	UASSERT(readU16(is) == 0x2233);
  	UASSERT(readU32(is) == 0x44556677);
@@ -9,7 +9,7 @@
  
  	UASSERT(readS8(is) == -128);
  	UASSERT(readS16(is) == 30000);
-@@ -330,7 +330,7 @@ void TestSerialization::testStreamWrite(
+@@ -336,7 +336,7 @@ void TestSerialization::testStreamWrite(
  	writeU8(os, 0x11);
  	writeU16(os, 0x2233);
  	writeU32(os, 0x44556677);
@@ -18,3 +18,30 @@
  
  	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);

Added: head/games/minetest/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/minetest/files/patch-src_CMakeLists.txt	Sat May 28 18:38:05 2016	(r416060)
@@ -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)

Modified: head/games/minetest/pkg-plist
==============================================================================
--- head/games/minetest/pkg-plist	Sat May 28 18:38:00 2016	(r416059)
+++ head/games/minetest/pkg-plist	Sat May 28 18:38:05 2016	(r416060)
@@ -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

More information about the svn-ports-all mailing list