Attachment #80784 for bug #115811

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

Lines 6-15 Link Here

(-)games/boswars/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= boswars	8	PORTNAME= boswars
9	PORTVERSION= 2.3	9	PORTVERSION= 2.4
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.boswars.org/dist/releases/	11	MASTER_SITES= http://boswars.org:8001/bos/releases/
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
14		13
15	MAINTAINER= alepulver@FreeBSD.org	14	MAINTAINER= alepulver@FreeBSD.org

Lines 1-3 Link Here

(-)games/boswars/distinfo (-3 / +3 lines)
1	MD5 (boswars-2.3-src.tar.gz) = ad3415bd91f5ac05fda41247dc76ff07	1	MD5 (boswars-2.4-src.tar.gz) = ffe382779ace57c52c816c74f06dbf27
2	SHA256 (boswars-2.3-src.tar.gz) = 09206df851374c548f12918a022cd54bb0f199bf3902bd3b604175e0997db81d	2	SHA256 (boswars-2.4-src.tar.gz) = 838ae9836b9dad5ad06ee4164ad9af170ae91ed06f4df5fdf2e61e1219786039
3	SIZE (boswars-2.3-src.tar.gz) = 45656754	3	SIZE (boswars-2.4-src.tar.gz) = 48856425




Index: ./SConstruct
@@ -50,6 +50,9 @@
@@ -33,12 +33,12 @@
 
 def DefineOptions(filename, args):
    opts = Options(filename, args)
-   opts.Add('CPPPATH', 'Additional preprocessor paths')
+   opts.Add('CPPPATH', 'Additional preprocessor paths', Split(''))
    opts.Add('CPPFLAGS', 'Additional preprocessor flags')
    opts.Add('CPPDEFINES', 'defined constants', Split(''))
-   opts.Add('LIBPATH', 'Additional library paths')
+   opts.Add('LIBPATH', 'Additional library paths', Split(''))
    opts.Add('LIBS', 'Additional libraries')
-   opts.Add('CCFLAGS', 'C Compiler flags', Split(ccflags))
+   opts.Add('CCFLAGS', 'C Compiler flags', Split(''))
    opts.Add('LINKFLAGS', 'Linker Compiler flags')
    opts.Add('CC', 'C Compiler')
    opts.Add('CXX', 'C++ Compiler')
@@ -52,6 +52,9 @@
 opts = DefineOptions("build_options.py", ARGUMENTS)
 env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
 opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work

+env['CPPPATH'] = Split(env['CPPPATH'])
+env['LIBPATH'] = Split(env['LIBPATH'])
 Help(opts.GenerateHelpText(env))
 mingw = env.Copy()
 optionsChanged = True
@@ -143,11 +146,17 @@
       'LIBS': ['GL'], 
       'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
       'CPPPATH': ['/usr/include']}
+  opengl['freebsd'] = { 
+      'LIBS': ['GL'], 
+      'LIBPATH': ['/usr/local/lib'],
+      'CPPPATH': ['/usr/local/include']}
   opengl['cygwin'] = {
       'LIBS': ['opengl3']}
   platform = sys.platform
   if sys.platform[:5] == 'linux':
      platform = 'linux'
+  if sys.platform[:7] == 'freebsd':
+     platform = 'freebsd'
   for key in opengl[platform].keys():
       if key != 'LIBS':
          for i in opengl[platform][key]:

Lines 31-36 Link Here

(-)games/boswars/pkg-plist (-47 / +60 lines)
31	%%DATADIR%%/campaigns/elites/level10.sms	31	%%DATADIR%%/campaigns/elites/level10.sms
32	%%DATADIR%%/campaigns/elites/level10.txt	32	%%DATADIR%%/campaigns/elites/level10.txt
33	%%DATADIR%%/campaigns/tutorial/campaign.lua	33	%%DATADIR%%/campaigns/tutorial/campaign.lua
		34	%%DATADIR%%/campaigns/tutorial/level01.wav
		35	%%DATADIR%%/campaigns/tutorial/level01-01.wav
		36	%%DATADIR%%/campaigns/tutorial/level01-03.wav
		37	%%DATADIR%%/campaigns/tutorial/level01-04.wav
		38	%%DATADIR%%/campaigns/tutorial/level01-05.wav
