- Update to 0.3-1, unbreak it

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

4 files changed, 103 insertions, 37 deletions

diff --git a/games/blobandconquer/Makefile b/games/blobandconquer/Makefile
index c8c5258..e1668c1 100644
--- a/games/blobandconquer/Makefile
+++ b/games/blobandconquer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	blobandconquer
-DISTVERSION=	0.2-1
+DISTVERSION=	0.3-1
 CATEGORIES=	games
 MASTER_SITES=	http://www.parallelrealities.co.uk/download.php?type=zip&file=
 DISTNAME=	blobAndConquer-${DISTVERSION}
@@ -14,8 +14,6 @@ DISTNAME=	blobAndConquer-${DISTVERSION}
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	A somewhat violent 3D action game
 
-BROKEN=		does not fetch
-
 FETCH_BEFORE_ARGS+=	-o ${DISTNAME}${EXTRACT_SUFX}
 
 USE_X_PREFIX=	yes
diff --git a/games/blobandconquer/distinfo b/games/blobandconquer/distinfo
index ad78eea..d42c2f7 100644
--- a/games/blobandconquer/distinfo
+++ b/games/blobandconquer/distinfo
@@ -1,3 +1,3 @@
-MD5 (blobAndConquer-0.2-1.tar.gz) = 881ae0fdb82211e062acd3a0d63d07d8
-SHA256 (blobAndConquer-0.2-1.tar.gz) = 8d3c00a52020ff97c6af96fb63e01aea0bb44666f3dd198d56e2900ae97c79f1
-SIZE (blobAndConquer-0.2-1.tar.gz) = 16411447
+MD5 (blobAndConquer-0.3-1.tar.gz) = fe2c82571ffcbd9e60257e8dfdc2af70
+SHA256 (blobAndConquer-0.3-1.tar.gz) = 4609270efed89771e6dfb548c30bc976217c85dd9626f8d7b772274789ebe7c1
+SIZE (blobAndConquer-0.3-1.tar.gz) = 23165363
diff --git a/games/blobandconquer/files/patch-makefile b/games/blobandconquer/files/patch-makefile
index 0e9b99f..5c96867 100644
--- a/games/blobandconquer/files/patch-makefile
+++ b/games/blobandconquer/files/patch-makefile
@@ -1,6 +1,6 @@
---- makefile.orig	Mon Apr  3 06:09:24 2006
-+++ makefile	Mon Apr  3 06:09:45 2006
-@@ -12,16 +12,16 @@
+--- makefile.orig	Thu Aug 17 07:51:40 2006
++++ makefile	Thu Aug 17 07:55:36 2006
+@@ -13,16 +13,16 @@
  
  PREFIX=$(DESTDIR)/usr
  BINDIR = $(PREFIX)/games/
@@ -12,18 +12,18 @@
  KDE = $(PREFIX)/share/applnk/Games/Arcade/
  GNOME = $(PREFIX)/share/gnome/apps/Games/
  
--CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
+-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
 -CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic
 -LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib
 -LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
-+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
++CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
 +CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
 +LIBPATH = -L$(X11BASE)/lib
 +LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
  
  # Yes, it means compiling is a little slower... but it's less hassle
  SEARCHPATH = src/ src/3d/ src/common/ src/gui/ src/util/ src/game/ src/system/
-@@ -75,12 +75,12 @@
+@@ -75,7 +75,7 @@
  all: $(PROG) $(PAK)
  
  %.o: %.cpp %.h defines.h defs.h headers.h
@@ -32,9 +32,3 @@
  
  # linking the program.
  $(PROG): $(OBJS) main.o 
- 	$(CXX) $(LIBPATH) $(OBJS) main.o -o $(PROG) $(LIBS)
--	
-+
- $(PAK): $(PAKOBJS)
- 	$(CXX) $(LIBPATH) $(LIBS) $(PAKOBJS) -o pak
- 
diff --git a/games/blobandconquer/pkg-plist b/games/blobandconquer/pkg-plist
index f5ff0b2..8e1c43c 100644
--- a/games/blobandconquer/pkg-plist
+++ b/games/blobandconquer/pkg-plist
@@ -3,31 +3,58 @@ bin/blobAndConquer
 %%DATADIR%%/data/bsp/ancientTomb1.map
 %%DATADIR%%/data/bsp/ancientTomb2.bsp
 %%DATADIR%%/data/bsp/ancientTomb2.map
