6 files changed, 13 insertions, 61 deletions
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 7126fad113c..c22dcf7b067 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/07/05 05:37:42 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/09/05 00:55:32 gdt Exp $
 #
 
-DISTNAME=	mail-notification-2.0
-PKGREVISION=	8
+DISTNAME=	mail-notification-3.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 
@@ -19,10 +18,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF2_SCHEMAS=		mail-notification.schemas
 
-EGDIR=		${PREFIX}/share/examples/mail-notification
-CONF_FILES=	${EGDIR}/sound/events/mail-notification.soundlist \
-		${PKG_SYSCONFDIR}/sound/events/mail-notification.soundlist
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mail-notification
 PKG_SUPPORTED_OPTIONS=	inet6 sasl ssl
 PKG_SUGGESTED_OPTIONS=	ssl
diff --git a/mail/mail-notification/PLIST b/mail/mail-notification/PLIST
index e3cd804f762..f2557dddf5e 100644
--- a/mail/mail-notification/PLIST
+++ b/mail/mail-notification/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/09/05 00:55:32 gdt Exp $
 bin/mail-notification
 lib/bonobo/servers/GNOME_MailNotification.server
 share/applications/mail-notification-properties.desktop
 share/applications/mail-notification.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
@@ -13,23 +12,23 @@ 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/locale/bg/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
+share/locale/ja/LC_MESSAGES/mail-notification.mo
+share/locale/nl/LC_MESSAGES/mail-notification.mo
 share/locale/pl/LC_MESSAGES/mail-notification.mo
 share/locale/pt/LC_MESSAGES/mail-notification.mo
+share/locale/pt_BR/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
-share/mail-notification/ui/edit-toolbars-dialog.glade
+share/locale/sv/LC_MESSAGES/mail-notification.mo
 share/mail-notification/ui/gmail.png
-share/mail-notification/ui/hand-open.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/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,8 +41,5 @@ share/pixmaps/mail-notification.png
 @dirrm share/gnome/help/mail-notification
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/examples/mail-notification/sound/events
-@dirrm share/examples/mail-notification/sound
-@dirrm share/examples/mail-notification
 @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 14395b80d53..68ec603e984 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/08/03 00:39:24 rillig Exp $
+$NetBSD: distinfo,v 1.7 2006/09/05 00:55:32 gdt Exp $
 
-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) = ba2b926da035ac2b53245d2a80e09574ace4d438
+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 (patch-af) = 29d4281671ef64d99e9367464137d50ebb9daee7
diff --git a/mail/mail-notification/patches/patch-aa b/mail/mail-notification/patches/patch-aa
deleted file mode 100644
index 9e278e1b149..00000000000
--- a/mail/mail-notification/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/12/05 08:44:09 jmmv Exp $
-
---- data/Makefile.in.orig	2004-11-25 01:41:36.000000000 +0100
-+++ data/Makefile.in
-@@ -238,7 +238,7 @@ server_DATA = GNOME_MailNotification_Aut
- schemasdir = $(GCONF_SCHEMA_FILE_DIR)
- schemas_in_files = mail-notification.schemas.in
- schemas_DATA = mail-notification.schemas
--soundlistdir = $(sysconfdir)/sound/events
-+soundlistdir = $(datadir)/examples/@PACKAGE@/sound/events
- soundlist_in_files = mail-notification.soundlist.in
- soundlist_DATA = mail-notification.soundlist
- EXTRA_DIST = \
diff --git a/mail/mail-notification/patches/patch-ab b/mail/mail-notification/patches/patch-ab
deleted file mode 100644
index f7578782167..00000000000
--- a/mail/mail-notification/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 9dab0fd138a..00000000000
--- a/mail/mail-notification/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/01/05 16:03:25 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"
-+#include <errno.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <glib/gi18n.h>