5 files changed, 33 insertions, 20 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index e8d85edf2770..c6e84dd42991 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		mail-notification
-PORTVERSION=		0.6.1
+PORTVERSION=		0.7.0
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
@@ -30,7 +30,8 @@ OPTIONS=		MBOX "mbox support" on \
 			SSL "SSL support" on \
 			SASL "SASL authentication support" on \
 			SYLPHEED "Sylpheed support" on \
-			GMAIL "Gmail support" on
+			GMAIL "Gmail support" on \
+			MIME "MIME support" on
 
 .include <bsd.port.pre.mk>
 
@@ -54,13 +55,28 @@ CONFIGURE_ARGS+=	--disable-imap
 WITHOUT_SSL=		yes
 WITHOUT_SASL=		yes
 .endif
+.if defined(WITHOUT_MBOX) \
+	&& defined(WITHOUT_MH) \
+	&& defined(WITHOUT_MAILDIR) \
+	&& defined(WITHOUT_POP3) \
+	&& defined(WITHOUT_IMAP) \
+	&& defined(WITHOUT_SYLPHEED)
+# MIME support not needed
+WITHOUT_MIME=		yes
+.endif
 .if defined(WITHOUT_SYLPHEED)
 CONFIGURE_ARGS+=	--disable-sylpheed
 .endif
-.if defined(WITHOUT_GMAIL)
+# .if defined(WITHOUT_GMAIL)
+WITHOUT_GMAIL=		yes	# depends on libsoup-2.2, which is in Marcus's CVS
 CONFIGURE_ARGS+=	--disable-gmail
+# .else
+# LIB_DEPENDS+=		soup-2.2:${PORTSDIR}/devel/libsoup
+# .endif
+.if defined(WITHOUT_MIME)
+CONFIGURE_ARGS+=	--disable-mime
 .else
-LIB_DEPENDS+=		soup-2.0:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=		gmime-2.0:${PORTSDIR}/mail/gmime2
 .endif
 
 .if defined(WITHOUT_SSL)
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 4f8183e83b83..c3425b2d116d 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,2 +1,2 @@
-MD5 (mail-notification-0.6.1.tar.gz) = 2ecfbc1dce948edd8f766b202267485b
-SIZE (mail-notification-0.6.1.tar.gz) = 367719
+MD5 (mail-notification-0.7.0.tar.gz) = e95deb387feb9fb5c8f790c1bcf4d469
+SIZE (mail-notification-0.7.0.tar.gz) = 516285
diff --git a/mail/mail-notification/files/patch-src::mn-md5.c b/mail/mail-notification/files/patch-src::mn-md5.c
deleted file mode 100644
index 2257a736d834..000000000000
--- a/mail/mail-notification/files/patch-src::mn-md5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mn-md5.c.orig	Fri Aug 20 19:35:18 2004
-+++ src/mn-md5.c	Fri Aug 20 19:35:26 2004
-@@ -42,7 +42,7 @@
-  * is a multiple of 4.
-  */
- static void
--mn_md5_encode (unsigned char *output, u_int32_t input, unsigned int len)
-+mn_md5_encode (unsigned char *output, u_int32_t *input, unsigned int len)
- {
-   unsigned int i, j;
- 
diff --git a/mail/mail-notification/pkg-descr b/mail/mail-notification/pkg-descr
index c403ee7e92dc..31f19f4f56ac 100644
--- a/mail/mail-notification/pkg-descr
+++ b/mail/mail-notification/pkg-descr
@@ -11,9 +11,11 @@ Mail Notification features include:
 	* mbox, MH, Maildir, Sylpheed, POP3, IMAP and Gmail support
 	* SASL authentication support
 	* APOP authentication support
-	* SSL support
+	* SSL/TLS support
 	* automatic detection of mailbox format
-	* automatic notification
+	* immediate notification (the status icon is updated within
+	  seconds after a mailbox changes)
+	* a mail summary
 	* HIG 2.0 compliance
 
 WWW: http://www.nongnu.org/mailnotify/
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index cd64ba58eb20..12102bf3c324 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -10,20 +10,26 @@ share/gnome/help/mail-notification/C/documentation-license.xml
 share/gnome/help/mail-notification/C/figures/mail.png
 share/gnome/help/mail-notification/C/mail-notification.xml
 share/gnome/help/mail-notification/C/software-license.xml
-share/gnome/mail-notification/ui/dialog.glade
 share/gnome/mail-notification/ui/gmail.png
 share/gnome/mail-notification/ui/logo.png
 share/gnome/mail-notification/ui/mail-notification.png
 share/gnome/mail-notification/ui/mailbox-properties.glade
 share/gnome/mail-notification/ui/properties.glade
+share/gnome/mail-notification/ui/summary-dialog.glade
+share/gnome/mail-notification/ui/summary-popup.glade
 share/gnome/mail-notification/ui/unsupported.png
 share/gnome/mail-notification/ui/welcome.glade
 share/gnome/omf/mail-notification/mail-notification-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/mail-notification/mail-notification-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/mail-notification/mail-notification-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/mail-notification.png
+share/locale/bg/LC_MESSAGES/mail-notification.mo
+share/locale/de/LC_MESSAGES/mail-notification.mo
 share/locale/fr/LC_MESSAGES/mail-notification.mo
+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
 @dirrm share/gnome/omf/mail-notification
 @dirrm share/gnome/mail-notification/ui
 @dirrm share/gnome/mail-notification