Update to 2.1.1

PR:		78784
Submitted by:	Tim Bishop <tim@bishnet.net>

10 files changed, 9 insertions, 95 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 1bae8f28251a..aa44e8dbb7b7 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 68ec5c8c77fc..2d3a914031fe 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnubiff-2.1.0.tar.gz) = b6ccb69dbc44a59ea166d7cb9cc3e97e
-SIZE (gnubiff-2.1.0.tar.gz) = 635146
+MD5 (gnubiff-2.1.1.tar.gz) = 0b3899ba3671b2730a6f25139cdde063
+SIZE (gnubiff-2.1.1.tar.gz) = 705530
diff --git a/mail/gnubiff/files/patch-configure b/mail/gnubiff/files/patch-configure
index 127d7cd4544d..efb1461648c2 100644
--- a/mail/gnubiff/files/patch-configure
+++ b/mail/gnubiff/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bak	Sat Sep 25 12:25:10 2004
-+++ configure	Sat Sep 25 12:25:40 2004
-@@ -3788,7 +3788,7 @@
+--- configure.bak	Sun Mar 13 13:02:42 2005
++++ configure	Sun Mar 13 13:03:08 2005
+@@ -3830,7 +3830,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3845,7 +3845,7 @@
+@@ -3886,7 +3886,7 @@
  #define HAVE_LIBSSL 1
  _ACEOF
  
@@ -17,8 +17,8 @@
 +  LIBS="-lssl -lcrypto $LIBS"
  
  fi
- ac_cv_lib_ssl=ac_cv_lib_ssl_main
-@@ -3927,7 +3927,7 @@
+ 
+@@ -3968,7 +3968,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/mail/gnubiff/files/patch-doc::gnubiff.info b/mail/gnubiff/files/patch-doc::gnubiff.info
deleted file mode 100644
index 3e43b2885aaf..000000000000
--- a/mail/gnubiff/files/patch-doc::gnubiff.info
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/gnubiff.info.bak	Sun Jan  9 13:49:42 2005
-+++ doc/gnubiff.info	Sun Jan  9 13:50:26 2005
-@@ -11,6 +11,11 @@
-      no Back-Cover Texts.  A copy of the license is included in the
-      section entitled "GNU Free Documentation License".
- 
-+INFO-DIR-SECTION Utilities
-+START-INFO-DIR-ENTRY
-+* gnubiff: (gnubiff).		A mail notification program for Gnome
-+END-INFO-DIR-ENTRY
-+
- 
- File: gnubiff.info,  Node: Top,  Next: Copying,  Up: (dir)
- 
diff --git a/mail/gnubiff/files/patch-src::biff.cc b/mail/gnubiff/files/patch-src::biff.cc
deleted file mode 100644
index e5ecf5d1959b..000000000000
--- a/mail/gnubiff/files/patch-src::biff.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/biff.cc.bak	Sun Jan  9 14:29:14 2005
-+++ src/biff.cc	Sun Jan  9 14:29:28 2005
-@@ -35,6 +35,7 @@
- #include <fstream>
- #include <sstream>
- #include <map>
-+#include <unistd.h>
- 
- #ifdef USE_GNOME
- #  include "ui-applet-gnome.h"
diff --git a/mail/gnubiff/files/patch-src::file.cc b/mail/gnubiff/files/patch-src::file.cc
deleted file mode 100644
index 64c3469b597b..000000000000
--- a/mail/gnubiff/files/patch-src::file.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/file.cc.bak	Sun Jan  9 14:12:06 2005
-+++ src/file.cc	Sun Jan  9 14:12:21 2005
-@@ -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::local.cc b/mail/gnubiff/files/patch-src::local.cc
deleted file mode 100644
index bdc02d7e0da8..000000000000
--- a/mail/gnubiff/files/patch-src::local.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/local.cc.bak	Sun Jan  9 14:45:14 2005
-+++ src/local.cc	Sun Jan  9 14:45:27 2005
-@@ -33,6 +33,7 @@
- 
- #include <errno.h>
- #include <signal.h>
-+#include <unistd.h>
- 
- #include "local.h"
- #include "ui-applet.h"
diff --git a/mail/gnubiff/files/patch-src::socket.cc b/mail/gnubiff/files/patch-src::socket.cc
deleted file mode 100644
index d4e43f3afdc1..000000000000
--- a/mail/gnubiff/files/patch-src::socket.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/socket.cc.bak	Sun Jan  9 14:43:12 2005
-+++ src/socket.cc	Sun Jan  9 14:43:22 2005
-@@ -40,6 +40,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <sys/time.h>
- 
- #include "ui-certificate.h"
- #include "mailbox.h"
diff --git a/mail/gnubiff/files/patch-src::support.cc b/mail/gnubiff/files/patch-src::support.cc
deleted file mode 100644
index fd991728ed2e..000000000000
--- a/mail/gnubiff/files/patch-src::support.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
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 c2aeb453d342..000000000000
--- a/mail/gnubiff/files/patch-src::ui-popup.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ui-popup.cc.bak	Sun Jan  9 14:22:10 2005
-+++ src/ui-popup.cc	Sun Jan  9 14:22:31 2005
-@@ -564,7 +564,7 @@
- 					g_free (utf8_part);
- 					utf8_text = buffer;
- 				}
--				copy_part.clear();
-+				copy_part.erase();
- 			}
- 			i+=2; 
- 			if (i >= copy.size()) {
-@@ -592,7 +592,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()) {