- Update to version 0.6-1.

PR:		ports/105189
Submitted by:	Dmitry Marakasov <amdmi3@mail.ru> (maintainer)

3 files changed, 153 insertions, 46 deletions

diff --git a/games/blobandconquer/Makefile b/games/blobandconquer/Makefile
index 9131bf0171b3..82a8b19911f6 100644
--- a/games/blobandconquer/Makefile
+++ b/games/blobandconquer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	blobandconquer
-DISTVERSION=	0.5-1
+DISTVERSION=	0.6-1
 CATEGORIES=	games
 MASTER_SITES=	http://www.parallelrealities.co.uk/download.php?type=zip&file=
 DISTNAME=	blobAndConquer-${DISTVERSION}
@@ -22,6 +22,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_DOS2UNIX=	makefile src/headers.h src/main.cpp
 
+FETCH_CMD=	/usr/bin/fetch
+
 WRKSRC=		${WRKDIR}/blobAndConquer-${DISTVERSION:C/^([0-9]\.[0-9]).*/\1/}
 PORTDOCS=	*
 
diff --git a/games/blobandconquer/distinfo b/games/blobandconquer/distinfo
index c23c14be173a..7e373891a879 100644
--- a/games/blobandconquer/distinfo
+++ b/games/blobandconquer/distinfo
@@ -1,3 +1,3 @@
-MD5 (blobAndConquer-0.5-1.tar.gz) = a154c1accb0b7836004f571a427c1495
-SHA256 (blobAndConquer-0.5-1.tar.gz) = fda462f4717a848a5465e8a6e8a556c615c805ba9dd7f1e9bc4eff701a40f09e
-SIZE (blobAndConquer-0.5-1.tar.gz) = 25182986
+MD5 (blobAndConquer-0.6-1.tar.gz) = 60dd58d3784a2f5fc92c10950b50d074
+SHA256 (blobAndConquer-0.6-1.tar.gz) = 514c231d151de9ece589292a908bd98a50371872285eab035d3053eb8a7c0102
+SIZE (blobAndConquer-0.6-1.tar.gz) = 29550965
diff --git a/games/blobandconquer/pkg-plist b/games/blobandconquer/pkg-plist
index 3fbb4f377458..2b99729c8add 100644
--- a/games/blobandconquer/pkg-plist
+++ b/games/blobandconquer/pkg-plist
@@ -1,4 +1,5 @@
 bin/blobAndConquer
+share/applications/blobAndConquer.desktop
 %%DATADIR%%/data/bsp/ancientTomb1.bsp
 %%DATADIR%%/data/bsp/ancientTomb1.map
 %%DATADIR%%/data/bsp/ancientTomb2.bsp
@@ -15,6 +16,8 @@ bin/blobAndConquer
 %%DATADIR%%/data/bsp/bossBattle1.map
 %%DATADIR%%/data/bsp/bossBattle2.bsp
 %%DATADIR%%/data/bsp/bossBattle2.map
+%%DATADIR%%/data/bsp/bossBattle4.bsp
+%%DATADIR%%/data/bsp/bossBattle4.map
 %%DATADIR%%/data/bsp/caves1.bsp
 %%DATADIR%%/data/bsp/caves1.map
 %%DATADIR%%/data/bsp/caves2.bsp
@@ -67,56 +70,60 @@ bin/blobAndConquer
 %%DATADIR%%/data/gameDefs/bioTank1
 %%DATADIR%%/data/gameDefs/bioTank2
 %%DATADIR%%/data/gameDefs/bioTankCommander
+%%DATADIR%%/data/gameDefs/blaze
 %%DATADIR%%/data/gameDefs/blobs
 %%DATADIR%%/data/gameDefs/defines.h
 %%DATADIR%%/data/gameDefs/enemies
 %%DATADIR%%/data/gameDefs/eyeDroidCommander
 %%DATADIR%%/data/gameDefs/features
+%%DATADIR%%/data/gameDefs/frost
 %%DATADIR%%/data/gameDefs/ionCannon
 %%DATADIR%%/data/gameDefs/items
 %%DATADIR%%/data/gameDefs/weapons
