From 1f231344e9b9100b106f0a02295bad127a38061d Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 14 Jun 2005 19:33:19 +0000
Subject: Constify a variable in multiple places so that the definitions match
 in all files.  Fixes build under Linux, closing PR pkg/29499.

---
 games/xracer/distinfo         |  6 +++---
 games/xracer/patches/patch-aa | 19 ++++++++++---------
 games/xracer/patches/patch-ae | 11 +++++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'games')

diff --git a/games/xracer/distinfo b/games/xracer/distinfo
index 8e47dd3e461..c38245fce02 100644
--- a/games/xracer/distinfo
+++ b/games/xracer/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/06/14 19:33:19 jmmv Exp $
 
 SHA1 (xracer-0.96.9.tar.gz) = 8c7a4f0be46ee83bbb588f6c5834340f519a3059
 RMD160 (xracer-0.96.9.tar.gz) = 1e9611dd55b1a3f0bf681a7051fcbb37bec47a6e
 Size (xracer-0.96.9.tar.gz) = 1550085 bytes
-SHA1 (patch-aa) = 867614d7325e1990e1f6af4ab03a8a7d00fe4193
+SHA1 (patch-aa) = bd73584734449a4de330982f2cd2fa2c93ecfba4
 SHA1 (patch-ab) = 397213618e38a9d8b6a02b66c0bd6dfa8e9088f2
 SHA1 (patch-ac) = 8ca84cea66a44b700d32633151767c7ecfacbefc
 SHA1 (patch-ad) = 89fba91a07db5222ddb21717205a16613710e12b
-SHA1 (patch-ae) = 89b0e5ac37d7ee894fd48338f6e65a86afc462db
+SHA1 (patch-ae) = f14f54d246370382255c2ebe4e907d9110f95a5e
 SHA1 (patch-af) = 05122f93b7f9ed1481a8d20696f75c35356db8a4
 SHA1 (patch-ag) = 129497c5e5b041b32c545493ea97afe9db996e33
 SHA1 (patch-ah) = b97883d599ac070385883e1356ac53382f15fbaa
diff --git a/games/xracer/patches/patch-aa b/games/xracer/patches/patch-aa
index c0aa9e36efd..7408399f374 100644
--- a/games/xracer/patches/patch-aa
+++ b/games/xracer/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
+$NetBSD: patch-aa,v 1.2 2005/06/14 19:33:19 jmmv Exp $
 
---- include/xracer-joystick.h.orig	Sat May 27 04:58:58 2000
-+++ include/xracer-joystick.h	Sat May 27 04:59:18 2000
-@@ -31,6 +31,6 @@
- extern void xrJoystickInit (void);
- extern int xrJoystickRead (struct xrJoystickStatus *status);
+--- src/joystick_freebsd.c.orig	2000-01-02 02:49:04.000000000 +0100
++++ src/joystick_freebsd.c
+@@ -39,7 +39,7 @@
+ static int fd = -1;
  
--extern const char *xrJoystickDevice;
-+extern char *xrJoystickDevice;
+ /* Joystick device. */
+-char *xrJoystickDevice = "/dev/joy0";
++const char *xrJoystickDevice = "/dev/joy0";
  
- #endif /* __xracer_joystick_h__ */
+ /* Program-level initializations. */
+ void
diff --git a/games/xracer/patches/patch-ae b/games/xracer/patches/patch-ae
index a7b85573e8f..d36e901f0f2 100644
--- a/games/xracer/patches/patch-ae
+++ b/games/xracer/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2000/10/02 08:23:15 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2005/06/14 19:33:19 jmmv Exp $
 
---- src/joystick_generic.c.orig	Sat Jan  1 20:49:04 2000
+--- src/joystick_generic.c.orig	2000-01-02 02:49:04.000000000 +0100
 +++ src/joystick_generic.c
-@@ -22,6 +22,10 @@
+@@ -22,8 +22,12 @@
  #include "xracer-joystick.h"
  #include "xracer-log.h"
  
@@ -11,5 +11,8 @@ $NetBSD: patch-ae,v 1.3 2000/10/02 08:23:15 jlam Exp $
 +#endif
 +
  /* Joystick device. */
- char *xrJoystickDevice = NULL;
+-char *xrJoystickDevice = NULL;
++const char *xrJoystickDevice = NULL;
  
+ /* Program-level initializations. */
+ void
-- 
cgit v1.2.3