update to 2.6.2

changes: many new levels, bugfixes, i18n...

8 files changed, 130 insertions, 21 deletions

diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 25704369ce3..5fea32a8d54 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2010/06/13 22:44:21 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2011/01/11 20:20:53 drochner Exp $
 
-DISTNAME=	lbreakout2-2.5.2
-PKGREVISION=	8
+DISTNAME=	lbreakout2-2.6.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
@@ -31,6 +30,8 @@ SUBST_SED.sunpro=	-e 's,^inline ,,'
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/lbreakout2.hscr \
 			${REAL_ROOT_USER} games 664
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lbreakout2/PLIST b/games/lbreakout2/PLIST
index d1754e3e1ef..79c64ec22b9 100644
--- a/games/lbreakout2/PLIST
+++ b/games/lbreakout2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:56:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/01/11 20:20:53 drochner Exp $
 bin/lbreakout2
 bin/lbreakout2server
+share/applications/lbreakout2.desktop
 share/doc/html/lbreakout2/b0.jpg
 share/doc/html/lbreakout2/b1.jpg
 share/doc/html/lbreakout2/b2.jpg
@@ -35,6 +36,7 @@ share/doc/html/lbreakout2/x6.jpg
 share/doc/html/lbreakout2/x7.jpg
 share/doc/html/lbreakout2/x8.jpg
 share/doc/html/lbreakout2/x9.jpg
+share/icons/lbreakout48.gif
 share/lbreakout2/gfx/AbsoluteB/ABOUT
 share/lbreakout2/gfx/AbsoluteB/README
 share/lbreakout2/gfx/AbsoluteB/back0.png
@@ -150,24 +152,41 @@ share/lbreakout2/gui_theme/scrollbar_arrows.png
 share/lbreakout2/gui_theme/spinbutton_arrows.png
 share/lbreakout2/gui_theme/widget_frame.png
 share/lbreakout2/gui_theme/widget_wallpaper.png
+share/lbreakout2/levels/1010011010
 share/lbreakout2/levels/Abc
 share/lbreakout2/levels/Afl
 share/lbreakout2/levels/Alex
+share/lbreakout2/levels/Alexandre
+share/lbreakout2/levels/AllNighter
 share/lbreakout2/levels/Arcade
 share/lbreakout2/levels/Arkanoid
 share/lbreakout2/levels/BeOS-4ever
+share/lbreakout2/levels/Bertrand
+share/lbreakout2/levels/BigBang
 share/lbreakout2/levels/Biolab428
+share/lbreakout2/levels/Blues
 share/lbreakout2/levels/Bombs
 share/lbreakout2/levels/CalendarFun
+share/lbreakout2/levels/Celine
 share/lbreakout2/levels/Chaos
+share/lbreakout2/levels/Choices
+share/lbreakout2/levels/Circle
+share/lbreakout2/levels/Classique
 share/lbreakout2/levels/Color
 share/lbreakout2/levels/Composers
+share/lbreakout2/levels/Cool
+share/lbreakout2/levels/Crossing
+share/lbreakout2/levels/D2K
+share/lbreakout2/levels/Daves
 share/lbreakout2/levels/Demons
 share/lbreakout2/levels/Family
+share/lbreakout2/levels/Fantaisie
 share/lbreakout2/levels/FatalDoomsday
+share/lbreakout2/levels/FatalDoomsday2
 share/lbreakout2/levels/Flower
 share/lbreakout2/levels/Fly
 share/lbreakout2/levels/Freek
+share/lbreakout2/levels/FunCity
 share/lbreakout2/levels/Gatinha
 share/lbreakout2/levels/GreenWall
 share/lbreakout2/levels/GreenWall2
@@ -180,11 +199,15 @@ share/lbreakout2/levels/HighBall
 share/lbreakout2/levels/Holidays
 share/lbreakout2/levels/Hommage
 share/lbreakout2/levels/Impossibility
+share/lbreakout2/levels/Invisible
 share/lbreakout2/levels/IoriYagami
 share/lbreakout2/levels/Iris
 share/lbreakout2/levels/IrrenhausAh
+share/lbreakout2/levels/Izusiowe
+share/lbreakout2/levels/JediAdventure
 share/lbreakout2/levels/Kazan-1
 share/lbreakout2/levels/Kevin
+share/lbreakout2/levels/KungFu
 share/lbreakout2/levels/LBreakout1
 share/lbreakout2/levels/LBreakout2
 share/lbreakout2/levels/Lapis
@@ -192,30 +215,54 @@ share/lbreakout2/levels/Lattsville
 share/lbreakout2/levels/LinuxFun
 share/lbreakout2/levels/Lord
 share/lbreakout2/levels/Maze