-%%DATADIR%%/data/locale/additional
-%%DATADIR%%/data/locale/battle
-%%DATADIR%%/data/locale/cheats
-%%DATADIR%%/data/locale/controls
-%%DATADIR%%/data/locale/enemies
-%%DATADIR%%/data/locale/hubLocale
+%%DATADIR%%/data/locale/en/additional
+%%DATADIR%%/data/locale/en/battle
+%%DATADIR%%/data/locale/en/cheats
+%%DATADIR%%/data/locale/en/controls
+%%DATADIR%%/data/locale/en/enemies
+%%DATADIR%%/data/locale/en/hubLocale
+%%DATADIR%%/data/locale/en/items
+%%DATADIR%%/data/locale/en/laserGrid
+%%DATADIR%%/data/locale/en/loadSave
+%%DATADIR%%/data/locale/en/mastermind
+%%DATADIR%%/data/locale/en/mission01Locale
+%%DATADIR%%/data/locale/en/mission02Locale
+%%DATADIR%%/data/locale/en/mission03Locale
+%%DATADIR%%/data/locale/en/mission04Locale
+%%DATADIR%%/data/locale/en/mission05Locale
+%%DATADIR%%/data/locale/en/mission06Locale
+%%DATADIR%%/data/locale/en/mission07Locale
+%%DATADIR%%/data/locale/en/mission08Locale
+%%DATADIR%%/data/locale/en/mission09Locale
+%%DATADIR%%/data/locale/en/mission10Locale
+%%DATADIR%%/data/locale/en/mission11Locale
+%%DATADIR%%/data/locale/en/mission12Locale
+%%DATADIR%%/data/locale/en/mission13Locale
+%%DATADIR%%/data/locale/en/mission14Locale
+%%DATADIR%%/data/locale/en/mission15Locale
+%%DATADIR%%/data/locale/en/mission17Locale
+%%DATADIR%%/data/locale/en/mission18Locale
+%%DATADIR%%/data/locale/en/mission19Locale
+%%DATADIR%%/data/locale/en/mission21Locale
+%%DATADIR%%/data/locale/en/mission22Locale
+%%DATADIR%%/data/locale/en/mission23Locale
+%%DATADIR%%/data/locale/en/mission24Locale
+%%DATADIR%%/data/locale/en/mission25Locale
+%%DATADIR%%/data/locale/en/mission26Locale
+%%DATADIR%%/data/locale/en/mission29Locale
+%%DATADIR%%/data/locale/en/mission30Locale
+%%DATADIR%%/data/locale/en/mission31Locale
+%%DATADIR%%/data/locale/en/options
+%%DATADIR%%/data/locale/en/status
+%%DATADIR%%/data/locale/en/system
+%%DATADIR%%/data/locale/en/trainingLocale
+%%DATADIR%%/data/locale/en/weapons
+%%DATADIR%%/data/locale/fr/options
 %%DATADIR%%/data/locale/index
-%%DATADIR%%/data/locale/init
-%%DATADIR%%/data/locale/items
-%%DATADIR%%/data/locale/loadSave
-%%DATADIR%%/data/locale/mastermind
-%%DATADIR%%/data/locale/mission01Locale
-%%DATADIR%%/data/locale/mission02Locale
-%%DATADIR%%/data/locale/mission03Locale
-%%DATADIR%%/data/locale/mission04Locale
-%%DATADIR%%/data/locale/mission05Locale
-%%DATADIR%%/data/locale/mission06Locale
-%%DATADIR%%/data/locale/mission07Locale
-%%DATADIR%%/data/locale/mission08Locale
-%%DATADIR%%/data/locale/mission09Locale
-%%DATADIR%%/data/locale/mission10Locale
-%%DATADIR%%/data/locale/mission11Locale
-%%DATADIR%%/data/locale/mission12Locale
-%%DATADIR%%/data/locale/mission13Locale
-%%DATADIR%%/data/locale/mission14Locale
-%%DATADIR%%/data/locale/mission15Locale
-%%DATADIR%%/data/locale/mission17Locale
-%%DATADIR%%/data/locale/mission18Locale
-%%DATADIR%%/data/locale/mission19Locale
-%%DATADIR%%/data/locale/mission21Locale
-%%DATADIR%%/data/locale/mission22Locale
-%%DATADIR%%/data/locale/mission24Locale
-%%DATADIR%%/data/locale/mission25Locale
-%%DATADIR%%/data/locale/mission26Locale
-%%DATADIR%%/data/locale/mission29Locale
-%%DATADIR%%/data/locale/mission30Locale
-%%DATADIR%%/data/locale/mission31Locale
-%%DATADIR%%/data/locale/options
-%%DATADIR%%/data/locale/status
-%%DATADIR%%/data/locale/system
-%%DATADIR%%/data/locale/trainingLocale
-%%DATADIR%%/data/locale/weapons
 %%DATADIR%%/data/misc/letterFrequencyTable
 %%DATADIR%%/data/missions/hub
 %%DATADIR%%/data/missions/mission01
