Don't break cmath if it doesn't undefine macros first.

Don't wrap system C++ headers with extern "C" {}.

3 files changed, 55 insertions, 1 deletions

diff --git a/graphics/Coin/distinfo b/graphics/Coin/distinfo
index cf36a75a16b..14c5724d189 100644
--- a/graphics/Coin/distinfo
+++ b/graphics/Coin/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2013/06/11 15:22:47 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2013/06/26 21:22:41 joerg Exp $
 
 SHA1 (Coin-3.1.3.tar.gz) = 8e9f05628461963623686d3ec53102214e233dd1
 RMD160 (Coin-3.1.3.tar.gz) = e57fd6a4876a06874429f9ad6b96f166f5609362
 Size (Coin-3.1.3.tar.gz) = 5981534 bytes
 SHA1 (patch-aa) = 9d5e5f1cc46344e2c882059d29625762365d628e
+SHA1 (patch-include_Inventor_C_base_math-undefs.h) = 0faecc1d8b3b0d08dff9e6e07ce644a2fdc745aa
+SHA1 (patch-src_fonts_freetype.cpp) = 32a4713f2a200724f76e64c42d68a64e4fc8fde7
diff --git a/graphics/Coin/patches/patch-include_Inventor_C_base_math-undefs.h b/graphics/Coin/patches/patch-include_Inventor_C_base_math-undefs.h
new file mode 100644
index 00000000000..b6258bdef86
--- /dev/null
+++ b/graphics/Coin/patches/patch-include_Inventor_C_base_math-undefs.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-include_Inventor_C_base_math-undefs.h,v 1.1 2013/06/26 21:22:41 joerg Exp $
+
+--- include/Inventor/C/base/math-undefs.h.orig	2013-06-26 19:21:55.000000000 +0000
++++ include/Inventor/C/base/math-undefs.h
+@@ -40,6 +40,7 @@
+   work as intended.  20070518 larsa
+ */
+ 
++#if 0
+ #undef cosf
+ #define cosf(x) NO_SINGLEPREC /* whatever that'll give us a compile error... */
+ #undef sinf
+@@ -58,6 +59,7 @@
+ #define atanf(x) NO_SINGLEPREC
+ #undef atan2f
+ #define atan2f(x) NO_SINGLEPREC
++#endif
+ 
+ /* *********************************************************************** */
+ 
diff --git a/graphics/Coin/patches/patch-src_fonts_freetype.cpp b/graphics/Coin/patches/patch-src_fonts_freetype.cpp
new file mode 100644
index 00000000000..981a9ba16ff
--- /dev/null
+++ b/graphics/Coin/patches/patch-src_fonts_freetype.cpp
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_fonts_freetype.cpp,v 1.1 2013/06/26 21:22:41 joerg Exp $
+
+--- src/fonts/freetype.cpp.orig	2013-06-26 19:25:26.000000000 +0000
++++ src/fonts/freetype.cpp
+@@ -46,9 +46,7 @@
+ 
+ /* ************************************************************************* */
+ 
+-#ifdef __cplusplus
+ extern "C" {
+-#endif /* __cplusplus */
+ 
+ /*
+   Implementation note: no part of the code has to be reentrant, as the
+@@ -117,6 +115,8 @@ static int flwft_calctessellatorsteps(fl
+ 
+ /* ************************************************************************* */
+ 
++}
++
+ #include <string.h>
+ #include <math.h>
+ #include <stdio.h>
+@@ -144,6 +144,8 @@ static int flwft_calctessellatorsteps(fl
+ #include "base/namemap.h"
+ #include "fonts/common.h"
+ 
++extern "C" {
++
+ /* ************************************************************************* */
+ 
+ static const int flwft_3dfontsize = 40;