5 files changed, 39 insertions, 47 deletions

diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 4d5ba9165333..a513d75b5922 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	frozenbubble
-PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTVERSION=	2.1.0
+PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	http://www.frozen-bubble.org/data/
 DISTNAME=	frozen-bubble-${PORTVERSION}
diff --git a/games/frozenbubble/distinfo b/games/frozenbubble/distinfo
index dfa640d16105..aa24066596a4 100644
--- a/games/frozenbubble/distinfo
+++ b/games/frozenbubble/distinfo
@@ -1,3 +1,3 @@
-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
+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
diff --git a/games/frozenbubble/files/patch-server_Makefile b/games/frozenbubble/files/patch-server_Makefile
index fe1720cc207d..d6a37f5694fe 100644
--- a/games/frozenbubble/files/patch-server_Makefile
+++ b/games/frozenbubble/files/patch-server_Makefile
@@ -1,13 +1,13 @@
---- server/Makefile.orig	Fri Nov  3 01:26:53 2006
-+++ server/Makefile	Fri Nov  3 01:27:30 2006
+--- server/Makefile.orig	Sun Nov 12 22:56:02 2006
++++ server/Makefile	Tue Nov 28 01:33:33 2006
 @@ -1,8 +1,8 @@
- PREFIX = /usr/local
- LIBDIR = $(PREFIX)/lib
+ include ../settings.mk
  
--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`
+-CFLAGS ?= -g -Wall -Werror -pipe
++CFLAGS += -Wall -Werror
+ CPPFLAGS += -I. `pkg-config glib-2.0 --cflags` -DVERSION=\"$(shell cat ../VERSION)\"
+-LDLIBS = `pkg-config glib-2.0 --libs`
++LDLIBS += `pkg-config glib-2.0 --libs`
  
  ALLSRC = fb-server.c log.c tools.c game.c net.c
  ALLOBJ = $(subst .c,.o,$(ALLSRC))
diff --git a/games/frozenbubble/files/patch-server_net.h b/games/frozenbubble/files/patch-server_net.h
deleted file mode 100644
index 023884e71daa..000000000000
--- a/games/frozenbubble/files/patch-server_net.h
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: server/net.h
-===================================================================
---- server/net.h	(revision 741)
-+++ server/net.h	(revision 742)
-@@ -17,11 +17,18 @@
-  *
-  ******************************************************************************/
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
- #include <stdlib.h>
- #include <unistd.h>
- 
- #include <glib.h>
- 
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL	0
-+#endif
-+
- extern const int proto_major;
- extern const int proto_minor;
- 
diff --git a/games/frozenbubble/pkg-plist b/games/frozenbubble/pkg-plist
index d62b1820b814..9526b93e25f4 100644
--- a/games/frozenbubble/pkg-plist
+++ b/games/frozenbubble/pkg-plist
@@ -1,23 +1,29 @@
 bin/frozen-bubble
 bin/frozen-bubble-editor
-%%SITE_PERL%%/%%PERL_ARCH%%/FBLE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/fb_c_stuff/fb_c_stuff.so
-%%SITE_PERL%%/%%PERL_ARCH%%/fb_c_stuff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/fb_net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/fb_stuff.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/fbsyms.pm
+lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/FBLE.pm
+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_net.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
 %%DATADIR%%/data/demo1.bz2
 %%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
 %%DATADIR%%/gfx/attack_rp2.png
 %%DATADIR%%/gfx/attack_rp3.png
 %%DATADIR%%/gfx/attack_rp4.png
+%%DATADIR%%/gfx/attackme_rp1.png
+%%DATADIR%%/gfx/attackme_rp2.png
+%%DATADIR%%/gfx/attackme_rp3.png
+%%DATADIR%%/gfx/attackme_rp4.png
 %%DATADIR%%/gfx/back_hiscores.png
 %%DATADIR%%/gfx/back_multiplayer.png
 %%DATADIR%%/gfx/back_netgame.png
@@ -40,13 +46,21 @@ libexec/frozenbubble/fb-server
 %%DATADIR%%/gfx/balls/bubble-7.gif
 %%DATADIR%%/gfx/balls/bubble-8-mini.png
 %%DATADIR%%/gfx/balls/bubble-8.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-1-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-1.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-2-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-2.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-3-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-3.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-4-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-4.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-5-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-5.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-6-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-6.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-7-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-7.gif
+%%DATADIR%%/gfx/balls/bubble-colourblind-8-mini.png
 %%DATADIR%%/gfx/balls/bubble-colourblind-8.gif
 %%DATADIR%%/gfx/balls/bubble_lose-mini.png
 %%DATADIR%%/gfx/balls/bubble_lose.png
@@ -748,6 +762,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-playing.png
 %%DATADIR%%/gfx/netspot-s%%PORTOBJFORMAT%%-1.png
 %%DATADIR%%/gfx/netspot-s%%PORTOBJFORMAT%%-2.png
 %%DATADIR%%/gfx/netspot-s%%PORTOBJFORMAT%%-3.png
@@ -3270,8 +3285,8 @@ share/locale/sv/LC_MESSAGES/frozen-bubble.mo
 @dirrm %%DATADIR%%
 @dirrm libexec/frozenbubble
 @dirrm lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto/fb_c_stuff
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/site_perl/%%PERL_VERSION%%
 @dirrmtry lib/perl5/site_perl
 @dirrmtry lib/perl5