34	%%DATADIR%%/campaigns/tutorial/level01.smp	39	%%DATADIR%%/campaigns/tutorial/level01.smp
35	%%DATADIR%%/campaigns/tutorial/level01.sms	40	%%DATADIR%%/campaigns/tutorial/level01.sms
36	%%DATADIR%%/campaigns/tutorial/level02.smp	41	%%DATADIR%%/campaigns/tutorial/level02.smp
Lines 40-50 Link Here
40	%%DATADIR%%/graphics/elites/missile/grenade.png	45	%%DATADIR%%/graphics/elites/missile/grenade.png
41	%%DATADIR%%/graphics/elites/missile/nuke.png	46	%%DATADIR%%/graphics/elites/missile/nuke.png
42	%%DATADIR%%/graphics/elites/missile/rocket.png	47	%%DATADIR%%/graphics/elites/missile/rocket.png
43	%%DATADIR%%/graphics/elites/research/res_ddril.png
44	%%DATADIR%%/graphics/elites/research/res_expl.png
45	%%DATADIR%%/graphics/elites/research/res_expl2.png
46	%%DATADIR%%/graphics/elites/research/res_pdril.png
47	%%DATADIR%%/graphics/elites/research/res_tdril.png
48	%%DATADIR%%/graphics/elites/ui/elites_claw.png	48	%%DATADIR%%/graphics/elites/ui/elites_claw.png
49	%%DATADIR%%/graphics/elites/ui/ui_1024_bpanel.png	49	%%DATADIR%%/graphics/elites/ui/ui_1024_bpanel.png
50	%%DATADIR%%/graphics/elites/ui/ui_1280_bpanel.png	50	%%DATADIR%%/graphics/elites/ui/ui_1280_bpanel.png
Lines 99-119 Link Here
99	%%DATADIR%%/graphics/ui/rosace1.png	99	%%DATADIR%%/graphics/ui/rosace1.png
100	%%DATADIR%%/graphics/ui/x_startpoint.png	100	%%DATADIR%%/graphics/ui/x_startpoint.png
101	%%DATADIR%%/languages/bg.po	101	%%DATADIR%%/languages/bg.po
		102	%%DATADIR%%/languages/bos-cs.po
102	%%DATADIR%%/languages/bos-da.po	103	%%DATADIR%%/languages/bos-da.po
103	%%DATADIR%%/languages/bos-de.po	104	%%DATADIR%%/languages/bos-de.po
104	%%DATADIR%%/languages/bos-en.po	105	%%DATADIR%%/languages/bos-es.po
105	%%DATADIR%%/languages/bos-fi.po	106	%%DATADIR%%/languages/bos-fi.po
106	%%DATADIR%%/languages/bos-fr.po	107	%%DATADIR%%/languages/bos-fr.po
		108	%%DATADIR%%/languages/bos-tr.po
107	%%DATADIR%%/languages/bos.pot	109	%%DATADIR%%/languages/bos.pot
		110	%%DATADIR%%/languages/cs.po
108	%%DATADIR%%/languages/da.po	111	%%DATADIR%%/languages/da.po
109	%%DATADIR%%/languages/de.po	112	%%DATADIR%%/languages/de.po
110	%%DATADIR%%/languages/en.po
111	%%DATADIR%%/languages/engine.pot	113	%%DATADIR%%/languages/engine.pot
		114	%%DATADIR%%/languages/es.po
112	%%DATADIR%%/languages/fi.po	115	%%DATADIR%%/languages/fi.po
113	%%DATADIR%%/languages/fr.po	116	%%DATADIR%%/languages/fr.po
114	%%DATADIR%%/languages/genpot.sh	117	%%DATADIR%%/languages/genpot.sh
115	%%DATADIR%%/languages/makesame.py	118	%%DATADIR%%/languages/makesame.py
116	%%DATADIR%%/languages/pl.po	119	%%DATADIR%%/languages/pl.po
		120	%%DATADIR%%/languages/tr.po
		121	%%DATADIR%%/languages/updatepo.sh
