Attachment #205974 for bug #238064

Lines 2-8 Link Here

(-)games/minetest/Makefile (-27 / +35 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= minetest	4	PORTNAME= minetest
5	PORTVERSION= 0.4.17.1	5	PORTVERSION= 5.0.1
6	CATEGORIES= games	6	CATEGORIES= games
7		7
8	MAINTAINER= amdmi3@FreeBSD.org	8	MAINTAINER= amdmi3@FreeBSD.org
Lines 14-23 Link Here
14	LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \	14	LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
15	libgmp.so:math/gmp	15	libgmp.so:math/gmp
16		16
		17	USES= cmake iconv:wchar_t gnome
		18
17	USE_GITHUB= yes	19	USE_GITHUB= yes
18	GH_ACCOUNT= minetest	20	GH_ACCOUNT= minetest
19		21
20	USES= cmake iconv:wchar_t
21	LLD_UNSAFE= yes	22	LLD_UNSAFE= yes
22	CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \	23	CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \
23	-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc"	24	-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc"
Lines 25-69 Link Here
25	PORTDATA= *	26	PORTDATA= *
26	PORTDOCS= *	27	PORTDOCS= *
27		28
28	OPTIONS_DEFINE= CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL PGSQL	29	OPTIONS_DEFINE= CONSOLE CURL DOCS EXAMPLES FREETYPE GAME LEVELDB LUAJIT NLS PGSQL REDIS SOUND SPATIAL
29	OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT	30	OPTIONS_DEFAULT= CLIENT CURL FREETYPE GAME LUAJIT SERVER SOUND
30	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
		32	OPTIONS_MULTI= EXECUTABLES
		33	OPTIONS_MULTI_EXECUTABLES= CLIENT SERVER
31		34
32	CLIENT_DESC= Build client	35	CLIENT_DESC= Build client
		36	CONSOLE_DESC= Enables curses console
		37	CURL_DESC= Enable cURL support for fetching media and server announce
		38	FREETYPE_DESC= Support for TrueType fonts with unicode
		39	GAME_DESC= Install minetest_game
		40	LEVELDB_DESC= Enable LevelDB backend
		41	LUAJIT_DESC= LuaJIT support
		42	REDIS_DESC= Enable Redis backend
33	SERVER_DESC= Build server	43	SERVER_DESC= Build server
34	CURL_DESC= Enable cURL support for fetching media
35	SOUND_DESC= Enable sound	44	SOUND_DESC= Enable sound
36	LEVELDB_DESC= Enable LevelDB backend
37	REDIS_DESC= Enable Redis backend
38	FREETYPE_DESC= Support for TrueType fonts with unicode
39	LUAJIT_DESC= LuaJIT support
40	SPATIAL_DESC= Enable SpatialIndex AreaStore backend	45	SPATIAL_DESC= Enable SpatialIndex AreaStore backend
41		46
		47	CLIENT_CMAKE_OFF= -DBUILD_CLIENT=0
42	CLIENT_CMAKE_ON= -DBUILD_CLIENT=1	48	CLIENT_CMAKE_ON= -DBUILD_CLIENT=1
43	CLIENT_CMAKE_OFF= -DBUILD_CLIENT=0	49	CLIENT_LIB_DEPENDS= libpng.so:graphics/png libIrrlicht.so:x11-toolkits/irrlicht
44	CLIENT_LIB_DEPENDS= libpng.so:graphics/png \	50	CLIENT_USE= GL=gl,glu XORG=x11,xext,xxf86vm
45	libIrrlicht.so:x11-toolkits/irrlicht	51	CLIENT_USES= gl jpeg
46	CLIENT_USES= jpeg	52	CLIENT_VARS= INSTALLS_ICONS=yes
47	CLIENT_USE= GL=gl XORG=x11,xext	53	CONSOLE_CMAKE_BOOL= ENABLE_CURSES
48	SERVER_CMAKE_BOOL= BUILD_SERVER	54	CONSOLE_USES= ncurses
49	CURL_CMAKE_BOOL= ENABLE_CURL	55	CURL_CMAKE_BOOL= ENABLE_CURL
50	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	56	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
		57	FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE
		58	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
		59	GAME_RUN_DEPENDS= minetest_game>0:games/minetest_game
		60	LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB
		61	LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb
		62	LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT REQUIRE_LUAJIT
		63	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
51	NLS_CMAKE_BOOL= ENABLE_GETTEXT	64	NLS_CMAKE_BOOL= ENABLE_GETTEXT
		65	NLS_LDFLAGS= -L${LOCALBASE}/lib
52	NLS_USES= gettext	66	NLS_USES= gettext
53	NLS_LDFLAGS= -L${LOCALBASE}/lib	67	PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL
54	SOUND_CMAKE_BOOL= ENABLE_SOUND	68	PGSQL_USES= pgsql
55	LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB
56	LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb
57	REDIS_CMAKE_BOOL= ENABLE_REDIS	69	REDIS_CMAKE_BOOL= ENABLE_REDIS
58	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis	70	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
59	FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE	71	SERVER_CMAKE_BOOL= BUILD_SERVER
60	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	72	SOUND_CMAKE_BOOL= ENABLE_SOUND
61	LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT REQUIRE_LUAJIT	73	SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL
62	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
63	SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex	74	SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex
64	SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL
65	PGSQL_USES= pgsql
66	PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL
67		75
68	.include <bsd.port.options.mk>	76	.include <bsd.port.options.mk>
69		77
Lines 84-90 Link Here
84	BUILD_DEPENDS+= ${NONEXISTENT}:x11-toolkits/irrlicht:patch	92	BUILD_DEPENDS+= ${NONEXISTENT}:x11-toolkits/irrlicht:patch
85	IRRLICHT_INCLUDE_DIR= `${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include	93	IRRLICHT_INCLUDE_DIR= `${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
86	CMAKE_ARGS+= -DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"	94	CMAKE_ARGS+= -DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
87	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-irrlichtdepend	95	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-CMakeLists.txt
88	.endif	96	.endif
89		97
90	post-patch:	98	post-patch:

Lines 1-3 Link Here

(-)games/minetest/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1528743956	1	TIMESTAMP = 1559139920
2	SHA256 (minetest-minetest-0.4.17.1_GH0.tar.gz) = cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59	2	SHA256 (minetest-minetest-5.0.1_GH0.tar.gz) = aa771cf178ad1b436d5723e5d6dd24e42b5d56f1cfe9c930f6426b7f24bb1635
3	SIZE (minetest-minetest-0.4.17.1_GH0.tar.gz) = 7758675	3	SIZE (minetest-minetest-5.0.1_GH0.tar.gz) = 8761122

Line 0 Link Here

(-)games/minetest/files/extra-patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2019-05-29 14:02:39 UTC
	2	+++ CMakeLists.txt
	3	@@ -63,7 +63,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SO
	4
	5
	6	# This is done here so that relative search paths are more reasonable
	7	-find_package(Irrlicht)
	8	+set(IRRLICHT_LIBRARY "")
	9
	10
	11	# Installation

Lines 1-11 Link Here

(-)games/minetest/files/extra-patch-irrlichtdepend (-11 lines)
1	--- CMakeLists.txt.orig 2015-08-20 02:02:00 UTC
2	+++ CMakeLists.txt
3	@@ -55,7 +55,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
4
5
6	# This is done here so that relative search paths are more reasonable
7	-find_package(Irrlicht)
8	+set(IRRLICHT_LIBRARY "")
9
10
11	# Installation

Lines 38-43 Link Here

(-)games/minetest/files/minetest.in (+1 lines)
38	: ${minetest_logdir="/var/log/minetest"}	38	: ${minetest_logdir="/var/log/minetest"}
39	: ${minetest_dbdir="/var/db/minetest"}	39	: ${minetest_dbdir="/var/db/minetest"}
40	: ${minetest_args:="--logfile ${minetest_logdir}/debug.log --world ${minetest_dbdir}/world ${minetest_flags}"}	40	: ${minetest_args:="--logfile ${minetest_logdir}/debug.log --world ${minetest_dbdir}/world ${minetest_flags}"}
		41	: ${minetest_env="HOME=/var/db/minetest"}
41		42
42	pidfile=	43	pidfile=
43		44

Lines 1-10 Link Here

(-)games/minetest/files/patch-src_CMakeLists.txt (-4 / +4 lines)
1	--- src/CMakeLists.txt.orig 2018-06-03 15:35:20 UTC	1	--- src/CMakeLists.txt.orig 2019-03-31 20:57:45 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -758,7 +758,6 @@ else()	3	@@ -729,7 +729,6 @@ else()
4		4
5	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")	5	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
6	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin\|FreeBSD)")	6	if(CMAKE_SYSTEM_NAME MATCHES "(Darwin\|BSD\|DragonFly)")
7	- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")	7	- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
8	else()	8	else()
9	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer")	9	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer")
10	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin\|FreeBSD)")	10	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin\|BSD\|DragonFly)")