-%%DATADIR%%/data/bsp/ancientTomb3.lin
+%%DATADIR%%/data/bsp/ancientTomb3.bsp
 %%DATADIR%%/data/bsp/ancientTomb3.map
-%%DATADIR%%/data/bsp/ancientTomb3.srf
+%%DATADIR%%/data/bsp/bioMechTower1.bsp
+%%DATADIR%%/data/bsp/bioMechTower1.map
+%%DATADIR%%/data/bsp/biomechTower2.bsp
+%%DATADIR%%/data/bsp/biomechTower2.map
+%%DATADIR%%/data/bsp/biomechTower3.bsp
+%%DATADIR%%/data/bsp/biomechTower3.map
 %%DATADIR%%/data/bsp/caves1.bsp
 %%DATADIR%%/data/bsp/caves1.map
 %%DATADIR%%/data/bsp/caves2.bsp
 %%DATADIR%%/data/bsp/caves2.map
+%%DATADIR%%/data/bsp/caves3.bsp
+%%DATADIR%%/data/bsp/caves3.map
+%%DATADIR%%/data/bsp/desimilator.bsp
+%%DATADIR%%/data/bsp/desimilator.map
 %%DATADIR%%/data/bsp/enemyBase1_1.bsp
 %%DATADIR%%/data/bsp/enemyBase1_1.map
 %%DATADIR%%/data/bsp/enemyBase1_2.bsp
 %%DATADIR%%/data/bsp/enemyBase1_2.map
 %%DATADIR%%/data/bsp/enemyBase1_3.bsp
 %%DATADIR%%/data/bsp/enemyBase1_3.map
+%%DATADIR%%/data/bsp/enemyBase2_0.bsp
+%%DATADIR%%/data/bsp/enemyBase2_0.map
+%%DATADIR%%/data/bsp/enemyBase2_1.bsp
+%%DATADIR%%/data/bsp/enemyBase2_1.map
+%%DATADIR%%/data/bsp/enemyBase2_2.bsp
+%%DATADIR%%/data/bsp/enemyBase2_2.map
+%%DATADIR%%/data/bsp/enemyBase3_1.bsp
+%%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
 %%DATADIR%%/data/bsp/sewers1.map
 %%DATADIR%%/data/bsp/start.bsp
 %%DATADIR%%/data/bsp/start.map
+%%DATADIR%%/data/bsp/test.bsp
+%%DATADIR%%/data/bsp/test.map
 %%DATADIR%%/data/bsp/training.bsp
 %%DATADIR%%/data/bsp/training.map
 %%DATADIR%%/data/bsp/waste.bsp
@@ -61,30 +88,54 @@ bin/blobAndConquer
 %%DATADIR%%/data/missions/enemytest
 %%DATADIR%%/data/missions/hub
 %%DATADIR%%/data/missions/hubLocale
-%%DATADIR%%/data/missions/mission1
+%%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/mission09
+%%DATADIR%%/data/missions/mission09Locale
 %%DATADIR%%/data/missions/mission10
 %%DATADIR%%/data/missions/mission10Locale
 %%DATADIR%%/data/missions/mission11
+%%DATADIR%%/data/missions/mission11Locale
+%%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/mission1Locale
-%%DATADIR%%/data/missions/mission2
-%%DATADIR%%/data/missions/mission20
-%%DATADIR%%/data/missions/mission2Locale
-%%DATADIR%%/data/missions/mission3
-%%DATADIR%%/data/missions/mission3Locale
-%%DATADIR%%/data/missions/mission4
-%%DATADIR%%/data/missions/mission4Locale
-%%DATADIR%%/data/missions/mission5
-%%DATADIR%%/data/missions/mission5Locale
-%%DATADIR%%/data/missions/mission6
-%%DATADIR%%/data/missions/mission6Locale
-%%DATADIR%%/data/missions/mission7
-%%DATADIR%%/data/missions/mission7Locale
-%%DATADIR%%/data/missions/mission9
-%%DATADIR%%/data/missions/mission9Locale
+%%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/test
 %%DATADIR%%/data/missions/training
 %%DATADIR%%/data/missions/trainingLocale
@@ -100,6 +151,17 @@ bin/blobAndConquer
 %%DATADIR%%/data/widgets/loadSave
 %%DATADIR%%/data/widgets/status
 %%DATADIR%%/data/widgets/title
