Update to 4.0. In addition to new/updated translation and bugfixes:

	* Core changes:
		* The mail summary popup has been replaced by
		  libnotify message popups. These new message popups
		  also provide actions such as "Open" and "Mark as Spam"
		* Mozilla products (Mozilla, SeaMonkey, Thunderbird, ...)
		  mailboxes are now supported
		* The mailbox properties dialog has been redesigned
		* A new click action has been added: open the latest
		  message
		* A MN icon set has been designed by Josef Vybíral
		  (#18198)
		* A --print-summary command line argument has been
		  added, allowing to access message data from an
		  external program
		* A mail-changed GConf command setting has been added
		  (it is executed when new mail is received or when a
		  message is read)
		* Handling of the GNOME mail reader command: instead
		  of stripping %s, the first word of the command is
		  now used; moreover, mozilla and evolution are now
		  handled specially (#18257)
		* The /desktop/gnome/url-handlers/mailto/needs_terminal
		  GConf key is now respected
		* Could no longer close the about dialog with recent
		  GTK+ versions: fixed (#18252)

	* POP3 changes:
		* Messages kept on the server but marked as read are
		  now discarded. Note that this only works with
		  servers which send Status headers; most don't
		  (#18164).

5 files changed, 17 insertions, 48 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index f07c5e3e7ea..c1b19d653f2 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2007/03/21 12:05:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/04/20 14:29:21 gdt Exp $
 #
 
-DISTNAME=	mail-notification-3.0
-PKGREVISION=	2
+DISTNAME=	mail-notification-4.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 
@@ -50,10 +49,13 @@ CONFIGURE_ARGS+=	--disable-ssl
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mail-notification/PLIST b/mail/mail-notification/PLIST
index f2557dddf5e..7b28513fb48 100644
--- a/mail/mail-notification/PLIST
+++ b/mail/mail-notification/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/05 00:55:32 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/20 14:29:21 gdt Exp $
 bin/mail-notification
 lib/bonobo/servers/GNOME_MailNotification.server
 share/applications/mail-notification-properties.desktop
@@ -11,7 +11,14 @@ share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png
 share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png
 share/gnome/help/mail-notification/C/mail-notification.xml
 share/gnome/help/mail-notification/C/software-license.xml
+share/icons/hicolor/16x16/apps/mail-notification.png
+share/icons/hicolor/22x22/apps/mail-notification.png
+share/icons/hicolor/24x24/apps/mail-notification.png
+share/icons/hicolor/32x32/apps/mail-notification.png
+share/icons/hicolor/48x48/apps/mail-notification.png
+share/icons/hicolor/scalable/apps/mail-notification.svg
 share/locale/bg/LC_MESSAGES/mail-notification.mo
+share/locale/ca/LC_MESSAGES/mail-notification.mo
 share/locale/cs/LC_MESSAGES/mail-notification.mo
 share/locale/de/LC_MESSAGES/mail-notification.mo
 share/locale/fr/LC_MESSAGES/mail-notification.mo
@@ -26,12 +33,9 @@ share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
 share/locale/sv/LC_MESSAGES/mail-notification.mo
 share/mail-notification/ui/gmail.png
 share/mail-notification/ui/logo.png
-share/mail-notification/ui/mail-summary-popup.glade
 share/mail-notification/ui/mailbox-properties-dialog.glade
 share/mail-notification/ui/properties-dialog.glade
 share/omf/mail-notification/mail-notification-C.omf
-share/pixmaps/mail-notification.png
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/mail-notification
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/mail-notification/ui
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 68ec603e984..e4e81809f47 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/09/05 00:55:32 gdt Exp $
+$NetBSD: distinfo,v 1.8 2007/04/20 14:29:21 gdt Exp $
 
-SHA1 (mail-notification-3.0.tar.gz) = efa84676134338d379df511a53044082ae296c6e
-RMD160 (mail-notification-3.0.tar.gz) = 6269a842458b525782595efdbd4a7f05fb77432b
-Size (mail-notification-3.0.tar.gz) = 914814 bytes
-SHA1 (patch-ad) = 9698b4e6551fcacd3fe4dea5a1227eb3b4c50f0c
-SHA1 (patch-ae) = f6b6eddb8739b77a9e9932a1d1cf77830268de08
+SHA1 (mail-notification-4.0.tar.gz) = 9cc832ff75913a80198e5b3d6a51c282e422a20f
+RMD160 (mail-notification-4.0.tar.gz) = 67804814f82a8048c5887dcf4e3c2d827790dc80
+Size (mail-notification-4.0.tar.gz) = 956007 bytes
 SHA1 (patch-af) = 29d4281671ef64d99e9367464137d50ebb9daee7
diff --git a/mail/mail-notification/patches/patch-ad b/mail/mail-notification/patches/patch-ad
deleted file mode 100644
index 6d523dd1811..00000000000
--- a/mail/mail-notification/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/03 00:39:24 rillig Exp $
-
-This is needed so that the preprocessor macros can be queried in
-mn-md5.h.
-
---- src/mn-md5.c.orig	2006-08-01 11:13:36.000000000 +0200
-+++ src/mn-md5.c	2006-08-01 11:13:47.255953537 +0200
-@@ -26,6 +26,8 @@
-  * edited for clarity and style only.
-  */
- 
-+#include <config.h>
-+
- #include <sys/types.h>
- #include <string.h>
- #include <glib.h>
diff --git a/mail/mail-notification/patches/patch-ae b/mail/mail-notification/patches/patch-ae
deleted file mode 100644
index 6ae7695228b..00000000000
--- a/mail/mail-notification/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/08/03 00:39:24 rillig Exp $
-
-Solaris 8 has <inttypes.h>, but not u_int32_t.
-
---- src/mn-md5.h.orig	2005-06-11 01:19:32.000000000 +0200
-+++ src/mn-md5.h	2006-08-01 11:18:34.558138839 +0200
-@@ -29,6 +29,12 @@
- #ifndef _MN_MD5_H
- #define _MN_MD5_H
- 
-+#ifdef HAVE_INTTYPES_H
-+#  include <inttypes.h>
-+#  if defined(__sun) && !defined(u_int32_t)
-+#    define u_int32_t uint32_t
-+#  endif
-+#endif
- #include <sys/types.h>
- 
- typedef struct