From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 25 12:50:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 976D116A41A for ; Sat, 25 Aug 2007 12:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7F413C459 for ; Sat, 25 Aug 2007 12:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7PCo2jR063509 for ; Sat, 25 Aug 2007 12:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7PCo2Un063508; Sat, 25 Aug 2007 12:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 25 Aug 2007 12:50:02 GMT Resent-Message-Id: <200708251250.l7PCo2Un063508@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kozlov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF6C716A417 for ; Sat, 25 Aug 2007 12:48:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id A59A213C480 for ; Sat, 25 Aug 2007 12:48:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l7PCmcoL089429 for ; Sat, 25 Aug 2007 12:48:38 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l7PCmcH2089428; Sat, 25 Aug 2007 12:48:38 GMT (envelope-from nobody) Message-Id: <200708251248.l7PCmcH2089428@www.freebsd.org> Date: Sat, 25 Aug 2007 12:48:38 GMT From: Alex Kozlov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/115811: [patch] games/boswars update to 2.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2007 12:50:02 -0000 >Number: 115811 >Category: ports >Synopsis: [patch] games/boswars update to 2.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 25 12:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: FreeBSD 6.2 >Organization: private >Environment: >Description: games/boswars update to 2.4 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: games/boswars/Makefile @@ -6,10 +6,9 @@ # PORTNAME= boswars -PORTVERSION= 2.3 -PORTREVISION= 2 +PORTVERSION= 2.4 CATEGORIES= games -MASTER_SITES= http://www.boswars.org/dist/releases/ +MASTER_SITES= http://boswars.org:8001/bos/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= alepulver@FreeBSD.org Index: games/boswars/distinfo @@ -1,3 +1,3 @@ -MD5 (boswars-2.3-src.tar.gz) = ad3415bd91f5ac05fda41247dc76ff07 -SHA256 (boswars-2.3-src.tar.gz) = 09206df851374c548f12918a022cd54bb0f199bf3902bd3b604175e0997db81d -SIZE (boswars-2.3-src.tar.gz) = 45656754 +MD5 (boswars-2.4-src.tar.gz) = ffe382779ace57c52c816c74f06dbf27 +SHA256 (boswars-2.4-src.tar.gz) = 838ae9836b9dad5ad06ee4164ad9af170ae91ed06f4df5fdf2e61e1219786039 +SIZE (boswars-2.4-src.tar.gz) = 48856425 Index: games/boswars/files/patch-SConstruct @@ -1,22 +1,5 @@ ---- ./SConstruct.orig Sun Mar 4 10:14:23 2007 -+++ ./SConstruct Mon Apr 9 11:15:01 2007 -@@ -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 @@ +Index: ./SConstruct +@@ -50,6 +50,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 @@ -24,15 +7,23 @@ +env['CPPPATH'] = Split(env['CPPPATH']) +env['LIBPATH'] = Split(env['LIBPATH']) Help(opts.GenerateHelpText(env)) + mingw = env.Copy() optionsChanged = True - if os.path.exists('build_options.py'): -@@ -144,9 +147,6 @@ - Exit(1) - if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'): - print 'Did not find the zlib library or headers, exiting!' -- Exit(1) -- if not conf.CheckLib('dl'): -- print 'Did not find dl library or header which is needed on some systems for lua. Exiting!' - Exit(1) - if not CheckLuaLib(env, conf): - print 'Did not find required lua library. Exiting!' +@@ -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]: Index: games/boswars/pkg-plist @@ -31,6 +31,11 @@ %%DATADIR%%/campaigns/elites/level10.sms %%DATADIR%%/campaigns/elites/level10.txt %%DATADIR%%/campaigns/tutorial/campaign.lua +%%DATADIR%%/campaigns/tutorial/level01.wav +%%DATADIR%%/campaigns/tutorial/level01-01.wav +%%DATADIR%%/campaigns/tutorial/level01-03.wav +%%DATADIR%%/campaigns/tutorial/level01-04.wav +%%DATADIR%%/campaigns/tutorial/level01-05.wav %%DATADIR%%/campaigns/tutorial/level01.smp %%DATADIR%%/campaigns/tutorial/level01.sms %%DATADIR%%/campaigns/tutorial/level02.smp @@ -40,11 +45,6 @@ %%DATADIR%%/graphics/elites/missile/grenade.png %%DATADIR%%/graphics/elites/missile/nuke.png %%DATADIR%%/graphics/elites/missile/rocket.png -%%DATADIR%%/graphics/elites/research/res_ddril.png -%%DATADIR%%/graphics/elites/research/res_expl.png -%%DATADIR%%/graphics/elites/research/res_expl2.png -%%DATADIR%%/graphics/elites/research/res_pdril.png -%%DATADIR%%/graphics/elites/research/res_tdril.png %%DATADIR%%/graphics/elites/ui/elites_claw.png %%DATADIR%%/graphics/elites/ui/ui_1024_bpanel.png %%DATADIR%%/graphics/elites/ui/ui_1280_bpanel.png @@ -99,21 +99,26 @@ %%DATADIR%%/graphics/ui/rosace1.png %%DATADIR%%/graphics/ui/x_startpoint.png %%DATADIR%%/languages/bg.po +%%DATADIR%%/languages/bos-cs.po %%DATADIR%%/languages/bos-da.po %%DATADIR%%/languages/bos-de.po -%%DATADIR%%/languages/bos-en.po +%%DATADIR%%/languages/bos-es.po %%DATADIR%%/languages/bos-fi.po %%DATADIR%%/languages/bos-fr.po +%%DATADIR%%/languages/bos-tr.po %%DATADIR%%/languages/bos.pot +%%DATADIR%%/languages/cs.po %%DATADIR%%/languages/da.po %%DATADIR%%/languages/de.po -%%DATADIR%%/languages/en.po %%DATADIR%%/languages/engine.pot +%%DATADIR%%/languages/es.po %%DATADIR%%/languages/fi.po %%DATADIR%%/languages/fr.po %%DATADIR%%/languages/genpot.sh %%DATADIR%%/languages/makesame.py %%DATADIR%%/languages/pl.po +%%DATADIR%%/languages/tr.po +%%DATADIR%%/languages/updatepo.sh %%DATADIR%%/maps/C1_M10_Fort_Savoy.smp %%DATADIR%%/maps/C1_M10_Fort_Savoy.sms %%DATADIR%%/maps/C1_M1_the_river.smp @@ -194,8 +199,6 @@ %%DATADIR%%/maps/river/setup.sms %%DATADIR%%/maps/river/terrain.lua %%DATADIR%%/maps/river/terrain.png -%%DATADIR%%/maps/test.smp -%%DATADIR%%/maps/test.sms %%DATADIR%%/maps/tutorial.smp %%DATADIR%%/maps/tutorial/access-unpassable.lua %%DATADIR%%/maps/tutorial/setup.sms @@ -211,6 +214,7 @@ %%DATADIR%%/scripts/ai.lua %%DATADIR%%/scripts/ais/passive.lua %%DATADIR%%/scripts/ais/rush.lua +%%DATADIR%%/scripts/ais/tankrush.lua %%DATADIR%%/scripts/anim.lua %%DATADIR%%/scripts/bos.lua %%DATADIR%%/scripts/buttons.lua @@ -218,7 +222,6 @@ %%DATADIR%%/scripts/cheats.lua %%DATADIR%%/scripts/commands.lua %%DATADIR%%/scripts/cursors.lua -%%DATADIR%%/scripts/dependency.lua %%DATADIR%%/scripts/editor.lua %%DATADIR%%/scripts/fonts.lua %%DATADIR%%/scripts/guichan.lua @@ -231,7 +234,6 @@ %%DATADIR%%/scripts/menus/ingame/game.lua %%DATADIR%%/scripts/menus/network.lua %%DATADIR%%/scripts/menus/options.lua -%%DATADIR%%/scripts/menus/widgetsdemo.lua %%DATADIR%%/scripts/missiles.lua %%DATADIR%%/scripts/sound.lua %%DATADIR%%/scripts/spells.lua @@ -241,10 +243,17 @@ %%DATADIR%%/scripts/ui.lua %%DATADIR%%/scripts/uilayout.lua %%DATADIR%%/scripts/units.lua -%%DATADIR%%/scripts/upgrade.lua %%DATADIR%%/sounds/bazoo_g_hit.wav %%DATADIR%%/sounds/grenadier_g_hit.wav +%%DATADIR%%/sounds/ui/chatmessage.wav %%DATADIR%%/sounds/ui/click.wav.gz +%%DATADIR%%/units/aircraftfactory/aircraftfactory.completed.wav +%%DATADIR%%/units/aircraftfactory/aircraftfactory.underattack.wav +%%DATADIR%%/units/aircraftfactory/unit-aircraftfactory.lua +%%DATADIR%%/units/aircraftfactory/aircraftfactory.png +%%DATADIR%%/units/aircraftfactory/aircraftfactory_c.png +%%DATADIR%%/units/aircraftfactory/aircraftfactory_i.png +%%DATADIR%%/units/aircraftfactory/aircraftfactory_s.png %%DATADIR%%/units/antharus/antharus.png %%DATADIR%%/units/antharus/icon.png %%DATADIR%%/units/antharus/unit-antharus.lua @@ -337,15 +346,6 @@ %%DATADIR%%/units/chopper/unit_chopper_s.png %%DATADIR%%/units/corpses/build-dead-2.png %%DATADIR%%/units/corpses/unit-corpses.lua -%%DATADIR%%/units/crystals/ico_crys.png -%%DATADIR%%/units/crystals/res_crys.png -%%DATADIR%%/units/crystals/res_crys_s.png -%%DATADIR%%/units/crystals/unit-crystals.lua -%%DATADIR%%/units/developmentyard/development_yard.png -%%DATADIR%%/units/developmentyard/development_yard_c.png -%%DATADIR%%/units/developmentyard/development_yard_i.png -%%DATADIR%%/units/developmentyard/development_yard_s.png -%%DATADIR%%/units/developmentyard/unit-developmentyard.lua %%DATADIR%%/units/dorcoz/ico_dorcoz.png %%DATADIR%%/units/dorcoz/mis_plasma_sml.png %%DATADIR%%/units/dorcoz/unit-dorcoz.lua @@ -361,15 +361,6 @@ %%DATADIR%%/units/engineer/unit_engineer.png %%DATADIR%%/units/engineer/unit_engineer_c.png %%DATADIR%%/units/engineer/unit_engineer_s.png -%%DATADIR%%/units/generator/generator.png -%%DATADIR%%/units/generator/generator_c.png -%%DATADIR%%/units/generator/generator_i.png -%%DATADIR%%/units/generator/generator_s.png -%%DATADIR%%/units/generator/power.plant.completed.wav -%%DATADIR%%/units/generator/power.plant.underattack.wav -%%DATADIR%%/units/generator/sfx_pplnt.die.wav -%%DATADIR%%/units/generator/sfx_pplnt.select.wav -%%DATADIR%%/units/generator/unit-generator.lua %%DATADIR%%/units/grenadier/grenadier.ready.wav %%DATADIR%%/units/grenadier/grenadier.underattack.wav %%DATADIR%%/units/grenadier/grenadier_action.wav @@ -409,6 +400,9 @@ %%DATADIR%%/units/hospital/sfx_hosp.die.wav %%DATADIR%%/units/hospital/sfx_hosp.select.wav %%DATADIR%%/units/hospital/unit-hospital.lua +%%DATADIR%%/units/hotspot/unit-hotspot.lua +%%DATADIR%%/units/hotspot/hotspot.png +%%DATADIR%%/units/hotspot/hotspot_i.png %%DATADIR%%/units/jet/ico_jet.png %%DATADIR%%/units/jet/jet.ready.wav %%DATADIR%%/units/jet/jet.underattack.wav @@ -416,6 +410,15 @@ %%DATADIR%%/units/jet/unit-jet.lua %%DATADIR%%/units/jet/unit_jet.png %%DATADIR%%/units/jet/unit_jet_s.png +%%DATADIR%%/units/magmapump/magmapump.completed.wav +%%DATADIR%%/units/magmapump/magmapump.select.wav +%%DATADIR%%/units/magmapump/magmapump.underattack.wav +%%DATADIR%%/units/magmapump/unit-magmapump.lua +%%DATADIR%%/units/magmapump/magmapump.png +%%DATADIR%%/units/magmapump/magmapump_c.png +%%DATADIR%%/units/magmapump/magmapump_i.png +%%DATADIR%%/units/magmapump/magmapump_s.png +%%DATADIR%%/units/magmapump/sfx_pplnt.die.wav %%DATADIR%%/units/medic/heal.png %%DATADIR%%/units/medic/ico_heal.png %%DATADIR%%/units/medic/ico_medic.png @@ -465,6 +468,22 @@ %%DATADIR%%/units/nukeplant/sfx_pplnt.die.wav %%DATADIR%%/units/nukeplant/sfx_pplnt.select.wav %%DATADIR%%/units/nukeplant/unit-nukeplant.lua +%%DATADIR%%/units/powerplant/power.plant.completed.wav +%%DATADIR%%/units/powerplant/power.plant.underattack.wav +%%DATADIR%%/units/powerplant/unit-powerplant.lua +%%DATADIR%%/units/powerplant/sfx_pplnt.die.wav +%%DATADIR%%/units/powerplant/sfx_pplnt.select.wav +%%DATADIR%%/units/powerplant/powerplant.png +%%DATADIR%%/units/powerplant/powerplant_c.png +%%DATADIR%%/units/powerplant/powerplant_i.png +%%DATADIR%%/units/powerplant/powerplant_s.png +%%DATADIR%%/units/plants/pitcher_icon.png +%%DATADIR%%/units/plants/rafflesia_icon.png +%%DATADIR%%/units/plants/unit-plant.lua +%%DATADIR%%/units/plants/pitcher.png +%%DATADIR%%/units/plants/pitcher_shadow.png +%%DATADIR%%/units/plants/rafflesia.png +%%DATADIR%%/units/plants/rafflesia_shadow.png %%DATADIR%%/units/radar/radar.completed.wav %%DATADIR%%/units/radar/radar.png %%DATADIR%%/units/radar/radar.underattack.wav @@ -472,16 +491,6 @@ %%DATADIR%%/units/radar/radar_s.png %%DATADIR%%/units/radar/sfx_rdar.select.wav %%DATADIR%%/units/radar/unit-radar.lua -%%DATADIR%%/units/research/research.completed.wav -%%DATADIR%%/units/research/research.facility.completed.wav -%%DATADIR%%/units/research/research.facility.underattack.wav -%%DATADIR%%/units/research/research_c.png -%%DATADIR%%/units/research/research_facility.png -%%DATADIR%%/units/research/research_facility_i.png -%%DATADIR%%/units/research/research_facility_s.png -%%DATADIR%%/units/research/sfx_rfac.die.wav -%%DATADIR%%/units/research/sfx_rfac.select.wav -%%DATADIR%%/units/research/unit-research.lua %%DATADIR%%/units/rocks/rock_1.png %%DATADIR%%/units/rocks/rock_1i.png %%DATADIR%%/units/rocks/rock_1s.png @@ -530,10 +539,10 @@ %%DATADIR%%/units/tree04/tree04.png %%DATADIR%%/units/tree04/tree04_s.png %%DATADIR%%/units/tree04/unit-tree04.lua -%%DATADIR%%/units/vault/elite.fort.completed.wav -%%DATADIR%%/units/vault/elite.fort.underattack.wav %%DATADIR%%/units/vault/sfx_fort.die.wav %%DATADIR%%/units/vault/sfx_fort.select.wav +%%DATADIR%%/units/vault/vault.completed.wav +%%DATADIR%%/units/vault/vault.underattack.wav %%DATADIR%%/units/vault/vault-i.png %%DATADIR%%/units/vault/vault.lua %%DATADIR%%/units/vault/vault.png @@ -548,6 +557,9 @@ %%DATADIR%%/units/vehiclefactory/vehicle_factory_i.png %%DATADIR%%/units/vehiclefactory/vehicle_factory_s.png %%DATADIR%%/units/vehiclefactory/vehiclefactory.lua +%%DATADIR%%/units/weakhotspot/unit-weakhotspot.lua +%%DATADIR%%/units/weakhotspot/hotspot.png +%%DATADIR%%/units/weakhotspot/hotspot_i.png %%DATADIR%%/video/boswars_intro.ogg %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/README.txt @@ -581,6 +593,7 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/video +@dirrm %%DATADIR%%/units/weakhotspot @dirrm %%DATADIR%%/units/vehiclefactory @dirrm %%DATADIR%%/units/vault @dirrm %%DATADIR%%/units/tree04 @@ -591,22 +604,22 @@ @dirrm %%DATADIR%%/units/rtank @dirrm %%DATADIR%%/units/rocksfield @dirrm %%DATADIR%%/units/rocks -@dirrm %%DATADIR%%/units/research @dirrm %%DATADIR%%/units/radar +@dirrm %%DATADIR%%/units/plants +@dirrm %%DATADIR%%/units/powerplant @dirrm %%DATADIR%%/units/nukeplant @dirrm %%DATADIR%%/units/morels @dirrm %%DATADIR%%/units/missilesilo @dirrm %%DATADIR%%/units/medic +@dirrm %%DATADIR%%/units/magmapump @dirrm %%DATADIR%%/units/jet +@dirrm %%DATADIR%%/units/hotspot @dirrm %%DATADIR%%/units/hospital @dirrm %%DATADIR%%/units/harvester @dirrm %%DATADIR%%/units/gturret @dirrm %%DATADIR%%/units/grenadier -@dirrm %%DATADIR%%/units/generator @dirrm %%DATADIR%%/units/engineer @dirrm %%DATADIR%%/units/dorcoz -@dirrm %%DATADIR%%/units/developmentyard -@dirrm %%DATADIR%%/units/crystals @dirrm %%DATADIR%%/units/corpses @dirrm %%DATADIR%%/units/chopper @dirrm %%DATADIR%%/units/cannon @@ -619,6 +632,7 @@ @dirrm %%DATADIR%%/units/artil @dirrm %%DATADIR%%/units/apcs @dirrm %%DATADIR%%/units/antharus +@dirrm %%DATADIR%%/units/aircraftfactory @dirrm %%DATADIR%%/units @dirrm %%DATADIR%%/sounds/ui @dirrm %%DATADIR%%/sounds @@ -647,7 +661,6 @@ @dirrm %%DATADIR%%/graphics/general @dirrm %%DATADIR%%/graphics/elites/units @dirrm %%DATADIR%%/graphics/elites/ui -@dirrm %%DATADIR%%/graphics/elites/research @dirrm %%DATADIR%%/graphics/elites/missile @dirrm %%DATADIR%%/graphics/elites @dirrm %%DATADIR%%/graphics >Release-Note: >Audit-Trail: >Unformatted: