Fix build with newer GCC

10 files changed, 130 insertions, 12 deletions

diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index 2f4ac3e0936..6020cc27518 100644
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,22 +1,28 @@
-$NetBSD: distinfo,v 1.19 2011/01/30 01:07:00 wiz Exp $
+$NetBSD: distinfo,v 1.20 2011/11/25 22:08:29 joerg Exp $
 
 SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
 Size (celestia-1.4.1.tar.gz) = 23966886 bytes
 SHA1 (patch-aa) = 04bfea9e2a83a4c9fbd3917e378b5812699ccbe9
-SHA1 (patch-ab) = e749cc8a8bd9be9dd10b4f53e6d7878875a2aa57
+SHA1 (patch-ab) = dae3c86ab56b5f9db11f6fc09184ebb4f7b1ec31
 SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90
 SHA1 (patch-ad) = 175d8df4eb58aa24c548ba14dee5c5ae1f240e41
 SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c
 SHA1 (patch-af) = 124f115719badb0d057cc324ac0455253e25022d
 SHA1 (patch-ag) = e5300a702a92f3f35f07b34726d80cd825c1a759
-SHA1 (patch-ah) = 90f20cbbf4a8f187ea39de23f0e5b13aa4e10fb6
+SHA1 (patch-ah) = 0c4a61b1906095e258cdcc61c54d4174620986af
 SHA1 (patch-ai) = d5abfae0b4c4395572f22b6fdd1e7ad7bda4032f
 SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4
 SHA1 (patch-ak) = 20506d8b2f7c8c9ff778e0844dc999b0e497d644
 SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
 SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945
-SHA1 (patch-an) = 80bd712a8ae3f4dee0d908882deadbe2ad319abf
+SHA1 (patch-an) = 089ecfe539186f20191595c79bcf84cb37daffef
 SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
 SHA1 (patch-ap) = 768ada9965afdbcfa8f797a9627ad90cb0b920b0
 SHA1 (patch-aq) = fdc7b7f0ff04672f93af144f41e09751b4de0c1a
+SHA1 (patch-src_celengine_console.cpp) = 2b813ef144bb98ef35fb9d19489373d9af8eb384
+SHA1 (patch-src_celengine_galaxy.cpp) = 2da22768d9a015361d9c5c601f82d91a03cb6daf
+SHA1 (patch-src_celengine_stardb.cpp) = ac31a0cba37f5b5d446624a40faffd4e55cea0f4
+SHA1 (patch-src_celestia_eclipsefinder.cpp) = 676cd48a631097619a2abfd78ae6bd235869a75d
+SHA1 (patch-src_celestia_url.cpp) = b06360d001c2738ead2494dcb05e2cec092ed5dc
+SHA1 (patch-src_celmath_mathlib.h) = 11f402fb9ccb9d0dc8f3f887d854b753e3318a17
diff --git a/misc/celestia/patches/patch-ab b/misc/celestia/patches/patch-ab
index d25d0fe14e8..c2c7bbb46bc 100644
--- a/misc/celestia/patches/patch-ab
+++ b/misc/celestia/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.4 2006/03/25 18:10:09 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2011/11/25 22:08:30 joerg Exp $
 
---- src/celutil/formatnum.cpp.orig	2006-03-25 18:04:47.000000000 +0000
+--- src/celutil/formatnum.cpp.orig	2006-02-13 14:33:02.000000000 +0000
 +++ src/celutil/formatnum.cpp
