diff options
| -rw-r--r-- | mail/evolution/Makefile | 2 | ||||
| -rw-r--r-- | mail/evolution/distinfo | 2 | ||||
| -rw-r--r-- | mail/evolution/files/patch-mail_em-junk-filter.c | 86 | ||||
| -rw-r--r-- | mail/evolution/pkg-plist | 16 |
4 files changed, 16 insertions, 90 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 981c41e1d..0ae31002d 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,7 +6,7 @@ # PORTNAME= evolution -PORTVERSION= 1.5.2 +PORTVERSION= 1.5.3 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.5 diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index c6a42fe1f..9f1fa9296 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1 +1 @@ -MD5 (gnome2/evolution-1.5.2.tar.bz2) = 63286660ea5673cb0f1f828c3b627685 +MD5 (gnome2/evolution-1.5.3.tar.bz2) = c8692b117b6a9e140ea989f52ebf1283 diff --git a/mail/evolution/files/patch-mail_em-junk-filter.c b/mail/evolution/files/patch-mail_em-junk-filter.c deleted file mode 100644 index 0650bb485..000000000 --- a/mail/evolution/files/patch-mail_em-junk-filter.c +++ /dev/null @@ -1,86 +0,0 @@ ---- mail/em-junk-filter.c.orig Mon Jan 12 16:21:24 2004 -+++ mail/em-junk-filter.c Tue Jan 13 14:00:48 2004 -@@ -176,7 +176,7 @@ - int retval; - - d(fprintf (stderr, "test if spamd is running (port %d)\n", port);) -- sac_args [2] = port > 0 ? g_strdup_printf ("spamc -x -p %d", port) : g_strdup_printf ("spamc -x"); -+ sac_args [2] = port > 0 ? g_strdup_printf ("'spamc -x -p %d'", port) : g_strdup_printf ("'spamc -x'"); - - retval = pipe_to_sa (NULL, "From test@127.0.0.1", 3, sac_args) == 0; - g_free (sac_args [2]); -@@ -191,7 +191,7 @@ - static gchar *args [4] = { - "/bin/sh", - "-c", -- "spamassassin --version", -+ "'spamassassin --version'", - NULL - }; - -@@ -229,7 +229,7 @@ - for (i = 0; i < NPORTS; i ++) { - d(fprintf (stderr, "trying to run spamd at port %d\n", port)); - -- sad_args [2] = g_strdup_printf ("spamd --port %d %s--daemonize", port, mail_session_get_sa_local_only () ? "--local " : ""); -+ sad_args [2] = g_strdup_printf ("'spamd --port %d %s--daemonize'", port, mail_session_get_sa_local_only () ? "--local " : ""); - if (!pipe_to_sa (NULL, NULL, 3, sad_args)) { - g_free (sad_args [2]); - em_junk_sa_use_spamc = TRUE; -@@ -277,14 +277,14 @@ - - args [2] = (em_junk_sa_use_spamc && mail_session_get_sa_use_daemon ()) - ? (em_junk_sa_spamd_port == -1 -- ? g_strdup ("spamc -c") /* Exit with a non-zero exit code if the -+ ? g_strdup ("'spamc -c'") /* Exit with a non-zero exit code if the - tested message was junk */ -- : g_strdup_printf ("spamc" -+ : g_strdup_printf ("'spamc" - " -c" /* Exit with a non-zero exit code if the - tested message was junk */ -- " -p %d", em_junk_sa_spamd_port)) -- : g_strdup_printf ("spamassassin" -- " --exit-code%s", /* Exit with a non-zero exit code if the -+ " -p %d'", em_junk_sa_spamd_port)) -+ : g_strdup_printf ("'spamassassin" -+ " --exit-code%s'", /* Exit with a non-zero exit code if the - tested message was junk */ - mail_session_get_sa_local_only () - ? " --local" : ""); /* Local tests only (no online tests) */ -@@ -310,10 +310,10 @@ - - if (em_junk_sa_is_available ()) { - args [2] = g_strdup_printf -- ("sa-learn" -+ ("'sa-learn" - " --no-rebuild" /* do not rebuild db */ - " --spam" /* report junk */ -- " --single%s", /* single message */ -+ " --single%s'", /* single message */ - mail_session_get_sa_local_only () - ? " --local" : ""); /* local only */ - pipe_to_sa (msg, NULL, 3, args); -@@ -335,10 +335,10 @@ - - if (em_junk_sa_is_available ()) { - args [2] = g_strdup_printf -- ("sa-learn" -+ ("'sa-learn" - " --no-rebuild" /* do not rebuild db */ - " --ham" /* report notjunk */ -- " --single%s", /* single message */ -+ " --single%s'", /* single message */ - mail_session_get_sa_local_only () - ? " --local" : ""); /* local only */ - pipe_to_sa (msg, NULL, 3, args); -@@ -360,8 +360,8 @@ - - if (em_junk_sa_is_available ()) { - args [2] = g_strdup_printf -- ("sa-learn" -- " --rebuild%s", /* do not rebuild db */ -+ ("'sa-learn" -+ " --rebuild%s'", /* do not rebuild db */ - mail_session_get_sa_local_only () - ? " --local" : ""); /* local only */ - pipe_to_sa (NULL, NULL, 3, args); diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 8b5fcd02d..5eb80dcec 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -2,6 +2,7 @@ bin/evolution-%%VERSION%% etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/display/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/calendar/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator/%gconf.xml @@ -33,6 +34,7 @@ etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/shortcut_bar/%gc etc/gconf/gconf.xml.defaults/schemas/apps/evolution/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/display/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator/%gconf.xml @@ -206,6 +208,7 @@ include/evolution-%%VERSION%%/e-conduit/e-pilot-settings.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h include/evolution-%%VERSION%%/e-util/e-account-list.h include/evolution-%%VERSION%%/e-util/e-account.h +include/evolution-%%VERSION%%/e-util/e-bconf-map.h include/evolution-%%VERSION%%/e-util/e-categories-config.h include/evolution-%%VERSION%%/e-util/e-categories-master-list-wombat.h include/evolution-%%VERSION%%/e-util/e-component-listener.h @@ -213,6 +216,7 @@ include/evolution-%%VERSION%%/e-util/e-config-listener.h include/evolution-%%VERSION%%/e-util/e-corba-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h +include/evolution-%%VERSION%%/e-util/e-folder-map.h include/evolution-%%VERSION%%/e-util/e-gtk-utils.h include/evolution-%%VERSION%%/e-util/e-gui-utils.h include/evolution-%%VERSION%%/e-util/e-host-utils.h @@ -233,7 +237,6 @@ include/evolution-%%VERSION%%/e-util/e-time-utils.h include/evolution-%%VERSION%%/e-util/e-trie.h include/evolution-%%VERSION%%/e-util/e-uid.h include/evolution-%%VERSION%%/e-util/e-url.h -include/evolution-%%VERSION%%/e-util/e-xml-hash-utils.h include/evolution-%%VERSION%%/e-util/md5-utils.h include/evolution-%%VERSION%%/importer/GNOME_Evolution_Importer.h include/evolution-%%VERSION%%/importer/evolution-importer-client.h @@ -320,13 +323,13 @@ libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server libdata/pkgconfig/camel-%%VERSION%%.pc libdata/pkgconfig/evolution-shell-%%VERSION%%.pc -libexec/evolution-mbox-upgrade libexec/evolution/%%VERSION%%/camel/camel-index-control libexec/evolution/%%VERSION%%/camel/camel-lock-helper libexec/evolution/%%VERSION%%/evolution-alarm-notify libexec/evolution/%%VERSION%%/killev share/gnome/applications/evolution-%%VERSION%%.desktop share/gnome/evolution/%%VERSION%%/addresstypes.xml +share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps @@ -363,6 +366,7 @@ share/gnome/evolution/%%VERSION%%/glade/event-page.glade share/gnome/evolution/%%VERSION%%/glade/evolution-startup-wizard.glade share/gnome/evolution/%%VERSION%%/glade/evolution.png share/gnome/evolution/%%VERSION%%/glade/filter.glade +share/gnome/evolution/%%VERSION%%/glade/flag-for-followup-done-48.png share/gnome/evolution/%%VERSION%%/glade/flag-for-followup-48.png share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade share/gnome/evolution/%%VERSION%%/glade/fullname.glade @@ -484,6 +488,7 @@ share/gnome/evolution/%%VERSION%%/images/faq-16.png share/gnome/evolution/%%VERSION%%/images/fetch-mail.png share/gnome/evolution/%%VERSION%%/images/find_contact.xpm share/gnome/evolution/%%VERSION%%/images/find_message.xpm +share/gnome/evolution/%%VERSION%%/images/flag-for-followup-done-16.png share/gnome/evolution/%%VERSION%%/images/flag-for-followup-16.png share/gnome/evolution/%%VERSION%%/images/folder-copy-16.png share/gnome/evolution/%%VERSION%%/images/folder-mini.png @@ -756,6 +761,7 @@ share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -793,6 +799,10 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/evolution/%%VERSION%%/glade @dirrm share/gnome/evolution/%%VERSION%%/etspec @dirrm share/gnome/evolution/%%VERSION%%/ecps +@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/C +@dirrm share/gnome/evolution/%%VERSION%%/default @dirrm share/gnome/evolution/%%VERSION%% @dirrm share/gnome/evolution @dirrm libexec/evolution/%%VERSION%%/camel @@ -838,6 +848,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/display @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution @@ -869,6 +880,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names +@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/display @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook @dirrm etc/gconf/gconf.xml.defaults/apps/evolution |