Update to 1.06.2:

10th April 2007 - Release 2. Forgot about the new locale directory
and didn't update the build script! Oops!

9th April 2007 - A 1.06 is a cummulative patch release, containing
many misc. bug fixes from many many different people over the last
couple of years. The most significant addition however is the
addition of GNU Gettext allowing the game to now be translated in
to many different languages. Catalan and Dutch translations currently
exist. If you're interested then download the source code and get
started. PO files can be found in the locale directory. Translates
for French, Spanish, Italian and German would be good.

11th May 2005 - A 1.05 version of the source code is available for
download. The main change with the code is that there is no endian
specific code for the PAK file. This should mean that the game will
run on all platforms it is compiled for. The downside is that a
PAK file created on PPC will not work in x86 (and vice versa).
However it is unlikely that a situation like this would arise and
even if it did it can be very easily corrected. PPC users (Mac,
Debian, etc) should test this new code (quick and dirty replace
the src directory and use the new make file). Any question and help
please get in touch.

6 files changed, 35 insertions, 70 deletions

diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 16ca905087c..ef024055928 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/15 12:58:11 wiz Exp $
 #
 
-DISTNAME=		blobwars-1.04-1
-PKGNAME=		blobwars-1.04.1
-PKGREVISION=		4
+DISTNAME=		blobwars-1.06-2
+PKGNAME=		blobwars-1.06.2
 CATEGORIES=		games
 MASTER_SITES=		# real site produces wrong filename, use default
 # http://www.parallelrealities.co.uk/download.php?type=zip&file=
@@ -13,13 +12,16 @@ HOMEPAGE=		http://www.parallelrealities.co.uk/blobWars.php
 COMMENT=		Blob Wars: Metal Blob Solid (platform shooter)
 
 USE_LANGUAGES=		c++
-WRKSRC=			${WRKDIR}/blobwars-1.04
+WRKSRC=			${WRKDIR}/blobwars-1.06
 MAKE_FILE=		makefile
 USE_TOOLS+=		gmake
+USE_DIRS+=		xdg-1.4
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/blobwars/PLIST b/games/blobwars/PLIST
index b6996f476ca..a9e8576169c 100644
--- a/games/blobwars/PLIST
+++ b/games/blobwars/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/03 21:13:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/15 12:58:11 wiz Exp $
 bin/blobwars
+share/applications/blobwars.desktop
 share/doc/blobwars/CHANGES
 share/doc/blobwars/HACKING
 share/doc/blobwars/LICENSE
@@ -25,12 +26,11 @@ share/doc/blobwars/points.gif
 share/doc/blobwars/scaredMIA.gif
 share/doc/blobwars/spreadIcon.png
 share/doc/blobwars/title.png
-share/parallelrealities/blobwars.pak
-share/icons/mini/blobwars.png
-share/icons/large/blobwars.png
-share/icons/blobwars.png
+share/games/blobwars/blobwars.pak
+share/icons/hicolor/16x16/apps/blobwars.png
+share/icons/hicolor/32x32/apps/blobwars.png
+share/icons/hicolor/64x64/apps/blobwars.png
+share/locale/ca/LC_MESSAGES/blobwars.mo
+share/locale/nl/LC_MESSAGES/blobwars.mo
+@dirrm share/games/blobwars
 @dirrm share/doc/blobwars
-@dirrm share/parallelrealities
-@unexec ${RMDIR} %D/share/icons/large 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/icons/mini 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/icons 2>/dev/null || ${TRUE}
diff --git a/games/blobwars/distinfo b/games/blobwars/distinfo
index 5f0526c8241..b38abd0c660 100644
--- a/games/blobwars/distinfo
+++ b/games/blobwars/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/06/25 19:24:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2007/04/15 12:58:11 wiz Exp $
 
