Attachment #108328 for bug #149149

View | Details | Raw Unified | Return to bug 149149
Collapse All | Expand All




#

PORTNAME=	colortail
PORTVERSION=	0.3.3
PORTREVISION=	2
CATEGORIES=	misc
MASTER_SITES=	http://joakimandersson.se/files/
		${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR=	distfiles

MAINTAINER=	tabthorpe@FreeBSD.org
COMMENT=	A colour-able replacement for tail(1)

Lines 1-3 Link Here

(-)colortail/distinfo (-3 / +3 lines)
1	MD5 (colortail-0.3.0.tar.gz) = 2589d3e372080f4052d1cc0d6550508f	1	MD5 (colortail-0.3.3.tar.gz) = a6fc24230c0a2c7cd0313cd3b73f4a64
2	SHA256 (colortail-0.3.0.tar.gz) = b88e18a798436616918487997d7b1aad4ffaecac4ffd62ba3885e840f1626e1b	2	SHA256 (colortail-0.3.3.tar.gz) = 0fabf424c3cc1aa030315d76490dbae64546a236abd8958bb3a99f8bdc322ae9
3	SIZE (colortail-0.3.0.tar.gz) = 54329	3	SIZE (colortail-0.3.3.tar.gz) = 97399





$FreeBSD: ports/misc/colortail/files/patch-CfgFileParser.cc,v 1.1 2002/11/26 00:34:06 naddy Exp $

--- CfgFileParser.cc.orig	Tue Aug  3 21:40:44 1999
+++ CfgFileParser.cc	Tue Nov 26 01:08:21 2002
@@ -20,11 +20,10 @@
 #include "CfgFileParser.h"
 
 #include <stdio.h>
-#include <fstream.h>
+#include <iostream.h>
 #include <assert.h>
 #include <string.h>
-#include <malloc.h>
-
+#include <stdlib.h>
 
 // ## class SearchData ##
 

Line 0 Link Here

(-)colortail/files/patch-CfgFileParser.h (+10 lines)
	1	--- CfgFileParser.h.bak 2010-07-31 14:18:50.529980803 +0200
	2	+++ CfgFileParser.h 2010-07-31 14:18:59.977448567 +0200
	3	@@ -24,7 +24,6 @@
	4	#include "config.h"
	5
	6	#include <sys/types.h>
	7	-#include <regex.h>
	8	#include <iostream>
	9	#include <fstream>
	10	#include <string>





$FreeBSD: ports/misc/colortail/files/patch-Colorizer.cc,v 1.2 2004/02/06 14:08:52 krion Exp $

--- Colorizer.cc.orig	Wed Aug  4 04:41:17 1999
+++ Colorizer.cc	Thu Feb  5 19:49:47 2004
@@ -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




--- OptionsParser.cc.orig	Thu Aug  5 08:23:39 1999
+++ OptionsParser.cc	Thu Feb  5 19:49:47 2004
@@ -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)
 	       {




--- TailFile.cc.bak	2010-07-31 14:12:15.145254811 +0200
+++ TailFile.cc	2010-07-31 14:13:31.996950208 +0200
@@ -352,7 +352,10 @@
    // 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);
       
       // check if return
       if (ch == '\n')




--- TailFile.h.orig	Wed Aug  4 04:42:33 1999
+++ TailFile.h	Thu Feb  5 19:49:47 2004
@@ -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);




--- CfgFileParser.h.old	Wed Jun 21 12:55:57 2000
+++ CfgFileParser.h	Wed Jun 21 12:56:09 2000
@@ -24,7 +24,9 @@
 #include "config.h"
 
 #include <sys/types.h>
+#if 0
 #include <regex.h>
+#endif
 #include <fstream.h>
 
 #ifdef HAVE_GNUREGEX_H




--- configure.bak	2010-07-31 13:58:20.150270253 +0200
+++ configure	2010-07-31 13:58:29.487410308 +0200
@@ -4528,7 +4528,7 @@
 
 fi
 
 
