From t.d.bishop@kent.ac.uk  Sat Oct 23 11:50:52 2004
Return-Path: <t.d.bishop@kent.ac.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6D76A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Oct 2004 11:50:52 +0000 (GMT)
Received: from mx5.kent.ac.uk (mx5.kent.ac.uk [129.12.21.36])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC71843D5A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Oct 2004 11:50:51 +0000 (GMT)
	(envelope-from t.d.bishop@kent.ac.uk)
Received: from apophis.ukc.ac.uk ([129.12.4.11])
	by mx5.kent.ac.uk with esmtp (Exim 4.42)
	id 1CLKPz-0007R4-Cl; Sat, 23 Oct 2004 12:50:43 +0100
Received: from pendennis.ukc.ac.uk ([129.12.3.232])
	by apophis.ukc.ac.uk with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.42)
	id 1CLKPz-0007ka-9w; Sat, 23 Oct 2004 12:50:43 +0100
Received: from tdb by pendennis.ukc.ac.uk with local (Exim 4.42 (FreeBSD))
	id 1CLKPz-00048w-5s; Sat, 23 Oct 2004 12:50:43 +0100
Message-Id: <E1CLKPz-00048w-5s@pendennis.ukc.ac.uk>
Date: Sat, 23 Oct 2004 12:50:43 +0100
From: Tim Bishop <tim@bishnet.net>
Sender: "T.D.Bishop" <T.D.Bishop@kent.ac.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tim@bishnet.net
Subject: [MAINTAINER] mail/gnubiff: update to 2.0.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73037
>Category:       ports
>Synopsis:       [MAINTAINER] mail/gnubiff: update to 2.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 23 12:00:44 GMT 2004
>Closed-Date:    Sat Nov 06 14:44:56 GMT 2004
>Last-Modified:  Sat Nov  6 20:20:27 GMT 2004
>Originator:     Tim Bishop
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Sun Jul 18 15:23:54 BST 2004
>Description:
- Update to 2.0.2

I contacted the gnubiff developers and they've intergrated all the
code patches into this gnubiff release. Consequently none of the
following patches are needed anymore.

