4 files changed, 80 insertions, 46 deletions

diff --git a/games/blobandconquer/Makefile b/games/blobandconquer/Makefile
index 5634ab4a831f..9131bf0171b3 100644
--- a/games/blobandconquer/Makefile
+++ b/games/blobandconquer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	blobandconquer
-DISTVERSION=	0.4-1
+DISTVERSION=	0.5-1
 CATEGORIES=	games
 MASTER_SITES=	http://www.parallelrealities.co.uk/download.php?type=zip&file=
 DISTNAME=	blobAndConquer-${DISTVERSION}
@@ -22,7 +22,7 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_DOS2UNIX=	makefile src/headers.h src/main.cpp
 
-WRKSRC=		${WRKDIR}/BlobAndConquer
+WRKSRC=		${WRKDIR}/blobAndConquer-${DISTVERSION:C/^([0-9]\.[0-9]).*/\1/}
 PORTDOCS=	*
 
 MAKEFILE=	makefile
diff --git a/games/blobandconquer/distinfo b/games/blobandconquer/distinfo
index 85b755f88b4e..c23c14be173a 100644
--- a/games/blobandconquer/distinfo
+++ b/games/blobandconquer/distinfo
@@ -1,3 +1,3 @@
-MD5 (blobAndConquer-0.4-1.tar.gz) = bd4b1c83a5059897490a138aecd91589
-SHA256 (blobAndConquer-0.4-1.tar.gz) = be236fc7883d20f79986042d41d17a2cd936460d17ae8574fd93adf6db16bbab
-SIZE (blobAndConquer-0.4-1.tar.gz) = 23959562
+MD5 (blobAndConquer-0.5-1.tar.gz) = a154c1accb0b7836004f571a427c1495
+SHA256 (blobAndConquer-0.5-1.tar.gz) = fda462f4717a848a5465e8a6e8a556c615c805ba9dd7f1e9bc4eff701a40f09e
+SIZE (blobAndConquer-0.5-1.tar.gz) = 25182986
diff --git a/games/blobandconquer/files/patch-makefile b/games/blobandconquer/files/patch-makefile
index 5c96867972bc..3fac951c3dbd 100644
--- a/games/blobandconquer/files/patch-makefile
+++ b/games/blobandconquer/files/patch-makefile
@@ -3,14 +3,14 @@
 @@ -13,16 +13,16 @@
  
  PREFIX=$(DESTDIR)/usr
- BINDIR = $(PREFIX)/games/
--DATADIR = $(PREFIX)/share/games/blobAndConquer/
--DOCDIR = $(PREFIX)/share/doc/$(PROG)/
+ BINDIR = $(PREFIX)/games
+-DATADIR = $(PREFIX)/share/games/blobAndConquer
+-DOCDIR = $(PREFIX)/share/doc/$(PROG)
 +DATADIR := $(DATADIR)/
 +DOCDIR = $(DOCSDIR)/
- ICONDIR = $(PREFIX)/share/icons/
- KDE = $(PREFIX)/share/applnk/Games/Arcade/
- GNOME = $(PREFIX)/share/gnome/apps/Games/
+ ICONDIR = $(PREFIX)/share/icons
+ KDE = $(PREFIX)/share/applnk/Games/Arcade
+ GNOME = $(PREFIX)/share/gnome/apps/Games
  
 -CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
 -CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
diff --git a/games/blobandconquer/pkg-plist b/games/blobandconquer/pkg-plist
index 597a2e3960c9..3fbb4f377458 100644
--- a/games/blobandconquer/pkg-plist
+++ b/games/blobandconquer/pkg-plist
@@ -11,6 +11,10 @@ bin/blobAndConquer
 %%DATADIR%%/data/bsp/biomechTower2.map
 %%DATADIR%%/data/bsp/biomechTower3.bsp
 %%DATADIR%%/data/bsp/biomechTower3.map
