Take maintainership (at suggestion of previous maintainer, jmmv@).

Update to 2.0 (minor changes and bugfixes omitted):

2.0					August 9, 2005

	* Core changes:
		* Evolution support has been added [not in pkgsrc]
		* Mailboxes can now be assigned a custom name
		* For greater flexibility, mailboxes configuration is
		  now stored in ~/.gnome2/mail-notification/mailboxes.xml
		  (previously, it was stored in the GConf database)
		* If a mailbox requires authentication and the
		  necessary credentials are not provided in the
		  mailbox properties dialog, Mail Notification now
		  lets GNOME prompt the user for the credentials
		* The Mail Notification item is now also listed in the
		  GNOME >= 2.10 Preferences menu
		* The third-party libegg code has been updated

	* mbox, MH, Maildir and Sylpheed changes:
		* Immediate notification did not work properly with
		  fast kernel notifiers (kqueue, inotify, dnotify,
		  ...): fixed
		* Unseekable files are now supported
		* The location of the system mailbox is now resolved
		  at runtime rather than when the mailbox is added
		  (eases sharing the Mail Notification settings across
		  multiple computers)

	* mbox changes:
		* When immediate notification is not available, the
		  mailbox is now also checked when its size or ctime
		  changes (previously, it was only checked if its
		  mtime had changed)

	* Sylpheed changes:
		* Mail Notification now tries to avoid race conditions
		  which may occur while Sylpheed is being used

	* POP3 and IMAP changes:
		* When the authentication mechanism option is set to
		  "autodetect", Mail Notification will now try to
		  authenticate using each server-supported SASL
		  mechanism

	* POP3 changes:
		* The TOP optional command is now supported. This
		  solves some issues with POP3 servers (for instance,
		  pop.gmail.com) which incorrectly archive mails that
		  have been accessed using the RETR command.

	* IMAP changes:
		* If, while idling, the server abruptly drops the
		  connection, Mail Notification now reconnects rather
		  than considering it an error
		* When idling, Mail Notification now only wakes up if
		  it receives a response indicating that the mailbox
		  might have changed
		* By default, Mail Notification now avoids using the
		  IDLE extension if the remote server software is
		  known to have a broken IDLE implementation
		* UTF-8 mailbox names are now converted to modified
		  UTF-7, as required by RFC 3501

	* Gmail changes:
		* Functionality has been restored after the Gmail web
		  site was modified; to prevent future disruptions and
		  simplify the source code, the Gmail Atom feed
		  (https://mail.google.com/mail/feed/atom) is now used

1.1					March 6, 2005

	* The mail summary dialog has been replaced by a main window,
	  for controlling Mail Notification when the status icon is
	  hidden

5 files changed, 48 insertions, 21 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 24afea31097..66092d61647 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/04 20:28:01 gdt Exp $
 #
 
-DISTNAME=	mail-notification-1.0
-PKGREVISION=	3
+DISTNAME=	mail-notification-2.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 
-MAINTAINER=	jmmv@NetBSD.org
+MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/mailnotify/
 COMMENT=	Status icon that provides new mail notifications
 
@@ -55,7 +54,7 @@ CONFIGURE_ARGS+=	--disable-ssl
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/mail/mail-notification/PLIST b/mail/mail-notification/PLIST
index cf384845ee6..fc7cfa100b4 100644
--- a/mail/mail-notification/PLIST
+++ b/mail/mail-notification/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/05 08:44:09 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/04 20:28:01 gdt Exp $
 bin/mail-notification
-lib/bonobo/servers/GNOME_MailNotification_Automation.server
+lib/bonobo/servers/GNOME_MailNotification.server
+share/applications/mail-notification-properties.desktop
 share/applications/mail-notification.desktop
-share/control-center-2.0/capplets/mail-notification-properties.desktop
 share/examples/mail-notification/sound/events/mail-notification.soundlist
 share/gconf/schemas/mail-notification.schemas
 share/gnome/help/mail-notification/C/documentation-license.xml
 share/gnome/help/mail-notification/C/figures/mail.png
+share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png
+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
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/mail-notification.mo
@@ -17,16 +20,16 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/mail-notification.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mail-notification.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/mail-notification.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
-share/mail-notification/ui/authentication.glade
+share/mail-notification/ui/edit-toolbars-dialog.glade
 share/mail-notification/ui/gmail.png
+share/mail-notification/ui/hand-open.png
 share/mail-notification/ui/logo.png
-share/mail-notification/ui/mail-notification.png
-share/mail-notification/ui/mailbox-properties.glade
-share/mail-notification/ui/properties.glade
-share/mail-notification/ui/summary-dialog.glade
-share/mail-notification/ui/summary-popup.glade
-share/mail-notification/ui/unsupported.png
-share/mail-notification/ui/welcome.glade
+share/mail-notification/ui/mail-summary-popup.glade
+share/mail-notification/ui/mailbox-properties-dialog.glade
+share/mail-notification/ui/main-window.png
+share/mail-notification/ui/menus.xml
+share/mail-notification/ui/properties-dialog.glade
+share/mail-notification/ui/toolbars.xml
 share/omf/mail-notification/mail-notification-C.omf
 share/pixmaps/mail-notification.png
 @comment in xdg-dirs: @dirrm share/pixmaps
@@ -42,6 +45,5 @@ share/pixmaps/mail-notification.png
 @dirrm share/examples/mail-notification/sound/events
 @dirrm share/examples/mail-notification/sound
 @dirrm share/examples/mail-notification
-@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 98cac2fb8e0..aa148ec44ae 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/04 20:28:01 gdt Exp $
 
-SHA1 (mail-notification-1.0.tar.gz) = 8b6fd3863621023b3763958736bff668b21ae798
-RMD160 (mail-notification-1.0.tar.gz) = 1bd740d3949c045052154ef7dd043001c9a83467
-Size (mail-notification-1.0.tar.gz) = 622289 bytes
+SHA1 (mail-notification-2.0.tar.gz) = dcfc89bbc03c08da086843426f459ac0127f5891
+RMD160 (mail-notification-2.0.tar.gz) = 0fb3adc3331f0699ca6fb01f3c63f360aa79a7fb
+Size (mail-notification-2.0.tar.gz) = 869151 bytes
 SHA1 (patch-aa) = a11b31afa5a50d2a5f079fb388cb6cc14ac718f5
+SHA1 (patch-ab) = 1fa7a94e4c9b25d810d85c7a2b136a7cdee51f5a
+SHA1 (patch-ac) = 299d8af51431ac13071a0e2e256fc4c9cae84fdd
diff --git a/mail/mail-notification/patches/patch-ab b/mail/mail-notification/patches/patch-ab
new file mode 100644
index 00000000000..f7578782167
--- /dev/null
+++ b/mail/mail-notification/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/01/04 20:28:01 gdt Exp $
+
+--- src/mn-mailboxes.c.orig	2005-08-09 16:01:57.000000000 -0400
++++ src/mn-mailboxes.c
+@@ -26,6 +26,7 @@
+ #line 25 "mn-mailboxes.gob"
+ 
+ #include "config.h"
++#include <errno.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <glib/gi18n.h>
diff --git a/mail/mail-notification/patches/patch-ac b/mail/mail-notification/patches/patch-ac
new file mode 100644
index 00000000000..0732076c121
--- /dev/null
+++ b/mail/mail-notification/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2006/01/04 20:28:01 gdt Exp $
+
+--- src/mn-mailboxes.gob.orig	2005-07-30 12:11:59.000000000 -0400
++++ src/mn-mailboxes.gob
+@@ -24,6 +24,7 @@ requires 2.0.12
+ 
+ %{
+ #include "config.h"
++#incldue <errno.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <glib/gi18n.h>