take maintainership and update to 2.2.0

4 files changed, 75 insertions, 58 deletions

diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 0cf8410cab6f..b8e188c4534d 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	frozenbubble
-PORTVERSION=	2.1.0
-PORTREVISION=	3
+PORTVERSION=	2.2.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.frozen-bubble.org/data/
 DISTNAME=	frozen-bubble-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	makc@FreeBSD.org
 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 \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
 
 USE_SDL=	mixer sdl pango
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 PERL_CONFIGURE=	yes
 
 CONFIGURE_WRKSRC=	${WRKSRC}/c_stuff
@@ -32,18 +29,34 @@ MAN6=		frozen-bubble-editor.6 frozen-bubble.6
 
 LEXECDIR=	${PREFIX}/libexec/${PORTNAME}
 
+.if !defined(WITHOUT_NLS)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
+		-e '/MANDIR/s|$$(DATADIR)|${PREFIX}|' \
+		 ${WRKSRC}/settings.mk
 	@${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' \
 		${WRKSRC}/c_stuff/Makefile.PL
-	@${REINPLACE_CMD} -E -e \
+
+pre-install:
+	${REINPLACE_CMD} -E -e \
 		"s,^(\\\$$FPATH[[:space:]]+=[[:space:]]+).*,\1'${DATADIR}';," \
 		-e \
 		"s,^(\\\$$FLPATH[[:space:]]+=[[:space:]]+).*,\1'${LEXECDIR}';,"\
-		${WRKSRC}/c_stuff/lib/fb_stuff.pm
+		${WRKSRC}/c_stuff/lib/fb_config.pm
+	${CP} ${WRKSRC}/c_stuff/lib/fb_config.pm ${WRKSRC}/c_stuff/blib/lib/
 
 do-install:
 	cd ${WRKSRC}/c_stuff && ${GMAKE} install
+
+.if !defined(WITHOUT_NLS)
 	cd ${WRKSRC}/po && ${GMAKE} install
+.endif
 
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble-editor ${PREFIX}/bin/
diff --git a/games/frozenbubble/distinfo b/games/frozenbubble/distinfo
index aa24066596a4..d5b6080d5945 100644
--- a/games/frozenbubble/distinfo
+++ b/games/frozenbubble/distinfo
@@ -1,3 +1,3 @@
-MD5 (frozen-bubble-2.1.0.tar.bz2) = f5eb984897e1ccd52a0d8820d8359861
-SHA256 (frozen-bubble-2.1.0.tar.bz2) = efb6b72e1d3caa414c3b6591be2208c8c39e25b296cd4af295e5ada063e3bbe3
-SIZE (frozen-bubble-2.1.0.tar.bz2) = 19886184
+MD5 (frozen-bubble-2.2.0.tar.bz2) = f7987201470d6755ed309762d348e0dd
+SHA256 (frozen-bubble-2.2.0.tar.bz2) = dada92322ef3adb75df7a4270b2e76c572c3f8e42006ed3a5aaeefa68fcaa5b7
+SIZE (frozen-bubble-2.2.0.tar.bz2) = 20585572
diff --git a/games/frozenbubble/files/patch-Makefile b/games/frozenbubble/files/patch-Makefile
index d93d40b772c8..4c5acbabb34b 100644
--- a/games/frozenbubble/files/patch-Makefile
+++ b/games/frozenbubble/files/patch-Makefile
@@ -1,9 +1,9 @@
---- 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 @@
+--- ./c_stuff/Makefile.orig	2008-11-15 17:23:58.000000000 +0300
++++ ./c_stuff/Makefile	2009-02-17 00:34:43.000000000 +0300
+@@ -57,7 +57,7 @@
+ 	$(MAKE) -f Makefile_c
  
  install:
- 	test -e Makefile_c || perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
 -	$(MAKE) -f Makefile_c install
 +	$(MAKE) -f Makefile_c pure_install
  
diff --git a/games/frozenbubble/pkg-plist b/games/frozenbubble/pkg-plist
index 8c37cb350c70..4b9b9f0546aa 100644
--- a/games/frozenbubble/pkg-plist
+++ b/games/frozenbubble/pkg-plist
@@ -5,7 +5,9 @@ lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto/fb_c_stuff/.packlist
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.bs
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.so
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fb_c_stuff.pm
+lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fb_config.pm
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fb_net.pm
+lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fb_net_discover.pm
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fb_stuff.pm
 lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/fbsyms.pm
 libexec/frozenbubble/fb-server
@@ -13,7 +15,6 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/data/demo2.bz2
 %%DATADIR%%/data/demo3.bz2
 %%DATADIR%%/data/demo4.bz2
-%%DATADIR%%/data/demo5.bz2
 %%DATADIR%%/data/levels
 %%DATADIR%%/data/plasma.raw
 %%DATADIR%%/gfx/attack_rp1.png
@@ -85,6 +86,8 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/gfx/banane.png
 %%DATADIR%%/gfx/compressor_ext.png
 %%DATADIR%%/gfx/compressor_main.png
+%%DATADIR%%/gfx/dot_green.png
+%%DATADIR%%/gfx/dot_red.png
 %%DATADIR%%/gfx/file_list_background.png
 %%DATADIR%%/gfx/flags/flag-af.png
 %%DATADIR%%/gfx/flags/flag-ar.png
@@ -166,6 +169,7 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/gfx/list_arrow_up_more.png
 %%DATADIR%%/gfx/loading.png
 %%DATADIR%%/gfx/loading_step.png
+%%DATADIR%%/gfx/loading_step_initial.png
 %%DATADIR%%/gfx/loadingpreviews.png
 %%DATADIR%%/gfx/lose_panel.png
 %%DATADIR%%/gfx/menu/1p_panel.png
@@ -729,31 +733,26 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/gfx/menu/txt_2pgame_over.png
 %%DATADIR%%/gfx/menu/txt_editor_off.png
 %%DATADIR%%/gfx/menu/txt_editor_over.png
-%%DATADIR%%/gfx/menu/txt_graphics_1.png
-%%DATADIR%%/gfx/menu/txt_graphics_1_off.png
-%%DATADIR%%/gfx/menu/txt_graphics_1_over.png
-%%DATADIR%%/gfx/menu/txt_graphics_2.png
-%%DATADIR%%/gfx/menu/txt_graphics_2_off.png
-%%DATADIR%%/gfx/menu/txt_graphics_2_over.png
-%%DATADIR%%/gfx/menu/txt_graphics_3.png
-%%DATADIR%%/gfx/menu/txt_graphics_3_off.png
-%%DATADIR%%/gfx/menu/txt_graphics_3_over.png
+%%DATADIR%%/gfx/menu/txt_graphics_off.png
+%%DATADIR%%/gfx/menu/txt_graphics_over.png
 %%DATADIR%%/gfx/menu/txt_highscores_off.png
 %%DATADIR%%/gfx/menu/txt_highscores_over.png
 %%DATADIR%%/gfx/menu/txt_keys_off.png
 %%DATADIR%%/gfx/menu/txt_keys_over.png
 %%DATADIR%%/gfx/menu/txt_langame_off.png
 %%DATADIR%%/gfx/menu/txt_langame_over.png
-%%DATADIR%%/gfx/menu/txt_multiplayer_training_off.png
-%%DATADIR%%/gfx/menu/txt_multiplayer_training_over.png
+%%DATADIR%%/gfx/menu/txt_menu_1p_off.png
+%%DATADIR%%/gfx/menu/txt_menu_1p_over.png
+%%DATADIR%%/gfx/menu/txt_multiplayer_training_outlined_text.png
+%%DATADIR%%/gfx/menu/txt_multiplayer_training_text.png
 %%DATADIR%%/gfx/menu/txt_netgame_off.png
 %%DATADIR%%/gfx/menu/txt_netgame_over.png
-%%DATADIR%%/gfx/menu/txt_pick_start_level_off.png
-%%DATADIR%%/gfx/menu/txt_pick_start_level_over.png
-%%DATADIR%%/gfx/menu/txt_play_all_levels_off.png
-%%DATADIR%%/gfx/menu/txt_play_all_levels_over.png
-%%DATADIR%%/gfx/menu/txt_play_random_levels_off.png
-%%DATADIR%%/gfx/menu/txt_play_random_levels_over.png
+%%DATADIR%%/gfx/menu/txt_pick_start_level_outlined_text.png
+%%DATADIR%%/gfx/menu/txt_pick_start_level_text.png
+%%DATADIR%%/gfx/menu/txt_play_all_levels_outlined_text.png
+%%DATADIR%%/gfx/menu/txt_play_all_levels_text.png
+%%DATADIR%%/gfx/menu/txt_play_random_levels_outlined_text.png
+%%DATADIR%%/gfx/menu/txt_play_random_levels_text.png
 %%DATADIR%%/gfx/menu/void_chat.png
 %%DATADIR%%/gfx/menu/void_chat_small.png
 %%DATADIR%%/gfx/menu/void_panel.png
@@ -762,6 +761,7 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/gfx/net_lose_rp2.png
 %%DATADIR%%/gfx/net_lose_rp3.png
 %%DATADIR%%/gfx/net_lose_rp4.png
+%%DATADIR%%/gfx/netspot-insamegame.png
 %%DATADIR%%/gfx/netspot-playing.png
 %%DATADIR%%/gfx/netspot-self-1.png
 %%DATADIR%%/gfx/netspot-self-2.png
@@ -3228,31 +3228,35 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/snd/snore.ogg
 %%DATADIR%%/snd/stick.ogg
 %%DATADIR%%/snd/typewriter.ogg
-share/locale/af/LC_MESSAGES/frozen-bubble.mo
-share/locale/ca/LC_MESSAGES/frozen-bubble.mo
-share/locale/cs/LC_MESSAGES/frozen-bubble.mo
-share/locale/da/LC_MESSAGES/frozen-bubble.mo
-share/locale/de/LC_MESSAGES/frozen-bubble.mo
-share/locale/eo/LC_MESSAGES/frozen-bubble.mo
-share/locale/es/LC_MESSAGES/frozen-bubble.mo
-share/locale/fa/LC_MESSAGES/frozen-bubble.mo
-share/locale/fi/LC_MESSAGES/frozen-bubble.mo
-share/locale/fr/LC_MESSAGES/frozen-bubble.mo
-share/locale/it/LC_MESSAGES/frozen-bubble.mo
-share/locale/ja/LC_MESSAGES/frozen-bubble.mo
-share/locale/lt/LC_MESSAGES/frozen-bubble.mo
-share/locale/nb/LC_MESSAGES/frozen-bubble.mo
-share/locale/ne/LC_MESSAGES/frozen-bubble.mo
-share/locale/nl/LC_MESSAGES/frozen-bubble.mo
-share/locale/nn/LC_MESSAGES/frozen-bubble.mo
-share/locale/pl/LC_MESSAGES/frozen-bubble.mo
-share/locale/pt/LC_MESSAGES/frozen-bubble.mo
-share/locale/pt_BR/LC_MESSAGES/frozen-bubble.mo
-share/locale/ro/LC_MESSAGES/frozen-bubble.mo
-share/locale/ru/LC_MESSAGES/frozen-bubble.mo
-share/locale/sk/LC_MESSAGES/frozen-bubble.mo
-share/locale/sl/LC_MESSAGES/frozen-bubble.mo
-share/locale/sv/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/af/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/br/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/da/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/de/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/el/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/es/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/it/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/frozen-bubble.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/frozen-bubble.mo
 @dirrm %%DATADIR%%/snd
 @dirrm %%DATADIR%%/gfx/pinguins
 @dirrm %%DATADIR%%/gfx/menu/anims