Date: Sat, 6 Nov 2004 20:20:30 GMT From: Tim Bishop <tim@bishnet.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/73037: [MAINTAINER] mail/gnubiff: update to 2.0.2 Message-ID: <200411062020.iA6KKUPG053070@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/73037; it has been noted by GNATS.
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411062020.iA6KKUPG053070>