+%%DATADIR%%/data/bsp/bossBattle1.bsp
+%%DATADIR%%/data/bsp/bossBattle1.map
+%%DATADIR%%/data/bsp/bossBattle2.bsp
+%%DATADIR%%/data/bsp/bossBattle2.map
 %%DATADIR%%/data/bsp/caves1.bsp
 %%DATADIR%%/data/bsp/caves1.map
 %%DATADIR%%/data/bsp/caves2.bsp
@@ -35,18 +39,12 @@ bin/blobAndConquer
 %%DATADIR%%/data/bsp/enemyBase3_1.map
 %%DATADIR%%/data/bsp/enemyBase3_3.bsp
 %%DATADIR%%/data/bsp/enemyBase3_3.map
-%%DATADIR%%/data/bsp/enemyTest.bsp
-%%DATADIR%%/data/bsp/enemyTest.map
 %%DATADIR%%/data/bsp/floodedTunnel.bsp
 %%DATADIR%%/data/bsp/floodedTunnel.map
-%%DATADIR%%/data/bsp/floodedTunnel.prt
-%%DATADIR%%/data/bsp/floodedTunnel.srf
 %%DATADIR%%/data/bsp/floodedTunnel2.bsp
 %%DATADIR%%/data/bsp/floodedTunnel2.map
 %%DATADIR%%/data/bsp/grasslands2.bsp
 %%DATADIR%%/data/bsp/grasslands2.map
-%%DATADIR%%/data/bsp/ground.bsp
-%%DATADIR%%/data/bsp/ground.map
 %%DATADIR%%/data/bsp/hub.bsp
 %%DATADIR%%/data/bsp/hub.map
 %%DATADIR%%/data/bsp/sewers1.bsp
@@ -66,10 +64,15 @@ bin/blobAndConquer
 %%DATADIR%%/data/fonts/tele.ttf
 %%DATADIR%%/data/fonts/tycho.ttf
 %%DATADIR%%/data/fonts/vera.ttf
+%%DATADIR%%/data/gameDefs/bioTank1
+%%DATADIR%%/data/gameDefs/bioTank2
+%%DATADIR%%/data/gameDefs/bioTankCommander
 %%DATADIR%%/data/gameDefs/blobs
 %%DATADIR%%/data/gameDefs/defines.h
 %%DATADIR%%/data/gameDefs/enemies
+%%DATADIR%%/data/gameDefs/eyeDroidCommander
 %%DATADIR%%/data/gameDefs/features
+%%DATADIR%%/data/gameDefs/ionCannon
 %%DATADIR%%/data/gameDefs/items
 %%DATADIR%%/data/gameDefs/weapons
 %%DATADIR%%/data/locale/additional
@@ -77,67 +80,72 @@ bin/blobAndConquer
 %%DATADIR%%/data/locale/cheats
 %%DATADIR%%/data/locale/controls
 %%DATADIR%%/data/locale/enemies
+%%DATADIR%%/data/locale/hubLocale
 %%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/hubLocale
 %%DATADIR%%/data/missions/mission01
-%%DATADIR%%/data/missions/mission01Locale
 %%DATADIR%%/data/missions/mission02
-%%DATADIR%%/data/missions/mission02Locale
 %%DATADIR%%/data/missions/mission03
-%%DATADIR%%/data/missions/mission03Locale
 %%DATADIR%%/data/missions/mission04
-%%DATADIR%%/data/missions/mission04Locale
 %%DATADIR%%/data/missions/mission05
-%%DATADIR%%/data/missions/mission05Locale
 %%DATADIR%%/data/missions/mission06
-%%DATADIR%%/data/missions/mission06Locale
 %%DATADIR%%/data/missions/mission07
-%%DATADIR%%/data/missions/mission07Locale
+%%DATADIR%%/data/missions/mission08
 %%DATADIR%%/data/missions/mission09
-%%DATADIR%%/data/missions/mission09Locale
 %%DATADIR%%/data/missions/mission10
-%%DATADIR%%/data/missions/mission10Locale
 %%DATADIR%%/data/missions/mission11
-%%DATADIR%%/data/missions/mission11Locale
+%%DATADIR%%/data/missions/mission12
 %%DATADIR%%/data/missions/mission13
-%%DATADIR%%/data/missions/mission13Locale
 %%DATADIR%%/data/missions/mission14
