From c28981151199b05dca232b0525898a79e7b94bdb Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Wed, 13 Jun 2007 00:10:43 +0000
Subject: Added two patches that are necessary for NetBSD 3.0.

---
 games/six/distinfo                 |  4 +++-
 games/six/patches/patch-batchh     | 20 ++++++++++++++++++++
 games/six/patches/patch-lssolvecpp | 29 +++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 games/six/patches/patch-batchh
 create mode 100644 games/six/patches/patch-lssolvecpp

(limited to 'games/six')

diff --git a/games/six/distinfo b/games/six/distinfo
index e658306630e..2498cb53ae7 100644
--- a/games/six/distinfo
+++ b/games/six/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/13 00:03:26 rillig Exp $
+$NetBSD: distinfo,v 1.2 2007/06/13 00:10:43 rillig Exp $
 
 SHA1 (six-0.5.3.tar.gz) = 4e6281ea0bd420e941909206df381a283e77d149
 RMD160 (six-0.5.3.tar.gz) = 3894ebdabe368a918efd4359ba9e2ed7e0d32279
 Size (six-0.5.3.tar.gz) = 883013 bytes
+SHA1 (patch-batchh) = 2b46c2f8df4cdb046464bf0faf25f735df43b411
+SHA1 (patch-lssolvecpp) = 17038bc249c54f7436eef3dd3b61ee2a6eecc859
diff --git a/games/six/patches/patch-batchh b/games/six/patches/patch-batchh
new file mode 100644
index 00000000000..7063ecdcb63
--- /dev/null
+++ b/games/six/patches/patch-batchh
@@ -0,0 +1,20 @@
+$NetBSD: patch-batchh,v 1.1 2007/06/13 00:10:44 rillig Exp $
+
+Every recent platform should have <limits.h> from ISO C90.
+
+--- six/batch.h.orig	2004-07-19 10:30:54.000000000 +0200
++++ six/batch.h	2007-06-13 02:07:09.000000000 +0200
+@@ -5,12 +5,8 @@
+ #include "carrier.h"
+ #include "group.h"
+ 
+-#ifdef __FreeBSD__
+-#include <machine/limits.h>
++#include <limits.h>
+ #define MAXINT INT_MAX
+-#else
+-#include <values.h>
+-#endif
+ #include <list>
+ 
+ /**
diff --git a/games/six/patches/patch-lssolvecpp b/games/six/patches/patch-lssolvecpp
new file mode 100644
index 00000000000..d88259c1162
--- /dev/null
+++ b/games/six/patches/patch-lssolvecpp
@@ -0,0 +1,29 @@
+$NetBSD: patch-lssolvecpp,v 1.1 2007/06/13 00:10:44 rillig Exp $
+
+--- six/lssolve.cpp.orig	2004-07-19 10:30:50.000000000 +0200
++++ six/lssolve.cpp	2007-06-13 02:06:20.000000000 +0200
+@@ -120,7 +120,11 @@ static void backwardSubstitution(const M
+   double temp;
+ 
+   x(n - 1) = b(n - 1) / U(n - 1, n - 1);
++#if defined(__NetBSD__)
++  if(isnan(x(n - 1)))
++#else
+   if(std::isnan(x(n - 1)))
++#endif
+      x(n - 1) = 0.;
+   for(i = n - 2; i >= 0; i--) {
+     // Should be: x(i)=((b(i)-U(i,i,i+1,n-1)*x(i+1,n-1))/U(i,i))(0);
+@@ -131,7 +135,11 @@ static void backwardSubstitution(const M
+       temp += U.data()[iPos + j] * x(j);
+     }
+     x(i) = (b(i) - temp) / U.data()[iPos + i];
+-    if(std::isnan(x(i)))
++#if defined(__NetBSD__)
++  if(isnan(x(i)))
++#else
++  if(std::isnan(x(i)))
++#endif
+        x(i) = 0.;
+   }
+ }
-- 
cgit v1.2.3