4 files changed, 29 insertions, 14 deletions

diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 5d1054f9b096..9647fa6f6495 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bubbros
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	1.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bub-n-bros
diff --git a/games/bubbros/distinfo b/games/bubbros/distinfo
index f556d485c9f2..5f4eb13bc0d8 100644
--- a/games/bubbros/distinfo
+++ b/games/bubbros/distinfo
@@ -1,3 +1,3 @@
-MD5 (bubbros-1.5.tar.bz2) = 431fd06ba7f838f61c9200e291060365
-SHA256 (bubbros-1.5.tar.bz2) = 91db9aa59f2adcd6f79cff475b457901aea82ffe0ebc557012eb3a0a36a3b05b
-SIZE (bubbros-1.5.tar.bz2) = 8856240
+MD5 (bubbros-1.6.tar.bz2) = 00aa5e26f5f0ed4c10765e4b33b28a09
+SHA256 (bubbros-1.6.tar.bz2) = dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255
+SIZE (bubbros-1.6.tar.bz2) = 9052959
diff --git a/games/bubbros/files/patch-bubbob-statesaver.c b/games/bubbros/files/patch-bubbob-statesaver.c
index 129aed58b730..f2521b063c03 100644
--- a/games/bubbros/files/patch-bubbob-statesaver.c
+++ b/games/bubbros/files/patch-bubbob-statesaver.c
@@ -1,26 +1,26 @@
---- bubbob/statesaver.c.orig	Sun Jul 15 08:59:52 2007
-+++ bubbob/statesaver.c	Sun Jul 15 09:01:41 2007
-@@ -44,10 +44,12 @@
+--- bubbob/statesaver.c.orig
++++ bubbob/statesaver.c
+@@ -75,10 +75,12 @@
      Py_INCREF(g);  /* exhausted -- can return 'g' itself */
      return g;
    }
 +#if PY_VERSION_HEX < 0x02050000
    if (f->f_nfreevars || f->f_ncells) {
      PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
-     return NULL;
+     goto error;
    }
 +#endif
  
-   dummy = (PyObject**) malloc(co->co_argcount * sizeof(PyObject*));
-   if (dummy == NULL)
-@@ -95,10 +97,12 @@
-         return -1;
+   if (co->co_argcount == 0)
+     dummy = NULL;
+@@ -143,10 +145,12 @@
        }
        f2 = (PyFrameObject*) x;
+ 
 +#if PY_VERSION_HEX < 0x02050000
        if (f2->f_stacksize != f->f_stacksize) {
          PyErr_SetString(PyExc_TypeError, "stack size mismatch");
-         return -1;
+         goto error;
        }
 +#endif
  
diff --git a/games/bubbros/pkg-plist b/games/bubbros/pkg-plist
index 37b362635691..021e411be8b7 100644
--- a/games/bubbros/pkg-plist
+++ b/games/bubbros/pkg-plist
@@ -177,6 +177,7 @@ bin/bubbros
 %%DATADIR%%/bubbob/images/bonus_9.ppm
 %%DATADIR%%/bubbob/images/bubble.ppm
 %%DATADIR%%/bubbob/images/buildcolors.py
+%%DATADIR%%/bubbob/images/butterfly.ppm
 %%DATADIR%%/bubbob/images/cream_pie_big.ppm
 %%DATADIR%%/bubbob/images/diamond_big_blue.ppm
 %%DATADIR%%/bubbob/images/diamond_big_purple.ppm
@@ -224,6 +225,16 @@ bin/bubbros
 %%DATADIR%%/bubbob/images/extra8.ppm
 %%DATADIR%%/bubbob/images/fire_drop.ppm
 %%DATADIR%%/bubbob/images/fire_surface.ppm
+%%DATADIR%%/bubbob/images/fish_0.ppm
+%%DATADIR%%/bubbob/images/fish_1.ppm
+%%DATADIR%%/bubbob/images/fish_2.ppm
+%%DATADIR%%/bubbob/images/fish_3.ppm
+%%DATADIR%%/bubbob/images/fish_4.ppm
+%%DATADIR%%/bubbob/images/fish_5.ppm
+%%DATADIR%%/bubbob/images/fish_6.ppm
+%%DATADIR%%/bubbob/images/fish_7.ppm
+%%DATADIR%%/bubbob/images/fish_8.ppm
+%%DATADIR%%/bubbob/images/fish_9.ppm
 %%DATADIR%%/bubbob/images/flappy.ppm
 %%DATADIR%%/bubbob/images/flapy_angry.ppm
 %%DATADIR%%/bubbob/images/game_over_0.ppm
@@ -257,6 +268,7 @@ bin/bubbros
 %%DATADIR%%/bubbob/images/nasty_angry.ppm
 %%DATADIR%%/bubbob/images/orcy.ppm
 %%DATADIR%%/bubbob/images/orcy_angry.ppm
+%%DATADIR%%/bubbob/images/palettes.dat
 %%DATADIR%%/bubbob/images/pastec_big.ppm
 %%DATADIR%%/bubbob/images/peach_big.ppm
 %%DATADIR%%/bubbob/images/point_0.ppm
@@ -270,6 +282,7 @@ bin/bubbros
 %%DATADIR%%/bubbob/images/point_8.ppm
 %%DATADIR%%/bubbob/images/point_9.ppm
 %%DATADIR%%/bubbob/images/red_Hurry_up.ppm
+%%DATADIR%%/bubbob/images/sheep.ppm
 %%DATADIR%%/bubbob/images/shot.ppm
 %%DATADIR%%/bubbob/images/spinning_drop.ppm
 %%DATADIR%%/bubbob/images/springy.ppm
@@ -318,6 +331,7 @@ bin/bubbros
 %%DATADIR%%/bubbob/statesaver.c
 %%DATADIR%%/bubbob/statesaver.so
 %%DATADIR%%/bubbob/test_rnglevel.py
+%%DATADIR%%/bubbob/save_rnglevel.py
 %%DATADIR%%/bubbob/tmp/pat00.ppm
 %%DATADIR%%/bubbob/tmp/pat01.ppm
 %%DATADIR%%/bubbob/tmp/pat02.ppm
@@ -428,6 +442,8 @@ bin/bubbros
 %%DATADIR%%/metaserver/metaclient.py
 %%DATADIR%%/metaserver/metaserver.py
 %%DATADIR%%/metaserver/metastruct.py
+%%DATADIR%%/metaserver/pipelayer.py
+%%DATADIR%%/metaserver/socketoverudp.py
 @dirrm %%DATADIR%%/bubbob/doc/images
 @dirrm %%DATADIR%%/bubbob/doc
 @dirrm %%DATADIR%%/bubbob/ext1