Fix build with newer GCC

7 files changed, 81 insertions, 1 deletions

diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 87143a29a94..2eb0f6ed6d7 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/10/13 18:12:40 rillig Exp $
+$NetBSD: distinfo,v 1.9 2011/11/25 22:16:26 joerg Exp $
 
 SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab
 RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3
@@ -21,3 +21,9 @@ SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7
 SHA1 (patch-am) = 88120d6a4705f9bcdac2e675dd74b83c9e270082
 SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13
 SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd
+SHA1 (patch-src_frontends_controllers_helper__funcs.h) = 03b1f40d5ad9c686dd58b2170aa50bc18a7dedae
+SHA1 (patch-src_frontends_xforms_FormMathsMatrix.C) = 63e1003ebc15be07556ff2f0fcc6aa26ee207fd6
+SHA1 (patch-src_mathed_math__xdata.C) = e0d51e11a5fa2c2a29e5ce95ed0b4dd11abd5c0a
+SHA1 (patch-src_support_LSubstring.C) = 51d8d547681c26fbee6f6f04a10e4b4ff8864417
+SHA1 (patch-src_support_forkedcontr.C) = d2068c100e7e068fc21f51a4789beb735cf2332b
+SHA1 (patch-src_support_lstrings.h) = 846087a2c5e6759ee3086d295ba3bb93e56df3ad
diff --git a/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h b/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h
new file mode 100644
index 00000000000..f9784cf31db
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_frontends_controllers_helper__funcs.h,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/frontends/controllers/helper_funcs.h.orig	2011-11-25 17:08:24.000000000 +0000
++++ src/frontends/controllers/helper_funcs.h
+@@ -15,6 +15,7 @@
+ #ifndef HELPERFUNCS_H
+ #define HELPERFUNCS_H
+ 
++#include <algorithm>
+ #include <utility> // pair
+ 
+ #ifdef __GNUG__
diff --git a/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C b/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C
new file mode 100644
index 00000000000..9e2a220a9ea
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_frontends_xforms_FormMathsMatrix.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/frontends/xforms/FormMathsMatrix.C.orig	2011-11-25 17:11:16.000000000 +0000
++++ src/frontends/xforms/FormMathsMatrix.C
+@@ -16,6 +16,7 @@
+ #endif
+ 
+ #include <algorithm>
++#include <cstring>
+ 
+ #include "FormMathsMatrix.h"
+ #include "form_maths_matrix.h"
diff --git a/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C b/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C
new file mode 100644
index 00000000000..5b91ca2d8c0
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mathed_math__xdata.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/mathed/math_xdata.C.orig	2011-11-25 17:01:56.000000000 +0000
++++ src/mathed/math_xdata.C
+@@ -9,7 +9,7 @@
+ #include "Painter.h"
+ #include "textpainter.h"
+ #include "debug.h"
+-
++#include <cstdlib>
+ 
+ using std::max;
+ using std::min;
diff --git a/print/cjk-lyx/patches/patch-src_support_LSubstring.C b/print/cjk-lyx/patches/patch-src_support_LSubstring.C
new file mode 100644
index 00000000000..6a40dfbe51f
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_support_LSubstring.C
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_support_LSubstring.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/support/LSubstring.C.orig	2011-11-25 17:05:19.000000000 +0000
++++ src/support/LSubstring.C
+@@ -16,6 +16,7 @@
+ #pragma implementation
+ #endif
+ 
++#include <cstring>
+ #include "LSubstring.h"
+ 
+ #ifndef CXX_GLOBAL_CSTD
diff --git a/print/cjk-lyx/patches/patch-src_support_forkedcontr.C b/print/cjk-lyx/patches/patch-src_support_forkedcontr.C
new file mode 100644
index 00000000000..9fac118dbfa
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_support_forkedcontr.C
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_support_forkedcontr.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/support/forkedcontr.C.orig	2011-11-25 17:05:52.000000000 +0000
++++ src/support/forkedcontr.C
+@@ -24,6 +24,7 @@
+ 
+ #include <cerrno>
+ #include <cstdlib>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/wait.h>
+ 
diff --git a/print/cjk-lyx/patches/patch-src_support_lstrings.h b/print/cjk-lyx/patches/patch-src_support_lstrings.h
new file mode 100644
index 00000000000..3aa7fc8f9ff
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-src_support_lstrings.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_support_lstrings.h,v 1.1 2011/11/25 22:16:26 joerg Exp $
+
+--- src/support/lstrings.h.orig	2011-11-25 16:59:32.000000000 +0000
++++ src/support/lstrings.h
+@@ -16,7 +16,7 @@
+ #pragma interface
+ #endif
+ 
+-//#include <cstring>
++#include <cstring>
+ //#include <cctype>
+ //#include <cctype>
+ #include <vector>