Update to 4.0-rc1

4 files changed, 24 insertions, 9 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 6aa8ceb928c9..670c18bb2103 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mail-notification
-PORTVERSION=	3.0
-PORTREVISION=	1
+DISTVERSION=	4.0-rc1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
@@ -15,6 +14,8 @@ MASTER_SITE_SUBDIR=	mailnotify
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A mail notification for freedesktop.org-compliant system trays
 
+LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
+
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack eel2
 GNU_CONFIGURE=	yes
@@ -24,6 +25,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GCONF_SCHEMAS=	mail-notification.schemas
 INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 
 OPTIONS=	MBOX "mbox support" on \
 		MH "MH support" on \
@@ -34,6 +36,7 @@ OPTIONS=	MBOX "mbox support" on \
 		SASL "SASL authentication support" on \
 		GMAIL "Gmail support" on \
 		EVOLUTION "Evolution support" off \
+		MOZILLA "Mozilla products support" on \
 		SYLPHEED "Sylpheed support" on
 
 .include <bsd.port.pre.mk>
@@ -73,6 +76,9 @@ BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.p
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution
 PLIST_SUB+=	EVOLUTION="" EVO_VERSION=${EVO_VERSION}
 .endif
+.if defined(WITHOUT_MOZILLA)
+CONFIGURE_ARGS+=--disable-mozilla
+.endif
 .if defined(WITHOUT_SYLPHEED)
 CONFIGURE_ARGS+=--disable-sylpheed
 .endif
@@ -81,6 +87,7 @@ CONFIGURE_ARGS+=--disable-sylpheed
 	|| defined(WITH_MAILDIR) \
 	|| defined(WITH_POP3) \
 	|| defined(WITH_IMAP) \
+	|| defined(WITH_MOZILLA) \
 	|| defined(WITH_SYLPHEED)
 LIB_DEPENDS+=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
 .endif
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 68520fff746c..ebe19a14748f 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-notification-3.0.tar.gz) = d19fb5c96a0f54d1b1541fbddf73488e
-SHA256 (mail-notification-3.0.tar.gz) = a5bf3f5857cc8895dfe4d356a14a3ac8407d5623a97e361ba3ba7316bfba8055
-SIZE (mail-notification-3.0.tar.gz) = 914814
+MD5 (mail-notification-4.0-rc1.tar.gz) = 91c09b72a59d161564b47fff033be37e
+SHA256 (mail-notification-4.0-rc1.tar.gz) = 3813f6ab1f537b8a120210e3063507c7b6e9b3bcfac38015c4c5c982c1f263dc
+SIZE (mail-notification-4.0-rc1.tar.gz) = 952127
diff --git a/mail/mail-notification/pkg-descr b/mail/mail-notification/pkg-descr
index 3301a81ad5b7..227c1436103a 100644
--- a/mail/mail-notification/pkg-descr
+++ b/mail/mail-notification/pkg-descr
@@ -8,14 +8,15 @@ Notification Area and the KDE System Tray.
 Mail Notification features include:
 
 	* multiple mailbox support
-	* mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution and Sylpheed support
+	* mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution, Mozilla products
+	  (Mozilla, SeaMonkey, Thunderbird, ...) and Sylpheed support
 	* SASL authentication support
 	* APOP authentication support
 	* SSL/TLS support
 	* automatic detection of mailbox format
 	* immediate notification (the status icon is updated immediately or
 	  within seconds after a mailbox changes)
-	* a mail summary
+	* message popups
 	* 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 c14c7d84255e..38fa8ca8ed34 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -12,12 +12,17 @@ share/gnome/help/mail-notification/C/mail-notification.xml
 share/gnome/help/mail-notification/C/software-license.xml
 %%GMAIL%%share/gnome/mail-notification/ui/gmail.png
 share/gnome/mail-notification/ui/logo.png
-share/gnome/mail-notification/ui/mail-summary-popup.glade
 share/gnome/mail-notification/ui/mailbox-properties-dialog.glade
 share/gnome/mail-notification/ui/properties-dialog.glade
 share/gnome/omf/mail-notification/mail-notification-C.omf
-share/gnome/pixmaps/mail-notification.png
+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
@@ -49,3 +54,5 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca