- Update to 2.0.0

This commit is contained in:
Stanislav Sedov 2006-11-03 12:30:17 +00:00
parent 043a40b425
commit 6a87ac199f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=176268
8 changed files with 3326 additions and 409 deletions

View file

@ -6,12 +6,11 @@
#
PORTNAME= frozenbubble
PORTVERSION= 1.0.0
PORTREVISION= 2
PORTVERSION= 2.0.0
PORTREVISION= 0
CATEGORIES= games
MASTER_SITES= http://zarb.org/~gc/fb/
MASTER_SITES= http://www.frozen-bubble.org/data/
DISTNAME= frozen-bubble-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= ports@FreeBSD.org
COMMENT= Throw colourful bubbles to build groups and destroy the groups
@ -19,48 +18,50 @@ COMMENT= Throw colourful bubbles to build groups and destroy the groups
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
USE_SDL= mixer image sdl
USE_SDL= mixer sdl pango
USE_GMAKE= yes
USE_BZIP2= yes
MAKE_ENV= MKDIR="${MKDIR}" \
TAR="${TAR}"
USE_GETTEXT= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/c_stuff/
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/
USE_PERL5= yes
PERL_CONFIGURE= yes
CONFIGURE_WRKSRC= ${WRKSRC}/c_stuff
REINPLACE_ARGS= -i ""
MAN6= frozen-bubble-editor.6 frozen-bubble.6
LEXECDIR= ${PREFIX}/libexec/${PORTNAME}
# XXX: exists untill it will be committed to bsd.port.mk
COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
post-patch:
@${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' ${WRKSRC}/Makefile.PL
@${RM} ${WRKSRC}/lib/FBLE.pm.orig
@${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' \
${WRKSRC}/c_stuff/Makefile.PL
@${REINPLACE_CMD} -E -e \
"s,^(\\\$$FPATH[[:space:]]+=[[:space:]]+).*,\1'${DATADIR}';," \
-e \
"s,^(\\\$$FLPATH[[:space:]]+=[[:space:]]+).*,\1'${LEXECDIR}';,"\
${WRKSRC}/c_stuff/lib/fb_stuff.pm
do-install:
cd ${WRKSRC}; ${GMAKE} install
@${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/frozen-bubble.pl
cd ${WRKSRC}/c_stuff && ${GMAKE} install
cd ${WRKSRC}/po && ${GMAKE} install
@${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/pinguins
@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/shoot
@${MKDIR} ${PREFIX}/share/frozen-bubble/gfx/menu
${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/
${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble-editor ${PREFIX}/bin/
@${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/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_MAN} ${MAN6:S,^,${WRKSRC}/doc/,} ${PREFIX}/man/man6/
@printf '#!/bin/sh\nLD_PRELOAD=/usr/lib/libc_r.so perl ${PREFIX}/bin/frozen-bubble.pl $$\@\n' > ${WRKSRC}/frozen-bubble
@${INSTALL_SCRIPT} ${WRKSRC}/frozen-bubble ${PREFIX}/bin
${MKDIR} ${DATADIR}
@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "gfx snd data" ${DATADIR}/)
${MKDIR} ${LEXECDIR}
${INSTALL_PROGRAM} ${WRKSRC}/server/fb-server ${LEXECDIR}/
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
MD5 (frozen-bubble-1.0.0.tar.bz2) = 2be5ead2aee72adc3fb643630a774b59
SHA256 (frozen-bubble-1.0.0.tar.bz2) = fe7e46e529c7c3c969946c41efb519462f98dd5c280e247bd98ff629dcca1433
SIZE (frozen-bubble-1.0.0.tar.bz2) = 7321135
MD5 (frozen-bubble-2.0.0.tar.bz2) = 9fdd84f56e5221e6c58c12eab72459d9
SHA256 (frozen-bubble-2.0.0.tar.bz2) = 7c6f9406cec25ba9a2971ac406f62ff43ac702479817ab3020b64ab03e225235
SIZE (frozen-bubble-2.0.0.tar.bz2) = 19841986

View file

@ -1,18 +0,0 @@
--- ../Makefile.orig Mon Feb 3 15:36:55 2003
+++ ../Makefile Wed May 18 10:01:52 2005
@@ -10,12 +10,12 @@
dirs:
@if ! perl -e 'use SDL'; then echo -e "\n *** I need perl-SDL installed"; false; fi
@if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n *** I need perl-SDL version 1.19.0 or upper"; false; fi
- @for n in . $(DIRS); do \
- [ "$$n" = "." ] || $(MAKE) -C $$n ;\
- done
@if [ ! -d save_virgin ]; then mkdir save_virgin; cp c_stuff/lib/fb_stuff.pm save_virgin; fi
cp -f save_virgin/fb_stuff.pm c_stuff/lib/fb_stuff.pm
perl -pi -e 's|\@DATADIR\@|$(DATADIR)|' c_stuff/lib/fb_stuff.pm
+ @for n in . $(DIRS); do \
+ [ "$$n" = "." ] || $(MAKE) -C $$n ;\
+ done
install: $(ALL)

View file

@ -1,27 +0,0 @@
--- 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);
+ }
}

View file

@ -1,5 +1,5 @@
--- Makefile.orig Mon Jan 6 23:52:45 2003
+++ Makefile Tue May 17 21:51:48 2005
--- c_stuff/Makefile.orig Mon Jan 6 23:52:45 2003
+++ c_stuff/Makefile Tue May 17 21:51:48 2005
@@ -6,7 +6,7 @@
install:

View file

@ -1,40 +0,0 @@
--- ../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 = 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";
+ } else {
+ $img or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
+ }
add_default_rect($img);
return $img;
}
@@ -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);
+ if (UNIVERSAL::isa($app, "HASH")) {
+ 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_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);
@@ -1641,8 +1649,10 @@
if ($graphics_level == 1) {
$background->blit($apprects{main}, $app, $apprects{main});
$app->flip;
- } else {
+ } elsif (UNIVERSAL::isa($app, "HASH")) {
fb_c_stuff::effect($app->{-surface}, $background->display_format->{-surface});
+ } else {
+ fb_c_stuff::effect($$app, ${$background->display_format});
}
$display_on_app_disabled = 0;

View file

@ -0,0 +1,13 @@
--- server/Makefile.orig Fri Nov 3 01:26:53 2006
+++ server/Makefile Fri Nov 3 01:27:30 2006
@@ -1,8 +1,8 @@
PREFIX = /usr/local
LIBDIR = $(PREFIX)/lib
-CFLAGS ?= -g -Wall -Werror -pipe `pkg-config glib-2.0 --cflags`
-LIBS ?= `pkg-config glib-2.0 --libs`
+CFLAGS+= `pkg-config glib-2.0 --cflags`
+LIBS+= `pkg-config glib-2.0 --libs`
ALLSRC = fb-server.c log.c tools.c game.c net.c
ALLOBJ = $(subst .c,.o,$(ALLSRC))

File diff suppressed because it is too large Load diff