From d11c089ec32e0a093cd1f481bd243015cc3fdcb5 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 10 Feb 2005 20:40:38 +0000 Subject: Update to 2.1.5. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3620 df743ca5-7f9a-e211-a948-0013205c9059 --- mail/evolution/Makefile | 2 +- mail/evolution/distinfo | 4 ++-- .../patch-addressbook_gui_widgets_eab-config.c | 19 ------------------ .../files/patch-calendar_gui_e-cal-config.c | 17 ---------------- ...tch-plugins_calendar-weather_calendar-weather.c | 23 ---------------------- mail/evolution/pkg-plist | 23 +++++++++++++--------- 6 files changed, 17 insertions(+), 71 deletions(-) delete mode 100644 mail/evolution/files/patch-addressbook_gui_widgets_eab-config.c delete mode 100644 mail/evolution/files/patch-calendar_gui_e-cal-config.c delete mode 100644 mail/evolution/files/patch-plugins_calendar-weather_calendar-weather.c diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 6958f5ef1..89fed9457 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,7 +6,7 @@ # PORTNAME= evolution -PORTVERSION= 2.1.4 +PORTVERSION= 2.1.5 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.1 diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index da44dd651..afcee0649 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-2.1.4.tar.bz2) = 7ea0196135c8efe66d90de13228e80c7 -SIZE (gnome2/evolution-2.1.4.tar.bz2) = 13286061 +MD5 (gnome2/evolution-2.1.5.tar.bz2) = 66cac9d9a156660484408da4e6ec3d04 +SIZE (gnome2/evolution-2.1.5.tar.bz2) = 14000234 diff --git a/mail/evolution/files/patch-addressbook_gui_widgets_eab-config.c b/mail/evolution/files/patch-addressbook_gui_widgets_eab-config.c deleted file mode 100644 index 19ed92d46..000000000 --- a/mail/evolution/files/patch-addressbook_gui_widgets_eab-config.c +++ /dev/null @@ -1,19 +0,0 @@ ---- addressbook/gui/widgets/eab-config.c.orig Tue Nov 23 16:01:13 2004 -+++ addressbook/gui/widgets/eab-config.c Tue Nov 23 16:03:20 2004 -@@ -23,13 +23,15 @@ - #include - #endif - -+#include -+ - #include "eab-config.h" - - static GObjectClass *ecp_parent_class; - static GObjectClass *ecph_parent_class; - - struct _EABConfigPrivate { -- ulong source_changed_id; -+ u_long source_changed_id; - }; - - #define _PRIVATE(o) (g_type_instance_get_private((GTypeInstance *)o, eab_config_get_type())) diff --git a/mail/evolution/files/patch-calendar_gui_e-cal-config.c b/mail/evolution/files/patch-calendar_gui_e-cal-config.c deleted file mode 100644 index f68a3ae60..000000000 --- a/mail/evolution/files/patch-calendar_gui_e-cal-config.c +++ /dev/null @@ -1,17 +0,0 @@ ---- calendar/gui/e-cal-config.c.orig Wed Dec 8 03:11:02 2004 -+++ calendar/gui/e-cal-config.c Wed Dec 8 03:12:13 2004 -@@ -26,11 +26,13 @@ - #include - #include "e-cal-config.h" - -+#include -+ - static GObjectClass *ecp_parent_class; - static GObjectClass *ecph_parent_class; - - struct _ECalConfigPrivate { -- ulong source_changed_id; -+ unsigned long source_changed_id; - }; - - #define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_cal_config_get_type ())) diff --git a/mail/evolution/files/patch-plugins_calendar-weather_calendar-weather.c b/mail/evolution/files/patch-plugins_calendar-weather_calendar-weather.c deleted file mode 100644 index 7aae64622..000000000 --- a/mail/evolution/files/patch-plugins_calendar-weather_calendar-weather.c +++ /dev/null @@ -1,23 +0,0 @@ ---- plugins/calendar-weather/calendar-weather.c.orig Thu Feb 10 11:27:00 2005 -+++ plugins/calendar-weather/calendar-weather.c Thu Feb 10 11:29:47 2005 -@@ -57,13 +57,13 @@ - } - } - if (!found) { -- e_categories_add (_("Weather: Cloudy"), NULL, WEATHER_DATADIR "/category_weather_cloudy_16.png"); -- e_categories_add (_("Weather: Fog"), NULL, WEATHER_DATADIR "/category_weather_fog_16.png"); -- e_categories_add (_("Weather: Partly Cloudy"), NULL, WEATHER_DATADIR "/category_weather_partly_cloudy_16.png"); -- e_categories_add (_("Weather: Rain"), NULL, WEATHER_DATADIR "/category_weather_rain_16.png"); -- e_categories_add (_("Weather: Snow"), NULL, WEATHER_DATADIR "/category_weather_snow_16.png"); -- e_categories_add (_("Weather: Sunny"), NULL, WEATHER_DATADIR "/category_weather_sun_16.png"); -- e_categories_add (_("Weather: Thunderstorms"), NULL, WEATHER_DATADIR "/category_weather_tstorm_16.png"); -+ e_categories_add (_("Weather: Cloudy"), NULL, WEATHER_DATADIR "/category_weather_cloudy_16.png", FALSE); -+ e_categories_add (_("Weather: Fog"), NULL, WEATHER_DATADIR "/category_weather_fog_16.png", FALSE); -+ e_categories_add (_("Weather: Partly Cloudy"), NULL, WEATHER_DATADIR "/category_weather_partly_cloudy_16.png", FALSE); -+ e_categories_add (_("Weather: Rain"), NULL, WEATHER_DATADIR "/category_weather_rain_16.png", FALSE); -+ e_categories_add (_("Weather: Snow"), NULL, WEATHER_DATADIR "/category_weather_snow_16.png", FALSE); -+ e_categories_add (_("Weather: Sunny"), NULL, WEATHER_DATADIR "/category_weather_sun_16.png", FALSE); -+ e_categories_add (_("Weather: Thunderstorms"), NULL, WEATHER_DATADIR "/category_weather_tstorm_16.png", FALSE); - } - - return 0; diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 444759216..bb551d65f 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -113,6 +113,7 @@ lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so @@ -126,6 +127,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-send-options.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug @@ -162,6 +164,7 @@ share/gnome/evolution/%%VERSION%%/addresstypes.xml share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps @@ -257,13 +260,13 @@ share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml -share/gnome/evolution-%%VERSION%%/weather/category_weather_cloudy_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_fog_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_partly_cloudy_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_rain_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_snow_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_sun_16.png -share/gnome/evolution-%%VERSION%%/weather/category_weather_tstorm_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_cloudy_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_fog_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_partly_cloudy_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_rain_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_snow_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_sun_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit @@ -391,6 +394,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures @dirrm share/gnome/help/evolution-%%PORTVERSION%%/C @dirrm share/gnome/help/evolution-%%PORTVERSION%% +@dirrm share/gnome/evolution/%%VERSION%%/weather @dirrm share/gnome/evolution/%%VERSION%%/views/tasks @dirrm share/gnome/evolution/%%VERSION%%/views/mail @dirrm share/gnome/evolution/%%VERSION%%/views/calendar @@ -408,6 +412,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local @dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail @dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN +@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/pt @dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local @dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail @dirrm share/gnome/evolution/%%VERSION%%/default/nl @@ -420,8 +427,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/evolution/%%VERSION%%/default @dirrm share/gnome/evolution/%%VERSION%% @dirrm share/gnome/evolution -@dirrm share/gnome/evolution-%%VERSION%%/weather -@dirrm share/gnome/evolution-%%VERSION%% @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution @dirrm lib/evolution/%%VERSION%%/plugins -- cgit v1.2.3