117	%%DATADIR%%/maps/C1_M10_Fort_Savoy.smp	122	%%DATADIR%%/maps/C1_M10_Fort_Savoy.smp
118	%%DATADIR%%/maps/C1_M10_Fort_Savoy.sms	123	%%DATADIR%%/maps/C1_M10_Fort_Savoy.sms
119	%%DATADIR%%/maps/C1_M1_the_river.smp	124	%%DATADIR%%/maps/C1_M1_the_river.smp
Lines 194-201 Link Here
194	%%DATADIR%%/maps/river/setup.sms	199	%%DATADIR%%/maps/river/setup.sms
195	%%DATADIR%%/maps/river/terrain.lua	200	%%DATADIR%%/maps/river/terrain.lua
196	%%DATADIR%%/maps/river/terrain.png	201	%%DATADIR%%/maps/river/terrain.png
197	%%DATADIR%%/maps/test.smp
198	%%DATADIR%%/maps/test.sms
199	%%DATADIR%%/maps/tutorial.smp	202	%%DATADIR%%/maps/tutorial.smp
200	%%DATADIR%%/maps/tutorial/access-unpassable.lua	203	%%DATADIR%%/maps/tutorial/access-unpassable.lua
201	%%DATADIR%%/maps/tutorial/setup.sms	204	%%DATADIR%%/maps/tutorial/setup.sms
Lines 211-216 Link Here
211	%%DATADIR%%/scripts/ai.lua	214	%%DATADIR%%/scripts/ai.lua
212	%%DATADIR%%/scripts/ais/passive.lua	215	%%DATADIR%%/scripts/ais/passive.lua
213	%%DATADIR%%/scripts/ais/rush.lua	216	%%DATADIR%%/scripts/ais/rush.lua
		217	%%DATADIR%%/scripts/ais/tankrush.lua
214	%%DATADIR%%/scripts/anim.lua	218	%%DATADIR%%/scripts/anim.lua
215	%%DATADIR%%/scripts/bos.lua	219	%%DATADIR%%/scripts/bos.lua
216	%%DATADIR%%/scripts/buttons.lua	220	%%DATADIR%%/scripts/buttons.lua
Lines 218-224 Link Here
218	%%DATADIR%%/scripts/cheats.lua	222	%%DATADIR%%/scripts/cheats.lua
219	%%DATADIR%%/scripts/commands.lua	223	%%DATADIR%%/scripts/commands.lua
220	%%DATADIR%%/scripts/cursors.lua	224	%%DATADIR%%/scripts/cursors.lua
221	%%DATADIR%%/scripts/dependency.lua
222	%%DATADIR%%/scripts/editor.lua	225	%%DATADIR%%/scripts/editor.lua
223	%%DATADIR%%/scripts/fonts.lua	226	%%DATADIR%%/scripts/fonts.lua
224	%%DATADIR%%/scripts/guichan.lua	227	%%DATADIR%%/scripts/guichan.lua
Lines 231-237 Link Here
231	%%DATADIR%%/scripts/menus/ingame/game.lua	234	%%DATADIR%%/scripts/menus/ingame/game.lua
232	%%DATADIR%%/scripts/menus/network.lua	235	%%DATADIR%%/scripts/menus/network.lua
233	%%DATADIR%%/scripts/menus/options.lua	236	%%DATADIR%%/scripts/menus/options.lua
234	%%DATADIR%%/scripts/menus/widgetsdemo.lua
235	%%DATADIR%%/scripts/missiles.lua	237	%%DATADIR%%/scripts/missiles.lua
236	%%DATADIR%%/scripts/sound.lua	238	%%DATADIR%%/scripts/sound.lua
237	%%DATADIR%%/scripts/spells.lua	239	%%DATADIR%%/scripts/spells.lua
Lines 241-250 Link Here
241	%%DATADIR%%/scripts/ui.lua	243	%%DATADIR%%/scripts/ui.lua
242	%%DATADIR%%/scripts/uilayout.lua	244	%%DATADIR%%/scripts/uilayout.lua
243	%%DATADIR%%/scripts/units.lua	245	%%DATADIR%%/scripts/units.lua
244	%%DATADIR%%/scripts/upgrade.lua
245	%%DATADIR%%/sounds/bazoo_g_hit.wav	246	%%DATADIR%%/sounds/bazoo_g_hit.wav
246	%%DATADIR%%/sounds/grenadier_g_hit.wav	247	%%DATADIR%%/sounds/grenadier_g_hit.wav
		248	%%DATADIR%%/sounds/ui/chatmessage.wav
