--- Makefile (revision 504630) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= minetest -PORTVERSION= 0.4.17.1 +PORTVERSION= 5.0.1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -14,10 +14,11 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libgmp.so:math/gmp +USES= cmake iconv:wchar_t gnome + USE_GITHUB= yes GH_ACCOUNT= minetest -USES= cmake iconv:wchar_t LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" @@ -25,48 +26,58 @@ 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_DEFINE= CONSOLE CURL DOCS EXAMPLES FREETYPE GAME LEVELDB LUAJIT NLS PGSQL REDIS SOUND SPATIAL +OPTIONS_DEFAULT= CLIENT CURL FREETYPE GAME LUAJIT SERVER SOUND OPTIONS_SUB= yes +OPTIONS_MULTI= EXECUTABLES +OPTIONS_MULTI_EXECUTABLES= CLIENT SERVER CLIENT_DESC= Build client +CONSOLE_DESC= Enables curses console +CURL_DESC= Enable cURL support for fetching media and server announce +FREETYPE_DESC= Support for TrueType fonts with unicode +GAME_DESC= Install minetest_game +LEVELDB_DESC= Enable LevelDB backend +LUAJIT_DESC= LuaJIT support +REDIS_DESC= Enable Redis backend 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_OFF= -DBUILD_CLIENT=0 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 +CLIENT_LIB_DEPENDS= libpng.so:graphics/png libIrrlicht.so:x11-toolkits/irrlicht +CLIENT_USE= GL=gl,glu XORG=x11,xext,xxf86vm +CLIENT_USES= gl jpeg +CONSOLE_CMAKE_BOOL= ENABLE_CURSES +CONSOLE_USES= ncurses CURL_CMAKE_BOOL= ENABLE_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl +FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +GAME_RUN_DEPENDS= minetest_game>0:games/minetest_game +LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB +LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb +LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT REQUIRE_LUAJIT +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit NLS_CMAKE_BOOL= ENABLE_GETTEXT +NLS_LDFLAGS= -L${LOCALBASE}/lib 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 +PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL +PGSQL_USES= pgsql 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 REQUIRE_LUAJIT -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +SERVER_CMAKE_BOOL= BUILD_SERVER +SOUND_CMAKE_BOOL= ENABLE_SOUND +SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL 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} +INSTALLS_ICONS= yes +.endif + .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} USES+= openal LIB_DEPENDS+= libvorbis.so:audio/libvorbis \ @@ -84,7 +95,7 @@ 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 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-CMakeLists.txt .endif post-patch: --- distinfo (revision 504630) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528743956 -SHA256 (minetest-minetest-0.4.17.1_GH0.tar.gz) = cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59 -SIZE (minetest-minetest-0.4.17.1_GH0.tar.gz) = 7758675 +TIMESTAMP = 1559139920 +SHA256 (minetest-minetest-5.0.1_GH0.tar.gz) = aa771cf178ad1b436d5723e5d6dd24e42b5d56f1cfe9c930f6426b7f24bb1635 +SIZE (minetest-minetest-5.0.1_GH0.tar.gz) = 8761122 --- files/extra-patch-CMakeLists.txt (nonexistent) +++ files/extra-patch-CMakeLists.txt (working copy) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-05-29 14:02:39 UTC ++++ CMakeLists.txt +@@ -63,7 +63,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SO + + + # This is done here so that relative search paths are more reasonable +-find_package(Irrlicht) ++set(IRRLICHT_LIBRARY "") + + + # Installation --- files/extra-patch-irrlichtdepend (revision 504630) +++ files/extra-patch-irrlichtdepend (nonexistent) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2015-08-20 02:02:00 UTC -+++ CMakeLists.txt -@@ -55,7 +55,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT - - - # This is done here so that relative search paths are more reasonable --find_package(Irrlicht) -+set(IRRLICHT_LIBRARY "") - - - # Installation --- files/minetest.in (revision 504630) +++ files/minetest.in (working copy) @@ -38,6 +38,7 @@ : ${minetest_logdir="/var/log/minetest"} : ${minetest_dbdir="/var/db/minetest"} : ${minetest_args:="--logfile ${minetest_logdir}/debug.log --world ${minetest_dbdir}/world ${minetest_flags}"} +: ${minetest_env="HOME=/var/db/minetest"} pidfile= --- files/patch-src_CMakeLists.txt (revision 504630) +++ files/patch-src_CMakeLists.txt (working copy) @@ -1,10 +1,10 @@ ---- src/CMakeLists.txt.orig 2018-06-03 15:35:20 UTC +--- src/CMakeLists.txt.orig 2019-03-31 20:57:45 UTC +++ src/CMakeLists.txt -@@ -758,7 +758,6 @@ else() +@@ -729,7 +729,6 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops") - if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") + if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") else() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer") - endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)") + endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")