frozen-bubble: update to 2.2.1beta1.

 [2010-08-07]

    use new SDL Perl API
    ported to CPAN; should now work "natively" on Windows and Mac OSX

6 files changed, 15 insertions, 198 deletions

diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 23bde75b25d..e92467f6c54 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2017/02/12 06:25:20 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.55 2017/09/26 11:17:37 wiz Exp $
 
-DISTNAME=	frozen-bubble-2.2.0
-PKGREVISION=	20
+DISTNAME=	frozen-bubble-2.2.1-beta1
+PKGNAME=	${DISTNAME:S/-beta/beta/}
 CATEGORIES=	games
 MASTER_SITES=	http://www.frozen-bubble.org/data/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,12 +12,14 @@ COMMENT=	Pop the frozen bubbles
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	p5-SDL>=2.1.2:../../devel/p5-SDL
-DEPENDS+=	p5-gettext>=0:../../devel/p5-gettext
+DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
+DEPENDS+=	p5-Compress-Bzip2-[0-9]*:../../archivers/p5-Compress-Bzip2
+DEPENDS+=	p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp
+DEPENDS+=	p5-IPC-System-Simple-[0-9]*:../../devel/p5-IPC-System-Simple
+DEPENDS+=	p5-Locale-Maketext-Lexicon-[0-9]*:../../misc/p5-Locale-Maketext-Lexicon
 
 USE_TOOLS+=	gmake perl pkg-config
 
-REPLACE_PERL+=	frozen-bubble frozen-bubble-editor
-
 MAKE_ENV+=	CP=${CP:Q} GMAKE=${GMAKE:Q} PERL5=${PERL5:Q} INSTALLDIRS="vendor"
 INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR} \
     INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q} \
@@ -28,7 +29,8 @@ INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR} \
     INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
-PERL5_PACKLIST=	auto/fb_c_stuff/.packlist
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=	auto/Games/FrozenBubble/.packlist
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 BUILDLINK_API_DEPENDS.SDL_Pango=	SDL_Pango>=0.1.2nb8
diff --git a/games/frozen-bubble/distinfo b/games/frozen-bubble/distinfo
index 7276d53c98a..e8602bbd2e5 100644
--- a/games/frozen-bubble/distinfo
+++ b/games/frozen-bubble/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 20:56:50 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/09/26 11:17:37 wiz Exp $
 