-for ac_header in malloc.h unistd.h regex.h gnuregex.h
+for ac_header in malloc.h unistd.h regex.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

Return to bug 149149

Lines 6-17 Link Here

(-)colortail/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= colortail	8	PORTNAME= colortail
9	PORTVERSION= 0.3.0	9	PORTVERSION= 0.3.3
10	PORTREVISION= 2
11	CATEGORIES= misc	10	CATEGORIES= misc
12	MASTER_SITES= http://joakimandersson.se/files/ \	11	MASTER_SITES= http://joakimandersson.se/files/
13	${MASTER_SITE_GENTOO}
14	MASTER_SITE_SUBDIR= distfiles
15		12
16	MAINTAINER= tabthorpe@FreeBSD.org	13	MAINTAINER= tabthorpe@FreeBSD.org
17	COMMENT= A colour-able replacement for tail(1)	14	COMMENT= A colour-able replacement for tail(1)

Lines 1-19 Link Here

(-)colortail/files/patch-CfgFileParser.cc (-19 lines)
1
2	$FreeBSD: ports/misc/colortail/files/patch-CfgFileParser.cc,v 1.1 2002/11/26 00:34:06 naddy Exp $
3
4	--- CfgFileParser.cc.orig Tue Aug 3 21:40:44 1999
5	+++ CfgFileParser.cc Tue Nov 26 01:08:21 2002
6	@@ -20,11 +20,10 @@
7	#include "CfgFileParser.h"
8
9	#include <stdio.h>
10	-#include <fstream.h>
11	+#include <iostream.h>
12	#include <assert.h>
13	#include <string.h>
14	-#include <malloc.h>
15	-
16	+#include <stdlib.h>
17
18	// ## class SearchData ##
19

Lines 1-56 Link Here

(-)colortail/files/patch-Colorizer.cc (-56 lines)
1
2	$FreeBSD: ports/misc/colortail/files/patch-Colorizer.cc,v 1.2 2004/02/06 14:08:52 krion Exp $
3
4	--- Colorizer.cc.orig Wed Aug 4 04:41:17 1999
5	+++ Colorizer.cc Thu Feb 5 19:49:47 2004
6	@@ -23,7 +23,7 @@
7
8	#include <assert.h>
9	#include <stdio.h>
10	-#include <strstream.h>
11	+#include <strstream>
12
13
14	Colorizer::Colorizer()
15	@@ -111,7 +111,7 @@
16	ListIterator<SearchData> itr(m_items_list);
17
18	// will contain the new string
19	- ostrstream newstr;
20	+ std::ostrstream newstr;
21
22	SearchData *current;
23	int i = 0;
24	@@ -172,7 +172,7 @@
25	}
26
27	// write ansi reset str and a newline
28	- newstr << ANSI_RESET_STR << endl << ends;
29	+ newstr << ANSI_RESET_STR << std::endl << std::ends;
30	// return the new string
31	return newstr.str();
32	}
33	@@ -187,12 +187,12 @@
34	// check if str ends in '\n'
35	if (str[strlen(str)] == '\n')
36	{
37	- newstr << str << ends;
38	+ newstr << str << std::ends;
39	}
40	else
41	{
42	// doesn't end in '\n'
43	- newstr << str << endl << ends;
44	+ newstr << str << std::endl << std::ends;
45	}
46
47	// return the new string
48	@@ -240,7 +240,7 @@
49
50	// write newline and null
51	//newstr << endl << ends;
52	- newstr << ends;
53	+ newstr << std::ends;
54
55
56	// return the new string

Lines 1-20 Link Here

