Fix build with modern GCC

7 files changed, 40 insertions, 40 deletions

diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 7d4b9b391c8..5ccb6326123 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2006/04/28 16:49:51 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/11/25 21:56:18 joerg Exp $
 
 SHA1 (cal3d-0.9.1.tar.bz2) = 2e0765caddc972f05f70d3a255862ced1276e039
 RMD160 (cal3d-0.9.1.tar.bz2) = f77dcf34a46a9286020592df16f5b16264839d80
 Size (cal3d-0.9.1.tar.bz2) = 2871094 bytes
 SHA1 (patch-aa) = dc308a6e7d0322a354b502d3ca6e9a01e497fa78
 SHA1 (patch-ab) = f3fbda1c69c22f5165fe57a7e1bf05190e88a9c0
-SHA1 (patch-ac) = 079f524fa683faea92e44ce9f4d437cbd4b6051a
-SHA1 (patch-ad) = 9c016c70610c4846c085c33ad6eabafed6385f0a
-SHA1 (patch-ae) = c4be228afe745be9e97896e99cdaa9a5d1b03882
 SHA1 (patch-af) = 0f70889b9c9c3cb0138b9f1a8e26ea6682d04f07
+SHA1 (patch-src_cal3d_platform.cpp) = 1d664fcc9b62124f089f202e98c74bc8ae99b8ee
+SHA1 (patch-src_cal3d_renderer.cpp) = 6c8ce2adbb1e58ed6ca22abbd0d3ed2672b11901
+SHA1 (patch-src_cal3d_submesh.cpp) = f336288724b501eeba67cb582424acfc0a583c74
diff --git a/graphics/cal3d/patches/patch-ac b/graphics/cal3d/patches/patch-ac
deleted file mode 100644
index ad3318930fd..00000000000
--- a/graphics/cal3d/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
---- src/cal3d/buffersource.h.orig	Thu Feb  5 14:00:26 2004
-+++ src/cal3d/buffersource.h	Thu Feb  5 14:00:36 2004
-@@ -17,7 +17,7 @@
- 
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
--#include <istream>
-+#include <istream.h>
- 
- /**
-  * CalBufferSource class.
diff --git a/graphics/cal3d/patches/patch-ad b/graphics/cal3d/patches/patch-ad
deleted file mode 100644
index e087e5ba525..00000000000
--- a/graphics/cal3d/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
---- src/cal3d/loader.h.orig	Thu Feb  5 14:01:32 2004
-+++ src/cal3d/loader.h	Thu Feb  5 14:01:55 2004
-@@ -17,7 +17,7 @@
- 
- 
- #include <string>
--#include <istream>
-+#include <istream.h>
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
- 
diff --git a/graphics/cal3d/patches/patch-ae b/graphics/cal3d/patches/patch-ae
deleted file mode 100644
index 50865cb179e..00000000000
--- a/graphics/cal3d/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
---- src/cal3d/streamsource.h.orig	Thu Feb  5 14:02:27 2004
-+++ src/cal3d/streamsource.h	Thu Feb  5 14:02:37 2004
-@@ -17,7 +17,7 @@
- 
- #include "cal3d/global.h"
- #include "cal3d/datasource.h"
--#include <istream>
-+#include <istream.h>
- 
- /**
-  * CalStreamSource class.
diff --git a/graphics/cal3d/patches/patch-src_cal3d_platform.cpp b/graphics/cal3d/patches/patch-src_cal3d_platform.cpp
new file mode 100644
index 00000000000..f6add2bed97
--- /dev/null
+++ b/graphics/cal3d/patches/patch-src_cal3d_platform.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cal3d_platform.cpp,v 1.1 2011/11/25 21:56:18 joerg Exp $
+
+--- src/cal3d/platform.cpp.orig	2011-11-25 16:04:14.000000000 +0000
++++ src/cal3d/platform.cpp
+@@ -16,6 +16,7 @@
+ // Includes                                                                   //
+ //****************************************************************************//
+ 
++#include <cstring>
+ #include "cal3d/platform.h"
+ 
+  /*****************************************************************************/
diff --git a/graphics/cal3d/patches/patch-src_cal3d_renderer.cpp b/graphics/cal3d/patches/patch-src_cal3d_renderer.cpp
new file mode 100644
index 00000000000..0696e35a22a
--- /dev/null
+++ b/graphics/cal3d/patches/patch-src_cal3d_renderer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cal3d_renderer.cpp,v 1.1 2011/11/25 21:56:18 joerg Exp $
+
+--- src/cal3d/renderer.cpp.orig	2011-11-25 16:04:28.000000000 +0000
++++ src/cal3d/renderer.cpp
+@@ -28,6 +28,7 @@
+ #include "cal3d/corematerial.h"
+ #include "cal3d/coresubmesh.h"
+ #include "cal3d/physique.h"
++#include <cstring>
+ 
+  /*****************************************************************************/
+ /** Constructs the renderer instance.
diff --git a/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp b/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp
new file mode 100644
index 00000000000..8f962c53fae
--- /dev/null
+++ b/graphics/cal3d/patches/patch-src_cal3d_submesh.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cal3d_submesh.cpp,v 1.1 2011/11/25 21:56:18 joerg Exp $
+
+--- src/cal3d/submesh.cpp.orig	2011-11-25 16:04:52.000000000 +0000
++++ src/cal3d/submesh.cpp
+@@ -19,6 +19,7 @@
+ #include "cal3d/submesh.h"
+ #include "cal3d/error.h"
+ #include "cal3d/coresubmesh.h"
++#include <cstring>
+ 
+  /*****************************************************************************/
+ /** Constructs the submesh instance.