diff options
author | shattered <shattered> | 2011-09-12 21:19:26 +0000 |
---|---|---|
committer | shattered <shattered> | 2011-09-12 21:19:26 +0000 |
commit | 0229aa1540597d92a1809b14a843111c88dde276 (patch) | |
tree | 6804a94bd7b91643c83a3a1edcc15b20b5724fbb | |
parent | 7717e2a0fad254f2fe58e890d328fe5a032abd42 (diff) | |
download | pkgsrc-0229aa1540597d92a1809b14a843111c88dde276.tar.gz |
Unbreak build on -current (pipe2 variable conflicts with syscall of same
name).
-rw-r--r-- | games/xkobo/distinfo | 4 | ||||
-rw-r--r-- | games/xkobo/patches/patch-ae | 37 | ||||
-rw-r--r-- | games/xkobo/patches/patch-af | 27 |
3 files changed, 67 insertions, 1 deletions
diff --git a/games/xkobo/distinfo b/games/xkobo/distinfo index 52ec5d18c1a..9d2712cd7b5 100644 --- a/games/xkobo/distinfo +++ b/games/xkobo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2010/02/14 22:12:59 joerg Exp $ +$NetBSD: distinfo,v 1.9 2011/09/12 21:19:26 shattered Exp $ SHA1 (xkobo-1.11.tar.gz) = 6ac1c0fe86b7fa524eb86f40b89e86ee6cbe3c5d RMD160 (xkobo-1.11.tar.gz) = 874ed89a6ed7da56f41b3867cf2cc45f0bcf9683 @@ -7,3 +7,5 @@ SHA1 (patch-aa) = 33d9c2777613d97246879284c9308aca1fd71423 SHA1 (patch-ab) = 917df924b7bba819ff90859b3cac302aec055289 SHA1 (patch-ac) = 59794fcdf0b6af8076e0309fdfb0449b35441ea6 SHA1 (patch-ad) = 64f7bf27f5005fca02c0e0c5fc1c30210829750c +SHA1 (patch-ae) = 48fb06d8089250a697d28df73638d364e98ab269 +SHA1 (patch-af) = 6557a35bc96e3967fd4c05d39f8054288dca76eb diff --git a/games/xkobo/patches/patch-ae b/games/xkobo/patches/patch-ae new file mode 100644 index 00000000000..19f0f525031 --- /dev/null +++ b/games/xkobo/patches/patch-ae @@ -0,0 +1,37 @@ +$NetBSD: patch-ae,v 1.1 2011/09/12 21:19:26 shattered Exp $ + +--- enemies.h.orig 1996-04-03 21:58:50.000000000 +0000 ++++ enemies.h +@@ -62,7 +62,7 @@ extern const enemy_kind bomb2; + extern const enemy_kind cannon; + extern const enemy_kind pipe1; + extern const enemy_kind core; +-extern const enemy_kind pipe2; ++extern const enemy_kind pipe_2; + extern const enemy_kind rock; + extern const enemy_kind ring; + extern const enemy_kind enemy_m1; +@@ -209,10 +209,10 @@ inline void _enemy::hit_by_beam() + state = notuse; + } + else if (ek == &core){ +- enemies.make(&pipe2, x>>SHIFT, y>>SHIFT, 0, 0, 3); +- enemies.make(&pipe2, x>>SHIFT, y>>SHIFT, 0, 0, 7); +- enemies.make(&pipe2, x>>SHIFT, y>>SHIFT, 0, 0, 1); +- enemies.make(&pipe2, x>>SHIFT, y>>SHIFT, 0, 0, 5); ++ enemies.make(&pipe_2, x>>SHIFT, y>>SHIFT, 0, 0, 3); ++ enemies.make(&pipe_2, x>>SHIFT, y>>SHIFT, 0, 0, 7); ++ enemies.make(&pipe_2, x>>SHIFT, y>>SHIFT, 0, 0, 1); ++ enemies.make(&pipe_2, x>>SHIFT, y>>SHIFT, 0, 0, 5); + enemies.make(&explosion, x>>SHIFT, y>>SHIFT); + state = notuse; + manage.destroyed_a_core(); +@@ -304,7 +304,7 @@ inline int _enemy::realize() + + inline int _enemy::is_pipe() + { +- return ((state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); ++ return ((state != notuse) && ((ek == &pipe1) || (ek == &pipe_2))); + } + + diff --git a/games/xkobo/patches/patch-af b/games/xkobo/patches/patch-af new file mode 100644 index 00000000000..2aa6b316c8d --- /dev/null +++ b/games/xkobo/patches/patch-af @@ -0,0 +1,27 @@ +$NetBSD: patch-af,v 1.1 2011/09/12 21:19:26 shattered Exp $ + +--- enemy.C.orig 1996-03-13 16:34:27.000000000 +0000 ++++ enemy.C +@@ -612,17 +612,17 @@ void _enemy::move_pipe2() + p ^= a; + int a=0, b=0, c=0, d=0; + if (p & U_MASK) +- a=enemies.make(&pipe2, (x>>SHIFT), (y>>SHIFT), 0, 0, 1); ++ a=enemies.make(&pipe_2, (x>>SHIFT), (y>>SHIFT), 0, 0, 1); + if (p & R_MASK) +- b=enemies.make(&pipe2, (x>>SHIFT), (y>>SHIFT), 0, 0, 3); ++ b=enemies.make(&pipe_2, (x>>SHIFT), (y>>SHIFT), 0, 0, 3); + if (p & D_MASK) +- c=enemies.make(&pipe2, (x>>SHIFT), (y>>SHIFT), 0, 0, 5); ++ c=enemies.make(&pipe_2, (x>>SHIFT), (y>>SHIFT), 0, 0, 5); + if (p & L_MASK) +- d=enemies.make(&pipe2, (x>>SHIFT), (y>>SHIFT), 0, 0, 7); ++ d=enemies.make(&pipe_2, (x>>SHIFT), (y>>SHIFT), 0, 0, 7); + manage.add_score(10); + state = notuse; + } +-const enemy_kind pipe2 = { ++const enemy_kind pipe_2 = { + 0, + &_enemy::make_pipe2, + &_enemy::move_pipe2, |