Removed file(s):
- files/patch-src-biff.cc
- files/patch-src-file.cc
- files/patch-src-socket.cc
- files/patch-src-ui-popup.cc
- files/patch-src-ui-preferences.cc

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- gnubiff-2.0.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	12 Oct 2004 13:30:09 -0000	1.5
+++ Makefile	23 Oct 2004 11:48:05 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: distinfo
===================================================================
RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	12 Oct 2004 13:30:09 -0000	1.3
+++ distinfo	23 Oct 2004 11:48:05 -0000
@@ -1,2 +1,2 @@
-MD5 (gnubiff-2.0.1.tar.gz) = 4963ff7e23cdc5396cdda035554e46c9
-SIZE (gnubiff-2.0.1.tar.gz) = 612929
+MD5 (gnubiff-2.0.2.tar.gz) = 38ee04ed9e41454e3e1b40677cdb70d5
+SIZE (gnubiff-2.0.2.tar.gz) = 608475
Index: files/patch-src-biff.cc
===================================================================
RCS file: files/patch-src-biff.cc
diff -N files/patch-src-biff.cc
--- files/patch-src-biff.cc	12 Oct 2004 13:30:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- src/biff.cc.orig	Fri Sep  3 20:19:11 2004
-+++ src/biff.cc	Tue Oct 12 14:56:23 2004
-@@ -68,14 +68,14 @@
- 								 GError **error)
- 	{
- 		BIFF(data)->xml_start_element (context, element_name, attribute_names, attribute_values, error);
--	};
-+	}
- 
- 	void BIFF_xml_error (GMarkupParseContext *context,
- 						 GError *error,
- 						 gpointer data)
- 	{
- 		BIFF(data)->xml_error (context, error);
--	};
-+	}
- }
- 
- 
Index: files/patch-src-file.cc
===================================================================
RCS file: files/patch-src-file.cc
diff -N files/patch-src-file.cc
--- files/patch-src-file.cc	12 Oct 2004 13:30:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- src/file.cc.orig	Sun Aug 22 11:04:12 2004
-+++ src/file.cc	Tue Oct 12 14:11:08 2004
-@@ -31,6 +31,7 @@
- 
- #include <fstream>
- #include <sstream>
-+#include <time.h>
- #include <utime.h>
- #include "file.h"
- 
Index: files/patch-src-socket.cc
===================================================================
RCS file: files/patch-src-socket.cc
diff -N files/patch-src-socket.cc
--- files/patch-src-socket.cc	12 Oct 2004 13:30:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/socket.cc.orig	Tue Aug 31 15:37:52 2004
-+++ src/socket.cc	Tue Oct 12 15:03:29 2004
-@@ -190,7 +190,7 @@
- #endif
- 	status_ = SOCKET_STATUS_OK;
- 	return 1;
--};
-+}
- 
- 
- gint
Index: files/patch-src-ui-popup.cc
===================================================================
RCS file: files/patch-src-ui-popup.cc
diff -N files/patch-src-ui-popup.cc
--- files/patch-src-ui-popup.cc	12 Oct 2004 13:30:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/ui-popup.cc.orig	Wed Sep  1 11:05:08 2004
-+++ src/ui-popup.cc	Tue Oct 12 14:15:09 2004
-@@ -529,7 +529,7 @@
- 					g_free (utf8_part);
- 					utf8_text = buffer;
- 				}
--				copy_part.clear();
-+				copy_part.erase();
- 			}
- 			i+=2; 
- 			if (i >= copy.size()) {
-@@ -557,7 +557,7 @@
- 				copy_part = _("* error *");
- 				break;
- 			}
--			copy_part.clear();
-+			copy_part.erase();
- 			while ((i < copy.size()) && (copy.substr(i,2) != "?="))
- 				copy_part += copy[i++];
- 			if (i >= copy.size()) {
Index: files/patch-src-ui-preferences.cc
===================================================================
RCS file: files/patch-src-ui-preferences.cc
diff -N files/patch-src-ui-preferences.cc
--- files/patch-src-ui-preferences.cc	12 Oct 2004 13:30:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- src/ui-preferences.cc.orig	Thu Sep  2 12:54:44 2004
-+++ src/ui-preferences.cc	Tue Oct 12 14:32:11 2004
-@@ -29,6 +29,7 @@
- // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
- // ========================================================================
- 
-+#include <stdio.h>
- #include <sstream>
- #include "ui-preferences.h"
- #include "ui-properties.h"
--- gnubiff-2.0.2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: arved 
State-Changed-When: Fri Nov 5 15:06:25 GMT 2004 
State-Changed-Why:  
Does not build on STABLE: 

c++ -DHAVE_CONFIG_H -I. -I. -I../config -D_THREAD_SAFE -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/X11R6/include/libglade-2.0   -DORBIT2=1 -D_THREAD_SAFE -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libart-2.0 -I/usr/local/include/orbit-2.0 -I/usr/local/include/libbonobo-2.0 -I/usr/local/include/bonobo-activation-2.0 -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/X11R6/include/panel-2.0 -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include/libgnomeui-2.0 -I/usr/X11R6/include/libbonoboui-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/X11R6/include/libgnome-2.0 -I/usr/X11R6/include/libgnomecanvas-2.0 -I/usr/X11R6/include/gconf/2 -I/usr/X11R6/include/gnome-vfs-2.0 -I/usr/X11R6/lib/gnome-vfs-2.0/include   -DGNUBIFF_LOCALEDIR=""/usr/X11R6/share/locale"" -DGNUBIFF_DATADIR=""/usr/X11R6/share/gnome/gnubiff"" -DGNUBIFF_ICONDIR=""/usr/X11R6/share/gnome/pixmaps"" -DREAL_DATADIR=""/usr/X11R6/share/gnome"" -D_GNU_SOURCE -Wall -ansi   -I/usr/local/include  -O -pipe -march=k6 -c -o support.o support.cc 
support.cc: In function `class string gb_substitute(basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> >, basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> >, vector<basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> >,allocator<basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> > > >)': 
support.cc:114: no matching function for call to `vector<basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> >,allocator<basic_string<char,string_char_traits<char>,__default_alloc_template<false,0> > > >::at (guint &)' 


http://www.freebsd.org/cgi/query-pr.cgi?pr=73037 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Nov 6 14:44:49 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73037 

From: Tim Bishop <tim@bishnet.net>
To: Tilman Linneweh <arved@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/73037: [MAINTAINER] mail/gnubiff: update to 2.0.2
Date: Sat, 6 Nov 2004 14:04:54 +0000

 On Fri, Nov 05, 2004 at 03:07:01PM +0000, Tilman Linneweh wrote:
 > Synopsis: [MAINTAINER] mail/gnubiff: update to 2.0.2
 > 
 > State-Changed-From-To: open->feedback
 > State-Changed-By: arved
 > State-Changed-When: Fri Nov 5 15:06:25 GMT 2004
 > State-Changed-Why: 
 > Does not build on STABLE:
 
 Ok - thanks. I've fixed the problems and tested on 4.x and 5.x. Here is
 the new patch.
 
 Added file(s):
 - files/patch-src::biff.cc
 - files/patch-src::support.cc
 
 Removed file(s):
 - files/patch-src-biff.cc
 - files/patch-src-file.cc
 - files/patch-src-socket.cc
 - files/patch-src-ui-popup.cc
 - files/patch-src-ui-preferences.cc
 
 --- gnubiff-2.0.2.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- Makefile	12 Oct 2004 13:30:09 -0000	1.5
 +++ Makefile	23 Oct 2004 11:48:05 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	gnubiff
 -PORTVERSION=	2.0.1
 +PORTVERSION=	2.0.2
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 Index: distinfo
 ===================================================================
 RCS file: /u1/freebsd/cvs/ports/mail/gnubiff/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo	12 Oct 2004 13:30:09 -0000	1.3
 +++ distinfo	23 Oct 2004 11:48:05 -0000
 @@ -1,2 +1,2 @@
 -MD5 (gnubiff-2.0.1.tar.gz) = 4963ff7e23cdc5396cdda035554e46c9
 -SIZE (gnubiff-2.0.1.tar.gz) = 612929
 +MD5 (gnubiff-2.0.2.tar.gz) = 38ee04ed9e41454e3e1b40677cdb70d5
 +SIZE (gnubiff-2.0.2.tar.gz) = 608475
 Index: files/patch-src-biff.cc
 ===================================================================
 RCS file: files/patch-src-biff.cc
 diff -N files/patch-src-biff.cc
 --- files/patch-src-biff.cc	12 Oct 2004 13:30:09 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,19 +0,0 @@
 ---- src/biff.cc.orig	Fri Sep  3 20:19:11 2004
 -+++ src/biff.cc	Tue Oct 12 14:56:23 2004
 -@@ -68,14 +68,14 @@
 - 								 GError **error)
 - 	{
 - 		BIFF(data)->xml_start_element (context, element_name, attribute_names, attribute_values, error);
 --	};
 -+	}
 - 
 - 	void BIFF_xml_error (GMarkupParseContext *context,
 - 						 GError *error,
 - 						 gpointer data)
 - 	{
 - 		BIFF(data)->xml_error (context, error);
 --	};
 -+	}
 - }
 - 
 - 
 Index: files/patch-src-file.cc
 ===================================================================
 RCS file: files/patch-src-file.cc
 diff -N files/patch-src-file.cc
 --- files/patch-src-file.cc	12 Oct 2004 13:30:09 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,10 +0,0 @@
 ---- src/file.cc.orig	Sun Aug 22 11:04:12 2004
 -+++ src/file.cc	Tue Oct 12 14:11:08 2004
 -@@ -31,6 +31,7 @@
 - 
 - #include <fstream>
 - #include <sstream>
 -+#include <time.h>
 - #include <utime.h>
 - #include "file.h"
 - 
 Index: files/patch-src-socket.cc
 ===================================================================
 RCS file: files/patch-src-socket.cc
 diff -N files/patch-src-socket.cc
 --- files/patch-src-socket.cc	12 Oct 2004 13:30:09 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- src/socket.cc.orig	Tue Aug 31 15:37:52 2004
 -+++ src/socket.cc	Tue Oct 12 15:03:29 2004
 -@@ -190,7 +190,7 @@
 - #endif
 - 	status_ = SOCKET_STATUS_OK;
 - 	return 1;
 --};
 -+}
 - 
 - 
 - gint
 Index: files/patch-src-ui-popup.cc
 ===================================================================
 RCS file: files/patch-src-ui-popup.cc
 diff -N files/patch-src-ui-popup.cc
 --- files/patch-src-ui-popup.cc	12 Oct 2004 13:30:09 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,20 +0,0 @@
 ---- src/ui-popup.cc.orig	Wed Sep  1 11:05:08 2004
 -+++ src/ui-popup.cc	Tue Oct 12 14:15:09 2004
 -@@ -529,7 +529,7 @@
 - 					g_free (utf8_part);
 - 					utf8_text = buffer;
 - 				}
 --				copy_part.clear();
 -+				copy_part.erase();
 - 			}
 - 			i+=2; 
 - 			if (i >= copy.size()) {
 -@@ -557,7 +557,7 @@
 - 				copy_part = _("* error *");
 - 				break;
 - 			}
 --			copy_part.clear();
 -+			copy_part.erase();
 - 			while ((i < copy.size()) && (copy.substr(i,2) != "?="))
 - 				copy_part += copy[i++];
 - 			if (i >= copy.size()) {
 Index: files/patch-src-ui-preferences.cc
 ===================================================================
 RCS file: files/patch-src-ui-preferences.cc
 diff -N files/patch-src-ui-preferences.cc
 --- files/patch-src-ui-preferences.cc	12 Oct 2004 13:30:09 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,10 +0,0 @@
 ---- src/ui-preferences.cc.orig	Thu Sep  2 12:54:44 2004
 -+++ src/ui-preferences.cc	Tue Oct 12 14:32:11 2004
 -@@ -29,6 +29,7 @@
 - // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 - // ========================================================================
 - 
 -+#include <stdio.h>
 - #include <sstream>
 - #include "ui-preferences.h"
 - #include "ui-properties.h"
 Index: files/patch-src::biff.cc
 ===================================================================
 RCS file: files/patch-src::biff.cc
 diff -N files/patch-src::biff.cc
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-src::biff.cc	6 Nov 2004 13:55:25 -0000
 @@ -0,0 +1,10 @@
 +--- src/biff.cc.bak	Sat Nov  6 13:49:41 2004
 ++++ src/biff.cc	Sat Nov  6 13:50:06 2004
 +@@ -32,6 +32,7 @@
 + #include <fstream>
 + #include <sstream>
 + #include <map>
 ++#include <unistd.h>
 + #include <fcntl.h>
 + #include "biff.h"
 + #include "ui-preferences.h"
 Index: files/patch-src::support.cc
 ===================================================================
 RCS file: files/patch-src::support.cc
 diff -N files/patch-src::support.cc
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-src::support.cc	6 Nov 2004 13:55:25 -0000
 @@ -0,0 +1,11 @@
 +--- src/support.cc.bak	Sat Nov  6 13:35:51 2004
 ++++ src/support.cc	Sat Nov  6 13:36:16 2004
 +@@ -111,7 +111,7 @@
 + 		// generic case
 + 		if ((cpos=chars.find(format.at(pos+1)))==std::string::npos)
 + 			continue;
 +-		result+=toinsert.at(cpos);
 ++		result+=toinsert[cpos];
 + 	}
 + 	if (prevpos<len)
 + 		result.append(format,prevpos,len-prevpos);
 --- gnubiff-2.0.2.patch ends here ---
 
 -- 
 Tim Bishop
 http://www.bishnet.net/tim
 PGP Key: 0x5AE7D984
>Unformatted:
