View | Details | Raw Unified | Return to bug 122023
Collapse All | Expand All

(-)teeworlds/Makefile (-11 / +12 lines)
Lines 5-14 Link Here
5
# $FreeBSD: ports/games/teewars/Makefile,v 1.1 2008/02/18 19:52:20 miwi Exp $
5
# $FreeBSD: ports/games/teewars/Makefile,v 1.1 2008/02/18 19:52:20 miwi Exp $
6
#
6
#
7
7
8
PORTNAME=	teewars
8
PORTNAME=	teeworlds
9
PORTVERSION=	0.3.4
9
PORTVERSION=	0.4.1
10
CATEGORIES=	games
10
CATEGORIES=	games
11
MASTER_SITES=	http://www.teewars.com/files/ \
11
MASTER_SITES=	http://www.teeworlds.com/files/ \
12
		http://www.amdmi3.ru/distfiles/
12
		http://www.amdmi3.ru/distfiles/
13
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
13
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
14
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bam${EXTRACT_SUFX}
14
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bam${EXTRACT_SUFX}
Lines 18-32 Link Here
18
18
19
USE_ZIP=	yes
19
USE_ZIP=	yes
20
USE_PYTHON_BUILD=	yes
20
USE_PYTHON_BUILD=	yes
21
USE_XORG=	x11 xxf86vm
21
22
22
BAM=	${WRKDIR}/bam.bin
23
BAM=	${WRKDIR}/bam.bin
23
BAM_TARGET=	release
24
BAM_TARGET=	release
24
25
25
OPTIONS=	TEEWARS_SERVER_ONLY	"Build dedicated server only"	off
26
OPTIONS=	TEEWORLDS_SERVER_ONLY	"Build dedicated server only"	off
26
27
27
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
28
29
29
.if defined(WITH_TEEWARS_SERVER_ONLY)
30
.if defined(WITH_TEEWORLDS_SERVER_ONLY)
30
BAM_TARGET=	server_release
31
BAM_TARGET=	server_release
31
PLIST_SUB+=	CLIENT="@comment "
32
PLIST_SUB+=	CLIENT="@comment "
32
.else
33
.else
Lines 47-68 Link Here
47
		${XARGS} ${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g'
48
		${XARGS} ${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g'
48
	@${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g' ${WRKSRC}/datasrc/*
49
	@${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g' ${WRKSRC}/datasrc/*
49
50
50
# build bam executable - teewars own build system
51
# build bam executable - teeworlds own build system
51
pre-build:
52
pre-build:
52
	cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/tools/txt2c.c -o src/tools/txt2c
53
	cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/tools/txt2c.c -o src/tools/txt2c
53
	cd ${WRKDIR}/bam && src/tools/txt2c < src/base.bam > src/internal_base.h
54
	cd ${WRKDIR}/bam && src/tools/txt2c < src/base.bam > src/internal_base.h
54
	cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/lua/src/*.c src/lua/src/lib/*.c \
55
	cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/lua/src/*.c src/lua/src/lib/*.c \
55
		src/*.c -Isrc/lua/include -o ${BAM} -lm ${PTHREAD_LIBS}
56
		src/*.c -Isrc/lua/include -o ${BAM} -lm ${PTHREAD_LIBS}
56
57
57
# build teewars
58
# build teeworlds
58
do-build:
59
do-build:
59
	cd ${WRKSRC} && ${BAM} ${BAM_TARGET}
60
	cd ${WRKSRC} && ${BAM} -v ${BAM_TARGET}
60
61
61
do-install:
62
do-install:
62
.if !defined(WITH_TEEWARS_SERVER_ONLY)
63
.if !defined(WITH_TEEWORLDS_SERVER_ONLY)
63
	${INSTALL_PROGRAM} ${WRKSRC}/teewars ${PREFIX}/bin
64
	${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
64
.endif
65
.endif
65
	${INSTALL_PROGRAM} ${WRKSRC}/teewars_srv ${PREFIX}/bin
66
	${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
66
	${MKDIR} ${DATADIR}
67
	${MKDIR} ${DATADIR}
67
	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}/
68
	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}/
68
69
(-)teeworlds/distinfo (-6 / +6 lines)
Lines 1-6 Link Here
1
MD5 (teewars-0.3.4-src.zip) = ed56470043b0dc73caa55a741282c761
1
MD5 (teeworlds-0.4.1-src.zip) = 6b680946ef1e1d503712d951ba810a38
2
SHA256 (teewars-0.3.4-src.zip) = 8ed3152a9fc631dce0c4da7ca991728895e2660b217bb26063c02503a36c0861
2
SHA256 (teeworlds-0.4.1-src.zip) = 5c590d80ae5b15de63535a11ba84a2d97ed60c91d240b1bb50d4f719844d6eef
3
SIZE (teewars-0.3.4-src.zip) = 4438820
3
SIZE (teeworlds-0.4.1-src.zip) = 5245937
4
MD5 (bam.zip) = 91065fcce9296b7259d71ef6aafe347a
4
MD5 (bam.zip) = dd1937ce711927299a1b09edffa319ca
5
SHA256 (bam.zip) = 616834108060c4f573d19dd087d6c4c5d5e40b8987002c9b9df089fb194fa71c
5
SHA256 (bam.zip) = db78d80b88fd05a07fc1ab29a9bcd060c2d0c2c214c6122861ff4d6d409ae937
6
SIZE (bam.zip) = 475348
6
SIZE (bam.zip) = 478660
(-)teeworlds/files/patch-default.bam (-23 / +40 lines)
Lines 1-9 Link Here
1
--- default.bam.orig	2008-02-09 22:10:40.000000000 +0300
1
--- default.bam.orig	2008-03-23 16:34:56.000000000 +0300
2
+++ default.bam	2008-02-18 00:06:31.000000000 +0300
2
+++ default.bam	2008-03-23 22:39:30.000000000 +0300
3
@@ -173,19 +173,20 @@
3
@@ -207,14 +207,16 @@
4
 		settings.cc.flags = "/wd4244"
4
 		if platform == "macosx" then
5
 	else
5
 			settings.cc.flags = "-Wall -fno-exceptions"
6
 		settings.cc.flags = "-Wall"
6
 		else
7
-			settings.cc.flags = "-Wall -fstack-protector -fstack-protector-all -fno-exceptions"
8
+			settings.cc.flags = settings.cc.flags .. " -Wall -fstack-protector -fstack-protector-all -fno-exceptions"
9
 		end
7
-		settings.linker.flags = ""
10
-		settings.linker.flags = ""
8
+		settings.linker.flags = "-L/usr/local/lib/portaudio2 -L/usr/local/lib -pthread"
11
+		settings.linker.flags = "-L/usr/local/lib/portaudio2 -L/usr/local/lib -pthread"
9
+		settings.linker.libs:add("z")
12
+		settings.linker.libs:add("z")
Lines 17-38 Link Here
17
 
20
 
18
 	if family == "unix" then
21
 	if family == "unix" then
19
    		if platform == "macosx" then
22
    		if platform == "macosx" then
20
 			glfw_platform = "macosx"
23
@@ -230,8 +232,6 @@
21
 		else
24
 			else
22
 			glfw_platform = "x11"
25
 				pa_hostapi = "oss"
26
 			end
27
-			
23
-			settings.linker.libs:add("pthread")
28
-			settings.linker.libs:add("pthread")
24
 		end
29
 		end
25
 	elseif family == "windows" then
30
 	elseif family == "windows" then
26
 		glfw_platform = "win32"
31
 		glfw_platform = "win32"
27
@@ -217,7 +218,6 @@
32
@@ -263,11 +263,6 @@
33
 	pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
34
 	pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
35
 	
36
-	portaudio = Compile(pa_settings,
37
-		Collect("src/engine/external/portaudio/src/common/*.c"),
38
-		Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
39
-		Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
40
-	
41
 	-- build game components
42
 	engine_settings = settings:copy()
43
 	
44
@@ -277,9 +272,8 @@
45
    		if platform == "macosx" then
46
 			engine_settings.cc.flags = "-Wall"
28
 		else
47
 		else
29
 			engine_settings.cc.flags = "-Wall -pedantic-errors"
48
-			engine_settings.cc.flags = "-Wall -pedantic-errors"
49
+			engine_settings.cc.flags = engine_settings.cc.flags .. " -Wall -pedantic-errors"
30
 		end
50
 		end
31
-		engine_settings.linker.flags = ""
51
-		engine_settings.linker.flags = ""
32
 	end
52
 	end
33
 
53
 
34
 	-- server
54
 	-- server
35
@@ -237,10 +237,11 @@
55
@@ -299,10 +293,11 @@
36
 			client_settings.linker.frameworks:add("AudioToolbox")
56
 			client_settings.linker.frameworks:add("AudioToolbox")
37
 			client_settings.linker.frameworks:add("AudioUnit")
57
 			client_settings.linker.frameworks:add("AudioUnit")
38
 		else
58
 		else
Lines 45-71 Link Here
45
 		end
65
 		end
46
 	elseif family == "windows" then
66
 	elseif family == "windows" then
47
 		client_settings.linker.libs:add("opengl32.lib")
67
 		client_settings.linker.libs:add("opengl32.lib")
48
@@ -249,10 +250,8 @@
68
@@ -311,7 +306,6 @@
49
 	end
69
 	end
50
 
70
 
51
 	external_settings = settings:copy()
71
 	external_settings = settings:copy()
52
-	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
72
-	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
53
 	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
73
 	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
54
 	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
74
 	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
55
-	portaudio = Compile(external_settings, Collect("src/engine/external/pa.c"))
75
 
56
 	
76
@@ -337,7 +331,7 @@
57
 	engine = Compile(engine_settings, Collect("src/engine/*.c"))
58
 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
59
@@ -280,7 +279,7 @@
60
 	
77
 	
61
 	-- build client, server and master server
78
 	-- build client, server and master server
62
 	client_exe = Link(client_settings, "teewars", game_shared, game_client,
79
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
63
-		engine, client, editor, glfw, portaudio, zlib, pnglite, wavpack,
80
-		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
64
+		engine, client, editor, glfw, pnglite, wavpack,
81
+		engine, client, game_editor, glfw, pnglite, wavpack,
65
 		client_link_other)
82
 		client_link_other)
66
 
83
 
67
 	server_exe = Link(server_settings, "teewars_srv", engine, server,
84
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
68
@@ -326,7 +325,7 @@
85
@@ -383,7 +377,7 @@
69
 release_settings.config_name = "release"
86
 release_settings.config_name = "release"
70
 release_settings.config_ext = ""
87
 release_settings.config_ext = ""
71
 release_settings.debug = 0
88
 release_settings.debug = 0
(-)teeworlds/pkg-plist (-11 / +77 lines)
Lines 1-5 Link Here
1
%%CLIENT%%bin/teewars
1
%%CLIENT%%bin/teeworlds
2
bin/teewars_srv
2
bin/teeworlds_srv
3
%%DATADIR%%/audio/foley_body_impact-01.wv
3
%%DATADIR%%/audio/foley_body_impact-01.wv
4
%%DATADIR%%/audio/foley_body_impact-02.wv
4
%%DATADIR%%/audio/foley_body_impact-02.wv
5
%%DATADIR%%/audio/foley_body_impact-03.wv
5
%%DATADIR%%/audio/foley_body_impact-03.wv
Lines 49-54 Link Here
49
%%DATADIR%%/audio/sfx_pickup_launcher.wv
49
%%DATADIR%%/audio/sfx_pickup_launcher.wv
50
%%DATADIR%%/audio/sfx_pickup_ninja.wv
50
%%DATADIR%%/audio/sfx_pickup_ninja.wv
51
%%DATADIR%%/audio/sfx_pickup_sg.wv
51
%%DATADIR%%/audio/sfx_pickup_sg.wv
52
%%DATADIR%%/audio/sfx_skid-01.wv
53
%%DATADIR%%/audio/sfx_skid-02.wv
54
%%DATADIR%%/audio/sfx_skid-03.wv
55
%%DATADIR%%/audio/sfx_skid-04.wv
52
%%DATADIR%%/audio/sfx_spawn_wpn-01.wv
56
%%DATADIR%%/audio/sfx_spawn_wpn-01.wv
53
%%DATADIR%%/audio/sfx_spawn_wpn-02.wv
57
%%DATADIR%%/audio/sfx_spawn_wpn-02.wv
54
%%DATADIR%%/audio/sfx_spawn_wpn-03.wv
58
%%DATADIR%%/audio/sfx_spawn_wpn-03.wv
Lines 110-137 Link Here
110
%%DATADIR%%/audio/wp_noammo-03.wv
114
%%DATADIR%%/audio/wp_noammo-03.wv
111
%%DATADIR%%/audio/wp_noammo-04.wv
115
%%DATADIR%%/audio/wp_noammo-04.wv
112
%%DATADIR%%/audio/wp_noammo-05.wv
116
%%DATADIR%%/audio/wp_noammo-05.wv
117
%%DATADIR%%/audio/wp_rifle_bnce-01.wv
118
%%DATADIR%%/audio/wp_rifle_bnce-02.wv
119
%%DATADIR%%/audio/wp_rifle_bnce-03.wv
120
%%DATADIR%%/audio/wp_rifle_fire-01.wv
121
%%DATADIR%%/audio/wp_rifle_fire-02.wv
122
%%DATADIR%%/audio/wp_rifle_fire-03.wv
113
%%DATADIR%%/audio/wp_shotty_fire-01.wv
123
%%DATADIR%%/audio/wp_shotty_fire-01.wv
114
%%DATADIR%%/audio/wp_shotty_fire-02.wv
124
%%DATADIR%%/audio/wp_shotty_fire-02.wv
115
%%DATADIR%%/audio/wp_shotty_fire-03.wv
125
%%DATADIR%%/audio/wp_shotty_fire-03.wv
116
%%DATADIR%%/audio/wp_switch-01.wv
126
%%DATADIR%%/audio/wp_switch-01.wv
117
%%DATADIR%%/audio/wp_switch-02.wv
127
%%DATADIR%%/audio/wp_switch-02.wv
118
%%DATADIR%%/audio/wp_switch-03.wv
128
%%DATADIR%%/audio/wp_switch-03.wv
119
%%DATADIR%%/big_font.png
120
%%DATADIR%%/browse_icons.png
129
%%DATADIR%%/browse_icons.png
121
%%DATADIR%%/checker.png
130
%%DATADIR%%/console.png
122
%%DATADIR%%/cloudmap.png
131
%%DATADIR%%/console_bar.png
123
%%DATADIR%%/debug_font.png
132
%%DATADIR%%/debug_font.png
133
%%DATADIR%%/editor/background.png
134
%%DATADIR%%/editor/checker.png
135
%%DATADIR%%/editor/cursor.png
136
%%DATADIR%%/editor/entities.png
124
%%DATADIR%%/emoticons.png
137
%%DATADIR%%/emoticons.png
138
%%DATADIR%%/fonts/default_font10.png
139
%%DATADIR%%/fonts/default_font10.tfnt
140
%%DATADIR%%/fonts/default_font10_b.png
141
%%DATADIR%%/fonts/default_font11.png
142
%%DATADIR%%/fonts/default_font11.tfnt
143
%%DATADIR%%/fonts/default_font11_b.png
144
%%DATADIR%%/fonts/default_font12.png
145
%%DATADIR%%/fonts/default_font12.tfnt
146
%%DATADIR%%/fonts/default_font12_b.png
147
%%DATADIR%%/fonts/default_font13.png
148
%%DATADIR%%/fonts/default_font13.tfnt
149
%%DATADIR%%/fonts/default_font13_b.png
150
%%DATADIR%%/fonts/default_font14.png
151
%%DATADIR%%/fonts/default_font14.tfnt
152
%%DATADIR%%/fonts/default_font14_b.png
153
%%DATADIR%%/fonts/default_font15.png
154
%%DATADIR%%/fonts/default_font15.tfnt
155
%%DATADIR%%/fonts/default_font15_b.png
156
%%DATADIR%%/fonts/default_font16.png
157
%%DATADIR%%/fonts/default_font16.tfnt
158
%%DATADIR%%/fonts/default_font16_b.png
159
%%DATADIR%%/fonts/default_font17.png
160
%%DATADIR%%/fonts/default_font17.tfnt
161
%%DATADIR%%/fonts/default_font17_b.png
162
%%DATADIR%%/fonts/default_font18.png
163
%%DATADIR%%/fonts/default_font18.tfnt
164
%%DATADIR%%/fonts/default_font18_b.png
165
%%DATADIR%%/fonts/default_font19.png
166
%%DATADIR%%/fonts/default_font19.tfnt
167
%%DATADIR%%/fonts/default_font19_b.png
168
%%DATADIR%%/fonts/default_font20.png
169
%%DATADIR%%/fonts/default_font20.tfnt
170
%%DATADIR%%/fonts/default_font20_b.png
171
%%DATADIR%%/fonts/default_font36.png
172
%%DATADIR%%/fonts/default_font36.tfnt
173
%%DATADIR%%/fonts/default_font36_b.png
174
%%DATADIR%%/fonts/default_font8.png
175
%%DATADIR%%/fonts/default_font8.tfnt
176
%%DATADIR%%/fonts/default_font8_b.png
177
%%DATADIR%%/fonts/default_font9.png
178
%%DATADIR%%/fonts/default_font9.tfnt
179
%%DATADIR%%/fonts/default_font9_b.png
125
%%DATADIR%%/game.png
180
%%DATADIR%%/game.png
126
%%DATADIR%%/gui_cursor.png
181
%%DATADIR%%/gui_cursor.png
127
%%DATADIR%%/gui_logo.png
182
%%DATADIR%%/gui_logo.png
183
%%DATADIR%%/mapres/desert_main.png
184
%%DATADIR%%/mapres/desert_mountains.png
185
%%DATADIR%%/mapres/desert_sun.png
186
%%DATADIR%%/mapres/grass_doodads.png
187
%%DATADIR%%/mapres/grass_main.png
188
%%DATADIR%%/mapres/moon.png
189
%%DATADIR%%/mapres/mountains.png
190
%%DATADIR%%/mapres/snow.png
191
%%DATADIR%%/mapres/stars.png
192
%%DATADIR%%/mapres/sun.png
193
%%DATADIR%%/mapres/winter_doodads.png
194
%%DATADIR%%/mapres/winter_main.png
128
%%DATADIR%%/maps/ctf1.map
195
%%DATADIR%%/maps/ctf1.map
129
%%DATADIR%%/maps/ctf2.map
196
%%DATADIR%%/maps/ctf2.map
130
%%DATADIR%%/maps/dm1.map
197
%%DATADIR%%/maps/dm1.map
131
%%DATADIR%%/maps/dm2.map
198
%%DATADIR%%/maps/dm2.map
132
%%DATADIR%%/maps/dm6.map
199
%%DATADIR%%/maps/dm6.map
133
%%DATADIR%%/moon.png
200
%%DATADIR%%/particles.png
134
%%DATADIR%%/mountain_paralax.png
135
%%DATADIR%%/skins/bluekitty.png
201
%%DATADIR%%/skins/bluekitty.png
136
%%DATADIR%%/skins/bluestripe.png
202
%%DATADIR%%/skins/bluestripe.png
137
%%DATADIR%%/skins/brownbear.png
203
%%DATADIR%%/skins/brownbear.png
Lines 140-146 Link Here
140
%%DATADIR%%/skins/coala.png
206
%%DATADIR%%/skins/coala.png
141
%%DATADIR%%/skins/default.png
207
%%DATADIR%%/skins/default.png
142
%%DATADIR%%/skins/limekitty.png
208
%%DATADIR%%/skins/limekitty.png
143
%%DATADIR%%/skins/ninja.png
144
%%DATADIR%%/skins/pinky.png
209
%%DATADIR%%/skins/pinky.png
145
%%DATADIR%%/skins/redbopp.png
210
%%DATADIR%%/skins/redbopp.png
146
%%DATADIR%%/skins/redstripe.png
211
%%DATADIR%%/skins/redstripe.png
Lines 149-158 Link Here
149
%%DATADIR%%/skins/twinbop.png
214
%%DATADIR%%/skins/twinbop.png
150
%%DATADIR%%/skins/twintri.png
215
%%DATADIR%%/skins/twintri.png
151
%%DATADIR%%/skins/warpaint.png
216
%%DATADIR%%/skins/warpaint.png
152
%%DATADIR%%/snow.png
217
%%DATADIR%%/skins/x_ninja.png
153
%%DATADIR%%/stars.png
154
%%DATADIR%%/sun.png
155
@dirrm %%DATADIR%%/skins
218
@dirrm %%DATADIR%%/skins
156
@dirrm %%DATADIR%%/maps
219
@dirrm %%DATADIR%%/maps
220
@dirrm %%DATADIR%%/mapres
221
@dirrm %%DATADIR%%/fonts
222
@dirrm %%DATADIR%%/editor
157
@dirrm %%DATADIR%%/audio
223
@dirrm %%DATADIR%%/audio
158
@dirrm %%DATADIR%%
224
@dirrm %%DATADIR%%

Return to bug 122023