View | Details | Raw Unified | Return to bug 178244 | Differences between
and this patch

Collapse All | Expand All

(-)minetest/Makefile (-42 / +30 lines)
Lines 2-89 Link Here
2
# $FreeBSD: games/minetest/Makefile 316596 2013-04-26 10:44:28Z ak $
2
# $FreeBSD: games/minetest/Makefile 316596 2013-04-26 10:44:28Z ak $
3
3
4
PORTNAME=	minetest
4
PORTNAME=	minetest
5
PORTVERSION=	0.4.4
5
PORTVERSION=	0.4.6
6
CATEGORIES=	games
6
CATEGORIES=	games
7
7
8
MAINTAINER=	amdmi3@FreeBSD.org
8
MAINTAINER=	amdmi3@FreeBSD.org
9
COMMENT=	An Infiniminer/Minecraft inspired game
9
COMMENT=	Infinite-world block sandbox game
10
11
LIB_DEPENDS=	Irrlicht.1:${PORTSDIR}/x11-toolkits/irrlicht \
12
		sqlite3:${PORTSDIR}/databases/sqlite3
13
10
14
LICENSE=	LGPL21
11
LICENSE=	LGPL21
15
12
13
LIB_DEPENDS=	Irrlicht:${PORTSDIR}/x11-toolkits/irrlicht \
14
		sqlite3:${PORTSDIR}/databases/sqlite3
15
16
USE_GITHUB=	yes
16
USE_GITHUB=	yes
17
GH_ACCOUNT=	celeron55
17
GH_ACCOUNT=	minetest
18
GH_TAGNAME=	0.4.4
18
GH_COMMIT=	f85c116
19
GH_COMMIT=	ab06fca
20
19
20
MAKE_JOBS_SAFE=	yes
21
USES=		cmake
21
USES=		cmake
22
22
CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
23
CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
23
		-DCUSTOM_EXAMPLE_CONF_DIR="${EXAMPLESDIR}"
24
		-DCUSTOM_EXAMPLE_CONF_DIR="${EXAMPLESDIR}"
24
MAKE_JOBS_SAFE=	yes
25
25
26
PORTDOCS=	*
26
PORTDOCS=	*
27
PORTEXAMPLES=	*
27
PORTEXAMPLES=	*
28
28
29
MAN6=		minetest.6 minetestserver.6
29
MAN6=		minetest.6 minetestserver.6
30
30
31
OPTIONS_DEFINE=	CLIENT SERVER SOUND NLS DOCS EXAMPLES
31
OPTIONS_DEFINE=	CLIENT DOCS EXAMPLES NLS SOUND
32
OPTIONS_DEFAULT=CLIENT SERVER SOUND NLS DOCS EXAMPLES
32
OPTIONS_DEFAULT=CLIENT DOCS EXAMPLES NLS SOUND
33
CLIENT_DESC=	Build client
33
CLIENT_DESC=	Build client
34
SERVER_DESC=	Build server
35
SOUND_DESC=	Enable sound
36
34
37
.include <bsd.port.options.mk>
35
.include <bsd.port.options.mk>
38
36
39
.if ${PORT_OPTIONS:MNLS}
40
CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=YES
41
USES+=		gettext
42
LDFLAGS+=	-L${LOCALBASE}/lib
43
PLIST_SUB+=	NLS=""
44
.else
45
CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=NO
46
PLIST_SUB+=	NLS="@comment "
47
.endif
48
49
.if ${PORT_OPTIONS:MCLIENT}
37
.if ${PORT_OPTIONS:MCLIENT}
50
USE_GL=		gl
38
CMAKE_ARGS+=	-DBUILD_CLIENT:BOOL=YES
51
LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
39
LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
52
		png15:${PORTSDIR}/graphics/png
40
		png15:${PORTSDIR}/graphics/png
