Attachment 108328 Details for Bug 149149 – file.diff

[patch] file.diff

file.diff (text/plain), 7.74 KB, created by Frederic Culot on 2010-07-31 14:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Culot

Created: 2010-07-31 14:20:02 UTC

Size: 7.74 KB

patch

obsolete

>diff -ruN colortail.bak/Makefile colortail/Makefile
>--- colortail.bak/Makefile	2010-07-31 13:44:20.409441181 +0200
>+++ colortail/Makefile	2010-07-31 13:53:08.922015824 +0200
>@@ -6,12 +6,9 @@
> #
> 
> PORTNAME=	colortail
>-PORTVERSION=	0.3.0
>-PORTREVISION=	2
>+PORTVERSION=	0.3.3
> CATEGORIES=	misc
>-MASTER_SITES=	http://joakimandersson.se/files/ \
>-		${MASTER_SITE_GENTOO}
>-MASTER_SITE_SUBDIR=	distfiles
>+MASTER_SITES=	http://joakimandersson.se/files/
> 
> MAINTAINER=	tabthorpe@FreeBSD.org
> COMMENT=	A colour-able replacement for tail(1)
>diff -ruN colortail.bak/distinfo colortail/distinfo
>--- colortail.bak/distinfo	2010-07-31 13:44:20.409441181 +0200
>+++ colortail/distinfo	2010-07-31 13:53:17.491787122 +0200
>@@ -1,3 +1,3 @@
>-MD5 (colortail-0.3.0.tar.gz) = 2589d3e372080f4052d1cc0d6550508f
>-SHA256 (colortail-0.3.0.tar.gz) = b88e18a798436616918487997d7b1aad4ffaecac4ffd62ba3885e840f1626e1b
>-SIZE (colortail-0.3.0.tar.gz) = 54329
>+MD5 (colortail-0.3.3.tar.gz) = a6fc24230c0a2c7cd0313cd3b73f4a64
>+SHA256 (colortail-0.3.3.tar.gz) = 0fabf424c3cc1aa030315d76490dbae64546a236abd8958bb3a99f8bdc322ae9
>+SIZE (colortail-0.3.3.tar.gz) = 97399
>diff -ruN colortail.bak/files/patch-CfgFileParser.cc colortail/files/patch-CfgFileParser.cc
>--- colortail.bak/files/patch-CfgFileParser.cc	2010-07-31 13:44:20.408438540 +0200
>+++ colortail/files/patch-CfgFileParser.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,19 +0,0 @@
>-
>-$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 ##
>- 
>diff -ruN colortail.bak/files/patch-CfgFileParser.h colortail/files/patch-CfgFileParser.h
>--- colortail.bak/files/patch-CfgFileParser.h	1970-01-01 01:00:00.000000000 +0100
>+++ colortail/files/patch-CfgFileParser.h	2010-07-31 14:19:18.371575754 +0200
>@@ -0,0 +1,10 @@
>+--- CfgFileParser.h.bak	2010-07-31 14:18:50.529980803 +0200
>++++ CfgFileParser.h	2010-07-31 14:18:59.977448567 +0200
>+@@ -24,7 +24,6 @@
>+ #include "config.h"
>+ 
>+ #include <sys/types.h>
>+-#include <regex.h>
>+ #include <iostream>
>+ #include <fstream>
>+ #include <string>
>diff -ruN colortail.bak/files/patch-Colorizer.cc colortail/files/patch-Colorizer.cc
>--- colortail.bak/files/patch-Colorizer.cc	2010-07-31 13:44:20.408438540 +0200
>+++ colortail/files/patch-Colorizer.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,56 +0,0 @@
>-
>-$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
>diff -ruN colortail.bak/files/patch-OptionsParser.cc colortail/files/patch-OptionsParser.cc
>--- colortail.bak/files/patch-OptionsParser.cc	2010-07-31 13:44:20.407433105 +0200
>+++ colortail/files/patch-OptionsParser.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- 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)
>- 	       {
>diff -ruN colortail.bak/files/patch-TailFile.cc colortail/files/patch-TailFile.cc
>--- colortail.bak/files/patch-TailFile.cc	2010-07-31 13:44:20.408438540 +0200
>+++ colortail/files/patch-TailFile.cc	2010-07-31 14:13:52.843382646 +0200
>@@ -1,21 +1,14 @@
>---- TailFile.cc.orig	Thu Aug  5 08:09:38 1999
>-+++ TailFile.cc	Thu Feb  5 19:49:47 2004
>-@@ -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 @@
>+--- 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 @@
>        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);
>++          m_follow_buffer->put(ch);
>        
>        // check if return
>+       if (ch == '\n')
>diff -ruN colortail.bak/files/patch-TailFile.h colortail/files/patch-TailFile.h
>--- colortail.bak/files/patch-TailFile.h	2010-07-31 13:44:20.409441181 +0200
>+++ colortail/files/patch-TailFile.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>---- 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);
>diff -ruN colortail.bak/files/patch-ab colortail/files/patch-ab
>--- colortail.bak/files/patch-ab	2010-07-31 13:44:20.408438540 +0200
>+++ colortail/files/patch-ab	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- 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
>diff -ruN colortail.bak/files/patch-configure colortail/files/patch-configure
>--- colortail.bak/files/patch-configure	2010-07-31 13:44:20.407433105 +0200
>+++ colortail/files/patch-configure	2010-07-31 13:59:00.657924717 +0200
>@@ -1,11 +1,11 @@
>---- configure.orig	Sun Aug 15 16:36:25 1999
>-+++ configure	Tue Jan 28 15:06:04 2003
>-@@ -1206,7 +1206,7 @@
>+--- 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_hdr in malloc.h unistd.h regex.h gnuregex.h
>-+for ac_hdr in malloc.h unistd.h regex.h
>+ 
>+-for ac_header in malloc.h unistd.h regex.h gnuregex.h
>++for ac_header in malloc.h unistd.h regex.h
>  do
>- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
>+ 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

Actions: View | Diff

Attachments on bug 149149: 108328