(-)colortail/files/patch-OptionsParser.cc (-20 lines)
1	--- OptionsParser.cc.orig Thu Aug 5 08:23:39 1999
2	+++ OptionsParser.cc Thu Feb 5 19:49:47 2004
3	@@ -18,7 +18,7 @@
4	*/
5
6	#include <iostream.h>
7	-#include <strstream.h>
8	+#include <strstream>
9	#include <string.h>
10	#include <stdio.h>
11	#include <stdlib.h>
12	@@ -130,7 +130,7 @@
13	int loop = 1;
14	while (loop)
15	{
16	- ostrstream filename;
17	+ std::ostrstream filename;
18
19	while (1)
20	{

Lines 1-21 Link Here

(-)colortail/files/patch-TailFile.cc (-13 / +6 lines)
1	--- TailFile.cc.orig Thu Aug 5 08:09:38 1999	1	--- TailFile.cc.bak 2010-07-31 14:12:15.145254811 +0200
2	+++ TailFile.cc Thu Feb 5 19:49:47 2004	2	+++ TailFile.cc 2010-07-31 14:13:31.996950208 +0200
3	@@ -375,7 +375,7 @@	3	@@ -352,7 +352,10 @@
4	// check if there isn't a follow buffer
5	if (m_follow_buffer == NULL)
6	{
7	- m_follow_buffer = new ostrstream();
8	+ m_follow_buffer = new std::ostrstream();
9	}
10
11	// make buffer
12	@@ -417,6 +417,9 @@
13	int ch = fgetc(m_file);	4	int ch = fgetc(m_file);
14		5
15	// add the character to the string	6	// add the character to the string
		7	- m_follow_buffer->put(ch);
16	+ if (ch == EOF)	8	+ if (ch == EOF)
17	+ clearerr(m_file); // required by POSIX and ANSI	9	+ clearerr(m_file); // required by POSIX and ANSI
18	+ else	10	+ else
19	m_follow_buffer->put(ch);	11	+ m_follow_buffer->put(ch);
20		12
21	// check if return	13	// check if return
		14	if (ch == '\n')

Lines 1-21 Link Here

(-)colortail/files/patch-TailFile.h (-21 lines)
1	--- TailFile.h.orig Wed Aug 4 04:42:33 1999
2	+++ TailFile.h Thu Feb 5 19:49:47 2004
3	@@ -23,7 +23,8 @@
4	#include "Colorizer.h"
5
6	#include <stdio.h>
7	-#include <strstream.h>
8	+#include <iostream>
9	+#include <strstream>
10
11	#define MAX_CHARS_READ 1024
12
13	@@ -40,7 +41,7 @@
14	// the stream position
15	long m_position;
16	// the follow buffer, used in follow_print
17	- ostrstream *m_follow_buffer;
18	+ std::ostrstream *m_follow_buffer;
19
20	// private methods
21	void find_position(int n);

Lines 1-12 Link Here

(-)colortail/files/patch-ab (-12 lines)
1	--- CfgFileParser.h.old Wed Jun 21 12:55:57 2000
2	+++ CfgFileParser.h Wed Jun 21 12:56:09 2000
3	@@ -24,7 +24,9 @@
4	#include "config.h"
5
6	#include <sys/types.h>
7	+#if 0
8	#include <regex.h>
9	+#endif
10	#include <fstream.h>
11
12	#ifdef HAVE_GNUREGEX_H

Lines 1-11 Link Here

(-)colortail/files/patch-configure (-8 / +8 lines)
1	--- configure.orig Sun Aug 15 16:36:25 1999	1	--- configure.bak 2010-07-31 13:58:20.150270253 +0200
2	+++ configure Tue Jan 28 15:06:04 2003	2	+++ configure 2010-07-31 13:58:29.487410308 +0200
3	@@ -1206,7 +1206,7 @@	3	@@ -4528,7 +4528,7 @@
4		4
5	fi
6		5
7	-for ac_hdr in malloc.h unistd.h regex.h gnuregex.h	6
8	+for ac_hdr in malloc.h unistd.h regex.h	7	-for ac_header in malloc.h unistd.h regex.h gnuregex.h
		8	+for ac_header in malloc.h unistd.h regex.h
9	do	9	do
10	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`	10	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6	11	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then