frozen-bubble: 2.1.0 -> 2.2.0

3 files changed, 36 insertions, 37 deletions

diff --git a/frozen-bubble/.footprint b/frozen-bubble/.footprint
index 5211ff158..9532e5a94 100644
--- a/frozen-bubble/.footprint
+++ b/frozen-bubble/.footprint
@@ -14,7 +14,9 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/fb_c_stuff/
 -r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/linux/auto/fb_c_stuff/fb_c_stuff.so
 -r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fb_c_stuff.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fb_config.pm
 -r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fb_net.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fb_net_discover.pm
 -r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fb_stuff.pm
 -r--r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/linux/fbsyms.pm
 drwxr-xr-x	root/root	usr/man/
@@ -30,7 +32,6 @@ drwxr-xr-x	root/root	usr/share/frozen-bubble/data/
 -rw-r--r--	root/root	usr/share/frozen-bubble/data/demo2.bz2
 -rw-r--r--	root/root	usr/share/frozen-bubble/data/demo3.bz2
 -rw-r--r--	root/root	usr/share/frozen-bubble/data/demo4.bz2
--rw-r--r--	root/root	usr/share/frozen-bubble/data/demo5.bz2
 -rw-r--r--	root/root	usr/share/frozen-bubble/data/levels
 -rw-r--r--	root/root	usr/share/frozen-bubble/data/plasma.raw
 drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/
@@ -104,6 +105,8 @@ drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/balls/
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/banane.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/compressor_ext.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/compressor_main.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/dot_green.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/dot_red.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/file_list_background.png
 drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/flags/
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/flags/flag-af.png
@@ -187,6 +190,7 @@ drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/intro/
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/list_arrow_up_more.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/loading.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/loading_step.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/loading_step_initial.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/loadingpreviews.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/lose_panel.png
 drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/menu/
@@ -752,31 +756,26 @@ drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/menu/anims/
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_2pgame_over.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_editor_off.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_editor_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_1.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_1_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_1_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_2.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_2_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_2_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_3.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_3_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_3_over.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_off.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_graphics_over.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_highscores_off.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_highscores_over.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_keys_off.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_keys_over.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_langame_off.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_langame_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_multiplayer_training_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_multiplayer_training_over.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_menu_1p_off.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_menu_1p_over.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_multiplayer_training_outlined_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_multiplayer_training_text.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_netgame_off.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_netgame_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_pick_start_level_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_pick_start_level_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_all_levels_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_all_levels_over.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_random_levels_off.png
--rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_random_levels_over.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_pick_start_level_outlined_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_pick_start_level_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_all_levels_outlined_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_all_levels_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_random_levels_outlined_text.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/txt_play_random_levels_text.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/void_chat.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/void_chat_small.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/menu/void_panel.png
@@ -785,6 +784,7 @@ drwxr-xr-x	root/root	usr/share/frozen-bubble/gfx/menu/anims/
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/net_lose_rp2.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/net_lose_rp3.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/net_lose_rp4.png
+-rw-r--r--	root/root	usr/share/frozen-bubble/gfx/netspot-insamegame.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/netspot-playing.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/netspot-self-1.png
 -rw-r--r--	root/root	usr/share/frozen-bubble/gfx/netspot-self-2.png
diff --git a/frozen-bubble/.md5sum b/frozen-bubble/.md5sum
index fecdd060e..0d73bce3e 100644
--- a/frozen-bubble/.md5sum
+++ b/frozen-bubble/.md5sum
@@ -1,2 +1,2 @@
-f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2
+f7987201470d6755ed309762d348e0dd  frozen-bubble-2.2.0.tar.bz2
 c96a0f1ae46fccc01d0d6ead59951c80  frozen-bubble.desktop
diff --git a/frozen-bubble/Pkgfile b/frozen-bubble/Pkgfile
index d9f20ed0f..7ac27c326 100644
--- a/frozen-bubble/Pkgfile
+++ b/frozen-bubble/Pkgfile
@@ -5,39 +5,38 @@
 # Depends on: p5-sdl1-perl sdl_pango p5-locale-gettext
 
 name=frozen-bubble
-version=2.1.0
-release=4
-source=(http://www.frozen-bubble.org/data/frozen-bubble-$version.tar.bz2 \
-	frozen-bubble.desktop)
+version=2.2.0
+release=1
+source=(http://www.frozen-bubble.org/data/$name-$version.tar.bz2
+	$name.desktop)
 
 build() {
-	cd frozen-bubble-$version
+	cd $name-$version
 	
-	sed -i \
+	sed -i settings.mk \
 		-e "s|PREFIX = .*|PREFIX = /usr|" \
-		-e 's|MANDIR = .*|MANDIR = $(PREFIX)/man|' settings.mk
+		-e 's|MANDIR = .*|MANDIR = $(PREFIX)/man|'
 
 	make
 	make DESTDIR=$PKG install
 	rm -r $PKG/usr/share/locale
 
 	# install icons
-	install -D -m644 icons/frozen-bubble-icon-16x16.png $PKG/usr/share/icons/hicolor/16x16/apps/frozen-bubble.png
-	install -D -m644 icons/frozen-bubble-icon-32x32.png $PKG/usr/share/icons/hicolor/32x32/apps/frozen-bubble.png
-	install -D -m644 icons/frozen-bubble-icon-48x48.png $PKG/usr/share/icons/hicolor/48x48/apps/frozen-bubble.png
-	install -D -m644 icons/frozen-bubble-icon-64x64.png $PKG/usr/share/icons/hicolor/64x64/apps/frozen-bubble.png
+	install -D -m 0644 icons/frozen-bubble-icon-16x16.png $PKG/usr/share/icons/hicolor/16x16/apps/frozen-bubble.png
+	install -D -m 0644 icons/frozen-bubble-icon-32x32.png $PKG/usr/share/icons/hicolor/32x32/apps/frozen-bubble.png
+	install -D -m 0644 icons/frozen-bubble-icon-48x48.png $PKG/usr/share/icons/hicolor/48x48/apps/frozen-bubble.png
+	install -D -m 0644 icons/frozen-bubble-icon-64x64.png $PKG/usr/share/icons/hicolor/64x64/apps/frozen-bubble.png
 
 	# install menu entry
-	install -D -m644 $SRC/frozen-bubble.desktop $PKG/usr/share/applications/frozen-bubble.desktop
+	install -D -m 0644 $SRC/frozen-bubble.desktop $PKG/usr/share/applications/frozen-bubble.desktop
 
 	# Remove perlcrap
-	find $PKG \
-		-name '.packlist' -delete -or \
-		-name '*.bs' -delete -or \
-		-name 'autosplit.ix' -delete -or \
-		-name 'perllocal.pod' -delete
+	find $PKG \( \
+		-name '.packlist' -o \
+		-name '*.bs' -o \
+		-name 'autosplit.ix' -o \
+		-name 'perllocal.pod' \) -delete
 
 	# Remove empty directories
 	find $PKG -depth -empty -delete
 }
-