247	%%DATADIR%%/sounds/ui/click.wav.gz	249	%%DATADIR%%/sounds/ui/click.wav.gz
		250	%%DATADIR%%/units/aircraftfactory/aircraftfactory.completed.wav
		251	%%DATADIR%%/units/aircraftfactory/aircraftfactory.underattack.wav
		252	%%DATADIR%%/units/aircraftfactory/unit-aircraftfactory.lua
		253	%%DATADIR%%/units/aircraftfactory/aircraftfactory.png
		254	%%DATADIR%%/units/aircraftfactory/aircraftfactory_c.png
		255	%%DATADIR%%/units/aircraftfactory/aircraftfactory_i.png
		256	%%DATADIR%%/units/aircraftfactory/aircraftfactory_s.png
248	%%DATADIR%%/units/antharus/antharus.png	257	%%DATADIR%%/units/antharus/antharus.png
249	%%DATADIR%%/units/antharus/icon.png	258	%%DATADIR%%/units/antharus/icon.png
250	%%DATADIR%%/units/antharus/unit-antharus.lua	259	%%DATADIR%%/units/antharus/unit-antharus.lua
Lines 337-351 Link Here
337	%%DATADIR%%/units/chopper/unit_chopper_s.png	346	%%DATADIR%%/units/chopper/unit_chopper_s.png
338	%%DATADIR%%/units/corpses/build-dead-2.png	347	%%DATADIR%%/units/corpses/build-dead-2.png
339	%%DATADIR%%/units/corpses/unit-corpses.lua	348	%%DATADIR%%/units/corpses/unit-corpses.lua
340	%%DATADIR%%/units/crystals/ico_crys.png
341	%%DATADIR%%/units/crystals/res_crys.png
342	%%DATADIR%%/units/crystals/res_crys_s.png
343	%%DATADIR%%/units/crystals/unit-crystals.lua
344	%%DATADIR%%/units/developmentyard/development_yard.png
345	%%DATADIR%%/units/developmentyard/development_yard_c.png
346	%%DATADIR%%/units/developmentyard/development_yard_i.png
347	%%DATADIR%%/units/developmentyard/development_yard_s.png
348	%%DATADIR%%/units/developmentyard/unit-developmentyard.lua
349	%%DATADIR%%/units/dorcoz/ico_dorcoz.png	349	%%DATADIR%%/units/dorcoz/ico_dorcoz.png
350	%%DATADIR%%/units/dorcoz/mis_plasma_sml.png	350	%%DATADIR%%/units/dorcoz/mis_plasma_sml.png
351	%%DATADIR%%/units/dorcoz/unit-dorcoz.lua	351	%%DATADIR%%/units/dorcoz/unit-dorcoz.lua
Lines 361-375 Link Here
361	%%DATADIR%%/units/engineer/unit_engineer.png	361	%%DATADIR%%/units/engineer/unit_engineer.png
362	%%DATADIR%%/units/engineer/unit_engineer_c.png	362	%%DATADIR%%/units/engineer/unit_engineer_c.png
363	%%DATADIR%%/units/engineer/unit_engineer_s.png	363	%%DATADIR%%/units/engineer/unit_engineer_s.png
364	%%DATADIR%%/units/generator/generator.png
365	%%DATADIR%%/units/generator/generator_c.png
366	%%DATADIR%%/units/generator/generator_i.png
367	%%DATADIR%%/units/generator/generator_s.png
368	%%DATADIR%%/units/generator/power.plant.completed.wav
369	%%DATADIR%%/units/generator/power.plant.underattack.wav
370	%%DATADIR%%/units/generator/sfx_pplnt.die.wav
371	%%DATADIR%%/units/generator/sfx_pplnt.select.wav
372	%%DATADIR%%/units/generator/unit-generator.lua
373	%%DATADIR%%/units/grenadier/grenadier.ready.wav	364	%%DATADIR%%/units/grenadier/grenadier.ready.wav
374	%%DATADIR%%/units/grenadier/grenadier.underattack.wav	365	%%DATADIR%%/units/grenadier/grenadier.underattack.wav
375	%%DATADIR%%/units/grenadier/grenadier_action.wav	366	%%DATADIR%%/units/grenadier/grenadier_action.wav
Lines 409-414 Link Here
409	%%DATADIR%%/units/hospital/sfx_hosp.die.wav	400	%%DATADIR%%/units/hospital/sfx_hosp.die.wav
410	%%DATADIR%%/units/hospital/sfx_hosp.select.wav	401	%%DATADIR%%/units/hospital/sfx_hosp.select.wav
411	%%DATADIR%%/units/hospital/unit-hospital.lua	402	%%DATADIR%%/units/hospital/unit-hospital.lua
		403	%%DATADIR%%/units/hotspot/unit-hotspot.lua
		404	%%DATADIR%%/units/hotspot/hotspot.png
		405	%%DATADIR%%/units/hotspot/hotspot_i.png
