5 files changed, 44 insertions, 78 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 28cf698e56a4..236b74bd0ae4 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=		mail-notification
-PORTVERSION=		1.1
-PORTREVISION=		2
+PORTVERSION=		2.0
 CATEGORIES=		mail ipv6
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	mailnotify
+#MASTER_SITES=		${MASTER_SITE_SAVANNAH}
+#MASTER_SITE_SUBDIR=	mailnotify
+MASTER_SITES=		http://www.nongnu.org/mailnotify/downloads/
 
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		A mail notification for freedesktop.org-compliant system trays
 
 USE_X_PREFIX=		yes
 USE_GNOME=		gnomeprefix gnomehack eel2
-GNU_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 USE_GMAKE=		yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_GCC=		3.4
 GCONF_SCHEMAS=		mail-notification.schemas
 INSTALLS_OMF=		yes
 
@@ -31,11 +30,11 @@ OPTIONS=		MBOX "mbox support" on \
 			MAILDIR "Maildir support" on \
 			POP3 "POP3 support" on \
 			IMAP "IMAP support" on \
-			SSL "SSL support" on \
+			SSL "SSL/TLS support" on \
 			SASL "SASL authentication support" on \
-			SYLPHEED "Sylpheed support" on \
 			GMAIL "Gmail support" on \
-			GMAIL_TIMESTAMPS "Gmail timestamps support" on
+			EVOLUTION "Evolution support" off \
+			SYLPHEED "Sylpheed support" on
 
 .include <bsd.port.pre.mk>
 
@@ -59,19 +58,22 @@ CONFIGURE_ARGS+=	--disable-imap
 WITHOUT_SSL=		yes
 WITHOUT_SASL=		yes
 .endif
-.if defined(WITHOUT_SYLPHEED)
-CONFIGURE_ARGS+=	--disable-sylpheed
-.endif
 .if defined(WITHOUT_GMAIL)
 CONFIGURE_ARGS+=	--disable-gmail
-WITHOUT_GMAIL_TIMESTAMPS=	yes
-.else
-LIB_DEPENDS+=		soup-2.2:${PORTSDIR}/devel/libsoup
 .endif
-.if defined(WITHOUT_GMAIL_TIMESTAMPS)
-CONFIGURE_ARGS+=	--disable-gmail-timestamps
+.if defined(WITHOUT_EVOLUTION)
+CONFIGURE_ARGS+=	--disable-evolution
+PLIST_SUB+=		EVOLUTION="@comment "
 .else
-LIB_DEPENDS+=		icuuc:${PORTSDIR}/devel/icu
+BUILD_DEPENDS+=		${NONEXISTENT}:${PORTSDIR}/mail/evolution:patch \
+			${X11BASE}/libdata/pkgconfig/evolution-plugin-2.2.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+=		${X11BASE}/libdata/pkgconfig/evolution-plugin-2.2.pc:${PORTSDIR}/mail/evolution
+EVOLUTION_WRKSRC!=	cd ${PORTSDIR}/mail/evolution && ${MAKE} -V WRKSRC
+CONFIGURE_ARGS+=	--with-evolution-source-dir="${EVOLUTION_WRKSRC}"
+PLIST_SUB+=		EVOLUTION="" LITERAL_PREFIX="${PREFIX}"
+.endif
+.if defined(WITHOUT_SYLPHEED)
+CONFIGURE_ARGS+=	--disable-sylpheed
 .endif
 .if defined(WITH_MBOX) \
 	|| defined(WITH_MH) \
@@ -92,10 +94,5 @@ CONFIGURE_ARGS+=	--disable-sasl
 .else
 LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
