Fix build with newer GCC

10 files changed, 146 insertions, 34 deletions

diff --git a/misc/colortail/distinfo b/misc/colortail/distinfo
index 863b8bbe5be..19dde84f23d 100644
--- a/misc/colortail/distinfo
+++ b/misc/colortail/distinfo
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.7 2006/06/02 18:30:14 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/11/26 17:16:53 joerg Exp $
 
 SHA1 (colortail-0.3.0.tar.gz) = 5c55a9b0550868129d8ede133f6b34fa5356c5ce
 RMD160 (colortail-0.3.0.tar.gz) = 9141fff0a26ec653b39f580749336cbd16c92492
 Size (colortail-0.3.0.tar.gz) = 54329 bytes
-SHA1 (patch-aa) = 4db6ef6d231c98914c572f320700f67ae09101a7
-SHA1 (patch-ab) = ad48e7a58417f114be2f7f91b106e25d30bb76d4
+SHA1 (patch-ColorTail.cc) = ff028051f92db984179fdf87465716a338910a5d
+SHA1 (patch-Info.cc) = d6f3670381c030ac44df516a049f419ee6692031
+SHA1 (patch-Usage.cc) = c1739c04c2d51a9bd5b1019f009f4cf52d2feafa
+SHA1 (patch-aa) = b7e930ed1de83b9bba507fb5b3f7b9a500132257
+SHA1 (patch-ab) = 927b8b6ef439cbf4d3d3e67b3f7c0a82b8df6584
 SHA1 (patch-ac) = fed43fd42497b951dd237f86ef08337f76fef494
-SHA1 (patch-ad) = ed3a9bdcd7f20a231823aad0010dd929103e9fb1
-SHA1 (patch-ae) = 09aaf9aebad66b0b220387f0b230fb615f8bef08
-SHA1 (patch-af) = 00fc20aa9508db7c3894a8cab0d5f75ed6a4a967
+SHA1 (patch-ad) = 96a95b7ab3435465bca767a90645a0bc07a9d226
+SHA1 (patch-ae) = 0c04839a28e2e4523cf058a03ee3a9ee87c904ee
+SHA1 (patch-af) = d580a043185160cc26f78b9da849534b0c9ed58d
 SHA1 (patch-ag) = 29222baff0953c1c78255092426926061ccd92c5
+SHA1 (patch-main.cc) = 7e1ca6ef30e7962e3850179a3f59bf9db5aba1ac
diff --git a/misc/colortail/patches/patch-ColorTail.cc b/misc/colortail/patches/patch-ColorTail.cc
new file mode 100644
index 00000000000..f1fa3e2283a
--- /dev/null
+++ b/misc/colortail/patches/patch-ColorTail.cc
@@ -0,0 +1,21 @@
+$NetBSD: patch-ColorTail.cc,v 1.1 2011/11/26 17:16:53 joerg Exp $
+
+--- ColorTail.cc.orig	2011-11-26 15:16:04.000000000 +0000
++++ ColorTail.cc
+@@ -17,7 +17,7 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <assert.h>
+ #include <unistd.h>
+ 
+@@ -26,6 +26,7 @@
+ #include "OptionsParser.h"
+ #include "Colorizer.h"
+ 
++using namespace std;
+ 
+ // the constructor
+ ColorTail::ColorTail()
diff --git a/misc/colortail/patches/patch-Info.cc b/misc/colortail/patches/patch-Info.cc
new file mode 100644
index 00000000000..6c02f75a3d7
--- /dev/null
+++ b/misc/colortail/patches/patch-Info.cc
@@ -0,0 +1,19 @@
+$NetBSD: patch-Info.cc,v 1.1 2011/11/26 17:16:53 joerg Exp $
+
+--- Info.cc.orig	2011-11-26 15:16:33.000000000 +0000
++++ Info.cc
+@@ -17,11 +17,13 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "Info.h"
+ #include "config.h"
+ 
++using namespace std;
++
+ Info::Info()
+ {
+ }
diff --git a/misc/colortail/patches/patch-Usage.cc b/misc/colortail/patches/patch-Usage.cc
new file mode 100644
index 00000000000..3f4323689ee
--- /dev/null
+++ b/misc/colortail/patches/patch-Usage.cc
@@ -0,0 +1,18 @@
+$NetBSD: patch-Usage.cc,v 1.1 2011/11/26 17:16:53 joerg Exp $
+
+--- Usage.cc.orig	2011-11-26 15:14:52.000000000 +0000
++++ Usage.cc
+@@ -17,10 +17,12 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "Usage.h"
+ 
++using namespace std;
++
+ Usage::Usage()
+ {
+ }
diff --git a/misc/colortail/patches/patch-aa b/misc/colortail/patches/patch-aa
index d2b070229b9..91b84a559bd 100644
--- a/misc/colortail/patches/patch-aa
+++ b/misc/colortail/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2004/01/11 21:22:41 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/26 17:16:53 joerg Exp $
 