+%%DATADIR%%/gfx/game/0.png
+%%DATADIR%%/gfx/game/1.png
+%%DATADIR%%/gfx/game/2.png
+%%DATADIR%%/gfx/game/3.png
+%%DATADIR%%/gfx/game/4.png
+%%DATADIR%%/gfx/game/5.png
+%%DATADIR%%/gfx/game/6.png
+%%DATADIR%%/gfx/game/7.png
+%%DATADIR%%/gfx/game/8.png
+%%DATADIR%%/gfx/game/9.png
+%%DATADIR%%/gfx/game/colon.png
 %%DATADIR%%/gfx/game/episode2.png
 %%DATADIR%%/gfx/game/missionFailed.png
 %%DATADIR%%/gfx/game/orderIcon1.png
@@ -120,6 +182,7 @@ bin/blobAndConquer
 %%DATADIR%%/gfx/primitive/blob.primitive
 %%DATADIR%%/gfx/primitive/bob.primitive
 %%DATADIR%%/gfx/primitive/c4.primitive
+%%DATADIR%%/gfx/primitive/darkBlob.primitive
 %%DATADIR%%/gfx/primitive/eyedroid.primitive
 %%DATADIR%%/gfx/primitive/item.primitive
 %%DATADIR%%/gfx/primitive/keycard.primitive
@@ -185,9 +248,14 @@ bin/blobAndConquer
 %%DATADIR%%/sound/combat/electricSparks05.ogg
 %%DATADIR%%/sound/combat/empty.ogg
 %%DATADIR%%/sound/combat/explode.ogg
+%%DATADIR%%/sound/combat/glassHit1.ogg
+%%DATADIR%%/sound/combat/glassHit2.ogg
 %%DATADIR%%/sound/combat/glassShatter1.ogg
 %%DATADIR%%/sound/combat/glassShatter2.ogg
 %%DATADIR%%/sound/combat/glassShatter3.ogg
+%%DATADIR%%/sound/combat/grappleFire.ogg
+%%DATADIR%%/sound/combat/grappleHit.ogg
+%%DATADIR%%/sound/combat/grappling.ogg
 %%DATADIR%%/sound/combat/grenadeBounce.ogg
 %%DATADIR%%/sound/combat/grenadeLauncher.ogg
 %%DATADIR%%/sound/combat/gulp.ogg
@@ -235,7 +303,9 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/bullet.png
 %%DATADIR%%/textures/game/c4.png
 %%DATADIR%%/textures/game/cherry.png
+%%DATADIR%%/textures/game/cherryTexture.png
 %%DATADIR%%/textures/game/danger.png
+%%DATADIR%%/textures/game/darkBlob.png
 %%DATADIR%%/textures/game/dawn.jpg
 %%DATADIR%%/textures/game/day.jpg
 %%DATADIR%%/textures/game/day2.jpg
@@ -248,6 +318,7 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/grenade.png
 %%DATADIR%%/textures/game/grenadeBlob.png
 %%DATADIR%%/textures/game/grenadeDroid.png
+%%DATADIR%%/textures/game/grenadeTexture.png
 %%DATADIR%%/textures/game/grey.png
 %%DATADIR%%/textures/game/iceBlock.jpg
 %%DATADIR%%/textures/game/keycard.png
@@ -263,10 +334,12 @@ bin/blobAndConquer
 %%DATADIR%%/textures/game/sentryGun1.jpg
 %%DATADIR%%/textures/game/shotGunDroid.png
 %%DATADIR%%/textures/game/spotLightMap.png
+%%DATADIR%%/textures/game/starsky.png
 %%DATADIR%%/textures/game/sunset.png
 %%DATADIR%%/textures/game/targetter.png
 %%DATADIR%%/textures/game/teekaWeapon.png
 %%DATADIR%%/textures/game/weapon.png
+%%DATADIR%%/textures/game/weaponTexture.png
 %%DATADIR%%/textures/game/white.png
 %%DATADIR%%/textures/grasslands/american_cherry.jpg
 %%DATADIR%%/textures/grasslands/brick01.jpg
@@ -350,6 +423,7 @@ bin/blobAndConquer
 %%DATADIR%%/textures/ruins/granite01.jpg
 %%DATADIR%%/textures/ruins/stone01.jpg
 %%DATADIR%%/textures/tools/nospawn.tga
+%%DATADIR%%/textures/tools/trigger.jpg
 %%DATADIR%%/textures/tunnels/crackedsewerbricks1.jpg
 %%DATADIR%%/textures/tunnels/crackedsewerbricks2.jpg
 %%DATADIR%%/textures/tunnels/dkstone.jpg