Attachment 205974 Details for Bug 238064 – Patch to upgrade games/minetest and games/minetest_game to 5.0.1

[patch] Patch to upgrade games/minetest and games/minetest_game to 5.0.1

minetest.diff (text/plain), 8.72 KB, created by crwhipp on 2019-07-21 17:31:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: crwhipp

Created: 2019-07-21 17:31:43 UTC

Size: 8.72 KB

patch

obsolete

>Index: games/minetest/Makefile
>===================================================================
>--- games/minetest/Makefile	(revision 506851)
>+++ games/minetest/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,45 +26,52 @@
> 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
>+CLIENT_VARS=	INSTALLS_ICONS=yes
>+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 <bsd.port.options.mk>
> 
>@@ -84,7 +92,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:
>Index: games/minetest/distinfo
>===================================================================
>--- games/minetest/distinfo	(revision 506851)
>+++ games/minetest/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
>Index: games/minetest/files/extra-patch-CMakeLists.txt
>===================================================================
>--- games/minetest/files/extra-patch-CMakeLists.txt	(nonexistent)
>+++ games/minetest/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
>
>Property changes on: games/minetest/files/extra-patch-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
>Index: games/minetest/files/extra-patch-irrlichtdepend
>===================================================================
>--- games/minetest/files/extra-patch-irrlichtdepend	(revision 506851)
>+++ games/minetest/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
>
>Property changes on: games/minetest/files/extra-patch-irrlichtdepend
>___________________________________________________________________
>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: games/minetest/files/minetest.in
>===================================================================
>--- games/minetest/files/minetest.in	(revision 506851)
>+++ games/minetest/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=
> 
>Index: games/minetest/files/patch-src_CMakeLists.txt
>===================================================================
>--- games/minetest/files/patch-src_CMakeLists.txt	(revision 506851)
>+++ games/minetest/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)")
>Index: games/minetest_game/Makefile
>===================================================================
>--- games/minetest_game/Makefile	(revision 506851)
>+++ games/minetest_game/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	minetest_game
>-PORTVERSION=	0.4.17
>+PORTVERSION=	5.0.1
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>@@ -10,8 +10,6 @@
> 
> LICENSE=	LGPL21+
> 
>-RUN_DEPENDS=	minetest:games/minetest
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	minetest
> 
>Index: games/minetest_game/distinfo
>===================================================================
>--- games/minetest_game/distinfo	(revision 506851)
>+++ games/minetest_game/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1528129310
>-SHA256 (minetest-minetest_game-0.4.17_GH0.tar.gz) = f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d
>-SIZE (minetest-minetest_game-0.4.17_GH0.tar.gz) = 1356784
>+TIMESTAMP = 1558454933
>+SHA256 (minetest-minetest_game-5.0.1_GH0.tar.gz) = 965d2cf3ac8c822bc9e60fb8f508182fb2f24dde46f46b000caf225ebe2ec519
>+SIZE (minetest-minetest_game-5.0.1_GH0.tar.gz) = 1509625

Actions: View | Diff

Attachments on bug 238064: 204558 | 204559 | 204760 | 204761 | 205243 | 205244 | 205245 | 205974 | 205975