-%%DATADIR%%/data/missions/mission14Locale
 %%DATADIR%%/data/missions/mission15
-%%DATADIR%%/data/missions/mission15Locale
 %%DATADIR%%/data/missions/mission17
-%%DATADIR%%/data/missions/mission17Locale
 %%DATADIR%%/data/missions/mission18
-%%DATADIR%%/data/missions/mission18Locale
 %%DATADIR%%/data/missions/mission19
-%%DATADIR%%/data/missions/mission19Locale
 %%DATADIR%%/data/missions/mission21
-%%DATADIR%%/data/missions/mission21Locale
 %%DATADIR%%/data/missions/mission22
-%%DATADIR%%/data/missions/mission22Locale
 %%DATADIR%%/data/missions/mission24
-%%DATADIR%%/data/missions/mission24Locale
 %%DATADIR%%/data/missions/mission25
-%%DATADIR%%/data/missions/mission25Locale
 %%DATADIR%%/data/missions/mission26
-%%DATADIR%%/data/missions/mission26Locale
 %%DATADIR%%/data/missions/mission29
-%%DATADIR%%/data/missions/mission29Locale
 %%DATADIR%%/data/missions/mission30
-%%DATADIR%%/data/missions/mission30Locale
 %%DATADIR%%/data/missions/mission31
-%%DATADIR%%/data/missions/mission31Locale
 %%DATADIR%%/data/missions/training
-%%DATADIR%%/data/missions/trainingLocale
 %%DATADIR%%/data/texturespecs/common
 %%DATADIR%%/data/texturespecs/liquid
 %%DATADIR%%/data/texturespecs/list
@@ -149,6 +157,7 @@ bin/blobAndConquer
 %%DATADIR%%/data/widgets/generalOptions
 %%DATADIR%%/data/widgets/inGameOptions
 %%DATADIR%%/data/widgets/loadSave
+%%DATADIR%%/data/widgets/masterMind
 %%DATADIR%%/data/widgets/status
 %%DATADIR%%/data/widgets/title
 %%DATADIR%%/gfx/game/0.png
@@ -161,6 +170,7 @@ 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/dot.png
 %%DATADIR%%/gfx/game/episode2.png
@@ -180,10 +190,13 @@ bin/blobAndConquer
 %%DATADIR%%/gfx/gui/unchecked.png
 %%DATADIR%%/gfx/gui/upArrow.png
 %%DATADIR%%/gfx/md2/.keep_me
+%%DATADIR%%/gfx/primitive/bioTank1.primitive
+%%DATADIR%%/gfx/primitive/bioTank2.primitive
 %%DATADIR%%/gfx/primitive/blob.primitive
 %%DATADIR%%/gfx/primitive/bob.primitive
 %%DATADIR%%/gfx/primitive/c4.primitive
 %%DATADIR%%/gfx/primitive/darkBlob.primitive
+%%DATADIR%%/gfx/primitive/eyeDroidCommander.primitive
 %%DATADIR%%/gfx/primitive/eyedroid.primitive
 %%DATADIR%%/gfx/primitive/item.primitive
 %%DATADIR%%/gfx/primitive/keycard.primitive
@@ -201,6 +214,7 @@ bin/blobAndConquer
 %%DATADIR%%/music/A Bear Called Otso.xm
 %%DATADIR%%/music/Advancement.xm
 %%DATADIR%%/music/Dark Club.s3m
+%%DATADIR%%/music/Dark.s3m
 %%DATADIR%%/music/Dragon Cave.xm
 %%DATADIR%%/music/Helmet Shake.mod
 %%DATADIR%%/music/Liquid Crystal.xm
@@ -255,6 +269,7 @@ bin/blobAndConquer
 %%DATADIR%%/sound/combat/electricSparks05.ogg
 %%DATADIR%%/sound/combat/empty.ogg
 %%DATADIR%%/sound/combat/explode.ogg
+%%DATADIR%%/sound/combat/flameThrower.ogg
 %%DATADIR%%/sound/combat/glassHit1.ogg
 %%DATADIR%%/sound/combat/glassHit2.ogg
 %%DATADIR%%/sound/combat/glassShatter1.ogg