+share/lbreakout2/levels/MegaMan2
 share/lbreakout2/levels/Megadoomer
+share/lbreakout2/levels/MontyHall
 share/lbreakout2/levels/NES
 share/lbreakout2/levels/N_Arenas
 share/lbreakout2/levels/N_Snapshots
+share/lbreakout2/levels/Nations
+share/lbreakout2/levels/Negundoid
+share/lbreakout2/levels/NewOERG1
+share/lbreakout2/levels/ObiWan
 share/lbreakout2/levels/OpenSource
+share/lbreakout2/levels/OurWorld
+share/lbreakout2/levels/P.I.T.A.
 share/lbreakout2/levels/Pabelo
+share/lbreakout2/levels/Patience
 share/lbreakout2/levels/Pawset
 share/lbreakout2/levels/Ph33r
+share/lbreakout2/levels/PlayAgain
+share/lbreakout2/levels/Popcorn
 share/lbreakout2/levels/R-World
+share/lbreakout2/levels/RichQuick
 share/lbreakout2/levels/Runes
+share/lbreakout2/levels/Sadistic
 share/lbreakout2/levels/Shimitar
 share/lbreakout2/levels/Silly
 share/lbreakout2/levels/SkillShot
+share/lbreakout2/levels/Smilies
 share/lbreakout2/levels/SnyMaxx
+share/lbreakout2/levels/StarWars
+share/lbreakout2/levels/Symmetry
 share/lbreakout2/levels/Symmetry-MKII
+share/lbreakout2/levels/T.C.S.
+share/lbreakout2/levels/TheEnd
 share/lbreakout2/levels/TheGauntlet
 share/lbreakout2/levels/TimeWaster
+share/lbreakout2/levels/TrickShot
 share/lbreakout2/levels/Tricky
 share/lbreakout2/levels/Twilight
+share/lbreakout2/levels/Vader
 share/lbreakout2/levels/WTF
+share/lbreakout2/levels/Weirdness
 share/lbreakout2/levels/Wolvie
+share/lbreakout2/levels/WonderWalls
 share/lbreakout2/levels/X
 share/lbreakout2/levels/Yexter
+share/lbreakout2/levels/Yoda
 share/lbreakout2/levels/Zigies
+share/lbreakout2/levels/Zooligan
 share/lbreakout2/levels/Zufallswelt
 share/lbreakout2/sounds/attach.wav
 share/lbreakout2/sounds/bonus_magnet.wav
@@ -253,4 +300,6 @@ share/lbreakout2/sounds/verygood.wav
 share/lbreakout2/sounds/wall.wav
 share/lbreakout2/sounds/weak_ball.wav
 share/lbreakout2/sounds/wontgiveup.wav
-@unexec echo Please remove highscore file %D/var/lbreakout2.hscr manually.
+share/locale/de/LC_MESSAGES/lbreakout2.mo
+share/locale/fr/LC_MESSAGES/lbreakout2.mo
+share/locale/tr/LC_MESSAGES/lbreakout2.mo
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo
index 95915a2a484..64c5fe3a75b 100644
--- a/games/lbreakout2/distinfo
+++ b/games/lbreakout2/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.10 2006/10/10 19:45:00 rillig Exp $
+$NetBSD: distinfo,v 1.11 2011/01/11 20:20:53 drochner Exp $
 
-SHA1 (lbreakout2-2.5.2.tar.gz) = 50a7627c7373178a04467c292e83a1c8e7dc58c6
-RMD160 (lbreakout2-2.5.2.tar.gz) = bf2031134f26b88899c96890cb994603c4e67f2c
-Size (lbreakout2-2.5.2.tar.gz) = 2849669 bytes
-SHA1 (patch-aa) = 1898a5af757bec97e3e9951f0329dfeb9fe41371
-SHA1 (patch-ab) = 98804b1a10146308e074aaccfaf948b1e046b107
+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 (patch-ab) = beee4c08af31eb515ddea2e512db1f6f7cb7dcf1
+SHA1 (patch-ac) = 67405340bf632d93d767e0d4c1f3df23c07e7a1e
+SHA1 (patch-ad) = b3f093e83b94d83ec4bcd7665b21cc6f969519a8
+SHA1 (patch-ae) = 33ca52782b945460197a32128d850839a1798cd5
diff --git a/games/lbreakout2/patches/patch-aa b/games/lbreakout2/patches/patch-aa
index 225fef8e692..f6de4969531 100644
--- a/games/lbreakout2/patches/patch-aa
+++ b/games/lbreakout2/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2006/06/21 16:00:57 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2011/01/11 20:20:53 drochner Exp $
 
