- Update to 2.0.1

PR:		ports/72563
Submitted by:	Tim Bishop <tim@bishnet.net> (maintainer)

10 files changed, 100 insertions, 55 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index dc3263960f8..52178fc7eac 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	1.4.0
+PORTVERSION=	2.0.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@ COMMENT=	A mail notification program for Gnome
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	intlhack libglade2 esound
 USE_GMAKE=	yes
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 858ac30bad9..1a42e4e618e 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnubiff-1.4.0.tar.bz2) = 11dca9aa4be57a73670243614ee1ee3d
-SIZE (gnubiff-1.4.0.tar.bz2) = 649934
+MD5 (gnubiff-2.0.1.tar.gz) = 4963ff7e23cdc5396cdda035554e46c9
+SIZE (gnubiff-2.0.1.tar.gz) = 612929
diff --git a/mail/gnubiff/files/patch-configure b/mail/gnubiff/files/patch-configure
index 4385a11a52c..127d7cd4544 100644
--- a/mail/gnubiff/files/patch-configure
+++ b/mail/gnubiff/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bak	Mon May  3 19:00:27 2004
-+++ configure	Mon May  3 19:01:08 2004
-@@ -3868,7 +3868,7 @@
+--- configure.bak	Sat Sep 25 12:25:10 2004
++++ configure	Sat Sep 25 12:25:40 2004
+@@ -3788,7 +3788,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
-@@ -3931,7 +3931,7 @@
+@@ -3845,7 +3845,7 @@
  #define HAVE_LIBSSL 1
  _ACEOF
  
@@ -17,4 +17,13 @@
 +  LIBS="-lssl -lcrypto $LIBS"
  
  fi
- 
+ ac_cv_lib_ssl=ac_cv_lib_ssl_main
+@@ -3927,7 +3927,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl  $LIBS"
++LIBS="-lssl -lcrypto  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/mail/gnubiff/files/patch-src-biff.cc b/mail/gnubiff/files/patch-src-biff.cc
new file mode 100644
index 00000000000..4757e428a4b
--- /dev/null
+++ b/mail/gnubiff/files/patch-src-biff.cc
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 00000000000..d6b1d11fda9
--- /dev/null
+++ b/mail/gnubiff/files/patch-src-file.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..3b5a2dbdae0
--- /dev/null
+++ b/mail/gnubiff/files/patch-src-socket.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 00000000000..8a9c09c57a0
--- /dev/null
+++ b/mail/gnubiff/files/patch-src-ui-popup.cc
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 00000000000..e56688cca48
--- /dev/null
+++ b/mail/gnubiff/files/patch-src-ui-preferences.cc
@@ -0,0 +1,10 @@
+--- 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::File.h b/mail/gnubiff/files/patch-src::File.h
deleted file mode 100644
index 8a29273b06f..00000000000
--- a/mail/gnubiff/files/patch-src::File.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/File.h.bak	Thu Jun 24 23:55:59 2004
-+++ src/File.h	Thu Jun 24 23:56:17 2004
-@@ -24,6 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #   include "../config.h"
- #endif
-+#include <sys/stat.h>
- #include "Mailbox.h"
- 
- 
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 8e402fa7b3f..4e85afcb600 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -1,56 +1,33 @@
 bin/gnubiff
 share/locale/de/LC_MESSAGES/gnubiff.mo
 share/locale/es/LC_MESSAGES/gnubiff.mo
+share/locale/fr/LC_MESSAGES/gnubiff.mo
 share/locale/fr_CA/LC_MESSAGES/gnubiff.mo
 share/locale/fr_FR/LC_MESSAGES/gnubiff.mo
 share/locale/it/LC_MESSAGES/gnubiff.mo
 share/locale/nl/LC_MESSAGES/gnubiff.mo
 share/locale/ro/LC_MESSAGES/gnubiff.mo
 share/locale/sv/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/AppletGNOME.glade
-%%SHAREDIR%%/gnubiff/AppletGTK.glade
-%%SHAREDIR%%/gnubiff/BiffCredits.png
-%%SHAREDIR%%/gnubiff/BiffGeometry.png
-%%SHAREDIR%%/gnubiff/BiffLayout.png
-%%SHAREDIR%%/gnubiff/BiffMailbox.png
-%%SHAREDIR%%/gnubiff/BiffOptions.png
-%%SHAREDIR%%/gnubiff/Popup.glade
-%%SHAREDIR%%/gnubiff/Setup.glade
-%%SHAREDIR%%/gnubiff/entry-list.png
-%%SHAREDIR%%/gnubiff/gnubiff_icon.png
+%%SHAREDIR%%/gnubiff/applet-gnome.glade
+%%SHAREDIR%%/gnubiff/applet-gtk.glade
+%%SHAREDIR%%/gnubiff/authentication.glade
+%%SHAREDIR%%/gnubiff/certificate.glade
+%%SHAREDIR%%/gnubiff/coin.wav
+%%SHAREDIR%%/gnubiff/envelopes.png
+%%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/stock-alarm.png
-%%SHAREDIR%%/gnubiff/stock-biff.png
-%%SHAREDIR%%/gnubiff/stock-clock.png
-%%SHAREDIR%%/gnubiff/stock-file.png
-%%SHAREDIR%%/gnubiff/stock-mailbox.png
-%%SHAREDIR%%/gnubiff/stock-network.png
-%%SHAREDIR%%/gnubiff/stock-nossl.png
-%%SHAREDIR%%/gnubiff/stock-password.png
-%%SHAREDIR%%/gnubiff/stock-popup.png
-%%SHAREDIR%%/gnubiff/stock-sound.png
-%%SHAREDIR%%/gnubiff/stock-soundfile.png
-%%SHAREDIR%%/gnubiff/stock-ssl-file-small.png
-%%SHAREDIR%%/gnubiff/stock-ssl-file.png
-%%SHAREDIR%%/gnubiff/stock-ssl.png
-%%SHAREDIR%%/gnubiff/stock-timer-stopped.png
-%%SHAREDIR%%/gnubiff/stock-timer.png
-%%SHAREDIR%%/gnubiff/stock-users.png
-%%SHAREDIR%%/gnubiff/stock-volume.png
-%%SHAREDIR%%/gnubiff/stock_left.png
-%%SHAREDIR%%/gnubiff/stock_right.png
-%%SHAREDIR%%/gnubiff/test.png
+%%SHAREDIR%%/gnubiff/popup.glade
+%%SHAREDIR%%/gnubiff/preferences.glade
+%%SHAREDIR%%/gnubiff/properties.glade
 %%SHAREDIR%%/gnubiff/tux-awake.png
 %%SHAREDIR%%/gnubiff/tux-jump(64x64).png
 %%SHAREDIR%%/gnubiff/tux-sleep(64x64).png
 %%SHAREDIR%%/gnubiff/tux-sleep.png
-%%SHAREDIR%%/pixmaps/gnubiff_icon.png
-%%SHAREDIR%%/sounds/gnubiff/coin.wav
-%%SHAREDIR%%/sounds/gnubiff/mail.wav
+%%SHAREDIR%%/pixmaps/gnubiff.png
 %%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
 %%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
 @dirrm %%SHAREDIR%%/gnubiff
-@dirrm %%SHAREDIR%%/sounds/gnubiff