---- TailFile.cc.orig	2004-01-11 16:19:14.000000000 -0500
-+++ TailFile.cc	2004-01-11 16:20:33.000000000 -0500
-@@ -375,7 +375,7 @@
+--- TailFile.cc.orig	1999-08-04 23:09:38.000000000 +0000
++++ TailFile.cc
+@@ -17,7 +17,7 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <string.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+@@ -25,6 +25,8 @@
+ 
+ #include "TailFile.h"
+ 
++using namespace std;
++
+ TailFile::TailFile()
+ {
+    m_filename = NULL;
+@@ -375,7 +377,7 @@ void TailFile::follow_print(int n, int v
     // check if there isn't a follow buffer
     if (m_follow_buffer == NULL)
     {
@@ -11,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/01/11 21:22:41 jschauma Exp $
     }
  
     // make buffer
-@@ -417,6 +417,9 @@
+@@ -417,6 +419,9 @@ void TailFile::follow_print(int n, int v
        int ch = fgetc(m_file);
  
        // add the character to the string
diff --git a/misc/colortail/patches/patch-ab b/misc/colortail/patches/patch-ab
index 0c0efafb9ef..5af1dc5a0e7 100644
--- a/misc/colortail/patches/patch-ab
+++ b/misc/colortail/patches/patch-ab
@@ -1,14 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2006/06/02 18:30:14 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/26 17:16:53 joerg Exp $
 
---- CfgFileParser.h.old	Wed Jun 21 12:55:57 2000
-+++ CfgFileParser.h	Wed Jun 21 12:56:09 2000
-@@ -24,7 +24,9 @@
+--- CfgFileParser.h.orig	1999-08-03 19:40:52.000000000 +0000
++++ CfgFileParser.h
+@@ -24,8 +24,12 @@
  #include "config.h"
  
  #include <sys/types.h>
 +#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <regex.h>
+-#include <fstream.h>
 +#endif
- #include <fstream.h>
++#include <fstream>
++
++using namespace std;
  
  #ifdef HAVE_GNUREGEX_H
+ # include <gnuregex.h>
diff --git a/misc/colortail/patches/patch-ad b/misc/colortail/patches/patch-ad
index 68332718003..94f6d2f83a8 100644
--- a/misc/colortail/patches/patch-ad
+++ b/misc/colortail/patches/patch-ad
@@ -1,9 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2004/05/23 23:28:29 danw Exp $
+$NetBSD: patch-ad,v 1.3 2011/11/26 17:16:53 joerg Exp $
 
---- CfgFileParser.cc.orig	Tue Aug  3 15:40:44 1999
+--- CfgFileParser.cc.orig	1999-08-03 19:40:44.000000000 +0000
 +++ CfgFileParser.cc
-@@ -23,7 +23,11 @@
- #include <fstream.h>
+@@ -20,10 +20,14 @@
+ #include "CfgFileParser.h"
+ 
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
  #include <assert.h>
  #include <string.h>
 -#include <malloc.h>
diff --git a/misc/colortail/patches/patch-ae b/misc/colortail/patches/patch-ae
index e3fa099ba4f..026c23dd8d0 100644
--- a/misc/colortail/patches/patch-ae
+++ b/misc/colortail/patches/patch-ae
@@ -1,17 +1,18 @@
-$NetBSD: patch-ae,v 1.1 2004/01/11 21:22:41 jschauma Exp $
+$NetBSD: patch-ae,v 1.2 2011/11/26 17:16:53 joerg Exp $
 
---- Colorizer.cc.orig	2004-01-11 16:15:16.000000000 -0500
-+++ Colorizer.cc	2004-01-11 16:15:46.000000000 -0500
-@@ -23,7 +23,7 @@
+--- Colorizer.cc.orig	1999-08-03 19:41:17.000000000 +0000
++++ Colorizer.cc
+@@ -23,7 +23,8 @@
  
  #include <assert.h>
  #include <stdio.h>
 -#include <strstream.h>
 +#include <strstream>
++#include <cstring>
  
  
  Colorizer::Colorizer()
-@@ -111,7 +111,7 @@
+@@ -111,7 +112,7 @@ char* Colorizer::colorize(char *str)
     ListIterator<SearchData*> itr(*m_items_list);
  
     // will contain the new string
@@ -20,7 +21,7 @@ $NetBSD: patch-ae,v 1.1 2004/01/11 21:22:41 jschauma Exp $
     
     SearchData *current;
     int i = 0;
-@@ -172,7 +172,7 @@
+@@ -172,7 +173,7 @@ char* Colorizer::colorize(char *str)
  	    }
  
  	    // write ansi reset str and a newline
@@ -29,7 +30,7 @@ $NetBSD: patch-ae,v 1.1 2004/01/11 21:22:41 jschauma Exp $
  	    // return the new string
  	    return newstr.str();
  	 }
-@@ -187,12 +187,12 @@
+@@ -187,12 +188,12 @@ char* Colorizer::colorize(char *str)
        // check if str ends in '\n'
        if (str[strlen(str)] == '\n')
        {
@@ -44,7 +45,7 @@ $NetBSD: patch-ae,v 1.1 2004/01/11 21:22:41 jschauma Exp $
        }
  
        // return the new string
-@@ -240,7 +240,7 @@
+@@ -240,7 +241,7 @@ char* Colorizer::colorize(char *str)
        
        // write newline and null
        //newstr << endl << ends;
diff --git a/misc/colortail/patches/patch-af b/misc/colortail/patches/patch-af
index 273f4490764..db0c0f8a7d1 100644
--- a/misc/colortail/patches/patch-af
+++ b/misc/colortail/patches/patch-af
@@ -1,17 +1,28 @@
-$NetBSD: patch-af,v 1.1 2004/01/11 21:22:41 jschauma Exp $
+$NetBSD: patch-af,v 1.2 2011/11/26 17:16:53 joerg Exp $
 
---- OptionsParser.cc.orig	2004-01-11 16:15:24.000000000 -0500
-+++ OptionsParser.cc	2004-01-11 16:15:42.000000000 -0500
-@@ -18,7 +18,7 @@
+--- OptionsParser.cc.orig	1999-08-04 23:23:39.000000000 +0000
++++ OptionsParser.cc
+@@ -17,8 +17,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
- #include <iostream.h>
+-#include <iostream.h>
 -#include <strstream.h>
++#include <iostream>
 +#include <strstream>
  #include <string.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -130,7 +130,7 @@
+@@ -27,6 +27,8 @@
+ #include "Info.h"
+ #include "Usage.h"
+ 
++using namespace std;
++
+ // methods for class Options
+ 
+ Options::Options()
+@@ -130,7 +132,7 @@ Options* OptionsParser::parse(int argc, 
  	    int loop = 1;
  	    while (loop)
  	    {
diff --git a/misc/colortail/patches/patch-main.cc b/misc/colortail/patches/patch-main.cc
new file mode 100644
index 00000000000..4d42af08045
--- /dev/null
+++ b/misc/colortail/patches/patch-main.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-main.cc,v 1.1 2011/11/26 17:16:53 joerg Exp $
+
+--- main.cc.orig	2011-11-26 15:17:12.000000000 +0000
++++ main.cc
+@@ -18,6 +18,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ 
+ #include "main.h"