- Update to 1.0.0

PR:		ports/73748
Submitted by:	Nicholas Kirby <nirbokirbinov@gmail.com>
Approved by:	can't remember if I got approval from maintainer or not

5 files changed, 65 insertions, 49 deletions

diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index cffbdeb05e8..1106eecb74b 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	frozenbubble
-PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTVERSION=	1.0.0
 CATEGORIES=	games
-MASTER_SITES=	http://people.mandrakesoft.com/~gc/fb/ \
-		http://frozenbubble.free.fr/fb/
+MASTER_SITES=	http://zarb.org/~gc/fb//
 DISTNAME=	frozen-bubble-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
@@ -35,19 +33,19 @@ PERL_CONFIGURE=	yes
 post-patch:
 .for file in fb_c_stuff.xs Makefile.PL
 	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|g'  ${WRKSRC}/${file}
-	@${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' ${WRKSRC}/Makefile.PL
 .endfor
+	@${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' ${WRKSRC}/Makefile.PL
+	@${RM} ${WRKSRC}/lib/FBLE.pm.orig
 
 do-install:
 	cd ${WRKSRC}; ${GMAKE} install
-	@${INSTALL_SCRIPT} ${BUILD_WRKSRC}/binaries_installpathok/frozen-bubble ${PREFIX}/bin/frozen-bubble.pl
+	@${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/frozen-bubble.pl
 
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/data
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/snd
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/balls
-	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/intro
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/pinguins
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/shoot
 	@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/menu
@@ -55,16 +53,15 @@ do-install:
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/data/levels  ${PREFIX}/share/frozen-bubble/data/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/data/plasma.raw  ${PREFIX}/share/frozen-bubble/data/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/*.png  ${PREFIX}/share/frozen-bubble/gfx/
+	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/*.gif  ${PREFIX}/share/frozen-bubble/gfx/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/balls/*.png  ${PREFIX}/share/frozen-bubble/gfx/balls/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/balls/*.gif  ${PREFIX}/share/frozen-bubble/gfx/balls/
-	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/intro/*.png  ${PREFIX}/share/frozen-bubble/gfx/intro/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/pinguins/*.png  ${PREFIX}/share/frozen-bubble/gfx/pinguins/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/shoot/data ${PREFIX}/share/frozen-bubble/gfx/shoot/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/shoot/*.png  ${PREFIX}/share/frozen-bubble/gfx/shoot/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/gfx/menu/*.png  ${PREFIX}/share/frozen-bubble/gfx/menu/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/snd/*.wav  ${PREFIX}/share/frozen-bubble/snd/
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/snd/*.xm  ${PREFIX}/share/frozen-bubble/snd/
-	@${INSTALL_DATA} ${BUILD_WRKSRC}/highscores.default  ${PREFIX}/share/frozen-bubble/
 
 	@printf '#!/bin/sh\nLD_PRELOAD=/usr/lib/libc_r.so perl ${PREFIX}/bin/frozen-bubble.pl $@' > ${WRKSRC}/frozen-bubble
 	@${INSTALL_SCRIPT} ${WRKSRC}/frozen-bubble ${PREFIX}/bin
diff --git a/games/frozenbubble/distinfo b/games/frozenbubble/distinfo
index b3b64688b0b..e5e85a02b5d 100644
--- a/games/frozenbubble/distinfo
+++ b/games/frozenbubble/distinfo
@@ -1,2 +1,2 @@
-MD5 (frozen-bubble-0.9.3.tar.bz2) = 761ac920a8e284287b64a3964ef9c753
-SIZE (frozen-bubble-0.9.3.tar.bz2) = 7049951
+MD5 (frozen-bubble-1.0.0.tar.bz2) = 2be5ead2aee72adc3fb643630a774b59
+SIZE (frozen-bubble-1.0.0.tar.bz2) = 7321135
diff --git a/games/frozenbubble/files/patch-FBLE.pm b/games/frozenbubble/files/patch-FBLE.pm
new file mode 100644
index 00000000000..137551a96a9
--- /dev/null
+++ b/games/frozenbubble/files/patch-FBLE.pm
@@ -0,0 +1,27 @@
+--- lib/FBLE.pm.orig	Sun Nov  7 00:25:46 2004
++++ lib/FBLE.pm	Sun Nov  7 00:26:25 2004
+@@ -1094,11 +1094,19 @@
+     $rect{screenshot} = SDL::Rect->new(-x => $POS_1P{p1}{left_limit} - 40, '-y' => 0, 
+ 				       -width => $POS_1P{p1}{right_limit} - $POS_1P{p1}{left_limit} + 80,
+ 				       -height => $POS_1P{bottom_limit} - $POS_1P{init_top_limit} + 190);
+-    fb_c_stuff::shrink($app->{-surface},
+-		       $file_browser_screenshots[$list_browser_highlight_offset]->display_format()->{-surface},
+-		       $rect{middle}->x + $rect{middle}->width - $rect{screenshot}->width/4 - 12,
+-		       $rect{middle}->y + $rect{middle}->height/2 - $rect{screenshot}->height/8 - 3,
+-		       $rect{screenshot}{-rect}, 4);
++    if (UNIVERSAL::isa($app, "HASH")) {
++        fb_c_stuff::shrink($app->{-surface},
++			   $file_browser_screenshots[$list_browser_highlight_offset]->display_format()->{-surface},
++			   $rect{middle}->x + $rect{middle}->width - $rect{screenshot}->width/4 - 12,
++			   $rect{middle}->y + $rect{middle}->height/2 - $rect{screenshot}->height/8 - 3,
++			   $rect{screenshot}{-rect}, 4);
++    } else {
++        fb_c_stuff::shrink($$app,
++			   ${$file_browser_screenshots[$list_browser_highlight_offset]->display_format()},
++			   $rect{middle}->x + $rect{middle}->width - $rect{screenshot}->width/4 - 12,
++			   $rect{middle}->y + $rect{middle}->height/2 - $rect{screenshot}->height/8 - 3,
++			   ${$rect{screenshot}}, 4);
++    }
+ }
+ 
+ 
diff --git a/games/frozenbubble/files/patch-frozen-bubble b/games/frozenbubble/files/patch-frozen-bubble
index 896c4529051..dec465389e8 100644
--- a/games/frozenbubble/files/patch-frozen-bubble
+++ b/games/frozenbubble/files/patch-frozen-bubble
@@ -1,9 +1,9 @@
---- ../frozen-bubble.orig	Mon Nov  1 18:29:01 2004
-+++ ../frozen-bubble	Mon Nov  1 18:31:54 2004
-@@ -319,7 +319,11 @@
+--- ../frozen-bubble.orig	Sat Nov  6 23:59:55 2004
++++ ../frozen-bubble	Sun Nov  7 00:02:38 2004
+@@ -307,7 +307,11 @@
  sub add_image($) {
      my $file = "$FPATH/gfx/$_[0]";
-     my $img = new SDL::Surface(-name => $file);
+     my $img = SDL::Surface->new(-name => $file);
 -    $img->{-surface} or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
 +    if (UNIVERSAL::isa($img, "HASH")) {
 +	$img->{-surface} or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
@@ -13,26 +13,26 @@
      add_default_rect($img);
      return $img;
  }
-@@ -1244,7 +1248,11 @@
- 	$imgbin{back_1p}->blit($high_rect, $background, $high_rect);
- 	open_level($high->{level});
+@@ -1473,7 +1477,11 @@
+ 	}
+ 
  	put_image($imgbin{hiscore_frame}, $high_posx - 7, $high_posy - 6);
--	fb_c_stuff::shrink($app->{-surface}, $background->display_format()->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
+-	fb_c_stuff::shrink($app->{-surface}, $background->display_format->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
 +	if (UNIVERSAL::isa($app, "HASH")) {
-+	    fb_c_stuff::shrink($app->{-surface}, $background->display_format()->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
++	    fb_c_stuff::shrink($app->{-surface}, $background->display_format->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
 +	} else {
-+	    fb_c_stuff::shrink($$app, ${$background->display_format}, $high_pox, $high_posy, $$high_rect, 4); 
++	    fb_c_stuff::shrink($$app, ${$background->display_format}, $high_posx, $high_posy, $$high_rect, 4);
 +	}
  	$centered_print->($high_posx, $high_posy,    $high->{name});
  	$centered_print->($high_posx, $high_posy+20, $high->{level} eq 'WON' ? "WON!" : "LVL-".$high->{level});
  	my $min = int($high->{time}/60);
-@@ -1412,8 +1420,10 @@
+@@ -1641,8 +1649,10 @@
      if ($graphics_level == 1) {
  	$background->blit($apprects{main}, $app, $apprects{main});
- 	$app->flip();
+ 	$app->flip;
 -    } else {
 +    } elsif (UNIVERSAL::isa($app, "HASH")) {
- 	fb_c_stuff::effect($app->{-surface}, $background->display_format()->{-surface});
+ 	fb_c_stuff::effect($app->{-surface}, $background->display_format->{-surface});
 +    } else {
 +	fb_c_stuff::effect($$app, ${$background->display_format});
      }
diff --git a/games/frozenbubble/pkg-plist b/games/frozenbubble/pkg-plist
index 5e77e05474f..7721aad758a 100644
--- a/games/frozenbubble/pkg-plist
+++ b/games/frozenbubble/pkg-plist
@@ -4,9 +4,10 @@ bin/frozen-bubble
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/build_fbsyms
+%%SITE_PERL%%/%%PERL_ARCH%%/FBLE.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/fb_c_stuff.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/fb_stuff.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/fbsyms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/fbmdkcommon.pm
 share/frozen-bubble/data/levels
 share/frozen-bubble/data/plasma.raw
 share/frozen-bubble/snd/applause.wav
@@ -55,28 +56,6 @@ share/frozen-bubble/gfx/balls/bubble-colourblind-5.gif
 share/frozen-bubble/gfx/balls/bubble-colourblind-6.gif
 share/frozen-bubble/gfx/balls/bubble-colourblind-7.gif
 share/frozen-bubble/gfx/balls/bubble-colourblind-8.gif
-share/frozen-bubble/gfx/intro/back_intro.png
-share/frozen-bubble/gfx/intro/intro_1.png
-share/frozen-bubble/gfx/intro/intro_10.png
-share/frozen-bubble/gfx/intro/intro_11.png
-share/frozen-bubble/gfx/intro/intro_12.png
-share/frozen-bubble/gfx/intro/intro_13.png
-share/frozen-bubble/gfx/intro/intro_14.png
-share/frozen-bubble/gfx/intro/intro_15.png
-share/frozen-bubble/gfx/intro/intro_16.png
-share/frozen-bubble/gfx/intro/intro_17.png
-share/frozen-bubble/gfx/intro/intro_18.png
-share/frozen-bubble/gfx/intro/intro_19.png
-share/frozen-bubble/gfx/intro/intro_2.png
-share/frozen-bubble/gfx/intro/intro_3.png
-share/frozen-bubble/gfx/intro/intro_4.png
-share/frozen-bubble/gfx/intro/intro_5.png
-share/frozen-bubble/gfx/intro/intro_6.png
-share/frozen-bubble/gfx/intro/intro_7.png
-share/frozen-bubble/gfx/intro/intro_8.png
-share/frozen-bubble/gfx/intro/intro_9.png
-share/frozen-bubble/gfx/intro/txt_bubble.png
-share/frozen-bubble/gfx/intro/txt_frozen.png
 share/frozen-bubble/gfx/pinguins/action_p1.png
 share/frozen-bubble/gfx/pinguins/action_p2.png
 share/frozen-bubble/gfx/pinguins/base_p1.png
@@ -230,6 +209,7 @@ share/frozen-bubble/gfx/shoot/shooter.png
 share/frozen-bubble/gfx/menu/back_start.png
 share/frozen-bubble/gfx/menu/banner_artwork.png
 share/frozen-bubble/gfx/menu/banner_cpucontrol.png
+share/frozen-bubble/gfx/menu/banner_leveleditor.png
 share/frozen-bubble/gfx/menu/banner_soundtrack.png
 share/frozen-bubble/gfx/menu/small_ping.png
 share/frozen-bubble/gfx/menu/txt_1pgame_off.png
@@ -240,6 +220,8 @@ share/frozen-bubble/gfx/menu/txt_box_checked.png
 share/frozen-bubble/gfx/menu/txt_box_unchecked.png
 share/frozen-bubble/gfx/menu/txt_circle_full.png
 share/frozen-bubble/gfx/menu/txt_circle_void.png
+share/frozen-bubble/gfx/menu/txt_editor_off.png
+share/frozen-bubble/gfx/menu/txt_editor_over.png
 share/frozen-bubble/gfx/menu/txt_fullscreen_act_off.png
 share/frozen-bubble/gfx/menu/txt_fullscreen_act_over.png
 share/frozen-bubble/gfx/menu/txt_fullscreen_off.png
@@ -261,6 +243,7 @@ share/frozen-bubble/gfx/menu/txt_sound_act_off.png
 share/frozen-bubble/gfx/menu/txt_sound_act_over.png
 share/frozen-bubble/gfx/menu/txt_sound_off.png
 share/frozen-bubble/gfx/menu/txt_sound_over.png
+share/frozen-bubble/gfx/menu/version.png
 share/frozen-bubble/gfx/menu/void_panel.png
 share/frozen-bubble/gfx/back_hiscores.png
 share/frozen-bubble/gfx/back_one_player.png
@@ -269,27 +252,36 @@ share/frozen-bubble/gfx/backgrnd.png
 share/frozen-bubble/gfx/banane.png
 share/frozen-bubble/gfx/compressor_ext.png
 share/frozen-bubble/gfx/compressor_main.png
+share/frozen-bubble/gfx/file_list_background.png
+share/frozen-bubble/gfx/font-hi.png
 share/frozen-bubble/gfx/font.png
 share/frozen-bubble/gfx/hiscore_frame.png
+share/frozen-bubble/gfx/hover.gif
 share/frozen-bubble/gfx/hurry_p1.png
 share/frozen-bubble/gfx/hurry_p2.png
+share/frozen-bubble/gfx/level_editor.png
+share/frozen-bubble/gfx/list_arrow_down.png
+share/frozen-bubble/gfx/list_arrow_up.png
 share/frozen-bubble/gfx/loading.png
 share/frozen-bubble/gfx/loading_step.png
+share/frozen-bubble/gfx/loadingpreviews.png
 share/frozen-bubble/gfx/lose_panel.png
 share/frozen-bubble/gfx/on_top_next.png
+share/frozen-bubble/gfx/pause_1.png
 share/frozen-bubble/gfx/pause_2.png
 share/frozen-bubble/gfx/pause_3.png
 share/frozen-bubble/gfx/pause_4.png
 share/frozen-bubble/gfx/pause_5.png
+share/frozen-bubble/gfx/purple_hover.gif
+share/frozen-bubble/gfx/scroll_list_background.png
 share/frozen-bubble/gfx/tomate.png
+share/frozen-bubble/gfx/win_panel_1player.png
 share/frozen-bubble/gfx/win_panel_p1.png
 share/frozen-bubble/gfx/win_panel_p2.png
-share/frozen-bubble/highscores.default
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff
 @dirrm share/frozen-bubble/data
 @dirrm share/frozen-bubble/snd
 @dirrm share/frozen-bubble/gfx/balls
-@dirrm share/frozen-bubble/gfx/intro
 @dirrm share/frozen-bubble/gfx/pinguins
 @dirrm share/frozen-bubble/gfx/shoot
 @dirrm share/frozen-bubble/gfx/menu