- Update to 2.1.0

PR:		ports/75994
Submitted by:	maintainer

9 files changed, 66 insertions, 18 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 86cdbd653de9..7405ada5984b 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 7305ad8062ae..68ec5c8c77fc 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnubiff-2.0.3.tar.gz) = d3982297e7e58c127c57cebec306acd9
-SIZE (gnubiff-2.0.3.tar.gz) = 606421
+MD5 (gnubiff-2.1.0.tar.gz) = b6ccb69dbc44a59ea166d7cb9cc3e97e
+SIZE (gnubiff-2.1.0.tar.gz) = 635146
diff --git a/mail/gnubiff/files/patch-doc::gnubiff.info b/mail/gnubiff/files/patch-doc::gnubiff.info
index 08f3ee8894e7..3e43b2885aaf 100644
--- a/mail/gnubiff/files/patch-doc::gnubiff.info
+++ b/mail/gnubiff/files/patch-doc::gnubiff.info
@@ -1,14 +1,14 @@
---- doc/gnubiff.info.bak	Fri Dec 10 13:20:19 2004
-+++ doc/gnubiff.info	Fri Dec 10 13:23:07 2004
-@@ -10,6 +10,11 @@
-      Foundation; with no Invariant Sections, no Front-Cover Texts, and
+--- 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
index ac64ccc37303..e5ecf5d1959b 100644
--- a/mail/gnubiff/files/patch-src::biff.cc
+++ b/mail/gnubiff/files/patch-src::biff.cc
@@ -1,10 +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 @@
+--- 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>
- #include <fcntl.h>
- #include "biff.h"
- #include "ui-preferences.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
new file mode 100644
index 000000000000..64c3469b597b
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::file.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..bdc02d7e0da8
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::local.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..d4e43f3afdc1
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::socket.cc
@@ -0,0 +1,10 @@
+--- 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::ui-popup.cc b/mail/gnubiff/files/patch-src::ui-popup.cc
new file mode 100644
index 000000000000..c2aeb453d342
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::ui-popup.cc
@@ -0,0 +1,20 @@
+--- 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()) {
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 5e3ebedb3656..5539a0036b6b 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -17,13 +17,11 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/gnubiff/gnubiff.png
 %%SHAREDIR%%/gnubiff/logo.png
 %%SHAREDIR%%/gnubiff/mail.wav
-%%SHAREDIR%%/gnubiff/menu_about.png
-%%SHAREDIR%%/gnubiff/menu_mail_read.png
-%%SHAREDIR%%/gnubiff/menu_mail_start.png
 %%SHAREDIR%%/gnubiff/popup.glade
 %%SHAREDIR%%/gnubiff/preferences.glade
 %%SHAREDIR%%/gnubiff/properties.glade
 %%SHAREDIR%%/gnubiff/tux-awake.png
+%%SHAREDIR%%/gnubiff/tux-big.png
 %%SHAREDIR%%/gnubiff/tux-jump(64x64).png
 %%SHAREDIR%%/gnubiff/tux-sleep(64x64).png
 %%SHAREDIR%%/gnubiff/tux-sleep.png