412	%%DATADIR%%/units/jet/ico_jet.png	406	%%DATADIR%%/units/jet/ico_jet.png
413	%%DATADIR%%/units/jet/jet.ready.wav	407	%%DATADIR%%/units/jet/jet.ready.wav
414	%%DATADIR%%/units/jet/jet.underattack.wav	408	%%DATADIR%%/units/jet/jet.underattack.wav
Lines 416-421 Link Here
416	%%DATADIR%%/units/jet/unit-jet.lua	410	%%DATADIR%%/units/jet/unit-jet.lua
417	%%DATADIR%%/units/jet/unit_jet.png	411	%%DATADIR%%/units/jet/unit_jet.png
418	%%DATADIR%%/units/jet/unit_jet_s.png	412	%%DATADIR%%/units/jet/unit_jet_s.png
		413	%%DATADIR%%/units/magmapump/magmapump.completed.wav
		414	%%DATADIR%%/units/magmapump/magmapump.select.wav
		415	%%DATADIR%%/units/magmapump/magmapump.underattack.wav
		416	%%DATADIR%%/units/magmapump/unit-magmapump.lua
		417	%%DATADIR%%/units/magmapump/magmapump.png
		418	%%DATADIR%%/units/magmapump/magmapump_c.png
		419	%%DATADIR%%/units/magmapump/magmapump_i.png
		420	%%DATADIR%%/units/magmapump/magmapump_s.png
		421	%%DATADIR%%/units/magmapump/sfx_pplnt.die.wav
419	%%DATADIR%%/units/medic/heal.png	422	%%DATADIR%%/units/medic/heal.png
420	%%DATADIR%%/units/medic/ico_heal.png	423	%%DATADIR%%/units/medic/ico_heal.png
421	%%DATADIR%%/units/medic/ico_medic.png	424	%%DATADIR%%/units/medic/ico_medic.png
Lines 465-470 Link Here
465	%%DATADIR%%/units/nukeplant/sfx_pplnt.die.wav	468	%%DATADIR%%/units/nukeplant/sfx_pplnt.die.wav
466	%%DATADIR%%/units/nukeplant/sfx_pplnt.select.wav	469	%%DATADIR%%/units/nukeplant/sfx_pplnt.select.wav
467	%%DATADIR%%/units/nukeplant/unit-nukeplant.lua	470	%%DATADIR%%/units/nukeplant/unit-nukeplant.lua
		471	%%DATADIR%%/units/powerplant/power.plant.completed.wav
		472	%%DATADIR%%/units/powerplant/power.plant.underattack.wav
		473	%%DATADIR%%/units/powerplant/unit-powerplant.lua
		474	%%DATADIR%%/units/powerplant/sfx_pplnt.die.wav
		475	%%DATADIR%%/units/powerplant/sfx_pplnt.select.wav
		476	%%DATADIR%%/units/powerplant/powerplant.png
		477	%%DATADIR%%/units/powerplant/powerplant_c.png
		478	%%DATADIR%%/units/powerplant/powerplant_i.png
		479	%%DATADIR%%/units/powerplant/powerplant_s.png
		480	%%DATADIR%%/units/plants/pitcher_icon.png
		481	%%DATADIR%%/units/plants/rafflesia_icon.png
		482	%%DATADIR%%/units/plants/unit-plant.lua
		483	%%DATADIR%%/units/plants/pitcher.png
		484	%%DATADIR%%/units/plants/pitcher_shadow.png
		485	%%DATADIR%%/units/plants/rafflesia.png
		486	%%DATADIR%%/units/plants/rafflesia_shadow.png