-SHA1 (frozen-bubble-2.2.0.tar.bz2) = df5a8c839a76fd662777925b2eb80fcb8adf3fa6
-RMD160 (frozen-bubble-2.2.0.tar.bz2) = 1bbe0163c28421c497979c85a98f64a98174c780
-SHA512 (frozen-bubble-2.2.0.tar.bz2) = f8cf15b94719387c8f4f0398880f70c228fd72de8a52f0724814e2d0d81762364dc763e65339a86728d9501edc2e2f7d28aa80346277563a987f714a5c188476
-Size (frozen-bubble-2.2.0.tar.bz2) = 20585572 bytes
-SHA1 (patch-aa) = ba588d24ab8cac1a96cc17ca04bbc259e6dc369b
-SHA1 (patch-ab) = c39aa9be7566305116f4f5209409daee69e828a8
-SHA1 (patch-ac) = 111db5d2a5e8f7463bc7b4457d0a76303afbda54
-SHA1 (patch-c__stuff_fb__c__stuff.xs) = 96f5bbf4790ad9663b84dc6165f88323bf3b5cfd
+SHA1 (frozen-bubble-2.2.1-beta1.tar.bz2) = f3d320e701afbab36c48524fe00d331aaab0257f
+RMD160 (frozen-bubble-2.2.1-beta1.tar.bz2) = 1b7f6204c302a1f1b98ce19bb1ffaf309d8e0837
+SHA512 (frozen-bubble-2.2.1-beta1.tar.bz2) = a5d1432195bc41b2823678986fe71223acf5c740636a871758e6337072c74a84bca7aa7088af7b299586e4e261521ae0b3341805692ab684d93e85f52174b1ac
+Size (frozen-bubble-2.2.1-beta1.tar.bz2) = 22424798 bytes
diff --git a/games/frozen-bubble/patches/patch-aa b/games/frozen-bubble/patches/patch-aa
deleted file mode 100644
index 4383cd18e53..00000000000
--- a/games/frozen-bubble/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2012/03/04 22:27:08 wiz Exp $
-
-Does not ignore CFLAGS.
-
---- c_stuff/Makefile.PL.orig	2008-07-02 23:07:14.000000000 +0200
-+++ c_stuff/Makefile.PL
-@@ -34,7 +34,7 @@ system("sdl-config --cflags 2>/dev/null 
- ccompile('#include <SDL.h>
-           #include <SDL_mixer.h>',
- 	 '',
--	 chomp_(`sdl-config --cflags`),
-+	 chomp_($ENV{CFLAGS} . ' ' . `sdl-config --cflags`),
- 	 chomp_(`sdl-config --libs`) . ' -lSDL_mixer')
-   or
-   die_ 'SDL_mixer development environment seems to be missing (failed to compile and link a simple program against libSDL_mixer)';
-@@ -43,7 +43,7 @@ ccompile('#include <SDL.h>
- ccompile('#include <SDL.h>
-           #include <SDL_mixer.h>',
- 	 'Mix_FadeInMusicPos(NULL, 0, 0, 0);',
--	 chomp_(`sdl-config --cflags`),
-+	 chomp_($ENV{CFLAGS} . ' ' . `sdl-config --cflags`),
- 	 chomp_(`sdl-config --libs`) . ' -lSDL_mixer')
-   or
-   die_ 'SDL_mixer >= 1.2.2 is needed (impossible to create an executable with function Mix_FadeInMusicPos)';
-@@ -77,6 +77,6 @@ WriteMakefile(
-     'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION
-     'OBJECT'       => 'fb_c_stuff.o',
-     'INC'          => chomp_(`sdl-config --cflags`) . ' ' . chomp_(`pkg-config SDL_Pango --cflags`) . ' -I.',
--    'OPTIMIZE'     => '-O2 -Wall',
-+    'OPTIMIZE'     => chomp_($ENV{CFLAGS} . ' -O2 -Wall'),
-     'MAKEFILE'     => 'Makefile_c',
- );
diff --git a/games/frozen-bubble/patches/patch-ab b/games/frozen-bubble/patches/patch-ab
deleted file mode 100644
index ea78afce482..00000000000
--- a/games/frozen-bubble/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2012/03/04 22:27:08 wiz Exp $
-
-Do not hard-code pkgsrc tools.
-
---- Makefile.orig	2008-11-08 15:47:24.000000000 +0100
-+++ Makefile
-@@ -11,30 +11,28 @@ prepare:
- 	echo '@EXPORT = qw($$FPATH $$FLPATH);' >> c_stuff/lib/fb_config.pm
- 	echo '$$FPATH = "$(DATADIR)/frozen-bubble";' >> c_stuff/lib/fb_config.pm
- 	echo '$$FLPATH = "$(LIBDIR)/frozen-bubble";' >> c_stuff/lib/fb_config.pm
--	perl -ne "print \$$1 if m|\\\$$version = '(.*)';|" c_stuff/lib/fb_stuff.pm > VERSION
-+	${PERL5} -ne "print \$$1 if m|\\\$$version = '(.*)';|" c_stuff/lib/fb_stuff.pm > VERSION
- 
- 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 0 if $$mj > 1 || $$mn >= 19; exit 1'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
-+	@if ! ${PERL5} -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
-+	@if ! ${PERL5} -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 0 if $$mj > 1 || $$mn >= 19; exit 1'; 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 || exit $$? ;\
-+		[ "$$n" = "." ] || $(GMAKE) -C $$n || exit $$? ;\
- 	done
- 
- 
- install: $(ALL)
- 	@for n in $(DIRS); do \
--		(cd $$n; $(MAKE) install) \
-+		(cd $$n; $(GMAKE) install) \
- 	done
--	install -d $(DESTDIR)$(BINDIR)
--	install frozen-bubble frozen-bubble-editor $(DESTDIR)$(BINDIR)
--	install -d $(DESTDIR)$(DATADIR)/frozen-bubble
--	cp -a gfx snd data $(DESTDIR)$(DATADIR)/frozen-bubble
--	install -d $(DESTDIR)$(MANDIR)/man6
--	install doc/*.6 $(DESTDIR)$(MANDIR)/man6
-+	${INSTALL_SCRIPT} frozen-bubble frozen-bubble-editor $(DESTDIR)$(BINDIR)
-+	${INSTALL_DATA_DIR} $(DESTDIR)$(DATADIR)/frozen-bubble
-+	${CP} -R gfx snd data $(DESTDIR)$(DATADIR)/frozen-bubble
-+	${INSTALL_MAN} doc/*.6 $(DESTDIR)$(MANDIR)/man6
- 
- clean: 
- 	@for n in $(DIRS); do \
--		(cd $$n; $(MAKE) clean) \
-+		(cd $$n; $(GMAKE) clean) \
- 	done
- 	@rm -f c_stuff/lib/fb_config.pm
- 
diff --git a/games/frozen-bubble/patches/patch-ac b/games/frozen-bubble/patches/patch-ac
deleted file mode 100644
index 874d7bd0e88..00000000000
--- a/games/frozen-bubble/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2012/03/04 22:27:08 wiz Exp $
-
-Do not hard-code install.
-
---- server/Makefile.orig	2008-07-02 23:07:28.000000000 +0200
-+++ server/Makefile
-@@ -21,11 +21,11 @@ clean: 
- 	rm -f fb-server *.o .depend
- 
- install: fb-server
--	install -d $(DESTDIR)$(LIBDIR)/frozen-bubble
--	install fb-server $(DESTDIR)$(LIBDIR)/frozen-bubble
-+	${INSTALL_LIB_DIR} $(DESTDIR)$(LIBDIR)/frozen-bubble
-+	${INSTALL_LIB} fb-server $(DESTDIR)$(LIBDIR)/frozen-bubble
- 
- .depend:
--	$(CPP) $(CFLAGS) $(CPPFLAGS) -M $(ALLSRC) > .depend
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -M $(ALLSRC) > .depend
- 
- ifeq (.depend,$(wildcard .depend))
- include .depend
diff --git a/games/frozen-bubble/patches/patch-c__stuff_fb__c__stuff.xs b/games/frozen-bubble/patches/patch-c__stuff_fb__c__stuff.xs
deleted file mode 100644
index db6e2f0a284..00000000000
--- a/games/frozen-bubble/patches/patch-c__stuff_fb__c__stuff.xs
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-c__stuff_fb__c__stuff.xs,v 1.1 2012/07/03 18:43:37 joerg Exp $
-
---- c_stuff/fb_c_stuff.xs.orig	2012-07-03 14:35:36.000000000 +0000
-+++ c_stuff/fb_c_stuff.xs
-@@ -96,14 +96,12 @@ int rand_(double val) { return 1+(int) (
- 
- void store_effect(SDL_Surface * s, SDL_Surface * img)
- {
--	void copy_line(int l) {
--		memcpy(s->pixels + l*img->pitch, img->pixels + l*img->pitch, img->pitch);
--	}
--	void copy_column(int c) {
--		int bpp = img->format->BytesPerPixel;
--		for (y=0; y<YRES; y++)
--			memcpy(s->pixels + y*img->pitch + c*bpp, img->pixels + y*img->pitch + c*bpp, bpp);
--	}
-+#define copy_line(l) memcpy(s->pixels + l*img->pitch, img->pixels + l*img->pitch, img->pitch)
-+#define copy_column(c) do { \
-+		int bpp = img->format->BytesPerPixel; \
-+		for (y=0; y<YRES; y++) \
-+			memcpy(s->pixels + y*img->pitch + c*bpp, img->pixels + y*img->pitch + c*bpp, bpp); \
-+	} while (0)
- 
- 	int step = 0;
- 	int store_thickness = 15;
-@@ -181,15 +179,8 @@ void squares_effect(SDL_Surface * s, SDL
- 	int bpp = img->format->BytesPerPixel;
- 	const int squares_size = 32;
- 
--	int fillrect(int i, int j) {
--		int c, v;
--		if (i >= XRES/squares_size || j >= YRES/squares_size)
--			return 0;
--		v = i*squares_size*bpp + j*squares_size*img->pitch;
--		for (c=0; c<squares_size; c++)
--			memcpy(s->pixels + v + c*img->pitch, img->pixels + v + c*img->pitch, squares_size*bpp);
--		return 1;
--	}
-+#define fillrect(i, j) \
-+	} while (0)
- 
- 	int still_moving = 1;
- 
-@@ -200,8 +191,13 @@ void squares_effect(SDL_Surface * s, SDL
- 
- 		still_moving = 0;
- 		for (j=i; j>=0; j--) {
--			if (fillrect(j, k))
--				still_moving = 1;
-+			if (i >= XRES/squares_size || j >= YRES/squares_size)
-+				continue;
-+			int c, v;
-+			v = i*squares_size*bpp + j*squares_size*img->pitch;
-+			for (c=0; c<squares_size; c++)
-+				memcpy(s->pixels + v + c*img->pitch, img->pixels + v + c*img->pitch, squares_size*bpp);
-+			still_moving = 1;
- 			k++;
- 		}
- 
-@@ -211,12 +207,12 @@ void squares_effect(SDL_Surface * s, SDL
- 
- 
- /* -------------- Circle ------------------ */
-+#define sqr(v) ((v) * (v))
- 
- int * circle_steps;
- const int circle_max_steps = 40;
- void circle_init(void)
- {
--	int sqr(int v) { return v*v; }
- 
- 	circle_steps = malloc(XRES * YRES * sizeof(int));
- 	if (!circle_steps)
-@@ -229,6 +225,7 @@ void circle_init(void)
- 			circle_steps[x+y*XRES] = (max-value)*circle_max_steps/max;
- 		}
- }
-+#undef sqr
- 
- void circle_effect(SDL_Surface * s, SDL_Surface * img)
- {