@@ -303,11 +318,13 @@ bin/blobAndConquer
 %%DATADIR%%/sound/combat/waterOut.ogg
 %%DATADIR%%/sound/combat/weaponPickup.ogg
 %%DATADIR%%/sound/gui/buttonClick.ogg
+%%DATADIR%%/sound/gui/cheatMode.ogg
 %%DATADIR%%/textures/arctic/snow01.jpg
 %%DATADIR%%/textures/common/blank.jpg
 %%DATADIR%%/textures/common/target.tga
 %%DATADIR%%/textures/common/target2.tga
 %%DATADIR%%/textures/desert/.keep_me
+%%DATADIR%%/textures/game/AIUnit.png
 %%DATADIR%%/textures/game/aquaBlob.png
 %%DATADIR%%/textures/game/arrow.png
 %%DATADIR%%/textures/game/black.png
@@ -317,8 +334,9 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/blood04.png
 %%DATADIR%%/textures/game/blood05.png
 %%DATADIR%%/textures/game/bullet.png
-%%DATADIR%%/textures/game/bulletHole01.png
-%%DATADIR%%/textures/game/bulletHole02.png
+%%DATADIR%%/textures/game/bulletMark01.tga
+%%DATADIR%%/textures/game/bulletMark02.tga
+%%DATADIR%%/textures/game/bulletMark03.tga
 %%DATADIR%%/textures/game/c4.png
 %%DATADIR%%/textures/game/cherry.png
 %%DATADIR%%/textures/game/cherryTexture.png
@@ -329,7 +347,11 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/day2.jpg
 %%DATADIR%%/textures/game/dusk.jpg
 %%DATADIR%%/textures/game/explosion.png
+%%DATADIR%%/textures/game/explosionMark01.tga
+%%DATADIR%%/textures/game/explosionMark02.tga
+%%DATADIR%%/textures/game/explosionMark03.tga
 %%DATADIR%%/textures/game/fire.png
+%%DATADIR%%/textures/game/glassImpact01.png
 %%DATADIR%%/textures/game/goodBlob.png
 %%DATADIR%%/textures/game/goodBlobInjured.png
 %%DATADIR%%/textures/game/grad.png
@@ -340,16 +362,28 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/grey.png
 %%DATADIR%%/textures/game/iceBlock.jpg
 %%DATADIR%%/textures/game/keycard.png
+%%DATADIR%%/textures/game/laserBeam.png
 %%DATADIR%%/textures/game/laserBlob.png
 %%DATADIR%%/textures/game/machineGunBlob.png
 %%DATADIR%%/textures/game/machineGunDroid.png
+%%DATADIR%%/textures/game/manualTargetter.png
+%%DATADIR%%/textures/game/mastermindArrow.png
+%%DATADIR%%/textures/game/mastermindBackground.png
+%%DATADIR%%/textures/game/mastermindBall1.png
+%%DATADIR%%/textures/game/mastermindBall2.png
+%%DATADIR%%/textures/game/mastermindBall3.png
+%%DATADIR%%/textures/game/mastermindBall4.png
+%%DATADIR%%/textures/game/mastermindBall5.png
+%%DATADIR%%/textures/game/mastermindBall6.png
+%%DATADIR%%/textures/game/mastermindBall7.png
+%%DATADIR%%/textures/game/mastermindBall8.png
 %%DATADIR%%/textures/game/medicine.png
 %%DATADIR%%/textures/game/medipack.png
 %%DATADIR%%/textures/game/noTarget.png
 %%DATADIR%%/textures/game/overcast.png
 %%DATADIR%%/textures/game/pistolBlob.png
 %%DATADIR%%/textures/game/pistolDroid.png
-%%DATADIR%%/textures/game/plasmaBurn01.png
+%%DATADIR%%/textures/game/pistolTexture.png
 %%DATADIR%%/textures/game/sentryGun1.jpg
 %%DATADIR%%/textures/game/shotGunDroid.png
 %%DATADIR%%/textures/game/spotLightMap.png