468	%%DATADIR%%/units/radar/radar.completed.wav	487	%%DATADIR%%/units/radar/radar.completed.wav
469	%%DATADIR%%/units/radar/radar.png	488	%%DATADIR%%/units/radar/radar.png
470	%%DATADIR%%/units/radar/radar.underattack.wav	489	%%DATADIR%%/units/radar/radar.underattack.wav
Lines 472-487 Link Here
472	%%DATADIR%%/units/radar/radar_s.png	491	%%DATADIR%%/units/radar/radar_s.png
473	%%DATADIR%%/units/radar/sfx_rdar.select.wav	492	%%DATADIR%%/units/radar/sfx_rdar.select.wav
474	%%DATADIR%%/units/radar/unit-radar.lua	493	%%DATADIR%%/units/radar/unit-radar.lua
475	%%DATADIR%%/units/research/research.completed.wav
476	%%DATADIR%%/units/research/research.facility.completed.wav
477	%%DATADIR%%/units/research/research.facility.underattack.wav
478	%%DATADIR%%/units/research/research_c.png
479	%%DATADIR%%/units/research/research_facility.png
480	%%DATADIR%%/units/research/research_facility_i.png
481	%%DATADIR%%/units/research/research_facility_s.png
482	%%DATADIR%%/units/research/sfx_rfac.die.wav
483	%%DATADIR%%/units/research/sfx_rfac.select.wav
484	%%DATADIR%%/units/research/unit-research.lua
485	%%DATADIR%%/units/rocks/rock_1.png	494	%%DATADIR%%/units/rocks/rock_1.png
486	%%DATADIR%%/units/rocks/rock_1i.png	495	%%DATADIR%%/units/rocks/rock_1i.png
487	%%DATADIR%%/units/rocks/rock_1s.png	496	%%DATADIR%%/units/rocks/rock_1s.png
Lines 530-539 Link Here
530	%%DATADIR%%/units/tree04/tree04.png	539	%%DATADIR%%/units/tree04/tree04.png
531	%%DATADIR%%/units/tree04/tree04_s.png	540	%%DATADIR%%/units/tree04/tree04_s.png
532	%%DATADIR%%/units/tree04/unit-tree04.lua	541	%%DATADIR%%/units/tree04/unit-tree04.lua
533	%%DATADIR%%/units/vault/elite.fort.completed.wav
534	%%DATADIR%%/units/vault/elite.fort.underattack.wav
535	%%DATADIR%%/units/vault/sfx_fort.die.wav	542	%%DATADIR%%/units/vault/sfx_fort.die.wav
536	%%DATADIR%%/units/vault/sfx_fort.select.wav	543	%%DATADIR%%/units/vault/sfx_fort.select.wav
		544	%%DATADIR%%/units/vault/vault.completed.wav
		545	%%DATADIR%%/units/vault/vault.underattack.wav
537	%%DATADIR%%/units/vault/vault-i.png	546	%%DATADIR%%/units/vault/vault-i.png
538	%%DATADIR%%/units/vault/vault.lua	547	%%DATADIR%%/units/vault/vault.lua
539	%%DATADIR%%/units/vault/vault.png	548	%%DATADIR%%/units/vault/vault.png
Lines 548-553 Link Here
548	%%DATADIR%%/units/vehiclefactory/vehicle_factory_i.png	557	%%DATADIR%%/units/vehiclefactory/vehicle_factory_i.png
549	%%DATADIR%%/units/vehiclefactory/vehicle_factory_s.png	558	%%DATADIR%%/units/vehiclefactory/vehicle_factory_s.png
550	%%DATADIR%%/units/vehiclefactory/vehiclefactory.lua	559	%%DATADIR%%/units/vehiclefactory/vehiclefactory.lua
		560	%%DATADIR%%/units/weakhotspot/unit-weakhotspot.lua
		561	%%DATADIR%%/units/weakhotspot/hotspot.png
		562	%%DATADIR%%/units/weakhotspot/hotspot_i.png
