diff options
| -rw-r--r-- | misc/colortail/distinfo | 8 | ||||
| -rw-r--r-- | misc/colortail/patches/patch-aa | 27 | ||||
| -rw-r--r-- | misc/colortail/patches/patch-ad | 15 | ||||
| -rw-r--r-- | misc/colortail/patches/patch-ae | 55 | ||||
| -rw-r--r-- | misc/colortail/patches/patch-af | 22 | ||||
| -rw-r--r-- | misc/colortail/patches/patch-ag | 23 |
6 files changed, 138 insertions, 12 deletions
diff --git a/misc/colortail/distinfo b/misc/colortail/distinfo index 18a40536008..4e91f4bd8e9 100644 --- a/misc/colortail/distinfo +++ b/misc/colortail/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.3 2002/12/13 23:01:42 jschauma Exp $ +$NetBSD: distinfo,v 1.4 2004/01/11 21:22:41 jschauma Exp $ SHA1 (colortail-0.3.0.tar.gz) = 5c55a9b0550868129d8ede133f6b34fa5356c5ce Size (colortail-0.3.0.tar.gz) = 54329 bytes -SHA1 (patch-aa) = 21a8249fd27487078d141a2e30e1e917586e1c3a +SHA1 (patch-aa) = 4db6ef6d231c98914c572f320700f67ae09101a7 SHA1 (patch-ab) = 055d1a11e6a555b569d11fe2c870332ae93b13e6 SHA1 (patch-ac) = fed43fd42497b951dd237f86ef08337f76fef494 +SHA1 (patch-ad) = d5d7c7c7b13856d097eaf21113a1a15cef8640f8 +SHA1 (patch-ae) = 09aaf9aebad66b0b220387f0b230fb615f8bef08 +SHA1 (patch-af) = 00fc20aa9508db7c3894a8cab0d5f75ed6a4a967 +SHA1 (patch-ag) = 29222baff0953c1c78255092426926061ccd92c5 diff --git a/misc/colortail/patches/patch-aa b/misc/colortail/patches/patch-aa index c711fb98b28..d2b070229b9 100644 --- a/misc/colortail/patches/patch-aa +++ b/misc/colortail/patches/patch-aa @@ -1,16 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/01/24 03:53:06 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2004/01/11 21:22:41 jschauma Exp $ ---- TailFile.cc.orig Wed Jan 24 04:44:29 2001 -+++ TailFile.cc -@@ -417,7 +417,10 @@ +--- 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 @@ + // check if there isn't a follow buffer + if (m_follow_buffer == NULL) + { +- m_follow_buffer = new ostrstream(); ++ m_follow_buffer = new std::ostrstream(); + } + + // make buffer +@@ -417,6 +417,9 @@ int ch = fgetc(m_file); // add the character to the string -- m_follow_buffer->put(ch); -+ if (ch == EOF) -+ clearerr(m_file); // required by POSIX and ANSI -+ else -+ m_follow_buffer->put(ch); ++ if (ch == EOF) ++ clearerr(m_file); // required by POSIX and ANSI ++ else + m_follow_buffer->put(ch); // check if return - if (ch == '\n') diff --git a/misc/colortail/patches/patch-ad b/misc/colortail/patches/patch-ad new file mode 100644 index 00000000000..42935343fab --- /dev/null +++ b/misc/colortail/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2004/01/11 21:22:41 jschauma Exp $ + +--- CfgFileParser.cc.orig 2004-01-11 16:15:05.000000000 -0500 ++++ CfgFileParser.cc 2004-01-11 16:15:08.000000000 -0500 +@@ -25,6 +25,10 @@ + #include <string.h> + #include <malloc.h> + ++#include <iostream> ++ ++using namespace std; ++ + + // ## class SearchData ## + diff --git a/misc/colortail/patches/patch-ae b/misc/colortail/patches/patch-ae new file mode 100644 index 00000000000..e3fa099ba4f --- /dev/null +++ b/misc/colortail/patches/patch-ae @@ -0,0 +1,55 @@ +$NetBSD: patch-ae,v 1.1 2004/01/11 21:22:41 jschauma 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 @@ + + #include <assert.h> + #include <stdio.h> +-#include <strstream.h> ++#include <strstream> + + + Colorizer::Colorizer() +@@ -111,7 +111,7 @@ + ListIterator<SearchData*> itr(*m_items_list); + + // will contain the new string +- ostrstream newstr; ++ std::ostrstream newstr; + + SearchData *current; + int i = 0; +@@ -172,7 +172,7 @@ + } + + // write ansi reset str and a newline +- newstr << ANSI_RESET_STR << endl << ends; ++ newstr << ANSI_RESET_STR << std::endl << std::ends; + // return the new string + return newstr.str(); + } +@@ -187,12 +187,12 @@ + // check if str ends in '\n' + if (str[strlen(str)] == '\n') + { +- newstr << str << ends; ++ newstr << str << std::ends; + } + else + { + // doesn't end in '\n' +- newstr << str << endl << ends; ++ newstr << str << std::endl << std::ends; + } + + // return the new string +@@ -240,7 +240,7 @@ + + // write newline and null + //newstr << endl << ends; +- newstr << ends; ++ newstr << std::ends; + + + // return the new string diff --git a/misc/colortail/patches/patch-af b/misc/colortail/patches/patch-af new file mode 100644 index 00000000000..273f4490764 --- /dev/null +++ b/misc/colortail/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1 2004/01/11 21:22:41 jschauma 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 @@ + */ + + #include <iostream.h> +-#include <strstream.h> ++#include <strstream> + #include <string.h> + #include <stdio.h> + #include <stdlib.h> +@@ -130,7 +130,7 @@ + int loop = 1; + while (loop) + { +- ostrstream filename; ++ std::ostrstream filename; + + while (1) + { diff --git a/misc/colortail/patches/patch-ag b/misc/colortail/patches/patch-ag new file mode 100644 index 00000000000..77cedc99277 --- /dev/null +++ b/misc/colortail/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1 2004/01/11 21:22:41 jschauma Exp $ + +--- TailFile.h.orig 2004-01-11 16:15:51.000000000 -0500 ++++ TailFile.h 2004-01-11 16:15:55.000000000 -0500 +@@ -23,7 +23,8 @@ + #include "Colorizer.h" + + #include <stdio.h> +-#include <strstream.h> ++#include <iostream> ++#include <strstream> + + #define MAX_CHARS_READ 1024 + +@@ -40,7 +41,7 @@ + // the stream position + long m_position; + // the follow buffer, used in follow_print +- ostrstream *m_follow_buffer; ++ std::ostrstream *m_follow_buffer; + + // private methods + void find_position(int n); |