@@ -134,11 +141,13 @@ bin/blobAndConquer
 %%DATADIR%%/data/missions/mission13
 %%DATADIR%%/data/missions/mission14
 %%DATADIR%%/data/missions/mission15
+%%DATADIR%%/data/missions/mission16
 %%DATADIR%%/data/missions/mission17
 %%DATADIR%%/data/missions/mission18
 %%DATADIR%%/data/missions/mission19
 %%DATADIR%%/data/missions/mission21
 %%DATADIR%%/data/missions/mission22
+%%DATADIR%%/data/missions/mission23
 %%DATADIR%%/data/missions/mission24
 %%DATADIR%%/data/missions/mission25
 %%DATADIR%%/data/missions/mission26
@@ -150,16 +159,41 @@ bin/blobAndConquer
 %%DATADIR%%/data/texturespecs/liquid
 %%DATADIR%%/data/texturespecs/list
 %%DATADIR%%/data/texturespecs/mech
+%%DATADIR%%/data/texturespecs/virtual
 %%DATADIR%%/data/widgets/additional
 %%DATADIR%%/data/widgets/cheats
 %%DATADIR%%/data/widgets/controlOptions
 %%DATADIR%%/data/widgets/gameover
 %%DATADIR%%/data/widgets/generalOptions
 %%DATADIR%%/data/widgets/inGameOptions
+%%DATADIR%%/data/widgets/language
 %%DATADIR%%/data/widgets/loadSave
 %%DATADIR%%/data/widgets/masterMind
 %%DATADIR%%/data/widgets/status
 %%DATADIR%%/data/widgets/title
+%%DATADIR%%/gfx/blender/cherry.blend
+%%DATADIR%%/gfx/blender/cypher1.blend
+%%DATADIR%%/gfx/blender/cypher2.blend
+%%DATADIR%%/gfx/blender/debris1.blend
+%%DATADIR%%/gfx/blender/debris2.blend
+%%DATADIR%%/gfx/blender/debris3.blend
+%%DATADIR%%/gfx/blender/debris4.blend
+%%DATADIR%%/gfx/blender/debris5.blend
+%%DATADIR%%/gfx/blender/diamond.blend
+%%DATADIR%%/gfx/blender/flamethrower.blend
+%%DATADIR%%/gfx/blender/grenade.blend
+%%DATADIR%%/gfx/blender/gun.blend
+%%DATADIR%%/gfx/blender/hackerswitch.blend
+%%DATADIR%%/gfx/blender/hook.blend
+%%DATADIR%%/gfx/blender/icegun.blend
+%%DATADIR%%/gfx/blender/plasmapistol.blend
+%%DATADIR%%/gfx/blender/plasmarifle.blend
+%%DATADIR%%/gfx/blender/rifle.blend
+%%DATADIR%%/gfx/blender/rocketlauncher.blend
+%%DATADIR%%/gfx/blender/shieldbelt.blend
+%%DATADIR%%/gfx/blender/switch.blend
+%%DATADIR%%/gfx/blender/teletag.blend
+%%DATADIR%%/gfx/blender/uzi.blend
 %%DATADIR%%/gfx/game/0.png
 %%DATADIR%%/gfx/game/1.png
 %%DATADIR%%/gfx/game/2.png
