6 files changed, 29 insertions, 48 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 8f1738ffe4dd..c4623d010659 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	1.2.0
+PORTVERSION=	1.4.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,6 +16,7 @@ COMMENT=	A mail notification program for Gnome
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	libglade2 esound
 USE_GMAKE=	yes
@@ -37,12 +38,12 @@ WANT_GNOME=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
-CONFIGURE_ARGS+=	--with-gnome
 USE_GNOME+=		gnomepanel gconf2 gnomeprefix gnomehack
 PKGNAMESUFFIX=		-gnome
 PLIST_SUB+=		SHAREDIR="share/gnome"
 PLIST_SUB+=		WITH_GNOME=""
 .else
+CONFIGURE_ARGS+=	--disable-gnome
 PLIST_SUB+=		SHAREDIR="share"
 PLIST_SUB+=		WITH_GNOME="@comment "
 .endif
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 338c8572d464..858ac30bad98 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnubiff-1.2.0.tar.gz) = 63910d7656916b59f4ab18a33a92ff78
-SIZE (gnubiff-1.2.0.tar.gz) = 519590
+MD5 (gnubiff-1.4.0.tar.bz2) = 11dca9aa4be57a73670243614ee1ee3d
+SIZE (gnubiff-1.4.0.tar.bz2) = 649934
diff --git a/mail/gnubiff/files/patch-src::Applet.cc b/mail/gnubiff/files/patch-src::Applet.cc
deleted file mode 100644
index d304607f25e0..000000000000
--- a/mail/gnubiff/files/patch-src::Applet.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Applet.cc.bak	Mon May  3 22:05:00 2004
-+++ src/Applet.cc	Mon May  3 22:05:19 2004
-@@ -108,9 +108,7 @@
- 		else if (_owner->_sound_type == SOUND_FILE) {
- 			std::stringstream s;
- 			s << _owner->_sound_volume/100.0;
--			std::string command = "play \"" + _owner->_sound_file + std::string ("\" -v ");
--			command += s.str();
--			command += " &";
-+			std::string command = "esdplay \"" + _owner->_sound_file + std::string ("\" &");
- 			system (command.c_str());
- 		}
- 	}
diff --git a/mail/gnubiff/files/patch-src::File.h b/mail/gnubiff/files/patch-src::File.h
new file mode 100644
index 000000000000..8a29273b06fa
--- /dev/null
+++ b/mail/gnubiff/files/patch-src::File.h
@@ -0,0 +1,10 @@
+--- 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/files/patch-src::Setup.cc b/mail/gnubiff/files/patch-src::Setup.cc
deleted file mode 100644
index c1c055692edc..000000000000
--- a/mail/gnubiff/files/patch-src::Setup.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Setup.cc.bak	Mon May  3 22:05:03 2004
-+++ src/Setup.cc	Mon May  3 22:05:14 2004
-@@ -765,9 +765,7 @@
- 		gchar *data = (gchar *) g_object_get_data (G_OBJECT(get("soundfile")), "_file_");
- 		std::stringstream s;
- 		s << gfloat(gtk_range_get_value (GTK_RANGE (get ("volume"))))/100.0;
--		std::string command = "play \"" + std::string (data) + std::string ("\" -v ");
--		command += s.str();
--		command += " &";
-+		std::string command = "esdplay \"" + std::string (data) + std::string ("\" &");
- 		system (command.c_str());
- 	}
- }
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index de62e197183b..8e402fa7b3f2 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -1,33 +1,27 @@
 bin/gnubiff
-share/locale/fr/LC_MESSAGES/gnubiff.mo
 share/locale/de/LC_MESSAGES/gnubiff.mo
+share/locale/es/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/es/LC_MESSAGES/gnubiff.mo
 share/locale/sv/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/Setup.glade2
-%%SHAREDIR%%/gnubiff/AppletGTK.glade2
-%%SHAREDIR%%/gnubiff/AppletGNOME.glade2
-%%SHAREDIR%%/gnubiff/Popup.glade2
+%%SHAREDIR%%/gnubiff/AppletGNOME.glade
+%%SHAREDIR%%/gnubiff/AppletGTK.glade
 %%SHAREDIR%%/gnubiff/BiffCredits.png
-%%SHAREDIR%%/gnubiff/BiffFont.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/gnome-mail.png
-%%SHAREDIR%%/gnubiff/gnome-nomail.png
-%%SHAREDIR%%/gnubiff/gnubiff.png
 %%SHAREDIR%%/gnubiff/gnubiff_icon.png
-%%SHAREDIR%%/gnubiff/gtk-mail.png
-%%SHAREDIR%%/gnubiff/gtk-nomail.png
 %%SHAREDIR%%/gnubiff/logo.png
-%%SHAREDIR%%/gnubiff/menu-mode-RGB-alt.png
 %%SHAREDIR%%/gnubiff/menu_about.png
 %%SHAREDIR%%/gnubiff/menu_mail_read.png
 %%SHAREDIR%%/gnubiff/menu_mail_start.png
-%%SHAREDIR%%/gnubiff/stock-adress.png
 %%SHAREDIR%%/gnubiff/stock-alarm.png
 %%SHAREDIR%%/gnubiff/stock-biff.png
 %%SHAREDIR%%/gnubiff/stock-clock.png
@@ -35,7 +29,6 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/gnubiff/stock-mailbox.png
 %%SHAREDIR%%/gnubiff/stock-network.png
 %%SHAREDIR%%/gnubiff/stock-nossl.png
-%%SHAREDIR%%/gnubiff/stock-panel.png
 %%SHAREDIR%%/gnubiff/stock-password.png
 %%SHAREDIR%%/gnubiff/stock-popup.png
 %%SHAREDIR%%/gnubiff/stock-sound.png
@@ -49,11 +42,14 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/gnubiff/stock-volume.png
 %%SHAREDIR%%/gnubiff/stock_left.png
 %%SHAREDIR%%/gnubiff/stock_right.png
-%%SHAREDIR%%/gnubiff/gnome-mail.gif
-%%SHAREDIR%%/gnubiff/gtk-mail.gif
+%%SHAREDIR%%/gnubiff/test.png
+%%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/mail.wav
 %%SHAREDIR%%/sounds/gnubiff/coin.wav
+%%SHAREDIR%%/sounds/gnubiff/mail.wav
 %%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
 %%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
 @dirrm %%SHAREDIR%%/gnubiff