[Patch] games/frozenbubbles 1.0.0
Jean-Baptiste Quenot
jb.quenot at caraldi.com
Tue Nov 2 07:45:03 PST 2004
Hello,
Please find attached a diff for bringing games/frozenbubble to version
1.0.0. It also adds a patch to address the problem with latest p5-sdl.
Thanks in advance for reviewing it,
--
Jean-Baptiste Quenot
http://caraldi.com/jbq/
-------------- next part --------------
diff -ruN /usr/ports/games/frozenbubble/Makefile ./Makefile
--- /usr/ports/games/frozenbubble/Makefile Tue Mar 16 05:23:41 2004
+++ ./Makefile Tue Nov 2 16:22:00 2004
@@ -6,10 +6,9 @@
#
PORTNAME= frozenbubble
-PORTVERSION= 0.9.3
-PORTREVISION= 4
+PORTVERSION= 1.0.0
CATEGORIES= games
-MASTER_SITES= http://people.mandrakesoft.com/~gc/fb/ \
+MASTER_SITES= http://zarb.org/~gc/fb/ \
http://frozenbubble.free.fr/fb/
DISTNAME= frozen-bubble-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
@@ -29,6 +28,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/c_stuff/
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/
+PATCH_WRKSRC= ${BUILD_WRKSRC}
USE_PERL5= yes
PERL_CONFIGURE= yes
@@ -40,14 +40,13 @@
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 +54,15 @@
@${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 -ruN /usr/ports/games/frozenbubble/distinfo ./distinfo
--- /usr/ports/games/frozenbubble/distinfo Wed Mar 31 05:07:53 2004
+++ ./distinfo Tue Nov 2 15:53:53 2004
@@ -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 -ruN /usr/ports/games/frozenbubble/files/patch-frozen-bubble ./files/patch-frozen-bubble
--- /usr/ports/games/frozenbubble/files/patch-frozen-bubble Thu Jan 1 01:00:00 1970
+++ ./files/patch-frozen-bubble Tue Nov 2 16:01:22 2004
@@ -0,0 +1,50 @@
+--- ./frozen-bubble.orig Mon Feb 17 00:45:27 2003
++++ ./frozen-bubble Tue Nov 2 15:55:28 2004
+@@ -304,10 +304,28 @@
+ return $save;
+ }
+
++sub surf {
++ my ($surface) = @_;
++ if (ref($surface) eq 'HASH') {
++ return $surface->{-surface};
++ } else {
++ return $$surface;
++ }
++}
++
++sub rect {
++ my ($rect) = @_;
++ if (ref($rect) eq 'HASH') {
++ return $rect->{-rect};
++ } else {
++ return $$rect;
++ }
++}
++
+ sub add_image($) {
+ my $file = "$FPATH/gfx/$_[0]";
+ my $img = SDL::Surface->new(-name => $file);
+- $img->{-surface} or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
++ surf($img) or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
+ add_default_rect($img);
+ return $img;
+ }
+@@ -1473,7 +1491,7 @@
+ }
+
+ 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(surf($app), surf($background->display_format), $high_posx, $high_posy, rect($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);
+@@ -1642,7 +1660,7 @@
+ $background->blit($apprects{main}, $app, $apprects{main});
+ $app->flip;
+ } else {
+- fb_c_stuff::effect($app->{-surface}, $background->display_format->{-surface});
++ fb_c_stuff::effect(surf($app), surf($background->display_format));
+ }
+
+ $display_on_app_disabled = 0;
diff -ruN /usr/ports/games/frozenbubble/pkg-plist ./pkg-plist
--- /usr/ports/games/frozenbubble/pkg-plist Fri Oct 24 14:02:25 2003
+++ ./pkg-plist Tue Nov 2 16:43:14 2004
@@ -6,39 +6,12 @@
%%SITE_PERL%%/%%PERL_ARCH%%/build_fbsyms
%%SITE_PERL%%/%%PERL_ARCH%%/fb_c_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
-share/frozen-bubble/snd/cancel.wav
-share/frozen-bubble/snd/destroy_group.wav
-share/frozen-bubble/snd/hurry.wav
-share/frozen-bubble/snd/launch.wav
-share/frozen-bubble/snd/lose.wav
-share/frozen-bubble/snd/malus.wav
-share/frozen-bubble/snd/menu_change.wav
-share/frozen-bubble/snd/menu_selected.wav
-share/frozen-bubble/snd/newroot.wav
-share/frozen-bubble/snd/newroot_solo.wav
-share/frozen-bubble/snd/noh.wav
-share/frozen-bubble/snd/pause.wav
-share/frozen-bubble/snd/rebound.wav
-share/frozen-bubble/snd/snore.wav
-share/frozen-bubble/snd/stick.wav
-share/frozen-bubble/snd/typewriter.wav
-share/frozen-bubble/snd/frozen-mainzik-1p.xm
-share/frozen-bubble/snd/frozen-mainzik-2p.xm
-share/frozen-bubble/snd/introzik.xm
-share/frozen-bubble/gfx/balls/bubble_lose.png
-share/frozen-bubble/gfx/balls/bubble_prelight.png
-share/frozen-bubble/gfx/balls/stick_effect_0.png
-share/frozen-bubble/gfx/balls/stick_effect_1.png
-share/frozen-bubble/gfx/balls/stick_effect_2.png
-share/frozen-bubble/gfx/balls/stick_effect_3.png
-share/frozen-bubble/gfx/balls/stick_effect_4.png
-share/frozen-bubble/gfx/balls/stick_effect_5.png
-share/frozen-bubble/gfx/balls/stick_effect_6.png
-share/frozen-bubble/gfx/balls/stick_effect_7.png
+share/frozen-bubble/gfx/back_hiscores.png
+share/frozen-bubble/gfx/back_one_player.png
+share/frozen-bubble/gfx/back_paused.png
+share/frozen-bubble/gfx/backgrnd.png
share/frozen-bubble/gfx/balls/bubble-1.gif
share/frozen-bubble/gfx/balls/bubble-2.gif
share/frozen-bubble/gfx/balls/bubble-3.gif
@@ -55,28 +28,78 @@
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/balls/bubble_lose.png
+share/frozen-bubble/gfx/balls/bubble_prelight.png
+share/frozen-bubble/gfx/balls/stick_effect_0.png
+share/frozen-bubble/gfx/balls/stick_effect_1.png
+share/frozen-bubble/gfx/balls/stick_effect_2.png
+share/frozen-bubble/gfx/balls/stick_effect_3.png
+share/frozen-bubble/gfx/balls/stick_effect_4.png
+share/frozen-bubble/gfx/balls/stick_effect_5.png
+share/frozen-bubble/gfx/balls/stick_effect_6.png
+share/frozen-bubble/gfx/balls/stick_effect_7.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/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
+share/frozen-bubble/gfx/menu/txt_1pgame_over.png
+share/frozen-bubble/gfx/menu/txt_2pgame_off.png
+share/frozen-bubble/gfx/menu/txt_2pgame_over.png
+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
+share/frozen-bubble/gfx/menu/txt_fullscreen_over.png
+share/frozen-bubble/gfx/menu/txt_graphics_1.png
+share/frozen-bubble/gfx/menu/txt_graphics_1_off.png
+share/frozen-bubble/gfx/menu/txt_graphics_1_over.png
+share/frozen-bubble/gfx/menu/txt_graphics_2.png
+share/frozen-bubble/gfx/menu/txt_graphics_2_off.png
+share/frozen-bubble/gfx/menu/txt_graphics_2_over.png
+share/frozen-bubble/gfx/menu/txt_graphics_3.png
+share/frozen-bubble/gfx/menu/txt_graphics_3_off.png
+share/frozen-bubble/gfx/menu/txt_graphics_3_over.png
+share/frozen-bubble/gfx/menu/txt_highscores_off.png
+share/frozen-bubble/gfx/menu/txt_highscores_over.png
+share/frozen-bubble/gfx/menu/txt_keys_off.png
+share/frozen-bubble/gfx/menu/txt_keys_over.png
+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/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/pinguins/action_p1.png
share/frozen-bubble/gfx/pinguins/action_p2.png
share/frozen-bubble/gfx/pinguins/base_p1.png
@@ -143,6 +166,8 @@
share/frozen-bubble/gfx/pinguins/small_corner_closed_p2.png
share/frozen-bubble/gfx/pinguins/small_corner_open_p1.png
share/frozen-bubble/gfx/pinguins/small_corner_open_p2.png
+share/frozen-bubble/gfx/purple_hover.gif
+share/frozen-bubble/gfx/scroll_list_background.png
share/frozen-bubble/gfx/shoot/base.png
share/frozen-bubble/gfx/shoot/base_-1.png
share/frozen-bubble/gfx/shoot/base_-10.png
@@ -163,10 +188,10 @@
share/frozen-bubble/gfx/shoot/base_-24.png
share/frozen-bubble/gfx/shoot/base_-25.png
share/frozen-bubble/gfx/shoot/base_-26.png
-share/frozen-bubble/gfx/shoot/base_-3.png
share/frozen-bubble/gfx/shoot/base_-27.png
share/frozen-bubble/gfx/shoot/base_-28.png
share/frozen-bubble/gfx/shoot/base_-29.png
+share/frozen-bubble/gfx/shoot/base_-3.png
share/frozen-bubble/gfx/shoot/base_-30.png
share/frozen-bubble/gfx/shoot/base_-31.png
share/frozen-bubble/gfx/shoot/base_-32.png
@@ -227,69 +252,34 @@
share/frozen-bubble/gfx/shoot/base_9.png
share/frozen-bubble/gfx/shoot/data
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_soundtrack.png
-share/frozen-bubble/gfx/menu/small_ping.png
-share/frozen-bubble/gfx/menu/txt_1pgame_off.png
-share/frozen-bubble/gfx/menu/txt_1pgame_over.png
-share/frozen-bubble/gfx/menu/txt_2pgame_off.png
-share/frozen-bubble/gfx/menu/txt_2pgame_over.png
-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_fullscreen_act_off.png
-share/frozen-bubble/gfx/menu/txt_fullscreen_act_over.png
-share/frozen-bubble/gfx/menu/txt_fullscreen_off.png
-share/frozen-bubble/gfx/menu/txt_fullscreen_over.png
-share/frozen-bubble/gfx/menu/txt_graphics_1.png
-share/frozen-bubble/gfx/menu/txt_graphics_1_off.png
-share/frozen-bubble/gfx/menu/txt_graphics_1_over.png
-share/frozen-bubble/gfx/menu/txt_graphics_2.png
-share/frozen-bubble/gfx/menu/txt_graphics_2_off.png
-share/frozen-bubble/gfx/menu/txt_graphics_2_over.png
-share/frozen-bubble/gfx/menu/txt_graphics_3.png
-share/frozen-bubble/gfx/menu/txt_graphics_3_off.png
-share/frozen-bubble/gfx/menu/txt_graphics_3_over.png
-share/frozen-bubble/gfx/menu/txt_highscores_off.png
-share/frozen-bubble/gfx/menu/txt_highscores_over.png
-share/frozen-bubble/gfx/menu/txt_keys_off.png
-share/frozen-bubble/gfx/menu/txt_keys_over.png
-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/void_panel.png
-share/frozen-bubble/gfx/back_hiscores.png
-share/frozen-bubble/gfx/back_one_player.png
-share/frozen-bubble/gfx/back_paused.png
-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/font.png
-share/frozen-bubble/gfx/hiscore_frame.png
-share/frozen-bubble/gfx/hurry_p1.png
-share/frozen-bubble/gfx/hurry_p2.png
-share/frozen-bubble/gfx/loading.png
-share/frozen-bubble/gfx/loading_step.png
-share/frozen-bubble/gfx/lose_panel.png
-share/frozen-bubble/gfx/on_top_next.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/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
+share/frozen-bubble/snd/applause.wav
+share/frozen-bubble/snd/cancel.wav
+share/frozen-bubble/snd/destroy_group.wav
+share/frozen-bubble/snd/frozen-mainzik-1p.xm
+share/frozen-bubble/snd/frozen-mainzik-2p.xm
+share/frozen-bubble/snd/hurry.wav
+share/frozen-bubble/snd/introzik.xm
+share/frozen-bubble/snd/launch.wav
+share/frozen-bubble/snd/lose.wav
+share/frozen-bubble/snd/malus.wav
+share/frozen-bubble/snd/menu_change.wav
+share/frozen-bubble/snd/menu_selected.wav
+share/frozen-bubble/snd/newroot.wav
+share/frozen-bubble/snd/newroot_solo.wav
+share/frozen-bubble/snd/noh.wav
+share/frozen-bubble/snd/pause.wav
+share/frozen-bubble/snd/rebound.wav
+share/frozen-bubble/snd/snore.wav
+share/frozen-bubble/snd/stick.wav
+share/frozen-bubble/snd/typewriter.wav
@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
- at dirrm share/frozen-bubble/gfx/intro
@dirrm share/frozen-bubble/gfx/pinguins
@dirrm share/frozen-bubble/gfx/shoot
@dirrm share/frozen-bubble/gfx/menu
More information about the freebsd-ports
mailing list