@@ -170,18 +204,28 @@ bin/blobAndConquer
 %%DATADIR%%/gfx/game/7.png
 %%DATADIR%%/gfx/game/8.png
 %%DATADIR%%/gfx/game/9.png
-%%DATADIR%%/gfx/game/cherry.png
 %%DATADIR%%/gfx/game/colon.png
+%%DATADIR%%/gfx/game/cypher1.png
+%%DATADIR%%/gfx/game/cypher2.png
 %%DATADIR%%/gfx/game/dot.png
 %%DATADIR%%/gfx/game/episode2.png
+%%DATADIR%%/gfx/game/hackerswitch.png
+%%DATADIR%%/gfx/game/hook.png
 %%DATADIR%%/gfx/game/missionFailed.png
 %%DATADIR%%/gfx/game/orderIcon1.png
 %%DATADIR%%/gfx/game/orderIcon2.png
 %%DATADIR%%/gfx/game/orderIcon3.png
 %%DATADIR%%/gfx/game/orderIcon4.png
+%%DATADIR%%/gfx/game/plasmapistol.blend.tga
+%%DATADIR%%/gfx/game/plasmarifle.blend.tga
+%%DATADIR%%/gfx/game/rifle.png
+%%DATADIR%%/gfx/game/rocketlauncher.png
+%%DATADIR%%/gfx/game/shieldbelt.png
+%%DATADIR%%/gfx/game/switch.png
 %%DATADIR%%/gfx/game/targetter.png
 %%DATADIR%%/gfx/game/title.png
 %%DATADIR%%/gfx/game/titleBack.png
+%%DATADIR%%/gfx/game/uzi.png
 %%DATADIR%%/gfx/game/violenceWarning.jpg
 %%DATADIR%%/gfx/gui/checked.png
 %%DATADIR%%/gfx/gui/downArrow.png
@@ -200,16 +244,36 @@ bin/blobAndConquer
 %%DATADIR%%/gfx/primitive/eyedroid.primitive
 %%DATADIR%%/gfx/primitive/item.primitive
 %%DATADIR%%/gfx/primitive/keycard.primitive
+%%DATADIR%%/gfx/primitive/lifeCrystal.primitive
 %%DATADIR%%/gfx/primitive/medipack.primitive
 %%DATADIR%%/gfx/primitive/sentryGun.primitive
 %%DATADIR%%/gfx/primitive/weapon.primitive
 %%DATADIR%%/gfx/rw2/bullet.blend.raw
 %%DATADIR%%/gfx/rw2/cherry.blend.raw
 %%DATADIR%%/gfx/rw2/clip.blend.raw
+%%DATADIR%%/gfx/rw2/cypher1.blend.raw
+%%DATADIR%%/gfx/rw2/cypher2.blend.raw
+%%DATADIR%%/gfx/rw2/debris1.blend.raw
+%%DATADIR%%/gfx/rw2/debris2.blend.raw
+%%DATADIR%%/gfx/rw2/debris3.blend.raw
+%%DATADIR%%/gfx/rw2/debris4.blend.raw
+%%DATADIR%%/gfx/rw2/debris5.blend.raw
+%%DATADIR%%/gfx/rw2/diamond.blend.raw
+%%DATADIR%%/gfx/rw2/flamethrower.blend.raw
 %%DATADIR%%/gfx/rw2/grenade.blend.raw
 %%DATADIR%%/gfx/rw2/gun.blend.raw
+%%DATADIR%%/gfx/rw2/hackerSwitch.blend.raw
+%%DATADIR%%/gfx/rw2/hackerswitch.blend.raw
+%%DATADIR%%/gfx/rw2/hook.blend.raw
+%%DATADIR%%/gfx/rw2/icegun.blend.raw
+%%DATADIR%%/gfx/rw2/plasmapistol.blend.raw
+%%DATADIR%%/gfx/rw2/plasmarifle.blend.raw
 %%DATADIR%%/gfx/rw2/pointer.blend.raw
 %%DATADIR%%/gfx/rw2/rifle.blend.raw
