9 files changed, 24 insertions, 73 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 52178fc7eaca..c721d7be0f60 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -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}
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 1a42e4e618ea..2fc2910ab99c 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -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
diff --git a/mail/gnubiff/files/patch-src-biff.cc b/mail/gnubiff/files/patch-src-biff.cc
deleted file mode 100644
index 4757e428a4b6..000000000000
--- a/mail/gnubiff/files/patch-src-biff.cc
+++ /dev/null
@@ -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);
--	};
-+	}
- }
- 
- 
diff --git a/mail/gnubiff/files/patch-src-file.cc b/mail/gnubiff/files/patch-src-file.cc
deleted file mode 100644
index d6b1d11fda93..000000000000
--- a/mail/gnubiff/files/patch-src-file.cc
+++ /dev/null
@@ -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"
- 
diff --git a/mail/gnubiff/files/patch-src-socket.cc b/mail/gnubiff/files/patch-src-socket.cc
deleted file mode 100644
index 3b5a2dbdae01..000000000000
--- a/mail/gnubiff/files/patch-src-socket.cc
+++ /dev/null
@@ -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
diff --git a/mail/gnubiff/files/patch-src-ui-popup.cc b/mail/gnubiff/files/patch-src-ui-popup.cc
deleted file mode 100644
index 8a9c09c57a08..000000000000
--- a/mail/gnubiff/files/patch-src-ui-popup.cc
+++ /dev/null
@@ -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()) {
diff --git a/mail/gnubiff/files/patch-src-ui-preferences.cc b/mail/gnubiff/files/patch-src-ui-preferences.cc
deleted file mode 100644
index e56688cca480..000000000000
--- a/mail/gnubiff/files/patch-src-ui-preferences.cc
+++ /dev/null
@@ -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"
diff --git a/mail/gnubiff/files/patch-src::biff.cc b/mail/gnubiff/files/patch-src::biff.cc
new file mode 100644
index 000000000000..ac64ccc37303
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::biff.cc
@@ -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"
diff --git a/mail/gnubiff/files/patch-src::support.cc b/mail/gnubiff/files/patch-src::support.cc
new file mode 100644
index 000000000000..fd991728ed2e
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::support.cc
@@ -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);