53
CMAKE_ARGS+=	-DBUILD_CLIENT=1
54
PLIST_SUB+=	CLIENT=""
41
PLIST_SUB+=	CLIENT=""
42
USE_GL=		gl
55
.else
43
.else
56
CMAKE_ARGS+=	-DBUILD_CLIENT=0
44
CMAKE_ARGS+=	-DBUILD_CLIENT:BOOL=NO
57
PLIST_SUB+=	CLIENT="@comment "
45
PLIST_SUB+=	CLIENT="@comment "
58
.endif
46
.endif
59
47
60
.if ${PORT_OPTIONS:MSERVER}
48
.if ${PORT_OPTIONS:MNLS}
61
CMAKE_ARGS+=	-DBUILD_SERVER=1
49
CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=YES
62
PLIST_SUB+=	SERVER=""
50
LDFLAGS+=	-L${LOCALBASE}/lib
51
PLIST_SUB+=	NLS=""
52
USES+=		gettext
63
.else
53
.else
64
CMAKE_ARGS+=	-DBUILD_SERVER=0
54
CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=NO
65
PLIST_SUB+=	SERVER="@comment "
55
PLIST_SUB+=	NLS="@comment "
66
.endif
56
.endif
67
57
68
.if ${PORT_OPTIONS:MSOUND}
58
.if ${PORT_OPTIONS:MSOUND}
59
LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
69
USE_OPENAL=	yes
60
USE_OPENAL=	yes
70
LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
71
.else
61
.else
72
CMAKE_ARGS+=	-DENABLE_SOUND:BOOL=OFF
62
CMAKE_ARGS+=	-DENABLE_SOUND:BOOL=OFF
73
.endif
63
.endif
74
64
75
post-patch:
65
post-patch:
76
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
77
		${WRKSRC}/cmake/Modules/FindIrrlicht.cmake
78
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
66
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
79
		${WRKSRC}/src/CMakeLists.txt
67
		${WRKSRC}/src/CMakeLists.txt
80
#	@${REINPLACE_CMD} -e 's|share/man|man|; /EXAMPLE_CONF_DIR/ s|..DOCDIR.|"${EXAMPLESDIR}"|' \
68
.if !${PORT_OPTIONS:MDOCS}
81
#		${WRKSRC}/CMakeLists.txt
69
	@${REINPLACE_CMD} -e '/install.*DESTINATION.*DOCDIR/I d' \
82
.if ! ${PORT_OPTIONS:MDOCS}
70
	    ${WRKSRC}/CMakeLists.txt
83
	@${REINPLACE_CMD} -e '/install.*DESTINATION.*DOCDIR/I d' ${WRKSRC}/CMakeLists.txt
71
.endif
84
.endif
72
.if !${PORT_OPTIONS:MEXAMPLES}
85
.if ! ${PORT_OPTIONS:MEXAMPLES}
73
	@${REINPLACE_CMD} -e '/install.*DESTINATION.*EXAMPLE_CONF_DIR/I d' \
86
	@${REINPLACE_CMD} -e '/install.*DESTINATION.*EXAMPLE_CONF_DIR/I d' ${WRKSRC}/CMakeLists.txt
74
	    ${WRKSRC}/CMakeLists.txt
87
.endif
75
.endif
88
76
89
.include <bsd.port.mk>
77
.include <bsd.port.mk>
(-)minetest/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (minetest-0.4.4.tar.gz) = 127741d361e8642dd5b7e3aaad4b38bae4c19a5d1b8fac8f5acafbc2225f5de0
1
SHA256 (minetest-0.4.6.tar.gz) = a6ea387b25181264eea43194be6137c1a54fac2873f0b811789ba0e24ff5b1b1
2
SIZE (minetest-0.4.4.tar.gz) = 2104959
2
SIZE (minetest-0.4.6.tar.gz) = 2578194
(-)minetest/files/patch-src-CMakeLists.txt (-10 lines)
Lines 1-10 Link Here
1
--- src/CMakeLists.txt.orig	2013-01-30 04:11:11.427933414 +0400
2
+++ src/CMakeLists.txt	2013-01-30 04:11:49.504933655 +0400
3
@@ -316,6 +316,7 @@
4
 		${ZLIB_LIBRARIES}
5
 		${JTHREAD_LIBRARY}
6
 		${SQLITE3_LIBRARY}
7
+		${GETTEXT_LIBRARY}
8
 		${LUA_LIBRARY}
9
 		${PLATFORM_LIBS}
10
 	)