+%%DATADIR%%/gfx/rw2/rocketlauncher.blend.raw
+%%DATADIR%%/gfx/rw2/shieldbelt.blend.raw
+%%DATADIR%%/gfx/rw2/switch.blend.raw
+%%DATADIR%%/gfx/rw2/teletag.blend.raw
 %%DATADIR%%/gfx/rw2/uzi.blend.raw
 %%DATADIR%%/music/A Bear Called Otso.xm
 %%DATADIR%%/music/Advancement.xm
@@ -245,6 +309,7 @@ bin/blobAndConquer
 %%DATADIR%%/sound/combat/arm2.ogg
 %%DATADIR%%/sound/combat/arm3.ogg
 %%DATADIR%%/sound/combat/barrierShutDown.ogg
+%%DATADIR%%/sound/combat/becomeIceBlock.ogg
 %%DATADIR%%/sound/combat/boom.ogg
 %%DATADIR%%/sound/combat/bulletHitWater.ogg
 %%DATADIR%%/sound/combat/clang.ogg
@@ -284,7 +349,9 @@ bin/blobAndConquer
 %%DATADIR%%/sound/combat/heavyPlasma.ogg
 %%DATADIR%%/sound/combat/hit.ogg
 %%DATADIR%%/sound/combat/ice.ogg
+%%DATADIR%%/sound/combat/iceHit.ogg
 %%DATADIR%%/sound/combat/iceHowl.ogg
+%%DATADIR%%/sound/combat/iceShatter.ogg
 %%DATADIR%%/sound/combat/item.ogg
 %%DATADIR%%/sound/combat/largeExplosion.ogg
 %%DATADIR%%/sound/combat/laser.ogg
@@ -325,6 +392,7 @@ bin/blobAndConquer
 %%DATADIR%%/textures/common/target2.tga
 %%DATADIR%%/textures/desert/.keep_me
 %%DATADIR%%/textures/game/AIUnit.png
+%%DATADIR%%/textures/game/LifeCrystal.png
 %%DATADIR%%/textures/game/aquaBlob.png
 %%DATADIR%%/textures/game/arrow.png
 %%DATADIR%%/textures/game/black.png
@@ -333,6 +401,7 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/blood03.png
 %%DATADIR%%/textures/game/blood04.png
 %%DATADIR%%/textures/game/blood05.png
+%%DATADIR%%/textures/game/blueGem.png
 %%DATADIR%%/textures/game/bullet.png
 %%DATADIR%%/textures/game/bulletMark01.tga
 %%DATADIR%%/textures/game/bulletMark02.tga
@@ -345,6 +414,16 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/dawn.jpg
 %%DATADIR%%/textures/game/day.jpg
 %%DATADIR%%/textures/game/day2.jpg
+%%DATADIR%%/textures/game/demolitionPlate01.png
+%%DATADIR%%/textures/game/demolitionPlate02.png
+%%DATADIR%%/textures/game/demolitionPlate03.png
+%%DATADIR%%/textures/game/demolitionPlate04.png
+%%DATADIR%%/textures/game/demolitionPlate05.png
+%%DATADIR%%/textures/game/demolitionPlate06.png
+%%DATADIR%%/textures/game/demolitionPlate07.png
+%%DATADIR%%/textures/game/demolitionPlate08.png
+%%DATADIR%%/textures/game/demolitionPlate09.png
+%%DATADIR%%/textures/game/demolitionPlate10.png
 %%DATADIR%%/textures/game/dusk.jpg
 %%DATADIR%%/textures/game/explosion.png
 %%DATADIR%%/textures/game/explosionMark01.tga
@@ -352,14 +431,20 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/explosionMark03.tga
 %%DATADIR%%/textures/game/fire.png
 %%DATADIR%%/textures/game/glassImpact01.png
+%%DATADIR%%/textures/game/gold.png
 %%DATADIR%%/textures/game/goodBlob.png
 %%DATADIR%%/textures/game/goodBlobInjured.png
 %%DATADIR%%/textures/game/grad.png
+%%DATADIR%%/textures/game/greenGem.png
 %%DATADIR%%/textures/game/grenade.png
 %%DATADIR%%/textures/game/grenadeBlob.png
 %%DATADIR%%/textures/game/grenadeDroid.png
