Fix build with newer GCC

5 files changed, 63 insertions, 2 deletions

diff --git a/math/tochnog/distinfo b/math/tochnog/distinfo
index 3da79d61438..9f3c2c5cf9b 100644
--- a/math/tochnog/distinfo
+++ b/math/tochnog/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 12:06:58 agc Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 13:50:50 joerg Exp $
 
 SHA1 (tochnog-20010429/tn.tar.gz) = a4628df82573b5b9ebf5deeb9f32c6068cff5fed
 RMD160 (tochnog-20010429/tn.tar.gz) = 4635de1f9f8f279c7950fb7897081461c170be3f
@@ -11,3 +11,4 @@ RMD160 (tochnog-20010429/tnp.ps.gz) = f68b3a7d4ea8dc1f5597c3f13dcf2aec8a4a0a36
 Size (tochnog-20010429/tnp.ps.gz) = 41836 bytes
 SHA1 (patch-aa) = 5ab191726552c8d7b44a3d3649099e5ab9f6f0b7
 SHA1 (patch-ab) = e90269af74181a3ce4be670b83ac07ff7e1a7c94
+SHA1 (patch-tochnog.h) = 10be07e09b062293158b920d39c633a54a5a7581
diff --git a/math/tochnog/patches/patch-tochnog.h b/math/tochnog/patches/patch-tochnog.h
new file mode 100644
index 00000000000..348cbe77923
--- /dev/null
+++ b/math/tochnog/patches/patch-tochnog.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-tochnog.h,v 1.1 2011/11/24 13:50:50 joerg Exp $
+
+--- tochnog.h.orig	2011-11-22 18:27:38.000000000 +0000
++++ tochnog.h
+@@ -17,22 +17,26 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <iostream.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <float.h>
+-#include <fstream.h>
+-#include <iomanip.h>
+ #include <math.h>
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++
++#include <iostream>
++#include <fstream>
++#include <iomanip>
++
+ #include "tnpetsc.h"
+ #include "tnsuplu.h"
+ #include "tnhypo.h"
+ 
++using namespace std;
++
+ typedef long int integer;
+ typedef double doublereal;       
+ 
diff --git a/misc/kchm/distinfo b/misc/kchm/distinfo
index 65ed2aafd8f..212a6e4b0be 100644
--- a/misc/kchm/distinfo
+++ b/misc/kchm/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/06/05 22:45:53 markd Exp $
+$NetBSD: distinfo,v 1.2 2011/11/24 13:49:57 joerg Exp $
 
 SHA1 (kchm-0.6.5.tar.bz2) = f34f7a96a81a69e1a4d6f80547addda1555dd99e
 RMD160 (kchm-0.6.5.tar.bz2) = 8b59798880a6eae55f70fa63016eda40b01d272e
 Size (kchm-0.6.5.tar.bz2) = 458684 bytes
+SHA1 (patch-libchm++_chm.cpp) = 160c9a751d6d2a35c35799016b0a328e2982f295
+SHA1 (patch-src_kpart_TopicTree.cpp) = a4bc507827cfd4e35471a755cf4d2dbab7b9ecb0
diff --git a/misc/kchm/patches/patch-libchm++_chm.cpp b/misc/kchm/patches/patch-libchm++_chm.cpp
new file mode 100644
index 00000000000..c18e0525654
--- /dev/null
+++ b/misc/kchm/patches/patch-libchm++_chm.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-libchm++_chm.cpp,v 1.1 2011/11/24 13:49:57 joerg Exp $
+
+--- libchm++/chm.cpp.orig	2011-11-24 01:25:08.000000000 +0000
++++ libchm++/chm.cpp
+@@ -5,6 +5,7 @@
+ #include <map>
+ #include <algorithm>
+ #include <cassert>
++#include <cstring>
+ 
+ #include "chmxx.h"
+ #include "chm_lib.h"
diff --git a/misc/kchm/patches/patch-src_kpart_TopicTree.cpp b/misc/kchm/patches/patch-src_kpart_TopicTree.cpp
new file mode 100644
index 00000000000..66668a09bd8
--- /dev/null
+++ b/misc/kchm/patches/patch-src_kpart_TopicTree.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_kpart_TopicTree.cpp,v 1.1 2011/11/24 13:49:57 joerg Exp $
+
+--- src/kpart/TopicTree.cpp.orig	2011-11-24 01:26:22.000000000 +0000
++++ src/kpart/TopicTree.cpp
+@@ -22,6 +22,7 @@
+ #include <qtimer.h>
+ #include <qregexp.h>
+ #include <qtextcodec.h>
++#include <memory>
+ 
+ #include "TopicTree.h"
+ #include "TopicLeaf.h"