- Update to 0.4.13

PR:		205856
Submitted by:	kevinz5000@gmail.com
This commit is contained in:
Dmitry Marakasov 2016-01-24 20:23:42 +00:00
parent 6895fd5641
commit f907470dbf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=407176
4 changed files with 35 additions and 38 deletions

View file

@ -2,29 +2,30 @@
# $FreeBSD$
PORTNAME= minetest
PORTVERSION= 0.4.12
PORTVERSION= 0.4.13
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Infiniminer/Minecraft inspired game
COMMENT= Near-infinite-world block sandbox game
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt
LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
libgmp.so:${PORTSDIR}/math/gmp
USE_GITHUB= yes
GH_ACCOUNT= minetest
USES= cmake
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
OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND
OPTIONS_DEFINE= CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL
OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT
OPTIONS_SUB= yes
CLIENT_DESC= Build client
@ -35,6 +36,7 @@ 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
@ -62,7 +64,12 @@ REDIS_LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis
FREETYPE_CMAKE_ON= -DENABLE_FREETYPE=1
FREETYPE_CMAKE_OFF= -DENABLE_FREETYPE=0
FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
LUAJIT_CMAKE_ON= -DENABLE_LUAJIT=1
LUAJIT_CMAKE_OFF= -DENABLE_LUAJIT=0
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit
SPATIAL_LIB_DEPENDS= libspatialindex.so:${PORTSDIR}/devel/spatialindex
SPATIAL_CMAKE_ON= -DENABLE_SPATIAL=1
SPATIAL_CMAKE_OFF= -DENABLE_SPATIAL=0
.include <bsd.port.options.mk>
@ -88,9 +95,5 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-irrlichtdepend
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/cmake/Modules/*.cmake
.if ! ${PORT_OPTIONS:MLUAJIT}
@${REINPLACE_CMD} -e '/find_/ s|LUA_|NO&|g' \
${WRKSRC}/src/CMakeLists.txt
.endif
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (minetest-minetest-0.4.12_GH0.tar.gz) = b37d663785a1ef9e75ec8513913bbd4fcaf761ccb248f4628d9397c71d4417df
SIZE (minetest-minetest-0.4.12_GH0.tar.gz) = 8184232
SHA256 (minetest-minetest-0.4.13_GH0.tar.gz) = d77ee70c00a923c3ed2355536997f064a95143d0949a7fc92d725d079edef9f7
SIZE (minetest-minetest-0.4.13_GH0.tar.gz) = 8367119

View file

@ -1,26 +0,0 @@
--- src/CMakeLists.txt.orig 2015-02-28 03:52:19.000000000 +0300
+++ src/CMakeLists.txt 2015-02-28 03:53:31.000000000 +0300
@@ -201,22 +201,7 @@
endif(ENABLE_GLES)
if(USE_FREETYPE)
- if(UNIX)
- include(FindPkgConfig)
- if(PKG_CONFIG_FOUND)
- pkg_check_modules(FREETYPE QUIET freetype2)
- if(FREETYPE_FOUND)
- SET(FREETYPE_PKGCONFIG_FOUND TRUE)
- SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
- # because cmake is idiotic
- string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
- string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
- endif(FREETYPE_FOUND)
- endif(PKG_CONFIG_FOUND)
- endif(UNIX)
- if(NOT FREETYPE_FOUND)
- find_package(Freetype REQUIRED)
- endif(NOT FREETYPE_FOUND)
+ find_package(Freetype REQUIRED)
set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
set(CGUITTFONT_LIBRARY cguittfont)
endif(USE_FREETYPE)

View file

@ -0,0 +1,20 @@
--- 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);