Lines 2-8 Link Here

(-)games/minetest_game/Makefile (-3 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= minetest_game	4	PORTNAME= minetest_game
5	PORTVERSION= 0.4.17	5	PORTVERSION= 5.0.1
6	CATEGORIES= games	6	CATEGORIES= games
7		7
8	MAINTAINER= amdmi3@FreeBSD.org	8	MAINTAINER= amdmi3@FreeBSD.org
Lines 10-17 Link Here
10		10
11	LICENSE= LGPL21+	11	LICENSE= LGPL21+
12		12
13	RUN_DEPENDS= minetest:games/minetest
14
15	USE_GITHUB= yes	13	USE_GITHUB= yes
16	GH_ACCOUNT= minetest	14	GH_ACCOUNT= minetest
17		15

Lines 1-3 Link Here

(-)games/minetest_game/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1528129310	1	TIMESTAMP = 1558454933
2	SHA256 (minetest-minetest_game-0.4.17_GH0.tar.gz) = f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d	2	SHA256 (minetest-minetest_game-5.0.1_GH0.tar.gz) = 965d2cf3ac8c822bc9e60fb8f508182fb2f24dde46f46b000caf225ebe2ec519
3	SIZE (minetest-minetest_game-0.4.17_GH0.tar.gz) = 1356784	3	SIZE (minetest-minetest_game-5.0.1_GH0.tar.gz) = 1509625

Return to bug 238064