---- client/Makefile.in.orig	2006-06-21 15:29:55.000000000 +0000
+--- client/Makefile.in.orig	2010-10-05 18:28:50.000000000 +0000
 +++ client/Makefile.in
-@@ -626,10 +626,6 @@ lbreakout2res.o: win32.ico 
+@@ -243,7 +243,7 @@ client_data.c client_handlers.c game.c c
+ display.c main.c win32.ico
+ 
+ lbreakout2_DEPENDENCIES = @win32_deps@
+-lbreakout2_LDADD = @win32_deps@ ../common/libcommon.a ../gui/libGui.a ../game/libgame.a @mixer_flag@ @sdlnet_lib_flag@
++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 
  
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(inst_dir)
diff --git a/games/lbreakout2/patches/patch-ab b/games/lbreakout2/patches/patch-ab
index 1685a5b3149..bb3e6b03275 100644
--- a/games/lbreakout2/patches/patch-ab
+++ b/games/lbreakout2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2006/10/10 19:45:00 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2011/01/11 20:20:53 drochner Exp $
 
---- configure.orig	2006-10-10 21:44:08.000000000 +0200
-+++ configure	2006-10-10 21:44:19.000000000 +0200
-@@ -1632,7 +1632,7 @@ fi
+--- configure.orig	2010-10-05 18:28:53.000000000 +0000
++++ configure
+@@ -12007,7 +12007,7 @@ fi
  
  
  
 -if test "$sdlnet_flag" == "-DSDL_NET_ENABLED" ; then
 +if test "$sdlnet_flag" = "-DSDL_NET_ENABLED" ; then
-     echo $ac_n "checking for main in -lSDL_net""... $ac_c" 1>&6
- echo "configure:1638: checking for main in -lSDL_net" >&5
- ac_lib_var=`echo SDL_net'_'main | sed 'y%./+-%__p_%'`
+     { echo "$as_me:$LINENO: checking for main in -lSDL_net" >&5
+ echo $ECHO_N "checking for main in -lSDL_net... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_SDL_net_main+set}" = set; then
diff --git a/games/lbreakout2/patches/patch-ac b/games/lbreakout2/patches/patch-ac
new file mode 100644
index 00000000000..82a64610a1e
--- /dev/null
+++ b/games/lbreakout2/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2011/01/11 20:20:53 drochner Exp $
+
+--- server/server.c.orig	2010-10-04 13:40:44.000000000 +0000
++++ server/server.c
+@@ -18,6 +18,7 @@
+ /***** INCLUDES ************************************************************/
+ 
+ #include <dirent.h>
++#include <locale.h>
+ #include "server.h"
+ #include "server_game.h"
+ 
diff --git a/games/lbreakout2/patches/patch-ad b/games/lbreakout2/patches/patch-ad
new file mode 100644
index 00000000000..12c96a25f55
--- /dev/null
+++ b/games/lbreakout2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2011/01/11 20:20:53 drochner Exp $
+
+--- server/Makefile.in.orig	2010-10-05 18:28:52.000000000 +0000
++++ server/Makefile.in
+@@ -230,7 +230,7 @@ lbreakout2server_SOURCES = \
+   server.c server_game.c
+ 
+ EXTRA_DIST = server.h server_game.h
+-lbreakout2server_LDADD = ../common/libcommon.a ../game/libgame.a @sdlnet_lib_flag@
++lbreakout2server_LDADD = ../common/libcommon.a ../game/libgame.a @sdlnet_lib_flag@ -lintl
+ SUBDIRS = levels
+ all: all-recursive
+ 
diff --git a/games/lbreakout2/patches/patch-ae b/games/lbreakout2/patches/patch-ae
new file mode 100644
index 00000000000..47c54d7acde
--- /dev/null
+++ b/games/lbreakout2/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2011/01/11 20:20:53 drochner Exp $
+
+--- client/main.c.orig	2010-10-05 17:55:43.000000000 +0000
++++ client/main.c
+@@ -23,6 +23,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <locale.h>
++
+ #include "lbreakout.h"
+ #include "../game/game.h"
+ #include "file.h"
+@@ -72,7 +74,7 @@ int main(int argc, char *argv[])
+     /* This is where we drop our setuid/setgid privileges.
+      */
+     realgid = getgid();
+-    if (setresgid(-1, realgid, realgid) != 0) {
++    if (setregid(-1, realgid) != 0) {
+         perror("Could not drop setgid privileges.  Aborting.");
+         exit(1);
+     }