Index: head/games/minetest/Makefile =================================================================== --- head/games/minetest/Makefile (revision 380128) +++ head/games/minetest/Makefile (revision 380129) @@ -1,98 +1,99 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= minetest -PORTVERSION= 0.4.11 +PORTVERSION= 0.4.12 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Infiniminer/Minecraft inspired game -LICENSE= LGPL21 +LICENSE= LGPL21 # or later +LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 USE_GITHUB= yes GH_ACCOUNT= minetest -GH_COMMIT= be358c0 +GH_COMMIT= 7993a40 USES= cmake 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_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 CLIENT_CMAKE_ON= -DBUILD_CLIENT=1 CLIENT_CMAKE_OFF= -DBUILD_CLIENT=0 CLIENT_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht CLIENT_USE= GL=gl XORG=x11 SERVER_CMAKE_ON= -DBUILD_SERVER=1 SERVER_CMAKE_OFF= -DBUILD_SERVER=0 CURL_CMAKE_ON= -DENABLE_CURL=1 CURL_CMAKE_OFF= -DENABLE_CURL=0 CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl NLS_CMAKE_ON= -DENABLE_GETTEXT=1 NLS_CMAKE_OFF= -DENABLE_GETTEXT=0 NLS_USES= gettext NLS_LDFLAGS= -L${LOCALBASE}/lib SOUND_CMAKE_ON= -DENABLE_SOUND=1 SOUND_CMAKE_OFF= -DENABLE_SOUND=0 LEVELDB_CMAKE_ON= -DENABLE_LEVELDB=1 LEVELDB_CMAKE_OFF= -DENABLE_LEVELDB=0 LEVELDB_LIB_DEPENDS= libleveldb.so:${PORTSDIR}/databases/leveldb REDIS_CMAKE_ON= -DENABLE_REDIS=1 REDIS_CMAKE_OFF= -DENABLE_REDIS=0 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_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit .include .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} USES+= openal LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis .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}:${PORTSDIR}/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 post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/src/CMakeLists.txt .if ! ${PORT_OPTIONS:MLUAJIT} @${REINPLACE_CMD} -e '/find_/ s|LUA_|NO&|g' \ ${WRKSRC}/src/CMakeLists.txt .endif .include Index: head/games/minetest/distinfo =================================================================== --- head/games/minetest/distinfo (revision 380128) +++ head/games/minetest/distinfo (revision 380129) @@ -1,2 +1,2 @@ -SHA256 (minetest-0.4.11.tar.gz) = b30f953ca8aa820a888e8ca7c74902f8740dc20a4db6129bb752232fff2290c7 -SIZE (minetest-0.4.11.tar.gz) = 9464268 +SHA256 (minetest-0.4.12.tar.gz) = 8d4e77310ceef4d804df8b2b0f40e822954fd5c7c2199921b54b7f20e2f7d8f9 +SIZE (minetest-0.4.12.tar.gz) = 8184578 Index: head/games/minetest/files/patch-src__cguittfont__irrUString.h =================================================================== --- head/games/minetest/files/patch-src__cguittfont__irrUString.h (revision 380128) +++ head/games/minetest/files/patch-src__cguittfont__irrUString.h (nonexistent) @@ -1,13 +0,0 @@ -diff --git src/cguittfont/irrUString.h src/cguittfont/irrUString.h -index 32efaa6..c175c79 100644 ---- src/cguittfont/irrUString.h -+++ src/cguittfont/irrUString.h -@@ -47,6 +47,8 @@ - #define __BIG_ENDIAN 1 - #elif __MACH__ - #include -+#elif defined(__FreeBSD__) -+#include - #else - #include - #endif Property changes on: head/games/minetest/files/patch-src__cguittfont__irrUString.h ___________________________________________________________________ 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 Index: head/games/minetest/files/patch-src_CMakeLists.txt =================================================================== --- head/games/minetest/files/patch-src_CMakeLists.txt (nonexistent) +++ head/games/minetest/files/patch-src_CMakeLists.txt (revision 380129) @@ -0,0 +1,26 @@ +--- 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) Property changes on: head/games/minetest/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property