Date: Thu, 7 May 2009 00:07:22 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@bsd.hu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/134313: [MAINTAINER] games/bubbros: update to 1.6 Message-ID: <200905062207.n46M7MCK043215@skye.ki.iif.hu> Resent-Message-ID: <200905062210.n46MA10U048043@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134313
>Category: ports
>Synopsis: [MAINTAINER] games/bubbros: update to 1.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 06 22:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 7.2-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD skye.ki.iif.hu 7.2-STABLE FreeBSD 7.2-STABLE #1: Tue May 5 14:54:35 CEST
>Description:
- Update to 1.6
Added file(s):
- files/patch-bubbob_statesaver.c
Removed file(s):
- files/patch-bubbob-statesaver.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- bubbros-1.6.patch begins here ---
diff -ruN --exclude=CVS /home/ports/games/bubbros.orig/Makefile /home/ports/games/bubbros/Makefile
--- /home/ports/games/bubbros.orig/Makefile 2008-06-24 11:56:26.000000000 +0200
+++ /home/ports/games/bubbros/Makefile 2009-05-06 23:13:52.000000000 +0200
@@ -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 -ruN --exclude=CVS /home/ports/games/bubbros.orig/distinfo /home/ports/games/bubbros/distinfo
--- /home/ports/games/bubbros.orig/distinfo 2006-11-08 17:13:41.000000000 +0100
+++ /home/ports/games/bubbros/distinfo 2009-05-06 23:14:10.000000000 +0200
@@ -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 -ruN --exclude=CVS /home/ports/games/bubbros.orig/files/patch-bubbob-statesaver.c /home/ports/games/bubbros/files/patch-bubbob-statesaver.c
--- /home/ports/games/bubbros.orig/files/patch-bubbob-statesaver.c 2007-07-30 11:41:29.000000000 +0200
+++ /home/ports/games/bubbros/files/patch-bubbob-statesaver.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
---- 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 @@
- 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;
- }
-+#endif
-
- dummy = (PyObject**) malloc(co->co_argcount * sizeof(PyObject*));
- if (dummy == NULL)
-@@ -95,10 +97,12 @@
- return -1;
- }
- f2 = (PyFrameObject*) x;
-+#if PY_VERSION_HEX < 0x02050000
- if (f2->f_stacksize != f->f_stacksize) {
- PyErr_SetString(PyExc_TypeError, "stack size mismatch");
- return -1;
- }
-+#endif
-
- if (f2->f_stacktop != NULL)
- while (f2->f_stacktop != f2->f_localsplus)
diff -ruN --exclude=CVS /home/ports/games/bubbros.orig/files/patch-bubbob_statesaver.c /home/ports/games/bubbros/files/patch-bubbob_statesaver.c
--- /home/ports/games/bubbros.orig/files/patch-bubbob_statesaver.c 1970-01-01 01:00:00.000000000 +0100
+++ /home/ports/games/bubbros/files/patch-bubbob_statesaver.c 2009-05-06 23:40:12.000000000 +0200
@@ -0,0 +1,31 @@
+
+$FreeBSD$
+
+--- 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");
+ goto error;
+ }
++#endif
+
+ 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");
+ goto error;
+ }
++#endif
+
+ if (f2->f_stacktop != NULL)
+ while (f2->f_stacktop != f2->f_localsplus)
diff -ruN --exclude=CVS /home/ports/games/bubbros.orig/pkg-plist /home/ports/games/bubbros/pkg-plist
--- /home/ports/games/bubbros.orig/pkg-plist 2006-11-08 17:13:41.000000000 +0100
+++ /home/ports/games/bubbros/pkg-plist 2009-05-07 00:02:23.000000000 +0200
@@ -177,6 +177,7 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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
--- bubbros-1.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905062207.n46M7MCK043215>