+%%DATADIR%%/textures/game/grenadeLauncher.png
 %%DATADIR%%/textures/game/grenadeTexture.png
 %%DATADIR%%/textures/game/grey.png
+%%DATADIR%%/textures/game/hackerSwitch1.png
+%%DATADIR%%/textures/game/hackerSwitch2.png
+%%DATADIR%%/textures/game/hook.png
 %%DATADIR%%/textures/game/iceBlock.jpg
 %%DATADIR%%/textures/game/keycard.png
 %%DATADIR%%/textures/game/laserBeam.png
@@ -380,20 +465,35 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/medicine.png
 %%DATADIR%%/textures/game/medipack.png
 %%DATADIR%%/textures/game/noTarget.png
+%%DATADIR%%/textures/game/orangeGem.png
 %%DATADIR%%/textures/game/overcast.png
 %%DATADIR%%/textures/game/pistolBlob.png
 %%DATADIR%%/textures/game/pistolDroid.png
 %%DATADIR%%/textures/game/pistolTexture.png
+%%DATADIR%%/textures/game/plasmaPistol.png
+%%DATADIR%%/textures/game/plasmaRifle.png
+%%DATADIR%%/textures/game/pressurePlate1.png
+%%DATADIR%%/textures/game/pressurePlate2.png
+%%DATADIR%%/textures/game/purpleGem.png
+%%DATADIR%%/textures/game/redGem.png
+%%DATADIR%%/textures/game/rifle.png
+%%DATADIR%%/textures/game/rocketLauncher.png
 %%DATADIR%%/textures/game/sentryGun1.jpg
+%%DATADIR%%/textures/game/shieldBelt.png
 %%DATADIR%%/textures/game/shotGunDroid.png
 %%DATADIR%%/textures/game/spotLightMap.png
 %%DATADIR%%/textures/game/starsky.png
 %%DATADIR%%/textures/game/sunset.png
+%%DATADIR%%/textures/game/switch1.png
+%%DATADIR%%/textures/game/switch2.png
 %%DATADIR%%/textures/game/targetter.png
 %%DATADIR%%/textures/game/teekaWeapon.png
+%%DATADIR%%/textures/game/teletag.png
+%%DATADIR%%/textures/game/uzi.png
 %%DATADIR%%/textures/game/weapon.png
 %%DATADIR%%/textures/game/weaponTexture.png
 %%DATADIR%%/textures/game/white.png
+%%DATADIR%%/textures/game/yellowGem.png
 %%DATADIR%%/textures/grasslands/american_cherry.jpg
 %%DATADIR%%/textures/grasslands/brick01.jpg
 %%DATADIR%%/textures/grasslands/brick30.jpg
@@ -490,6 +590,8 @@ bin/blobAndConquer
 %%DATADIR%%/textures/tunnels/sewerbricks1.jpg
 %%DATADIR%%/textures/tunnels/sewerbricks2.jpg
 %%DATADIR%%/textures/tunnels/sewerwall1.jpg
+%%DATADIR%%/textures/virtual/bridge.jpg
+%%DATADIR%%/textures/virtual/portal.jpg
 %%DATADIR%%/textures/virtual/virtual.jpg
 @dirrm %%DATADIR%%/textures/virtual
 @dirrm %%DATADIR%%/textures/tunnels
@@ -518,11 +620,14 @@ bin/blobAndConquer
 @dirrm %%DATADIR%%/gfx/md2
 @dirrm %%DATADIR%%/gfx/gui
 @dirrm %%DATADIR%%/gfx/game
+@dirrm %%DATADIR%%/gfx/blender
 @dirrm %%DATADIR%%/gfx
 @dirrm %%DATADIR%%/data/widgets
 @dirrm %%DATADIR%%/data/texturespecs
 @dirrm %%DATADIR%%/data/missions
 @dirrm %%DATADIR%%/data/misc
+@dirrm %%DATADIR%%/data/locale/fr
+@dirrm %%DATADIR%%/data/locale/en
 @dirrm %%DATADIR%%/data/locale
 @dirrm %%DATADIR%%/data/gameDefs
 @dirrm %%DATADIR%%/data/fonts