-SHA1 (blobwars-1.04-1.tar.gz) = c351a8e4a507e0636b8856cdd174b7b131b2772d
-RMD160 (blobwars-1.04-1.tar.gz) = d211649d6946cdf2db3170947f5ef9816ffcb653
-Size (blobwars-1.04-1.tar.gz) = 7682669 bytes
-SHA1 (patch-aa) = 1e884e34d33406d09857ceaa378041aeb59b760d
-SHA1 (patch-ab) = 9c7517346ad68450b2def76fc3e944c917cbc1d9
-SHA1 (patch-ac) = 741c971831356b063817c2a512106ed4776ad425
+SHA1 (blobwars-1.06-2.tar.gz) = 3521d134d8bcd5872895f9a83d85bf646158abba
+RMD160 (blobwars-1.06-2.tar.gz) = 89f85a7a607e10f41da89c09c859ad4e820989eb
+Size (blobwars-1.06-2.tar.gz) = 7744037 bytes
+SHA1 (patch-aa) = eb8e213c7f49cdf1c243a3597925de87b67d10d9
diff --git a/games/blobwars/patches/patch-aa b/games/blobwars/patches/patch-aa
index 105b9e09cc0..c64b01398d7 100644
--- a/games/blobwars/patches/patch-aa
+++ b/games/blobwars/patches/patch-aa
@@ -1,35 +1,23 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/03 21:13:18 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/15 12:58:11 wiz Exp $
 
---- makefile.orig	2005-04-25 20:25:37.000000000 +0200
+--- makefile.orig	2007-04-10 18:35:02.000000000 +0000
 +++ makefile
-@@ -7,9 +7,9 @@ VERSION = 1.04
- RELEASE = 1
+@@ -7,8 +7,7 @@ VERSION = 1.06
+ RELEASE = 2
  USEPAK = 1
  
 -PREFIX=$(DESTDIR)/usr
 -BINDIR = $(PREFIX)/games/
--DATADIR = $(PREFIX)/share/games/parallelrealities/
-+#PREFIX=$(DESTDIR)/usr
 +BINDIR = $(PREFIX)/bin/
-+DATADIR = $(PREFIX)/share/parallelrealities/
+ DATADIR = $(PREFIX)/share/games/blobwars/
  DOCDIR = $(PREFIX)/share/doc/$(PROG)/
- ICONDIR = $(PREFIX)/share/icons/
- KDE = $(PREFIX)/share/applnk/Games/Arcade/
-@@ -70,8 +70,6 @@ install:
- 	mkdir -p $(ICONDIR)
- 	mkdir -p $(ICONDIR)mini
- 	mkdir -p $(ICONDIR)large
--	mkdir -p $(KDE)
--	mkdir -p $(GNOME)
+ ICONDIR = $(PREFIX)/share/icons/hicolor/
+@@ -19,7 +18,7 @@ CXXFLAGS += `sdl-config --cflags` -DVERS
+ CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
+ CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
+ CXXFLAGS += $(CFLAGS)
+-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
++LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lintl -lz
  
- 	strip $(PROG)
- 	install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
-@@ -80,8 +78,6 @@ install:
- 	cp $(ICONS)$(PROG).png $(ICONDIR)
- 	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png
- 	cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png
--	cp $(ICONS)$(PROG).desktop $(KDE)
--	cp $(ICONS)$(PROG).desktop $(GNOME)
- 
- uninstall:
- 	$(RM) $(BINDIR)$(PROG)
+ OBJS += aquaBoss.o bosses.o bullets.o cutscene.o
+ OBJS += CAudio.o CBoss.o CCollision.o CCutscene.o CData.o CEffect.o CEngine.o CEntity.o CFileData.o CGame.o 
diff --git a/games/blobwars/patches/patch-ab b/games/blobwars/patches/patch-ab
deleted file mode 100644
index cb0545a6078..00000000000
--- a/games/blobwars/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/06/25 19:24:41 wiz Exp $
-
---- src/CFileData.h.orig	2005-04-25 18:25:38.000000000 +0000
-+++ src/CFileData.h
-@@ -30,5 +30,5 @@ class FileData {
- 	FileData();
- 	
- 	void swapEndians();
--	void FileData::set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
-+	void set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
- };
diff --git a/games/blobwars/patches/patch-ac b/games/blobwars/patches/patch-ac
deleted file mode 100644
index 383d663c02d..00000000000
--- a/games/blobwars/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/06/25 19:24:41 wiz Exp $
-
---- src/CKeyboard.h.orig	2005-04-25 18:25:38.000000000 +0000
-+++ src/CKeyboard.h
-@@ -8,6 +8,6 @@ class Keyboard {
- 	
- 		Keyboard();
- 		void setDefaultKeys();
--		static char *Keyboard::translateKey(int value);
-+		static char *translateKey(int value);
- 
- };