svn commit: r507742 - in head/games/minetest: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Jul 31 22:50:17 UTC 2019
Author: amdmi3
Date: Wed Jul 31 22:50:15 2019
New Revision: 507742
URL: https://svnweb.freebsd.org/changeset/ports/507742
Log:
- Update to 5.0.1
- Rework options
- Unbundle dependencies where possible
- Fix minetestserver rc.d script by setting HOME [1]
- Unbreak in powerpc [3]
- Update WWW
PR: 235355 [1], 238064 [2], 239413 [3]
Submitted by: dch at freebsd.org [1], crwhipp at gmail.com [2], pkubaj at FreeBSD.org [3]
Modified:
head/games/minetest/Makefile
head/games/minetest/distinfo
head/games/minetest/files/minetest.in
head/games/minetest/files/patch-src_CMakeLists.txt
head/games/minetest/pkg-descr
Modified: head/games/minetest/Makefile
==============================================================================
--- head/games/minetest/Makefile Wed Jul 31 22:04:10 2019 (r507741)
+++ head/games/minetest/Makefile Wed Jul 31 22:50:15 2019 (r507742)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= minetest
-PORTVERSION= 0.4.17.1
+PORTVERSION= 5.0.1
CATEGORIES= games
MAINTAINER= amdmi3 at FreeBSD.org
@@ -25,46 +25,63 @@ CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \
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
+OPTIONS_DEFINE= CURL SOUND FREETYPE NCURSES LUAJIT \
+ DOCS EXAMPLES NLS
+OPTIONS_MULTI= COMP
+OPTIONS_GROUP= DATABASE
-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
+COMP_DESC= Software components
+OPTIONS_MULTI_COMP= CLIENT SERVER
-CLIENT_CMAKE_ON= -DBUILD_CLIENT=1
-CLIENT_CMAKE_OFF= -DBUILD_CLIENT=0
+DATABASE_DESC= Database support
+OPTIONS_GROUP_DATABASE= PGSQL LEVELDB REDIS SPATIAL
+
+OPTIONS_DEFAULT= CLIENT SERVER \
+ CURL SOUND FREETYPE NCURSES LUAJIT
+OPTIONS_EXCLUDE_powerpc64= LUAJIT
+OPTIONS_SUB= yes
+
+CLIENT_DESC= Build client
+CLIENT_CMAKE_BOOL= BUILD_CLIENT
CLIENT_LIB_DEPENDS= libpng.so:graphics/png \
libIrrlicht.so:x11-toolkits/irrlicht
-CLIENT_USES= jpeg
-CLIENT_USE= GL=gl XORG=x11,xext
+CLIENT_USES= gl jpeg
+CLIENT_USE= GL=gl XORG=x11,xext,xxf86vm
+SERVER_DESC= Build server
SERVER_CMAKE_BOOL= BUILD_SERVER
+
+CURL_DESC= Enable cURL support for fetching media
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_DESC= Enable sound
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_DESC= Support for TrueType fonts with unicode
FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
+NCURSES_DESC= Enable ncurses console
+NCURSES_CMAKE_BOOL= ENABLE_CURSES
+NCURSES_USES= ncurses
+
+LUAJIT_DESC= LuaJIT support
LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT REQUIRE_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
+LEVELDB_DESC= Enable LevelDB backend
+LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB
+LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb
+REDIS_DESC= Enable Redis backend
+REDIS_CMAKE_BOOL= ENABLE_REDIS
+REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
+SPATIAL_DESC= Enable SpatialIndex AreaStore backend
+SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex
+SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL
+NLS_CMAKE_BOOL= ENABLE_GETTEXT
+NLS_USES= gettext
+NLS_LDFLAGS= -L${LOCALBASE}/lib
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
@@ -86,6 +103,13 @@ IRRLICHT_INCLUDE_DIR= `${MAKE} -C ${PORTSDIR}/x11-tool
CMAKE_ARGS+= -DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-irrlichtdepend
.endif
+
+post-extract:
+# make sure no bundled gmp is used
+ @${RM} -rf ${WRKSRC}/lib/gmp
+# bundled jsoncpp is OK, see comment in cmake/Modules/FindJson.cmake
+# (not sure if it affects FreeBSD, but too lazy to investigate)
+# bundled lua is OK, there's no option to use system one
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
Modified: head/games/minetest/distinfo
==============================================================================
--- head/games/minetest/distinfo Wed Jul 31 22:04:10 2019 (r507741)
+++ head/games/minetest/distinfo Wed Jul 31 22:50:15 2019 (r507742)
@@ -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 = 1554132616
+SHA256 (minetest-minetest-5.0.1_GH0.tar.gz) = aa771cf178ad1b436d5723e5d6dd24e42b5d56f1cfe9c930f6426b7f24bb1635
+SIZE (minetest-minetest-5.0.1_GH0.tar.gz) = 8761122
Modified: head/games/minetest/files/minetest.in
==============================================================================
--- head/games/minetest/files/minetest.in Wed Jul 31 22:04:10 2019 (r507741)
+++ head/games/minetest/files/minetest.in Wed Jul 31 22:50:15 2019 (r507742)
@@ -54,7 +54,7 @@ esac
command=/usr/sbin/daemon
procname=/usr/local/bin/minetestserver
pidfile=${minetest_rundir}/minetest.pid
-command_args="-c -f -p ${pidfile} ${procname} ${minetest_args}"
+command_args="-c -f -p ${pidfile} /usr/bin/env HOME='${minetest_dbdir}' ${procname} ${minetest_args}"
required_files=${minetest_config}
start_precmd=minetest_prestart
Modified: head/games/minetest/files/patch-src_CMakeLists.txt
==============================================================================
--- head/games/minetest/files/patch-src_CMakeLists.txt Wed Jul 31 22:04:10 2019 (r507741)
+++ head/games/minetest/files/patch-src_CMakeLists.txt Wed Jul 31 22:50:15 2019 (r507742)
@@ -1,10 +1,12 @@
---- src/CMakeLists.txt.orig 2018-06-03 15:35:20 UTC
+Fixes random crashes (especially reproducible when moving in dense
+forests), still relevant for 5.0.1
+--- 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)")
Modified: head/games/minetest/pkg-descr
==============================================================================
--- head/games/minetest/pkg-descr Wed Jul 31 22:04:10 2019 (r507741)
+++ head/games/minetest/pkg-descr Wed Jul 31 22:50:15 2019 (r507742)
@@ -1,4 +1,4 @@
Minetest is a near-infinite-world block sandbox game and a game engine,
inspired by InfiniMiner, Minecraft, and the like.
-WWW: http://www.minetest.net/
+WWW: https://www.minetest.net/
More information about the svn-ports-all
mailing list