551	%%DATADIR%%/video/boswars_intro.ogg	563	%%DATADIR%%/video/boswars_intro.ogg
552	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG	564	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
553	%%PORTDOCS%%%%DOCSDIR%%/README.txt	565	%%PORTDOCS%%%%DOCSDIR%%/README.txt
Lines 581-586 Link Here
581	%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc	593	%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
582	%%PORTDOCS%%@dirrm %%DOCSDIR%%	594	%%PORTDOCS%%@dirrm %%DOCSDIR%%
583	@dirrm %%DATADIR%%/video	595	@dirrm %%DATADIR%%/video
		596	@dirrm %%DATADIR%%/units/weakhotspot
584	@dirrm %%DATADIR%%/units/vehiclefactory	597	@dirrm %%DATADIR%%/units/vehiclefactory
585	@dirrm %%DATADIR%%/units/vault	598	@dirrm %%DATADIR%%/units/vault
586	@dirrm %%DATADIR%%/units/tree04	599	@dirrm %%DATADIR%%/units/tree04
Lines 591-612 Link Here
591	@dirrm %%DATADIR%%/units/rtank	604	@dirrm %%DATADIR%%/units/rtank
592	@dirrm %%DATADIR%%/units/rocksfield	605	@dirrm %%DATADIR%%/units/rocksfield
593	@dirrm %%DATADIR%%/units/rocks	606	@dirrm %%DATADIR%%/units/rocks
594	@dirrm %%DATADIR%%/units/research
595	@dirrm %%DATADIR%%/units/radar	607	@dirrm %%DATADIR%%/units/radar
		608	@dirrm %%DATADIR%%/units/plants
		609	@dirrm %%DATADIR%%/units/powerplant
596	@dirrm %%DATADIR%%/units/nukeplant	610	@dirrm %%DATADIR%%/units/nukeplant
597	@dirrm %%DATADIR%%/units/morels	611	@dirrm %%DATADIR%%/units/morels
598	@dirrm %%DATADIR%%/units/missilesilo	612	@dirrm %%DATADIR%%/units/missilesilo
599	@dirrm %%DATADIR%%/units/medic	613	@dirrm %%DATADIR%%/units/medic
		614	@dirrm %%DATADIR%%/units/magmapump
600	@dirrm %%DATADIR%%/units/jet	615	@dirrm %%DATADIR%%/units/jet
		616	@dirrm %%DATADIR%%/units/hotspot
601	@dirrm %%DATADIR%%/units/hospital	617	@dirrm %%DATADIR%%/units/hospital
602	@dirrm %%DATADIR%%/units/harvester	618	@dirrm %%DATADIR%%/units/harvester
603	@dirrm %%DATADIR%%/units/gturret	619	@dirrm %%DATADIR%%/units/gturret
604	@dirrm %%DATADIR%%/units/grenadier	620	@dirrm %%DATADIR%%/units/grenadier
605	@dirrm %%DATADIR%%/units/generator
606	@dirrm %%DATADIR%%/units/engineer	621	@dirrm %%DATADIR%%/units/engineer
607	@dirrm %%DATADIR%%/units/dorcoz	622	@dirrm %%DATADIR%%/units/dorcoz
608	@dirrm %%DATADIR%%/units/developmentyard
609	@dirrm %%DATADIR%%/units/crystals
610	@dirrm %%DATADIR%%/units/corpses	623	@dirrm %%DATADIR%%/units/corpses
611	@dirrm %%DATADIR%%/units/chopper	624	@dirrm %%DATADIR%%/units/chopper
612	@dirrm %%DATADIR%%/units/cannon	625	@dirrm %%DATADIR%%/units/cannon
Lines 619-624 Link Here
619	@dirrm %%DATADIR%%/units/artil	632	@dirrm %%DATADIR%%/units/artil
620	@dirrm %%DATADIR%%/units/apcs	633	@dirrm %%DATADIR%%/units/apcs
621	@dirrm %%DATADIR%%/units/antharus	634	@dirrm %%DATADIR%%/units/antharus
		635	@dirrm %%DATADIR%%/units/aircraftfactory