-.if defined(WITH_POP3) || defined(WITH_IMAP) || defined(WITH_GMAIL)
-PLIST_SUB+=		AUTHENTICATION=""
-.else
-PLIST_SUB+=		AUTHENTICATION="@comment "
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 521e69c7fab7..70453cad4dcb 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,2 +1,2 @@
-MD5 (mail-notification-1.1.tar.gz) = 2359fb53128b12cf295bdf8553e5869b
-SIZE (mail-notification-1.1.tar.gz) = 683776
+MD5 (mail-notification-2.0.tar.gz) = 56ef7401aba1cb27d881fb0f33a3248d
+SIZE (mail-notification-2.0.tar.gz) = 869151
diff --git a/mail/mail-notification/files/patch-src_mn-mailbox.c b/mail/mail-notification/files/patch-src_mn-mailbox.c
deleted file mode 100644
index bff2fc50b9d7..000000000000
--- a/mail/mail-notification/files/patch-src_mn-mailbox.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/mn-mailbox.c.orig	Mon May  9 20:49:29 2005
-+++ src/mn-mailbox.c	Mon May  9 20:51:26 2005
-@@ -913,31 +913,11 @@
- {
- #line 378 "mn-mailbox.gob"
- 	
--    GnomeVFSResult result;
--
-     g_return_if_fail(MN_MAILBOX_CAN_CHECK(self));
-     g_return_if_fail(selfp->monitor_handle == NULL);
-     
--    gdk_flush();
--    GDK_THREADS_LEAVE();
--
--    result = gnome_vfs_monitor_add(&selfp->monitor_handle,
--				   uri,
--				   monitor_type,
--				   self_monitor_cb,
--				   self);
--
--    GDK_THREADS_ENTER();
--    
--    if (result == GNOME_VFS_OK)
--      {
--	selfp->monitor_uri = g_strdup(uri);
--	selfp->monitor_events = events;
--	self_set_must_poll(self, FALSE);
--      }
--    else
-       {
--	self_warning(self, _("unable to enable immediate notification: %s"), gnome_vfs_result_to_string(result));
-+	self_warning(self, _("unable to enable immediate notification: broken, will be fixed in the next release"));
- 
- 	if (! eel_gconf_get_boolean(MN_CONF_IMMEDIATE_NOTIFICATION_ERROR_DIALOG_DO_NOT_SHOW))
- 	  {
diff --git a/mail/mail-notification/pkg-descr b/mail/mail-notification/pkg-descr
index ef40cad3b088..3301a81ad5b7 100644
--- a/mail/mail-notification/pkg-descr
+++ b/mail/mail-notification/pkg-descr
@@ -1,20 +1,20 @@
-Mail Notification is a status icon (aka tray icon) that informs you if
-you have new mail.
+Mail Notification is a status icon (aka tray icon) that informs you if you
+have new mail.
 
-It works with system trays implementing the freedesktop.org System
-Tray Specification, such as the GNOME Panel Notification Area, the
-Xfce Notification Area and the KDE System Tray.
+It works with system trays implementing the freedesktop.org System Tray
+Specification, such as the GNOME Panel Notification Area, the Xfce
+Notification Area and the KDE System Tray.
 
 Mail Notification features include:
 
 	* multiple mailbox support
-	* mbox, MH, Maildir, Sylpheed, POP3, IMAP and Gmail support
+	* mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution and Sylpheed support
 	* SASL authentication support
 	* APOP authentication support
 	* SSL/TLS support
 	* automatic detection of mailbox format
-	* immediate notification (the status icon is updated within
-	  seconds after a mailbox changes)
+	* immediate notification (the status icon is updated immediately or
+	  within seconds after a mailbox changes)
 	* a mail summary
 	* HIG 2.0 compliance
 
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index 35b78a8bad78..2021262b3254 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -1,26 +1,26 @@
 bin/mail-notification
 etc/sound/events/mail-notification.soundlist
-libdata/bonobo/servers/GNOME_MailNotification_Automation.server
+libdata/bonobo/servers/GNOME_MailNotification.server
+%%EVOLUTION%%libdata/bonobo/servers/GNOME_MailNotification_Evolution.server
+share/gnome/applications/mail-notification-properties.desktop
 share/gnome/applications/mail-notification.desktop
-share/gnome/control-center-2.0/capplets/mail-notification-properties.desktop
 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
-%%AUTHENTICATION%%share/gnome/mail-notification/ui/authentication.glade
-share/gnome/mail-notification/ui/edit-toolbars.glade
+share/gnome/mail-notification/ui/edit-toolbars-dialog.glade
 share/gnome/mail-notification/ui/gmail.png
 share/gnome/mail-notification/ui/hand-open.png
 share/gnome/mail-notification/ui/logo.png
-share/gnome/mail-notification/ui/mailbox-properties.glade
+share/gnome/mail-notification/ui/mail-summary-popup.glade
+share/gnome/mail-notification/ui/mailbox-properties-dialog.glade
 share/gnome/mail-notification/ui/main-window.png
-share/gnome/mail-notification/ui/main.glade
 share/gnome/mail-notification/ui/menus.xml
-share/gnome/mail-notification/ui/properties.glade
-share/gnome/mail-notification/ui/summary-popup.glade
+share/gnome/mail-notification/ui/properties-dialog.glade
 share/gnome/mail-notification/ui/toolbars.xml
-share/gnome/mail-notification/ui/unsupported.png
-share/gnome/mail-notification/ui/welcome.glade
 share/gnome/omf/mail-notification/mail-notification-C.omf
 share/gnome/pixmaps/mail-notification.png
 share/locale/bg/LC_MESSAGES/mail-notification.mo
@@ -31,6 +31,10 @@ share/locale/pt/LC_MESSAGES/mail-notification.mo
 share/locale/ru/LC_MESSAGES/mail-notification.mo
 share/locale/sr/LC_MESSAGES/mail-notification.mo
 share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
+%%EVOLUTION%%@cwd %%X11BASE%%
+%%EVOLUTION%%lib/evolution/2.2/plugins/liborg-gnome-mail-notification.so
+%%EVOLUTION%%lib/evolution/2.2/plugins/org-gnome-mail-notification.eplug
+%%EVOLUTION%%@cwd %%LITERAL_PREFIX%%
 @dirrm share/gnome/omf/mail-notification
 @dirrm share/gnome/mail-notification/ui
 @dirrm share/gnome/mail-notification