(-)minetest/pkg-descr (-2 / +3 lines)
Lines 1-3 Link Here
1
An InfiniMiner/Minecraft inspired game.
1
Minetest is an infinite-world block sandbox game and a game engine, inspired
2
by InfiniMiner, Minecraft and the like.
2
3
3
WWW: http://minetest.net/
4
WWW: http://www.minetest.net/
(-)minetest/pkg-plist (-22 / +68 lines)
Lines 1-11 Link Here
1
%%CLIENT%%%%DATADIR%%/textures/base/pack/fontdejavusansmono.png
2
%%CLIENT%%%%DATADIR%%/textures/base/pack/fontlucida.png
3
%%CLIENT%%%%DATADIR%%/textures/base/pack/logo.png
4
%%CLIENT%%%%DATADIR%%/textures/base/pack/menubg.png
5
%%CLIENT%%%%DATADIR%%/textures/base/pack/menufooter.png
6
%%CLIENT%%%%DATADIR%%/textures/base/pack/menuheader.png
7
%%CLIENT%%%%DATADIR%%/textures/base/pack/smoke_puff.png
8
%%CLIENT%%%%DATADIR%%/textures/base/pack/sunrisebg.png
9
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_block.png
10
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_item.png
11
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_object.png
12
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/minetest.mo
13
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/minetest.mo
14
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/minetest.mo
15
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/et/LC_MESSAGES/minetest.mo
16
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/minetest.mo
17
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/it/LC_MESSAGES/minetest.mo
18
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ja/LC_MESSAGES/minetest.mo
19
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ko/LC_MESSAGES/minetest.mo
20
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ky/LC_MESSAGES/minetest.mo
21
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/pl/LC_MESSAGES/minetest.mo
22
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/pt/LC_MESSAGES/minetest.mo
23
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ro/LC_MESSAGES/minetest.mo
24
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/minetest.mo
25
%%CLIENT%%%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/minetest.mo
1
%%CLIENT%%bin/minetest
26
%%CLIENT%%bin/minetest
2
%%SERVER%%bin/minetestserver
3
share/applications/minetest.desktop
4
share/icons/hicolor/scalable/apps/minetest-icon.svg
5
%%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/minetest.mo
6
%%CLIENT%%%%NLS%%share/locale/de/LC_MESSAGES/minetest.mo
7
%%CLIENT%%%%NLS%%share/locale/fr/LC_MESSAGES/minetest.mo
8
%%CLIENT%%%%NLS%%share/locale/it/LC_MESSAGES/minetest.mo
9
%%DATADIR%%/builtin/auth.lua
27
%%DATADIR%%/builtin/auth.lua
10
%%DATADIR%%/builtin/builtin.lua
28
%%DATADIR%%/builtin/builtin.lua
11
%%DATADIR%%/builtin/chatcommands.lua
29
%%DATADIR%%/builtin/chatcommands.lua
Lines 20-31 Link Here
20
%%DATADIR%%/builtin/privileges.lua
38
%%DATADIR%%/builtin/privileges.lua
21
%%DATADIR%%/builtin/serialize.lua
39
%%DATADIR%%/builtin/serialize.lua
22
%%DATADIR%%/builtin/static_spawn.lua
40
%%DATADIR%%/builtin/static_spawn.lua
41
%%DATADIR%%/client/serverlist/.gitignore
23
%%DATADIR%%/client/shaders/test_shader_1/base.txt
42
%%DATADIR%%/client/shaders/test_shader_1/base.txt
24
%%DATADIR%%/client/shaders/test_shader_1/opengl_fragment.glsl
43
%%DATADIR%%/client/shaders/test_shader_1/opengl_fragment.glsl
25
%%DATADIR%%/client/shaders/test_shader_1/opengl_vertex.glsl
44
%%DATADIR%%/client/shaders/test_shader_1/opengl_vertex.glsl
26
%%DATADIR%%/client/shaders/test_shader_2/base.txt
45
%%DATADIR%%/client/shaders/test_shader_2/base.txt
27
%%DATADIR%%/client/shaders/test_shader_2/opengl_fragment.glsl
46
%%DATADIR%%/client/shaders/test_shader_2/opengl_fragment.glsl
28
%%DATADIR%%/client/shaders/test_shader_2/opengl_vertex.glsl
47
%%DATADIR%%/client/shaders/test_shader_2/opengl_vertex.glsl
48
%%DATADIR%%/fonts/liberationmono.ttf
49
%%DATADIR%%/fonts/liberationsans.ttf
29
%%DATADIR%%/games/minimal/game.conf
50
%%DATADIR%%/games/minimal/game.conf
30
%%DATADIR%%/games/minimal/mods/bucket/depends.txt
51
%%DATADIR%%/games/minimal/mods/bucket/depends.txt
31
%%DATADIR%%/games/minimal/mods/bucket/init.lua
52
%%DATADIR%%/games/minimal/mods/bucket/init.lua
Lines 143-160 Link Here
143
%%DATADIR%%/games/minimal/mods/stairs/depends.txt
164
%%DATADIR%%/games/minimal/mods/stairs/depends.txt
144
%%DATADIR%%/games/minimal/mods/stairs/init.lua
165
%%DATADIR%%/games/minimal/mods/stairs/init.lua
145
%%DATADIR%%/games/minimal/mods/test/init.lua
166
%%DATADIR%%/games/minimal/mods/test/init.lua
146
%%CLIENT%%%%DATADIR%%/textures/base/pack/fontdejavusansmono.png
167
bin/minetestserver
147
%%CLIENT%%%%DATADIR%%/textures/base/pack/fontlucida.png
168
share/applications/minetest.desktop
148
%%CLIENT%%%%DATADIR%%/textures/base/pack/menubg.png
169
share/icons/hicolor/scalable/apps/minetest-icon.svg
149
%%CLIENT%%%%DATADIR%%/textures/base/pack/menulogo.png
150
%%CLIENT%%%%DATADIR%%/textures/base/pack/smoke_puff.png
151
%%CLIENT%%%%DATADIR%%/textures/base/pack/sunrisebg.png
152
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_block.png
153
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_item.png
154
%%CLIENT%%%%DATADIR%%/textures/base/pack/unknown_object.png
155
%%CLIENT%%@dirrm %%DATADIR%%/textures/base/pack
170
%%CLIENT%%@dirrm %%DATADIR%%/textures/base/pack
156
%%CLIENT%%@dirrm %%DATADIR%%/textures/base
171
%%CLIENT%%@dirrm %%DATADIR%%/textures/base
157
%%CLIENT%%@dirrm %%DATADIR%%/textures
172
%%CLIENT%%@dirrm %%DATADIR%%/textures
173
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/zh_CN/LC_MESSAGES
174
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/zh_CN
175
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES
176
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ru
177
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ro/LC_MESSAGES
178
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ro
179
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pt/LC_MESSAGES
180
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pt
181
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pl/LC_MESSAGES
182
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/pl
183
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ky/LC_MESSAGES
184
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ky
185
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ko/LC_MESSAGES
186
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ko
187
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ja/LC_MESSAGES
188
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/ja
189
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/it/LC_MESSAGES
190
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/it
191
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/fr/LC_MESSAGES
192
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/fr
193
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/et/LC_MESSAGES
194
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/et
195
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/es/LC_MESSAGES
196
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/es
197
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/de/LC_MESSAGES
198
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/de
199
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/da/LC_MESSAGES
200
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale/da
201
%%CLIENT%%%%NLS%%@dirrm %%DATADIR%%/locale
202
@dirrm share/icons/hicolor/scalable/apps
203
@dirrm share/icons/hicolor/scalable
204
@dirrm share/icons/hicolor
205
@dirrm share/icons
206
@dirrm share/applications
158
@dirrm %%DATADIR%%/games/minimal/mods/test
207
@dirrm %%DATADIR%%/games/minimal/mods/test
159
@dirrm %%DATADIR%%/games/minimal/mods/stairs
208
@dirrm %%DATADIR%%/games/minimal/mods/stairs
160
@dirrm %%DATADIR%%/games/minimal/mods/legacy/textures
209
@dirrm %%DATADIR%%/games/minimal/mods/legacy/textures
Lines 169-183 Link Here
169
@dirrm %%DATADIR%%/games/minimal/mods/bucket
218
@dirrm %%DATADIR%%/games/minimal/mods/bucket
170
@dirrm %%DATADIR%%/games/minimal/mods
219
@dirrm %%DATADIR%%/games/minimal/mods
171
@dirrm %%DATADIR%%/games/minimal
220
@dirrm %%DATADIR%%/games/minimal
172
@dirrm %%DATADIR%%/games
221
@dirrmtry %%DATADIR%%/games
222
@dirrm %%DATADIR%%/fonts
173
@dirrm %%DATADIR%%/client/shaders/test_shader_2
223
@dirrm %%DATADIR%%/client/shaders/test_shader_2
174
@dirrm %%DATADIR%%/client/shaders/test_shader_1
224
@dirrm %%DATADIR%%/client/shaders/test_shader_1
175
@dirrm %%DATADIR%%/client/shaders
225
@dirrm %%DATADIR%%/client/shaders
226
@dirrm %%DATADIR%%/client/serverlist
176
@dirrm %%DATADIR%%/client
227
@dirrm %%DATADIR%%/client
177
@dirrm %%DATADIR%%/builtin
228
@dirrm %%DATADIR%%/builtin
178
@dirrm %%DATADIR%%
229
@dirrm %%DATADIR%%
179
@dirrmtry share/icons/hicolor/scalable/apps
180
@dirrmtry share/icons/hicolor/scalable
181
@dirrmtry share/icons/hicolor
182
@dirrmtry share/icons
183
@dirrmtry share/applications

Return to bug 178244