622	@dirrm %%DATADIR%%/units	636	@dirrm %%DATADIR%%/units
623	@dirrm %%DATADIR%%/sounds/ui	637	@dirrm %%DATADIR%%/sounds/ui
624	@dirrm %%DATADIR%%/sounds	638	@dirrm %%DATADIR%%/sounds
Lines 647-653 Link Here
647	@dirrm %%DATADIR%%/graphics/general	661	@dirrm %%DATADIR%%/graphics/general
648	@dirrm %%DATADIR%%/graphics/elites/units	662	@dirrm %%DATADIR%%/graphics/elites/units
649	@dirrm %%DATADIR%%/graphics/elites/ui	663	@dirrm %%DATADIR%%/graphics/elites/ui
650	@dirrm %%DATADIR%%/graphics/elites/research
651	@dirrm %%DATADIR%%/graphics/elites/missile	664	@dirrm %%DATADIR%%/graphics/elites/missile
652	@dirrm %%DATADIR%%/graphics/elites	665	@dirrm %%DATADIR%%/graphics/elites
653	@dirrm %%DATADIR%%/graphics	666	@dirrm %%DATADIR%%/graphics

Return to bug 115811

Lines 1-22 Link Here

(-)games/boswars/files/patch-SConstruct (-30 / +21 lines)
1	--- ./SConstruct.orig Sun Mar 4 10:14:23 2007	1	Index: ./SConstruct
2	+++ ./SConstruct Mon Apr 9 11:15:01 2007	2	@@ -50,6 +50,9 @@
3	@@ -33,12 +33,12 @@
4
5	def DefineOptions(filename, args):
6	opts = Options(filename, args)
7	- opts.Add('CPPPATH', 'Additional preprocessor paths')
8	+ opts.Add('CPPPATH', 'Additional preprocessor paths', Split(''))
9	opts.Add('CPPFLAGS', 'Additional preprocessor flags')
10	opts.Add('CPPDEFINES', 'defined constants', Split(''))
11	- opts.Add('LIBPATH', 'Additional library paths')
12	+ opts.Add('LIBPATH', 'Additional library paths', Split(''))
13	opts.Add('LIBS', 'Additional libraries')
14	- opts.Add('CCFLAGS', 'C Compiler flags', Split(ccflags))
15	+ opts.Add('CCFLAGS', 'C Compiler flags', Split(''))
16	opts.Add('LINKFLAGS', 'Linker Compiler flags')
17	opts.Add('CC', 'C Compiler')
18	opts.Add('CXX', 'C++ Compiler')
19	@@ -52,6 +52,9 @@
20	opts = DefineOptions("build_options.py", ARGUMENTS)	3	opts = DefineOptions("build_options.py", ARGUMENTS)
21	env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well	4	env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
22	opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work	5	opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
Lines 24-38 Link Here
24	+env['CPPPATH'] = Split(env['CPPPATH'])	7	+env['CPPPATH'] = Split(env['CPPPATH'])
25	+env['LIBPATH'] = Split(env['LIBPATH'])	8	+env['LIBPATH'] = Split(env['LIBPATH'])
26	Help(opts.GenerateHelpText(env))	9	Help(opts.GenerateHelpText(env))
		10	mingw = env.Copy()
27	optionsChanged = True	11	optionsChanged = True
28	if os.path.exists('build_options.py'):	12	@@ -143,11 +146,17 @@
29	@@ -144,9 +147,6 @@	13	'LIBS': ['GL'],
30	Exit(1)	14	'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
31	if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):	15	'CPPPATH': ['/usr/include']}
32	print 'Did not find the zlib library or headers, exiting!'	16	+ opengl['freebsd'] = {
33	- Exit(1)	17	+ 'LIBS': ['GL'],
34	- if not conf.CheckLib('dl'):	18	+ 'LIBPATH': ['/usr/local/lib'],
35	- print 'Did not find dl library or header which is needed on some systems for lua. Exiting!'	19	+ 'CPPPATH': ['/usr/local/include']}
36	Exit(1)	20	opengl['cygwin'] = {
37	if not CheckLuaLib(env, conf):	21	'LIBS': ['opengl3']}
38	print 'Did not find required lua library. Exiting!'	22	platform = sys.platform
		23	if sys.platform[:5] == 'linux':
		24	platform = 'linux'
		25	+ if sys.platform[:7] == 'freebsd':
		26	+ platform = 'freebsd'
		27	for key in opengl[platform].keys():
		28	if key != 'LIBS':
		29	for i in opengl[platform][key]: