[pkgsrc/trunk]: pkgsrc/games/gnome2-games Fix patch that corrected the build ...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/66d6283c0153
branches:  trunk
changeset: 491753:66d6283c0153
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Mar 29 13:59:40 2005 +0000

description:
Fix patch that corrected the build with gcc 2.95 (C++ style comments are
not supported).  Closes PR pkg/29820 by jklowden at schemamania.org.

diffstat:

 games/gnome2-games/distinfo         |   4 ++--
 games/gnome2-games/patches/patch-ad |  26 +++++++-------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diffs (58 lines):

diff -r 39ddb0ff5453 -r 66d6283c0153 games/gnome2-games/distinfo
--- a/games/gnome2-games/distinfo       Tue Mar 29 13:59:38 2005 +0000
+++ b/games/gnome2-games/distinfo       Tue Mar 29 13:59:40 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2005/03/22 16:33:30 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2005/03/29 13:59:40 jmmv Exp $
 
 SHA1 (gnome-games-2.10.0.tar.bz2) = a941d33bbb881a0ed52d95252c88d2e3f25c7e02
 RMD160 (gnome-games-2.10.0.tar.bz2) = dffc3f2c59451fb883e6cfc51defdcc58657d0a6
 Size (gnome-games-2.10.0.tar.bz2) = 5292770 bytes
 SHA1 (patch-aa) = e74547a19267b1a39528d9556d115fff4f7cd21d
 SHA1 (patch-ac) = e54f3fecee226f78edf17dc686c6bde2a25e36fd
-SHA1 (patch-ad) = 52360026ae111850c8097d315243d040ec654fcf
+SHA1 (patch-ad) = fe37a9355b68f4dbd89590a6c1baab56c480840c
diff -r 39ddb0ff5453 -r 66d6283c0153 games/gnome2-games/patches/patch-ad
--- a/games/gnome2-games/patches/patch-ad       Tue Mar 29 13:59:38 2005 +0000
+++ b/games/gnome2-games/patches/patch-ad       Tue Mar 29 13:59:40 2005 +0000
@@ -1,33 +1,21 @@
-$NetBSD: patch-ad,v 1.1 2005/03/16 15:39:02 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2005/03/29 13:59:40 jmmv Exp $
 
-Use C comments, not C++. Needed for gcc-2.95.3.
+Drop C++ comments; they break the build with gcc-2.95.
 
---- iagno/othello.c.orig       Wed Jan 12 10:21:32 2005
-+++ iagno/othello.c    Wed Mar 16 00:05:05 2005
-@@ -551,7 +551,7 @@ find_best_move(gint8 board[8][8], guint 
-                                       memcpy (tboard, board, sizeof (gint8) * 8 * 8);
-                                       move_board(tboard, i, j, me, 0);
-       
--                                      // assume that opponent takes best move
-+                                      /* assume that opponent takes best move */
-                                       tmp_move = find_best_move(tboard, not_me, ply_depth-1,
-                                               -pass_thresh, -use_thresh, 0, 0);
- 
-@@ -808,14 +808,14 @@ eval_board (gint8 board[8][8], guint me)
+--- iagno/othello.c.orig       2005-01-25 06:44:38.000000000 +0000
++++ iagno/othello.c
+@@ -784,14 +784,11 @@ eval_board (gint8 board[8][8], guint me)
                                found_free = TRUE;
                }
                
 -      // check if a player is dead
-+      /* check if a player is dead */
        if (!found_me && found_not_me)
-               return (-10000);
+               return (S_LOSING_GAME);
        else if (found_me && !found_not_me)
-               return (10000);
+               return (S_WINNING_GAME);
        
 -      // if the game is finished, return the actual score rather than
 -      // a huristic
-+      /* if the game is finished, return the actual score rather than
-+       * a huristic */
        if (!found_free)
                return (actual_score);