Index: head/games/minetest/Makefile =================================================================== --- head/games/minetest/Makefile (revision 430628) +++ head/games/minetest/Makefile (revision 430629) @@ -1,97 +1,93 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= minetest PORTVERSION= 0.4.15 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Near-infinite-world block sandbox game LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libgmp.so:math/gmp USE_GITHUB= yes GH_ACCOUNT= minetest USES= cmake iconv:wchar_t CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" PORTDATA= * PORTDOCS= * OPTIONS_DEFINE= CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL PGSQL OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT OPTIONS_SUB= yes CLIENT_DESC= Build client SERVER_DESC= Build server CURL_DESC= Enable cURL support for fetching media SOUND_DESC= Enable sound LEVELDB_DESC= Enable LevelDB backend REDIS_DESC= Enable Redis backend FREETYPE_DESC= Support for TrueType fonts with unicode LUAJIT_DESC= LuaJIT support SPATIAL_DESC= Enable SpatialIndex AreaStore backend CLIENT_CMAKE_ON= -DBUILD_CLIENT=1 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,xext SERVER_CMAKE_BOOL= BUILD_SERVER CURL_CMAKE_BOOL= ENABLE_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl NLS_CMAKE_BOOL= ENABLE_GETTEXT NLS_USES= gettext NLS_LDFLAGS= -L${LOCALBASE}/lib SOUND_CMAKE_BOOL= ENABLE_SOUND LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb REDIS_CMAKE_BOOL= ENABLE_REDIS REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL PGSQL_USES= pgsql PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL .include .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} USES+= openal LIB_DEPENDS+= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg .endif .if ${PORT_OPTIONS:MSERVER} USE_RC_SUBR= ${PORTNAME} USERS= ${PORTNAME} GROUPS= ${PORTNAME} .endif # hacky way to not bring irrlicht and X11 depends for server only .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER} BUILD_DEPENDS+= ${NONEXISTENT}:x11-toolkits/irrlicht:patch IRRLICHT_INCLUDE_DIR= `${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include 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 .include Index: head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp =================================================================== --- head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp (revision 430628) +++ head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp (nonexistent) @@ -1,47 +0,0 @@ ---- 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); Property changes on: head/games/minetest/files/extra-patch-src_unittest_test__serialization.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property