-@@ -60,9 +60,9 @@ std::ostream& operator<<(std::ostream& o
+@@ -7,8 +7,10 @@
+ // as published by the Free Software Foundation; either version 2
+ // of the License, or (at your option) any later version.
+ 
++#include <climits>
+ #include <cmath>
+ #include <cstdio>
++#include <cstring>
+ #include <string>
+ #include "formatnum.h"
+ 
+@@ -60,9 +62,9 @@ std::ostream& operator<<(std::ostream& o
      char buf[32];
      char obuf[64];
      double value = num.getRoundedValue();
diff --git a/misc/celestia/patches/patch-ah b/misc/celestia/patches/patch-ah
index 043d6138d38..2bb41a5bded 100644
--- a/misc/celestia/patches/patch-ah
+++ b/misc/celestia/patches/patch-ah
@@ -1,8 +1,25 @@
-$NetBSD: patch-ah,v 1.4 2006/12/13 16:45:42 obache Exp $
+$NetBSD: patch-ah,v 1.5 2011/11/25 22:08:30 joerg Exp $
 
---- src/celutil/util.h.orig	2006-01-17 21:28:30.000000000 +0100
+--- src/celutil/util.h.orig	2005-08-15 20:34:43.000000000 +0000
 +++ src/celutil/util.h
-@@ -28,6 +28,7 @@
+@@ -12,22 +12,16 @@
+ #ifndef _UTIL_H_
+ #define _UTIL_H_
+ 
++#include <algorithm>
+ #include <string>
+ #include <vector>
+ #include <iostream>
+ #include <functional>
+ 
+-#ifndef min
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+-#ifndef max
+-#define max(a, b) ((a) < (b) ? (b) : (a))
+-#endif
+-				      
  #ifdef _WIN32
  #define _(s) s
  #else
diff --git a/misc/celestia/patches/patch-an b/misc/celestia/patches/patch-an
index 8ef7d95710b..ff264e115ed 100644
--- a/misc/celestia/patches/patch-an
+++ b/misc/celestia/patches/patch-an
@@ -1,8 +1,16 @@
-$NetBSD: patch-an,v 1.1 2006/12/13 16:45:42 obache Exp $
+$NetBSD: patch-an,v 1.2 2011/11/25 22:08:30 joerg Exp $
 
 --- src/celengine/overlay.cpp.orig	2005-07-19 20:30:54.000000000 +0000
 +++ src/celengine/overlay.cpp
-@@ -173,7 +173,7 @@ void Overlay::print(char* s)
+@@ -9,6 +9,7 @@
+ 
+ #include <cstdarg>
+ #include <cstdio>
++#include <cstring>
+ #include <celutil/utf8.h>
+ #include "gl.h"
+ #include "vecgl.h"
+@@ -173,7 +174,7 @@ void Overlay::print(char* s)
  }
  
  
diff --git a/misc/celestia/patches/patch-src_celengine_console.cpp b/misc/celestia/patches/patch-src_celengine_console.cpp
new file mode 100644
index 00000000000..e6c9bf29faf
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celengine_console.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_celengine_console.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celengine/console.cpp.orig	2011-11-25 16:12:42.000000000 +0000
++++ src/celengine/console.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include <cstdarg>
+ #include <cstdio>
++#include <cstring>
+ #include <cassert>
+ #include "celutil/utf8.h"
+ #include "gl.h"
diff --git a/misc/celestia/patches/patch-src_celengine_galaxy.cpp b/misc/celestia/patches/patch-src_celengine_galaxy.cpp
new file mode 100644
index 00000000000..44bb7d71591
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celengine_galaxy.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_celengine_galaxy.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celengine/galaxy.cpp.orig	2011-11-25 16:20:46.000000000 +0000
++++ src/celengine/galaxy.cpp
+@@ -311,8 +311,8 @@ void Galaxy::renderGalaxyEllipsoid(const
+     float discSizeInPixels = pixelSize * getRadius() / offset.length();
+     unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f);
+     unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f);
+-    nRings = max(nRings, 100);
+-    nSlices = max(nSlices, 100);
++    nRings = max(nRings, 100U);
++    nSlices = max(nSlices, 100U);
+ 
+     VertexProcessor* vproc = context.getVertexProcessor();
+     if (vproc == NULL)
diff --git a/misc/celestia/patches/patch-src_celengine_stardb.cpp b/misc/celestia/patches/patch-src_celengine_stardb.cpp
new file mode 100644
index 00000000000..ea3dd15e379
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celengine_stardb.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_celengine_stardb.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celengine/stardb.cpp.orig	2011-11-25 16:27:06.000000000 +0000
++++ src/celengine/stardb.cpp
+@@ -10,6 +10,7 @@
+ #include <cmath>
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ #include <cassert>
+ #include <algorithm>
+ #include <celmath/mathlib.h>
diff --git a/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp b/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp
new file mode 100644
index 00000000000..c5543ec477e
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_celestia_eclipsefinder.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celestia/eclipsefinder.cpp.orig	2011-11-25 16:35:03.000000000 +0000
++++ src/celestia/eclipsefinder.cpp
+@@ -10,6 +10,7 @@
+ // as published by the Free Software Foundation; either version 2
+ // of the License, or (at your option) any later version.
+ 
++#include <cstring>
+ #include <string>
+ #include <sstream>
+ #include <algorithm>
diff --git a/misc/celestia/patches/patch-src_celestia_url.cpp b/misc/celestia/patches/patch-src_celestia_url.cpp
new file mode 100644
index 00000000000..f54569ce0db
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celestia_url.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_celestia_url.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celestia/url.cpp.orig	2011-11-25 16:35:25.000000000 +0000
++++ src/celestia/url.cpp
+@@ -15,6 +15,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstring>
+ #include <string>
+ #include <stdio.h>
+ #include "celestiacore.h"
diff --git a/misc/celestia/patches/patch-src_celmath_mathlib.h b/misc/celestia/patches/patch-src_celmath_mathlib.h
new file mode 100644
index 00000000000..bf970d3de48
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celmath_mathlib.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_celmath_mathlib.h,v 1.1 2011/11/25 22:08:30 joerg Exp $
+
+--- src/celmath/mathlib.h.orig	2011-11-25 16:18:13.000000000 +0000
++++ src/celmath/mathlib.h
+@@ -11,7 +11,7 @@
+ #define _MATHLIB_H_
+ 
+ #include <cmath>
+-#include <stdlib.h>
++#include <cstdlib>
+ 
+ #define PI 3.14159265358979323846
+