update to 2.6.3

changes:
-added level selection dialog
-fixes
-translation update

5 files changed, 13 insertions, 75 deletions

diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 1b5e58e4a68..873d13540bb 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2011/04/22 13:43:37 obache Exp $
+# $NetBSD: Makefile,v 1.36 2011/06/09 17:06:16 drochner Exp $
 
-DISTNAME=	lbreakout2-2.6.2
-PKGREVISION=	2
+DISTNAME=	lbreakout2-2.6.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/lbreakout2/PLIST b/games/lbreakout2/PLIST
index 79c64ec22b9..70c7a89242a 100644
--- a/games/lbreakout2/PLIST
+++ b/games/lbreakout2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/01/11 20:20:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/06/09 17:06:16 drochner Exp $
 bin/lbreakout2
 bin/lbreakout2server
 share/applications/lbreakout2.desktop
@@ -256,6 +256,7 @@ share/lbreakout2/levels/Twilight
 share/lbreakout2/levels/Vader
 share/lbreakout2/levels/WTF
 share/lbreakout2/levels/Weirdness
+share/lbreakout2/levels/Wizi
 share/lbreakout2/levels/Wolvie
 share/lbreakout2/levels/WonderWalls
 share/lbreakout2/levels/X
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo
index 2a72c3c0bfe..c6cb731b0e0 100644
--- a/games/lbreakout2/distinfo
+++ b/games/lbreakout2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2011/02/01 00:29:26 wiz Exp $
+$NetBSD: distinfo,v 1.13 2011/06/09 17:06:16 drochner Exp $
 
-SHA1 (lbreakout2-2.6.2.tar.gz) = dc0bdde272351945b48a09277275ac3fd5d513f4
-RMD160 (lbreakout2-2.6.2.tar.gz) = 5382731dfdef5343957a722a4b23af05ebb0a1b1
-Size (lbreakout2-2.6.2.tar.gz) = 3393491 bytes
-SHA1 (patch-aa) = 04d94f634e801452e29d1de980fc401cc279f3fe
+SHA1 (lbreakout2-2.6.3.tar.gz) = 6d09ca1e5b50116efb4f17ac86cee53b081c2229
+RMD160 (lbreakout2-2.6.3.tar.gz) = 24b4717b642c5e544c1917dc86de61f2fcfde392
+Size (lbreakout2-2.6.3.tar.gz) = 3403150 bytes
+SHA1 (patch-aa) = 25736b37b9ab5f8d57d25bffa3f456b0384f266d
 SHA1 (patch-ab) = beee4c08af31eb515ddea2e512db1f6f7cb7dcf1
 SHA1 (patch-ac) = 67405340bf632d93d767e0d4c1f3df23c07e7a1e
 SHA1 (patch-ad) = b3f093e83b94d83ec4bcd7665b21cc6f969519a8
 SHA1 (patch-ae) = 33ca52782b945460197a32128d850839a1798cd5
-SHA1 (patch-gui_stk.c) = 17b46d40e760e13507d704783ecd161ccbc3b1b0
diff --git a/games/lbreakout2/patches/patch-aa b/games/lbreakout2/patches/patch-aa
index f6de4969531..7d7f69782e5 100644
--- a/games/lbreakout2/patches/patch-aa
+++ b/games/lbreakout2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2011/01/11 20:20:53 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2011/06/09 17:06:16 drochner Exp $
 
---- client/Makefile.in.orig	2010-10-05 18:28:50.000000000 +0000
+--- client/Makefile.in.orig	2011-03-08 08:31:49.000000000 +0000
 +++ client/Makefile.in
 @@ -243,7 +243,7 @@ client_data.c client_handlers.c game.c c
  display.c main.c win32.ico
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.4 2011/01/11 20:20:53 drochner Exp $
 +lbreakout2_LDADD = @win32_deps@ ../common/libcommon.a ../gui/libGui.a ../game/libgame.a @mixer_flag@ @sdlnet_lib_flag@ -lintl
  EXTRA_DIST = credit.h shine.h extras.h balls.h shrapnells.h  \
  shots.h event.h paddle.h frame.h misc.h bricks.h player.h \
- file.h config.h lbreakout.h \
-@@ -667,10 +667,6 @@ lbreakout2res.o: win32.ico 
+ file.h config.h lbreakout.h setselect.h \
+@@ -668,10 +668,6 @@ lbreakout2res.o: win32.ico 
  
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(inst_dir)
diff --git a/games/lbreakout2/patches/patch-gui_stk.c b/games/lbreakout2/patches/patch-gui_stk.c
deleted file mode 100644
index 7a84a27e5d1..00000000000
--- a/games/lbreakout2/patches/patch-gui_stk.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-gui_stk.c,v 1.1 2011/02/01 00:29:26 wiz Exp $
-
-Fix build with png-1.5.
-
---- gui/stk.c.orig	2010-10-04 13:40:45.000000000 +0000
-+++ gui/stk.c
-@@ -105,7 +105,7 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		IMG_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -174,9 +174,9 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -184,7 +184,7 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		IMG_SetError("Out of memory");
- 		goto done;
-@@ -229,12 +229,18 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else {
-+		png_colorp file_palette;
-+		int file_num_palette;
-+		png_get_PLTE(png_ptr, info_ptr, &file_palette,
-+			     &file_num_palette);
-+		if (file_num_palette > 0 ) {
-+		    palette->ncolors = file_num_palette;
-+		    for( i=0; i<file_num_palette; ++i ) {
-+		        palette->colors[i].b = file_palette[i].blue;
-+		        palette->colors[i].g = file_palette[i].green;
-+		        palette->colors[i].r = file_palette[i].red;
-+		    }
- 		}
- 	    }
- 	}