summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-03-22 16:39:39 +0000
committerjmmv <jmmv@pkgsrc.org>2005-03-22 16:39:39 +0000
commit13e6e188af69148058b2c21f917fa1f04d961977 (patch)
treeda112b12c797404967c3a0b69d6ae045e953bcc3 /mail
parent05a37465b48d4b28d0def0c7536b86bbde8abe79 (diff)
downloadpkgsrc-13e6e188af69148058b2c21f917fa1f04d961977.tar.gz
Update to 2.2.0:
Evolution 2.2.0, 2005-03-07 --------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Addressbook #73152 - Assigning Color To Default Personal Contacts, Creates Duplicate (Siva) * Calendar #72835 - Alarm notify crashes always (Rodrigo) #73152 - Assigning Color To Default Personal Calendar, Creates Duplicate (Siva) Other bugs * Plugins - Fix exchange plugin description for OOF (Sushma) Updated translations: - pt_BR (Raphael Higino) - hu (Laszlo Dvornik) - sr (Danilo Segan, Igor Nestorovic) - sr@Latn (Danilo Segan, Igor Nestorovic) - nl (Tino Meinen) - lt (Zygimantas Berucka) - sq (Gintautas Miliauskas, Laurent Dhima) - ja (Takeshi AIHANA) - bg (Iassen Pramataro) Evolution 2.1.6, 2005-02-28 --------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Addressbook #73005 - Cannot cancel 'Contact List Editor' (Siva) #73005 - offline - setting/unsetting folder offline property is not working (Sushma) #70371 - Evolution crashes when adding contact list (Siva) #67724 - When unix user name, callendar points to old username (Siva) #54825 - Freeze on .vcf import from MacOS X AddressBook (Christophe Fergeau) #73013 - 'Right' click on a 'Contact' cannot select 'Cut' (Siva) * Calendar #72958 - Unable to send delayed meeting (Chen) #72006 - Opened existing appointments with attachment - press cancel - popup info with save / discard / cancel changes (Chen) #63866 - Same name can be entered twice in invitations tab (JP) #67714 - Invitations Tab Allows Entry Of Empty Line (JP) #62089 - adding contact lists to meetings impossible (JP) #47747 - Changes to attendee not updated until click on different row (JP) #61495 - Existing text is placed off screen when editing attendee field (JP) #28947 - adding contact list to attendee list should expand it (JP) #67724 - When unix user name, callendar points to old username (Siva) #72038 - Changes meeting to appoinment after throwing warning invalid mail id (Rodrigo) #69556 - Crash attaching mime parts to calendar events (Harish) * Mail #66126 - attach File Chooser is modal (Michael) #68549 - Answering to Usenet article doesn't consider the "Followup-To:" field (Michael) #71003 - threads still running at exit (Michael) #62109 - Inconsistent ways of determining 8-bit Subject: and From: header charsets (Jeff) #34153 - Confusing Outbox semantics for deleted outgoing messages (Michael) #71528 - Search Selection Widget Has Repeated Items (Michael) #71967 - Evolution delete mail from POP3 server even is checked the option "leave the mail on server (Michael) #40515 - Signature scripts do not allow switches (Michael) #68866 - Forward button doesn't put newline between headers and body (Michael) #35219 - flag-for-followup crufting (Michael) #64987 - Go to next unread message doesn't work when multiple messages are selected (Michael) #72337 - Evolution crashes if I click OK/Cancel on the password dialog after disabling the IMAP account (Michael) #70718 - Next and previous buttons don't realize there's new mail (Michael) #61363 - Setup wizard, IMAP for receiving server, sending default GW (Michael) #70795 - Next/Previous Message Should Only Display Listed Emails (Michael) #23822 - no copy text option when right-clicking on marked mail text (Rodney) #72266 - You shouldn't be able to open more than one 'Select Folder' dialog in the mail filters (Michael) #71429 - on NLD, menus in wrong order (Michae)l #72228 - cannot store into groupwise sent folder (Michael) #72209 - Evolution is crashing when you move a VFolder to a folder 'on this computer' (Michael) #72275 - Can't use Shift+F10 to popup context menu for link in message (Harry Lu) #54503 - "New" dropdown menu on toolbar has wrong widget style (Rodney) #72676 - Saved filter rule can't be modified if it is selected with GOK. (Harry Lu) * SMIME #68592 - "Backup" buttons in certificate settings does nothing - work around (Michael) * Shell #33287 - "send/receive" button not greyed out when starting offline (JP) #48868 - Status bar changes its height when fonts are large (William Jon McCann) * Plugins #71527 - Save Calendar widget mixup between directory and file (Rodrigo) Other bugs * Addressbook - Use new categories dialog in contact editor (Rodrigo) - HIG spacing fixes (Rodney) - Display warning dialog when GW server is old (Vivek) * Calendar - Always ensure default sources are available (Siva) - Don't look up free/busy unless we need to (Harish) - Make sure new events don't display twice (Chen) - Make sure double click opens attachments (Chen) * Mail - a11y fixes for composer (Harry Lu) - Use gnome-vfs API to launch external applications (Marco Pesenti Gritti) - New mailer context menus for messages (Rodney) * Shell - Fix leak (JP) - Use gnome-vfs API to open quick reference (Marco Pesenti Gritti) * Plugins - Make e-popup more robust (Michael) - Cleanup authors/descriptions (Björn Torkelsson) - out of office exchange fixes (Sushma) - retry send options if invalid session string (Chen) - set proper default port for shared folders (Vivek) * Miscellaneous - BSD runtime linking fixes (Hans) - distclean fixes (Björn Torkelsson) Updated translations: - et (Priit Laes) - el (Kostas Papadimas, Nikos Charonitakis) - sv (Christian Rose) - es (Francisco Javier F. Serrador) - it (Luca Ferretti, Marco Ciampa) - da (Martin Willemoes Hansen) - ca (Josep Puigdemont, Xavi Conde) - nb (Kjartan Maraas) - no (Kjartan Maraas) - ru (Leonid Kanter) - gu (Ankit Patel) - cs (Miloslav Trmac) - nl (Vincent van Adrighem) - fi (Ilkka Tuohela) - pt (Duarte Loreto) - uk (Maxim Dziumanenko) - ko (Changwoo Ryu) - de (Frank Arnold) - fr (Vincent Carriere) - en_CA (Adam Weinberger) - cs (Miloslav Trmac) - pl (Artur Flinta) - bg (Vladimir Petkov) - ja (Takeshi AIHANA) - en_GB (David Lodge) - en_CA (Adam Weinberger) - lt (Zygimantas Berucka) Evolution 2.1.5, 2005-02-07 --------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Addressbook #36137 - Leading %s in addressbook message totally non-obvious (Siva) #57819 - Evolution allows to create several contact lists with same name (Partha) #61060 - Don't split sentences in Evolution (Siva) #61067 - Use translator comment for evolution addressbook message (Siva) #67411 - Crash: create new address book (Hans Petter) #68799 - Evolution doesn't store IM info on the LDAP server (Siva) #70339 - vcard preview doesn't appear to work (Siva) * Calendar #33078 - No category list for Category searches in Calendar & Tasks (Rodrigo) #56901 - Only one line gets printed when printing Tasks and Appointments (Yong) #61078 - Please avoid using different styles of markup in translateable evolution messages (Priit) #64682 - Moving a appts from one calendar to another sends update (Chenthill) #71265 - Deletion Of Weather Calendar Crashes Evo (Rodrigo) #71452 - Pressing 2 times escape - edited meeting window disappear (JP) #71485 - String issues (JP) #71729 - Gnopernicus should report the full name of week day (Li) #71929 - Whitespace before colons in Evolution calendar a11y messages (Rodrigo) #71924, 71926, 71932 - Don't split sentences (Harry) #71944 - Failed to compile (JP) #72088 - Some calendar a11y functions don't work (Harry) #72090 - Evolution crashed when clicking on 'open calender' in sent items (Rodrigo) * Mail #65329 - Regression in default folder name localisation (Michael) #67083 - CJK-translated mail header names are line-wrapped with long lined headers (Michael) #68137 - Inconsistent VFolder vs vFolder (Rodney) #68696 - RFE: Simplifications to the "Account Management" page of the Account setup druid (Rodney) #68743 - Button jumps when you click it (Rodney) #69815 - Cannot quit while updating vfolders (Michael) #69850 - Crash: attempting to create a Vfolder based on a message without a Sender (Michael) #70454 - Folder shows unsubscribed, but is subscribed (Jeff) #71310 - Always loses my signature script settings (Michael) #71312 - Double-clicking vFolder of Draft folder doesn't allow editing (Michael) #71520 - Changing server type not displayed immediately in 'Account settings' (Michael) #71521 - 'Account Editor' does not allow to change hostname (Michael) #71774 - Evolution crashes when cancel 'Rename Folder' dialog (Mengjie) #71937 - Spamasssassin typo in Evolution mail schemas (JP) * Plugins #41235 - Spacing/padding of itip control (Rodney) #71460 - Clicking accept button in appointment - Unable to send item to calender 'Calender'. Invalid object (Chenthill) #71512 - Crash: AMD64 Unable to add or import contacts (Siva) #71644 - Empty string marked for translation (Sushma) Other bugs * Addressbook - Use new categories dialog in contact editor (Rodrigo) - HIG spacing fixes (Rodney) - Display warning dialog when GW server is old (Vivek) * Calendar - Fixed sensitation of widgets in recurrence page (Rodrigo) - Fixed IDL duplications (Hans Petter) - Don't build private libraries as modules (Hans Petter) - Fixed popup menu for detached recurrences (Rodrigo) - HIG spacing/padding fixes (Rodney) - Display warning dialog when GW server is old (Vivek) - Clear component preview when updating (Rodrigo) - Added help button to editors (Rodney) - Fix DND issues with calendar attachments (Harish) * Mail - HIG fixes (Rodney) * Plugins - Use icon factory in audio-inline plugin (JP) - Fix order of menus in calendar-http plugin (David) - Added missing ID's (JP) - Set weather categories as not searchable (Rodrigo) - Added auth type section in exchange-account-setup plugin (Sushma) - Fixed crash in groupwise-send-options dialog (Chenthill) * All - Added 'pt' default setup to build (Rodney) - Fixed druid lock on startup (Jeff) - a11y improvements (Mengjie, Li, Harry) - HIG fixes to e-passwords dialogs (Rodney) Updated translations: - bg (Alexander Shopov) - cs (Miloslav Trmac) - de (Hendrik Richter, Frank Arnold) - el (Kostas Papadimas) - en_CA (Adam Weinberger) - es (Francisco Javier F. Serrador) - et (Priit Laes) - it (Marco Ciampa) - ja (Takeshi AIHANA) - lt (Zygimantas Beruska) - nb (Kjartan Maraas) - no (Kjartan Maraas) - ru (Leonid Kanter) - sk (Marcel Telka) - sv (Christian Rose) - zh_CN (Funda Wang) Evolution 2.1.4, 2005-01-24 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Mail #46287 - Space key should work for checkbox (JP) #57090 - Junk Button Sensitivity needs changes (Radek) #69122 - Make subject || sender contains the default search (Michael) #60664 - message view does not follow theme change (Michael) #55831 - missing warning dialog about opening a lot of selected mails (Michael) #66943 - Crash when saving draft (Michael) #70768 - 'Mark All as Read' marks all the mails which are not in current query as read (Michael) #71105 - When trying to rename a folder containing a slash "/" and spaces, evil stuff happens (Michael) #65178 - newly created folder on local maildir doesn't show until evolution restart (Michael) #71029 - receiving settings not stored (Michael) #70990 - NNTP without username broken (Michael) #70018 - Signatures don't work (Michael) #68352 - Add post message keybinding (Rodney) * Calendar #71407 - Input Protect Read-Only Calendars (Rodrigo) #65820 - Evolution Calendar weekday names message needs translator comment (JP) * Addressbook #70622 - crash (JP) #71448 - Deleting many contacts is incredibly slow (Siva) #41210 - spacing/padding of "Contact Quick Add" dialog (Rodney) #60852 - "Add address" popup dialog UI is ugly/wrong size, and button is resizable (Rodney) #41228 - spacing/padding of "duplicate contact detected" dialog (Rodney) #70922 - Email address types should show "Other" when importing vcards (Siva) #61973 - add TTYTDD translator comment (JP) * Plugins #71384 - 'Forward' button is disabled while configuring mail id (Sushma) #29985 - Accepted meetings should have a replied-to icon (JP) * Miscellaneous #46404 - not remembering printer definition (JP) Other bugs * Address Book - set full name appropriately when quick adding (Hans) - fix creation of local addressbooks (Siva) - a11y fixes (Hao Sheng) * Mail - Add items to folder properties correctly (Jeff) - Add async descriptions (Jeff) * Calendar - for detached instances, disable recurrence UI (Rodrigo) - use receive_objects for importing (Rodrigo) - change free/busy prefs title (Nat) - handle attachment errors better (Harish) - fix possible day view resize crash (Michael) * Shell - fix offline handler crash (JP) - close import wizard on Esc (Mengjie Yu) * S/MIME - don't remove tree node if deleting cert failed (Michael) * Plugins - Add addressbook file config plugin so local calendar get set up right (Siva) - In BBDB check the buddy account name not alias (Nat) - In weather calendar fix units spelling (David Trowbridge) - In weather calendar use single metric/imperial specification (David Trowbridge) - Add default source plugin so its easy to set for the user (Siva) - Make exchange account setup simpler (Sushma) - In groupwise account setup simplify the settings for soap only (Siva) - Add groupwise status tracking plugin so the user can see the information they requested (Chen) - In itip-formatter extract the decoded text so non-ascii works (JP) - In itip-formatter handle utc dtstart/dtend correctly (JP) - In new-mail-notify fix DBUS event handling (Miguel Angel Lopez Hernandez) - In groupwise sendoptions, make sure the global send options actually work (Chen) - In groupwise shared folder, improve UI (Vivek) - In groupwise shared folder, add a wizard for shared folder notifications (Vivek) Updated translations: - es (Francisco Javier F. Serrador) - de (Hendrik Richter, Frank Arnold) - it (Marco Ciampa) - nl (Vincent van Adrighem) - lt (Zygimantas Berucka) - nb (Kjartan Maraas) - no (Kjartan Maraas) - et (Priit Laes) - el (Nikos Charonitakis) - ja (Takeshi AIHANA) - en_CA (Adam Weinberger) Evolution 2.1.3, 2004-01-10 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Calendar #69663 - Task list on the web does not mark tasks as finished (JP) #61076 - Evolution calendar messages unnecessarily marked for translation (JP) #41624 - only the last exception is deleted on palm device (JP) * Addressbook #61068 - Extraneous space in evolution message (Andre Klapper) #61975 - Can't translate string "Reflow test" (JP) * Plugins #30992 - Preferences dialog greys out OK button after Apply (JP) Other bugs * Address Book - set read only state better for contact editor (Hans) - add UI for marking calendars offline (Siva) - use new name selector api (Hans) * Mail - Display icon for shared folder (Vivek) - New offline folder/store classes (Jeff) - Handle reply in mailto: (Michael) - a11y fixes (Mengjie Yu) - (Mengjie Yu) * Calendar - detached instance recurrence handling (Rodrigo) - calendar attachments (Harish) - send options for meeting (Chen) - handle calendar:// uris (JP) - handle different calendars having the same uid (Rodrigo) - add UI for marking calendars offline (Chen) - use new name selector API (Hans) - prevent crash when searching for f/b info (JP) - a11y fixes (Harry) - calendar config cleanup (JP) * Shell - Make component buttons configurable (JP) - Set offline with gconf key (Siva) * Plugins - add component.migration event for calendar (David Trowbridge) - fix translations of popup menus (Michael) - HIG config dialog fixes (Rodney) - Add calendar file config plugin so local calendar get set up right (JP) - Add calendar weather config plugin (David Trowbridge) - Add exchange account config plugin (Sushma) - Add groupwise send options plugin (Partha) - Add itip formatter plugin (JP) - Add new-mail-notify plugin that uses DBUS (Miguel Angel Lopez Hernandez) - Use standard error messages in save-calendar plugin (Philip Van Hoof) - Add send options plugin for account editor (Chen) - Add shared folder notification plugin (vivek) Updated translations: - lt (Zygimantas Berucka) - ja (Takeshi AIHANA) - bg (Vladimir Petkov, Alexander Shopov) - et (Priit Laes, Ivar Smolin) Evolution 2.1.2, 2004-12-20 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Mail #68759 - Evolution Shell can't load modules (JP) #69579 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Michael) #69339 - postscript and some other attachments not visable (Michael) #69579 - vFolders#UNMATCHED generates errors (Michael) #68958 - current message forgotten in vfolders (Michael) #69446 - Mail shown as attachment if some headers are upper case (Michael) #46229 - Filters dialog - label suggestions (Diego Sevilla Ruiz) * Calendar #47535 - Snooze Time "minutes" string Improperly marked for translation (Rodney) #67403 - wrong alarm time displayed (Rodrigo) * Shell #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) Other bugs * Address Book - Turkish locale fixes (S. Caglar Onur) - Set proper window title for editing addressbook properties (Vivek) - Prevent null UID from causing weird saving problems (Siva) - a11y fixes (Harry Lu, Hao Sheng) * Mail - Add mnemonics everywhere (Mengjie Yu) - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek) * Calendar - let users set a template for fetching free/busy information (James Bowes) - Set proper window title for editing calendar/task properties (Vivek) - Leak fixes (Harish) - Fix 64 bit problem (David Mosberger) - UI Fixes for meetings and assigned tasks (Chen) * Shell - fix 64 bit problem (David Mosberger) - use new window icon (Rodney) * Plugins - make plugin hooks available for mail even when the mailer is not activated (Michael) - move groupwise config code to a plugin (Siva) - support csv and rdf calendar saving (Philip Van Hoof) Updated translations: - nl (Vincent van Adrighem) - sv (Christian Rose) - ca (Jordi Mallach) - zh_CN (Funda Wang) - bg (Alexander Shopov) - fi (Ilkka Tuohela) - da (Martin Willemoes Hansen) - tr (Baris Cicek) - lt (Zygimantas Berucka) - cy (Dafydd Harries) Evolution 2.1.1, 2004-11-28 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Addressbook #28725 - should not say "no items in this view" until the backend is done responding (Sushma) #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) #61976 - Near-identical strings, should be made identical (Rodney) #67656 - almost the same email address are considrered identical (Siva) #61966 - Typo in string: Word "be" missing (Andre Klapper) #69079 - Data repeated after save with bad date format (Siva) #66854 - Some strings are missed to translation (partial, Rodney) * Mail #68787 - Crash when migrating 1.4 data to 2.0.2 (Michael) #69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael) #69408 - Evolution hang in message fetching with ima4rev1 (Jeff) #69145 - toplevel message/rfc822 parts are broken for IMAP (Michael) #69241 - base64 attachement holding PGP block (Jeff) #69160 - IMAP4 dont freez on scaning imap folders (Jeff) #67496 - html email not rendered in preview pane (Michael) * Calendar #68624 - Requires URL to have http:// or webcal:// at beginning (Diego Sevilla Ruiz) #47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney) #6767 - Fix hardcode colors in day, week, month views (Li Yuan) #68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP) * Shell #61065 - Evolution should be spelled with uppercase E in evolution message (Joan Sanfeliu) Other bugs * Address Book - Handle required fields (Siva) - a11y fixes (Hao Sheng) - make shift-F10 popup menu (Hao Sheng) - don't show error dialog when cancelling operation (Siva) * Mail - Reduce memory for vfolder operations (Michael) - Use unix sockets for spam checking (Radek) * Calendar - warn is summary is blank (Chen) - allow creating new calendar with right click on a group (Harish) - EConfigize new calendar and calendar properties (David Trowbridge) - make sure switch between 12/24h time shows immediately (JP) * Plugins - set "base" plugin target (Michael) - add webcal config plugin (David Trowbridge) - mailing list actions plugin (Meilof Venningen) - plugin manager plugin (Michael) Updated translations: - da (Martin Willemoes Hansen) - lt (Žygimantas Beručka) - nl (Vincent van Adrighem) - de (Hendrik Richter) - it (Marco Ciampa) - ca (Jordi Mallach) - fa (Meelad Zakaria) - sq (Laurent Dhima) - fr (Sebastien Bacher) - cs (Juraj Kubelka) Evolution 2.1.0, 2004-11-01 ---------------------------- Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi): * Addressbook #61069 - Missing space in evolution addressbook message (Andre Klapper) #61972 - Typo in country name: Is "Grena-dines", should be "Grenadines" (Andre Klapper) * Mail #68894 - IMAP4 rev1, error on selecting INBOX (Jeff) #68814 - evo crash while fetching mail using IMAP4 rev1 (Jeff) #44876 - Missing keyboard navigation in the e-mail recipient section (Mengjie Yu) Other bugs * Address Book - Display multi value attributes in the preview (Nat) * Mail - Enable IMAP4 camel provider by default (Jeff) - IMAP4 offline folder info caching (Jeff) * Calendar - a11y fixes (Li Yuan) - make free/busy information gathering more efficient (Harish) * Shell - remove deprecated calls (Kjartan Maraas) * Plugins - convert mail, address book to econfig (Zucchi) - convert all components to e-menu (Zucchi) - add new mail event (Zucchi) - add message replied event (Nat/Zucchi) - add online/offline event (Zucchi) - inline audio via gstreamer (Radek) - big brother database (Nat) - copy address tool (Zucchi) - folder unsubscribe (Jeff) - mail to task (Rodrigo) - mark calendar for offline (Harish) - prefer plain text for messages (Zucchi) - save attachments (Zucchi) - save calendar (Rodrigo) - select one calendar/task (JP) - subject threading (JP/Zucchi) Updated translations: - da (Martin Willemoes Hansen) - it (Marco Ciampa) - sq (Laurent Dhima) - el (Nikos Charonitakis) - ms (Hasbullah Bin Pit) - bg (Vladimir Petkov)
Diffstat (limited to 'mail')
-rw-r--r--mail/evolution/Makefile28
-rw-r--r--mail/evolution/PLIST991
-rw-r--r--mail/evolution/buildlink3.mk29
-rw-r--r--mail/evolution/distinfo9
-rw-r--r--mail/evolution/patches/patch-aa12
5 files changed, 505 insertions, 564 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 545e9ec6392..b55f39cca30 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2005/03/04 12:20:25 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2005/03/22 16:39:39 jmmv Exp $
-DISTNAME= evolution-2.0.4
+DISTNAME= evolution-2.2.0
CATEGORIES= mail time gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.0/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.2/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rh@NetBSD.org
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES
BUILDLINK_DEPENDS.gal2+= gal2>=2.2.5
BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb2
BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.2.5
-BUILDLINK_DEPENDS.evolution-data-server+= evolution-data-server>=1.0.4
BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.1
PKG_OPTIONS_VAR= PKG_OPTIONS.evolution
@@ -51,7 +50,6 @@ CONFIGURE_ARGS+= --with-openldap
CONFIGURE_ARGS+= --without-static-ldap
CONFIGURE_ARGS+= --enable-openssl=no
CONFIGURE_ARGS+= --enable-pilot-conduits=no
-CONFIGURE_ARGS+= --enable-smime=no
CONFIGURE_ARGS+= --with-krb4=/usr
CONFIGURE_ARGS+= --with-krb5=/usr
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -80,16 +78,14 @@ CONFIGURE_ARGS+= --without-krb5
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --enable-nss=yes
-# XXX We should have a standalone NSS package and use it here, instead of
-# depending on the whole mozilla-gtk2...
-BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.3nb1
# XXX Workaround for the following problem: addressbook/util/libeabutil.la
# is compiled as a static library only which uses the NSS stuff. When other
# parts of the program use this .la archive, they get the right -L flags
# (from the dependency_libs variable) but not the rpaths. buildlink3 should
# add rpath flags to the dependency_libs, but there is an strange comment
# in the wrapper saying that it shouldn't.
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mozilla-gtk2}/lib/mozilla-gtk2
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
+# XXX Change to use devel/nss (but a mozilla-nss.pc file is required).
. include "../../www/mozilla-gtk2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-nss
@@ -98,10 +94,10 @@ CONFIGURE_ARGS+= --disable-nss
PKGCONFIG_OVERRIDE= camel.pc.in
PKGCONFIG_OVERRIDE+= evolution-shell.pc.in
-GCONF2_SCHEMAS= apps_evolution_addressbook-2.0.schemas
-GCONF2_SCHEMAS+= apps_evolution_calendar-2.0.schemas
-GCONF2_SCHEMAS+= apps_evolution_shell-2.0.schemas
-GCONF2_SCHEMAS+= evolution-mail-2.0.schemas
+GCONF2_SCHEMAS= apps_evolution_addressbook-2.2.schemas
+GCONF2_SCHEMAS+= apps_evolution_calendar-2.2.schemas
+GCONF2_SCHEMAS+= apps_evolution_shell-2.2.schemas
+GCONF2_SCHEMAS+= evolution-mail-2.2.schemas
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
@@ -125,13 +121,17 @@ LDFLAGS+= -lsemaphore
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../multimedia/gstreamer/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml3/buildlink3.mk"
+.include "../../www/gtkhtml36/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index bf239d5b038..fbe503017c8 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,545 +1,470 @@
-@comment $NetBSD: PLIST,v 1.20 2004/10/15 21:31:51 jmmv Exp $
-bin/evolution-2.0
-include/evolution-2.0/camel/broken-date-parser.h
-include/evolution-2.0/camel/camel-address.h
-include/evolution-2.0/camel/camel-arg.h
-include/evolution-2.0/camel/camel-block-file.h
-include/evolution-2.0/camel/camel-certdb.h
-include/evolution-2.0/camel/camel-charset-map.h
-include/evolution-2.0/camel/camel-cipher-context.h
-include/evolution-2.0/camel/camel-data-cache.h
-include/evolution-2.0/camel/camel-data-wrapper.h
-include/evolution-2.0/camel/camel-debug.h
-include/evolution-2.0/camel/camel-digest-folder.h
-include/evolution-2.0/camel/camel-digest-store.h
-include/evolution-2.0/camel/camel-digest-summary.h
-include/evolution-2.0/camel/camel-disco-diary.h
-include/evolution-2.0/camel/camel-disco-folder.h
-include/evolution-2.0/camel/camel-disco-store.h
-include/evolution-2.0/camel/camel-exception-list.def
-include/evolution-2.0/camel/camel-exception.h
-include/evolution-2.0/camel/camel-file-utils.h
-include/evolution-2.0/camel/camel-filter-driver.h
-include/evolution-2.0/camel/camel-filter-search.h
-include/evolution-2.0/camel/camel-folder-search.h
-include/evolution-2.0/camel/camel-folder-summary.h
-include/evolution-2.0/camel/camel-folder-thread.h
-include/evolution-2.0/camel/camel-folder.h
-include/evolution-2.0/camel/camel-gpg-context.h
-include/evolution-2.0/camel/camel-http-stream.h
-include/evolution-2.0/camel/camel-i18n.h
-include/evolution-2.0/camel/camel-imap-command.h
-include/evolution-2.0/camel/camel-imap-folder.h
-include/evolution-2.0/camel/camel-imap-message-cache.h
-include/evolution-2.0/camel/camel-imap-search.h
-include/evolution-2.0/camel/camel-imap-store-summary.h
-include/evolution-2.0/camel/camel-imap-store.h
-include/evolution-2.0/camel/camel-imap-summary.h
-include/evolution-2.0/camel/camel-imap-types.h
-include/evolution-2.0/camel/camel-imap-utils.h
-include/evolution-2.0/camel/camel-imap-wrapper.h
-include/evolution-2.0/camel/camel-index.h
-include/evolution-2.0/camel/camel-internet-address.h
-include/evolution-2.0/camel/camel-junk-plugin.h
-include/evolution-2.0/camel/camel-local-folder.h
-include/evolution-2.0/camel/camel-local-store.h
-include/evolution-2.0/camel/camel-local-summary.h
-include/evolution-2.0/camel/camel-lock-client.h
-include/evolution-2.0/camel/camel-lock.h
-include/evolution-2.0/camel/camel-maildir-folder.h
-include/evolution-2.0/camel/camel-maildir-store.h
-include/evolution-2.0/camel/camel-maildir-summary.h
-include/evolution-2.0/camel/camel-mbox-folder.h
-include/evolution-2.0/camel/camel-mbox-store.h
-include/evolution-2.0/camel/camel-mbox-summary.h
-include/evolution-2.0/camel/camel-medium.h
-include/evolution-2.0/camel/camel-mh-folder.h
-include/evolution-2.0/camel/camel-mh-store.h
-include/evolution-2.0/camel/camel-mh-summary.h
-include/evolution-2.0/camel/camel-mime-filter-basic.h
-include/evolution-2.0/camel/camel-mime-filter-bestenc.h
-include/evolution-2.0/camel/camel-mime-filter-canon.h
-include/evolution-2.0/camel/camel-mime-filter-charset.h
-include/evolution-2.0/camel/camel-mime-filter-crlf.h
-include/evolution-2.0/camel/camel-mime-filter-enriched.h
-include/evolution-2.0/camel/camel-mime-filter-from.h
-include/evolution-2.0/camel/camel-mime-filter-gzip.h
-include/evolution-2.0/camel/camel-mime-filter-html.h
-include/evolution-2.0/camel/camel-mime-filter-index.h
-include/evolution-2.0/camel/camel-mime-filter-linewrap.h
-include/evolution-2.0/camel/camel-mime-filter-save.h
-include/evolution-2.0/camel/camel-mime-filter-tohtml.h
-include/evolution-2.0/camel/camel-mime-filter-windows.h
-include/evolution-2.0/camel/camel-mime-filter-yenc.h
-include/evolution-2.0/camel/camel-mime-filter.h
-include/evolution-2.0/camel/camel-mime-message.h
-include/evolution-2.0/camel/camel-mime-parser.h
-include/evolution-2.0/camel/camel-mime-part-utils.h
-include/evolution-2.0/camel/camel-mime-part.h
-include/evolution-2.0/camel/camel-mime-utils.h
-include/evolution-2.0/camel/camel-movemail.h
-include/evolution-2.0/camel/camel-multipart-encrypted.h
-include/evolution-2.0/camel/camel-multipart-signed.h
-include/evolution-2.0/camel/camel-multipart.h
-include/evolution-2.0/camel/camel-nntp-folder.h
-include/evolution-2.0/camel/camel-nntp-resp-codes.h
-include/evolution-2.0/camel/camel-nntp-store-summary.h
-include/evolution-2.0/camel/camel-nntp-store.h
-include/evolution-2.0/camel/camel-nntp-stream.h
-include/evolution-2.0/camel/camel-nntp-summary.h
-include/evolution-2.0/camel/camel-object.h
-include/evolution-2.0/camel/camel-operation.h
-include/evolution-2.0/camel/camel-partition-table.h
-include/evolution-2.0/camel/camel-pop3-engine.h
-include/evolution-2.0/camel/camel-pop3-folder.h
-include/evolution-2.0/camel/camel-pop3-store.h
-include/evolution-2.0/camel/camel-pop3-stream.h
-include/evolution-2.0/camel/camel-provider.h
-include/evolution-2.0/camel/camel-sasl-anonymous.h
-include/evolution-2.0/camel/camel-sasl-cram-md5.h
-include/evolution-2.0/camel/camel-sasl-digest-md5.h
-include/evolution-2.0/camel/camel-sasl-gssapi.h
-include/evolution-2.0/camel/camel-sasl-kerberos4.h
-include/evolution-2.0/camel/camel-sasl-login.h
-include/evolution-2.0/camel/camel-sasl-ntlm.h
-include/evolution-2.0/camel/camel-sasl-plain.h
-include/evolution-2.0/camel/camel-sasl-popb4smtp.h
-include/evolution-2.0/camel/camel-sasl.h
-include/evolution-2.0/camel/camel-seekable-stream.h
-include/evolution-2.0/camel/camel-seekable-substream.h
-include/evolution-2.0/camel/camel-sendmail-transport.h
-include/evolution-2.0/camel/camel-service.h
-include/evolution-2.0/camel/camel-session.h
-include/evolution-2.0/camel/camel-smime-context.h
-include/evolution-2.0/camel/camel-smtp-transport.h
-include/evolution-2.0/camel/camel-spool-folder.h
-include/evolution-2.0/camel/camel-spool-store.h
-include/evolution-2.0/camel/camel-spool-summary.h
-include/evolution-2.0/camel/camel-store-summary.h
-include/evolution-2.0/camel/camel-store.h
-include/evolution-2.0/camel/camel-stream-buffer.h
-include/evolution-2.0/camel/camel-stream-filter.h
-include/evolution-2.0/camel/camel-stream-fs.h
-include/evolution-2.0/camel/camel-stream-mem.h
-include/evolution-2.0/camel/camel-stream-null.h
-include/evolution-2.0/camel/camel-stream-process.h
-include/evolution-2.0/camel/camel-stream.h
-include/evolution-2.0/camel/camel-string-utils.h
-include/evolution-2.0/camel/camel-tcp-stream-raw.h
-include/evolution-2.0/camel/camel-tcp-stream-ssl.h
-include/evolution-2.0/camel/camel-tcp-stream.h
-include/evolution-2.0/camel/camel-text-index.h
-include/evolution-2.0/camel/camel-transport.h
-include/evolution-2.0/camel/camel-types.h
-include/evolution-2.0/camel/camel-uid-cache.h
-include/evolution-2.0/camel/camel-url-scanner.h
-include/evolution-2.0/camel/camel-url.h
-include/evolution-2.0/camel/camel-utf8.h
-include/evolution-2.0/camel/camel-vee-folder.h
-include/evolution-2.0/camel/camel-vee-store.h
-include/evolution-2.0/camel/camel-vtrash-folder.h
-include/evolution-2.0/camel/camel.h
-include/evolution-2.0/e-conduit/e-pilot-map.h
-include/evolution-2.0/e-conduit/e-pilot-util.h
-include/evolution-2.0/e-util/e-account-list.h
-include/evolution-2.0/e-util/e-account.h
-include/evolution-2.0/e-util/e-bconf-map.h
-include/evolution-2.0/e-util/e-categories-config.h
-include/evolution-2.0/e-util/e-categories-master-list-wombat.h
-include/evolution-2.0/e-util/e-component-listener.h
-include/evolution-2.0/e-util/e-config-listener.h
-include/evolution-2.0/e-util/e-corba-utils.h
-include/evolution-2.0/e-util/e-dialog-utils.h
-include/evolution-2.0/e-util/e-dialog-widgets.h
-include/evolution-2.0/e-util/e-folder-map.h
-include/evolution-2.0/e-util/e-fsutils.h
-include/evolution-2.0/e-util/e-gtk-utils.h
-include/evolution-2.0/e-util/e-gui-utils.h
-include/evolution-2.0/e-util/e-host-utils.h
-include/evolution-2.0/e-util/e-html-utils.h
-include/evolution-2.0/e-util/e-icon-factory.h
-include/evolution-2.0/e-util/e-iterator.h
-include/evolution-2.0/e-util/e-list-iterator.h
-include/evolution-2.0/e-util/e-list.h
-include/evolution-2.0/e-util/e-memory.h
-include/evolution-2.0/e-util/e-mktemp.h
-include/evolution-2.0/e-util/e-msgport.h
-include/evolution-2.0/e-util/e-passwords.h
-include/evolution-2.0/e-util/e-path.h
-include/evolution-2.0/e-util/e-request.h
-include/evolution-2.0/e-util/e-sexp.h
-include/evolution-2.0/e-util/e-signature-list.h
-include/evolution-2.0/e-util/e-signature.h
-include/evolution-2.0/e-util/e-time-utils.h
-include/evolution-2.0/e-util/e-trie.h
-include/evolution-2.0/e-util/e-uid.h
-include/evolution-2.0/e-util/e-url.h
-include/evolution-2.0/e-util/md5-utils.h
-include/evolution-2.0/importer/GNOME_Evolution_Importer.h
-include/evolution-2.0/importer/evolution-importer-client.h
-include/evolution-2.0/importer/evolution-importer-listener.h
-include/evolution-2.0/importer/evolution-importer.h
-include/evolution-2.0/importer/evolution-intelligent-importer.h
-include/evolution-2.0/shell/Evolution.h
-include/evolution-2.0/shell/e-shell-corba-icon-utils.h
-include/evolution-2.0/shell/e-shell-utils.h
-include/evolution-2.0/shell/e-user-creatable-items-handler.h
-include/evolution-2.0/shell/evolution-config-control.h
-include/evolution-2.0/shell/evolution-shell-component-utils.h
-include/evolution-2.0/shell/evolution-wizard.h
-include/evolution-2.0/widgets/e-activity-handler.h
-include/evolution-2.0/widgets/e-calendar-item.h
-include/evolution-2.0/widgets/e-calendar.h
-include/evolution-2.0/widgets/e-cell-date-edit.h
-include/evolution-2.0/widgets/e-cell-percent.h
-include/evolution-2.0/widgets/e-cell-renderer-combo.h
-include/evolution-2.0/widgets/e-charset-picker.h
-include/evolution-2.0/widgets/e-clipped-label.h
-include/evolution-2.0/widgets/e-combo-button.h
-include/evolution-2.0/widgets/e-combo-cell-editable.h
-include/evolution-2.0/widgets/e-config-page.h
-include/evolution-2.0/widgets/e-dateedit.h
-include/evolution-2.0/widgets/e-dropdown-button.h
-include/evolution-2.0/widgets/e-error.h
-include/evolution-2.0/widgets/e-expander.h
-include/evolution-2.0/widgets/e-image-chooser.h
-include/evolution-2.0/widgets/e-info-label.h
-include/evolution-2.0/widgets/e-map.h
-include/evolution-2.0/widgets/e-multi-config-dialog.h
-include/evolution-2.0/widgets/e-search-bar.h
-include/evolution-2.0/widgets/e-source-option-menu.h
-include/evolution-2.0/widgets/e-source-selector.h
-include/evolution-2.0/widgets/e-task-bar.h
-include/evolution-2.0/widgets/e-task-widget.h
-include/evolution-2.0/widgets/e-title-bar.h
-include/evolution-2.0/widgets/e-url-entry.h
-lib/bonobo/servers/GNOME_Evolution_Addressbook_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_Importer_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Mail_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Mail_Importers_2.0.server
-lib/bonobo/servers/GNOME_Evolution_Shell_2.0.server
-lib/evolution/2.0/camel-providers/libcamelgroupwise.la
-lib/evolution/2.0/camel-providers/libcamelgroupwise.urls
-lib/evolution/2.0/camel-providers/libcamelimap.la
-lib/evolution/2.0/camel-providers/libcamelimap.urls
-lib/evolution/2.0/camel-providers/libcamellocal.la
-lib/evolution/2.0/camel-providers/libcamellocal.urls
-lib/evolution/2.0/camel-providers/libcamelnntp.la
-lib/evolution/2.0/camel-providers/libcamelnntp.urls
-lib/evolution/2.0/camel-providers/libcamelpop3.la
-lib/evolution/2.0/camel-providers/libcamelpop3.urls
-lib/evolution/2.0/camel-providers/libcamelsendmail.la
-lib/evolution/2.0/camel-providers/libcamelsendmail.urls
-lib/evolution/2.0/camel-providers/libcamelsmtp.la
-lib/evolution/2.0/camel-providers/libcamelsmtp.urls
-lib/evolution/2.0/components/libevolution-addressbook.la
-lib/evolution/2.0/components/libevolution-calendar.la
-lib/evolution/2.0/components/libevolution-mail.la
-lib/evolution/2.0/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.la
-lib/evolution/2.0/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.la
-lib/evolution/2.0/evolution-calendar-importers/libevolution-calendar-importers.la
-lib/evolution/2.0/libcamel.la
-lib/evolution/2.0/libeconduit.la
-lib/evolution/2.0/libemiscwidgets.la
-lib/evolution/2.0/libeselectnames.la
-lib/evolution/2.0/libeshell.la
-lib/evolution/2.0/libeutil.la
-lib/evolution/2.0/libevolution-a11y.la
-lib/evolution/2.0/libevolution-addressbook-a11y.la
-lib/evolution/2.0/libevolution-calendar-a11y.la
-lib/evolution/2.0/libevolution-importer.la
-lib/evolution/2.0/libevolution-mail-importers.la
-lib/evolution/2.0/libevolution-widgets-a11y.la
-lib/pkgconfig/camel-2.0.pc
-lib/pkgconfig/evolution-shell-2.0.pc
-libexec/evolution/2.0/camel/camel-index-control
-libexec/evolution/2.0/camel/camel-lock-helper
-libexec/evolution/2.0/csv2vcard
-libexec/evolution/2.0/evolution-addressbook-clean
-libexec/evolution/2.0/evolution-addressbook-export
-libexec/evolution/2.0/evolution-alarm-notify
-libexec/evolution/2.0/killev
-share/applications/evolution-2.0.desktop
-share/evolution/2.0/addresstypes.xml
-share/evolution/2.0/default/C/mail/local/Inbox
-share/evolution/2.0/ecps/medbook.ecps
-share/evolution/2.0/ecps/phonelist.ecps
-share/evolution/2.0/ecps/smallbook.ecps
-share/evolution/2.0/errors/addressbook-errors.xml
-share/evolution/2.0/errors/calendar-errors.xml
-share/evolution/2.0/errors/e-system-errors.xml
-share/evolution/2.0/errors/filter-errors.xml
-share/evolution/2.0/errors/mail-composer-errors.xml
-share/evolution/2.0/errors/mail-errors.xml
-share/evolution/2.0/errors/shell-errors.xml
-share/evolution/2.0/etspec/e-addressbook-view.etspec
-share/evolution/2.0/etspec/e-cal-list-view.etspec
-share/evolution/2.0/etspec/e-calendar-table.etspec
-share/evolution/2.0/etspec/e-contact-list-editor.etspec
-share/evolution/2.0/etspec/e-meeting-time-sel.etspec
-share/evolution/2.0/etspec/e-select-names-section.etspec
-share/evolution/2.0/etspec/e-select-names.etspec
-share/evolution/2.0/etspec/message-list.etspec
-share/evolution/2.0/filtertypes.xml
-share/evolution/2.0/glade/alarm-dialog.glade
-share/evolution/2.0/glade/alarm-list-dialog.glade
-share/evolution/2.0/glade/alarm-notify.glade
-share/evolution/2.0/glade/cal-prefs-dialog.glade
-share/evolution/2.0/glade/calendar-setup.glade
-share/evolution/2.0/glade/contact-editor.glade
-share/evolution/2.0/glade/contact-list-editor.glade
-share/evolution/2.0/glade/e-active-connection-dialog.glade
-share/evolution/2.0/glade/e-contact-print.glade
-share/evolution/2.0/glade/e-delegate-dialog.glade
-share/evolution/2.0/glade/e-itip-control.glade
-share/evolution/2.0/glade/e-msg-composer-attachment.glade
-share/evolution/2.0/glade/e-timezone-dialog.glade
-share/evolution/2.0/glade/eab-contact-commit-duplicate-detected.glade
-share/evolution/2.0/glade/eab-contact-duplicate-detected.glade
-share/evolution/2.0/glade/event-page.glade
-share/evolution/2.0/glade/evolution-startup-wizard.glade
-share/evolution/2.0/glade/filter.glade
-share/evolution/2.0/glade/fulladdr.glade
-share/evolution/2.0/glade/fullname.glade
-share/evolution/2.0/glade/goto-dialog.glade
-share/evolution/2.0/glade/im.glade
-share/evolution/2.0/glade/import.glade
-share/evolution/2.0/glade/ldap-config.glade
-share/evolution/2.0/glade/mail-config.glade
-share/evolution/2.0/glade/mail-dialogs.glade
-share/evolution/2.0/glade/meeting-page.glade
-share/evolution/2.0/glade/recurrence-page.glade
-share/evolution/2.0/glade/schedule-page.glade
-share/evolution/2.0/glade/select-names.glade
-share/evolution/2.0/glade/task-details-page.glade
-share/evolution/2.0/glade/task-page.glade
-share/evolution/2.0/glade/url-editor-dialog.glade
-share/evolution/2.0/help/quickref/C/quickref.pdf
-share/evolution/2.0/images/about-box.png
-share/evolution/2.0/images/bcg.png
-share/evolution/2.0/images/evolution-contacts-mini.png
-share/evolution/2.0/images/monkey-16.png
-share/evolution/2.0/images/offline.png
-share/evolution/2.0/images/online.png
-share/evolution/2.0/images/world_map-960.png
-share/evolution/2.0/searchtypes.xml
-share/evolution/2.0/ui/evolution-addressbook.xml
-share/evolution/2.0/ui/evolution-calendar.xml
-share/evolution/2.0/ui/evolution-comp-editor.xml
-share/evolution/2.0/ui/evolution-composer-entries.xml
-share/evolution/2.0/ui/evolution-contact-editor.xml
-share/evolution/2.0/ui/evolution-contact-list-editor.xml
-share/evolution/2.0/ui/evolution-event-editor.xml
-share/evolution/2.0/ui/evolution-executive-summary.xml
-share/evolution/2.0/ui/evolution-mail-global.xml
-share/evolution/2.0/ui/evolution-mail-list.xml
-share/evolution/2.0/ui/evolution-mail-message.xml
-share/evolution/2.0/ui/evolution-mail-messagedisplay.xml
-share/evolution/2.0/ui/evolution-message-composer.xml
-share/evolution/2.0/ui/evolution-signature-editor.xml
-share/evolution/2.0/ui/evolution-subscribe.xml
-share/evolution/2.0/ui/evolution-task-editor.xml
-share/evolution/2.0/ui/evolution-tasks.xml
-share/evolution/2.0/ui/evolution.xml
-share/evolution/2.0/vfoldertypes.xml
-share/evolution/2.0/views/addressbook/Address_Cards.galview
-share/evolution/2.0/views/addressbook/By_Company.galview
-share/evolution/2.0/views/addressbook/Phone_List.galview
-share/evolution/2.0/views/addressbook/galview.xml
-share/evolution/2.0/views/calendar/List_View.galview
-share/evolution/2.0/views/calendar/galview.xml
-share/evolution/2.0/views/mail/As_Sent_Folder.galview
-share/evolution/2.0/views/mail/By_Follow_Up_Flag.galview
-share/evolution/2.0/views/mail/By_Sender.galview
-share/evolution/2.0/views/mail/By_Status.galview
-share/evolution/2.0/views/mail/By_Subject.galview
-share/evolution/2.0/views/mail/Messages.galview
-share/evolution/2.0/views/mail/galview.xml
-share/evolution/2.0/views/tasks/Tasks.galview
-share/evolution/2.0/views/tasks/With_DueDate.galview
-share/evolution/2.0/views/tasks/With_Status.galview
-share/evolution/2.0/views/tasks/galview.xml
-share/gconf/schemas/apps_evolution_addressbook-2.0.schemas
-share/gconf/schemas/apps_evolution_calendar-2.0.schemas
-share/gconf/schemas/apps_evolution_shell-2.0.schemas
-share/gconf/schemas/evolution-mail-2.0.schemas
-share/gnome/help/evolution-2.0/C/evolution-2.0.xml
-share/gnome/help/evolution-2.0/C/figures/calendar.png
-share/gnome/help/evolution-2.0/C/figures/config-cal.png
-share/gnome/help/evolution-2.0/C/figures/config-mail.png
-share/gnome/help/evolution-2.0/C/figures/contact-editor.png
-share/gnome/help/evolution-2.0/C/figures/contact.png
-share/gnome/help/evolution-2.0/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_email_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_identity_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_rule_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-2.0/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-2.0/C/figures/exchange-delegation.png
-share/gnome/help/evolution-2.0/C/figures/exchange-identity.png
-share/gnome/help/evolution-2.0/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-2.0/C/figures/exchange-receive.png
-share/gnome/help/evolution-2.0/C/figures/filter-new-fig.png
-share/gnome/help/evolution-2.0/C/figures/full-1.png
-share/gnome/help/evolution-2.0/C/figures/full-2.png
-share/gnome/help/evolution-2.0/C/figures/full-3.png
-share/gnome/help/evolution-2.0/C/figures/full-4.png
-share/gnome/help/evolution-2.0/C/figures/full-5.png
-share/gnome/help/evolution-2.0/C/figures/full-6.png
-share/gnome/help/evolution-2.0/C/figures/full-7.png
-share/gnome/help/evolution-2.0/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-2.0/C/figures/mail-inbox.png
-share/gnome/help/evolution-2.0/C/figures/mail-threaded.png
-share/gnome/help/evolution-2.0/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-2.0/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-2.0/C/figures/newmsg.png
-share/gnome/help/evolution-2.0/C/figures/replymsg.png
-share/gnome/help/evolution-2.0/C/figures/schedule.png
-share/gnome/help/evolution-2.0/C/figures/vfolder-createrule-fig.png
-share/idl/evolution-2.0/Composer.idl
-share/idl/evolution-2.0/Evolution-Addressbook-SelectNames.idl
-share/idl/evolution-2.0/Evolution-Component.idl
-share/idl/evolution-2.0/Evolution-Composer.idl
-share/idl/evolution-2.0/Evolution-ConfigControl.idl
-share/idl/evolution-2.0/Evolution-Offline.idl
-share/idl/evolution-2.0/Evolution-Shell.idl
-share/idl/evolution-2.0/Evolution-Wizard.idl
-share/idl/evolution-2.0/Evolution-common.idl
-share/idl/evolution-2.0/Evolution.idl
-share/idl/evolution-2.0/GNOME_Evolution_Importer.idl
-share/idl/evolution-2.0/evolution-calendar.idl
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evolution-2.0.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evolution-2.0.mo
-share/mime-info/evolution-2.0.keys
-share/mime-info/evolution-2.0.mime
-share/omf/evolution/evolution-2.0-C.omf
-share/pixmaps/evolution-2.0.png
+@comment $NetBSD: PLIST,v 1.21 2005/03/22 16:39:39 jmmv Exp $
+bin/evolution-2.2
+include/evolution-2.2/calendar/gui/e-cal-config.h
+include/evolution-2.2/e-conduit/e-pilot-map.h
+include/evolution-2.2/e-conduit/e-pilot-util.h
+include/evolution-2.2/e-util/e-account-list.h
+include/evolution-2.2/e-util/e-account.h
+include/evolution-2.2/e-util/e-bconf-map.h
+include/evolution-2.2/e-util/e-categories-config.h
+include/evolution-2.2/e-util/e-categories-master-list-wombat.h
+include/evolution-2.2/e-util/e-component-listener.h
+include/evolution-2.2/e-util/e-config-listener.h
+include/evolution-2.2/e-util/e-config.h
+include/evolution-2.2/e-util/e-corba-utils.h
+include/evolution-2.2/e-util/e-dialog-utils.h
+include/evolution-2.2/e-util/e-dialog-widgets.h
+include/evolution-2.2/e-util/e-event.h
+include/evolution-2.2/e-util/e-folder-map.h
+include/evolution-2.2/e-util/e-fsutils.h
+include/evolution-2.2/e-util/e-gtk-utils.h
+include/evolution-2.2/e-util/e-gui-utils.h
+include/evolution-2.2/e-util/e-html-utils.h
+include/evolution-2.2/e-util/e-icon-factory.h
+include/evolution-2.2/e-util/e-iterator.h
+include/evolution-2.2/e-util/e-list-iterator.h
+include/evolution-2.2/e-util/e-list.h
+include/evolution-2.2/e-util/e-menu.h
+include/evolution-2.2/e-util/e-mktemp.h
+include/evolution-2.2/e-util/e-plugin.h
+include/evolution-2.2/e-util/e-popup.h
+include/evolution-2.2/e-util/e-print.h
+include/evolution-2.2/e-util/e-request.h
+include/evolution-2.2/e-util/e-signature-list.h
+include/evolution-2.2/e-util/e-signature.h
+include/evolution-2.2/e-util/e-time-utils.h
+include/evolution-2.2/e-util/e-uid.h
+include/evolution-2.2/e-util/md5-utils.h
+include/evolution-2.2/importer/GNOME_Evolution_Importer.h
+include/evolution-2.2/importer/evolution-importer-client.h
+include/evolution-2.2/importer/evolution-importer-listener.h
+include/evolution-2.2/importer/evolution-importer.h
+include/evolution-2.2/importer/evolution-intelligent-importer.h
+include/evolution-2.2/shell/Evolution.h
+include/evolution-2.2/shell/e-shell-corba-icon-utils.h
+include/evolution-2.2/shell/e-shell-utils.h
+include/evolution-2.2/shell/e-user-creatable-items-handler.h
+include/evolution-2.2/shell/evolution-config-control.h
+include/evolution-2.2/shell/evolution-shell-component-utils.h
+include/evolution-2.2/shell/evolution-wizard.h
+include/evolution-2.2/widgets/e-activity-handler.h
+include/evolution-2.2/widgets/e-calendar-item.h
+include/evolution-2.2/widgets/e-calendar.h
+include/evolution-2.2/widgets/e-cell-date-edit.h
+include/evolution-2.2/widgets/e-cell-percent.h
+include/evolution-2.2/widgets/e-cell-renderer-combo.h
+include/evolution-2.2/widgets/e-charset-picker.h
+include/evolution-2.2/widgets/e-clipped-label.h
+include/evolution-2.2/widgets/e-combo-button.h
+include/evolution-2.2/widgets/e-combo-cell-editable.h
+include/evolution-2.2/widgets/e-config-page.h
+include/evolution-2.2/widgets/e-dateedit.h
+include/evolution-2.2/widgets/e-dropdown-button.h
+include/evolution-2.2/widgets/e-error.h
+include/evolution-2.2/widgets/e-expander.h
+include/evolution-2.2/widgets/e-image-chooser.h
+include/evolution-2.2/widgets/e-info-label.h
+include/evolution-2.2/widgets/e-map.h
+include/evolution-2.2/widgets/e-multi-config-dialog.h
+include/evolution-2.2/widgets/e-search-bar.h
+include/evolution-2.2/widgets/e-send-options.h
+include/evolution-2.2/widgets/e-task-bar.h
+include/evolution-2.2/widgets/e-task-widget.h
+include/evolution-2.2/widgets/e-url-entry.h
+lib/bonobo/servers/GNOME_Evolution_Addressbook_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Calendar_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Calendar_Importer_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Mail_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Mail_Importers_2.2.server
+lib/bonobo/servers/GNOME_Evolution_Shell_2.2.server
+lib/evolution/2.2/components/libevolution-addressbook.la
+lib/evolution/2.2/components/libevolution-calendar.la
+lib/evolution/2.2/components/libevolution-mail.la
+lib/evolution/2.2/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.la
+lib/evolution/2.2/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.la
+lib/evolution/2.2/evolution-calendar-importers/libevolution-calendar-importers.la
+lib/evolution/2.2/libeabutil.la
+lib/evolution/2.2/libeconduit.la
+lib/evolution/2.2/libecontacteditor.la
+lib/evolution/2.2/libecontactlisteditor.la
+lib/evolution/2.2/libefilterbar.la
+lib/evolution/2.2/libemiscwidgets.la
+lib/evolution/2.2/libeshell.la
+lib/evolution/2.2/libessmime.la
+lib/evolution/2.2/libetimezonedialog.la
+lib/evolution/2.2/libeutil.la
+lib/evolution/2.2/libevolution-a11y.la
+lib/evolution/2.2/libevolution-addressbook-a11y.la
+lib/evolution/2.2/libevolution-calendar-a11y.la
+lib/evolution/2.2/libevolution-importer.la
+lib/evolution/2.2/libevolution-mail-importers.la
+lib/evolution/2.2/libevolution-smime.la
+lib/evolution/2.2/libevolution-widgets-a11y.la
+lib/evolution/2.2/libfilter.la
+lib/evolution/2.2/libmenus.la
+lib/evolution/2.2/plugins/liborg-gnome-addressbook-file.la
+lib/evolution/2.2/plugins/liborg-gnome-addressbook-groupwise.la
+lib/evolution/2.2/plugins/liborg-gnome-audio-inline.la
+lib/evolution/2.2/plugins/liborg-gnome-calendar-file.la
+lib/evolution/2.2/plugins/liborg-gnome-calendar-http.la
+lib/evolution/2.2/plugins/liborg-gnome-calendar-weather.la
+lib/evolution/2.2/plugins/liborg-gnome-compose-send-options.la
+lib/evolution/2.2/plugins/liborg-gnome-copy-tool.la
+lib/evolution/2.2/plugins/liborg-gnome-default-source.la
+lib/evolution/2.2/plugins/liborg-gnome-evolution-bbdb.la
+lib/evolution/2.2/plugins/liborg-gnome-evolution-startup-wizard.la
+lib/evolution/2.2/plugins/liborg-gnome-exchange-account-settings.la
+lib/evolution/2.2/plugins/liborg-gnome-gw-account-setup.la
+lib/evolution/2.2/plugins/liborg-gnome-itip-formatter.la
+lib/evolution/2.2/plugins/liborg-gnome-mail-folder-unsubscribe.la
+lib/evolution/2.2/plugins/liborg-gnome-mail-to-task.la
+lib/evolution/2.2/plugins/liborg-gnome-mailing-list-actions.la
+lib/evolution/2.2/plugins/liborg-gnome-mark-calendar-offline.la
+lib/evolution/2.2/plugins/liborg-gnome-plugin-manager.la
+lib/evolution/2.2/plugins/liborg-gnome-prefer-plain.la
+lib/evolution/2.2/plugins/liborg-gnome-save-attachments.la
+lib/evolution/2.2/plugins/liborg-gnome-save-calendar.la
+lib/evolution/2.2/plugins/liborg-gnome-select-one-source.la
+lib/evolution/2.2/plugins/liborg-gnome-send-options.la
+lib/evolution/2.2/plugins/liborg-gnome-shared-folder.la
+lib/evolution/2.2/plugins/liborg-gnome-status-track.la
+lib/evolution/2.2/plugins/liborg-gnome-subject-thread.la
+lib/evolution/2.2/plugins/org-gnome-addressbook-file.eplug
+lib/evolution/2.2/plugins/org-gnome-addressbook-groupwise.eplug
+lib/evolution/2.2/plugins/org-gnome-audio-inline.eplug
+lib/evolution/2.2/plugins/org-gnome-calendar-file.eplug
+lib/evolution/2.2/plugins/org-gnome-calendar-http.eplug
+lib/evolution/2.2/plugins/org-gnome-calendar-weather.eplug
+lib/evolution/2.2/plugins/org-gnome-compose-send-options.eplug
+lib/evolution/2.2/plugins/org-gnome-compose-send-options.xml
+lib/evolution/2.2/plugins/org-gnome-copy-tool.eplug
+lib/evolution/2.2/plugins/org-gnome-default-source.eplug
+lib/evolution/2.2/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/2.2/plugins/org-gnome-evolution-startup-wizard.eplug
+lib/evolution/2.2/plugins/org-gnome-exchange-account-setup.eplug
+lib/evolution/2.2/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/2.2/plugins/org-gnome-itip-formatter.eplug
+lib/evolution/2.2/plugins/org-gnome-mail-folder-unsubscribe.eplug
+lib/evolution/2.2/plugins/org-gnome-mail-to-task.eplug
+lib/evolution/2.2/plugins/org-gnome-mailing-list-actions.eplug
+lib/evolution/2.2/plugins/org-gnome-mailing-list-actions.xml
+lib/evolution/2.2/plugins/org-gnome-mark-calendar-offline.eplug
+lib/evolution/2.2/plugins/org-gnome-plugin-manager.eplug
+lib/evolution/2.2/plugins/org-gnome-plugin-manager.xml
+lib/evolution/2.2/plugins/org-gnome-prefer-plain.eplug
+lib/evolution/2.2/plugins/org-gnome-save-attachments.eplug
+lib/evolution/2.2/plugins/org-gnome-save-attachments.xml
+lib/evolution/2.2/plugins/org-gnome-save-calendar.eplug
+lib/evolution/2.2/plugins/org-gnome-select-one-source.eplug
+lib/evolution/2.2/plugins/org-gnome-send-options.eplug
+lib/evolution/2.2/plugins/org-gnome-shared-folder.eplug
+lib/evolution/2.2/plugins/org-gnome-status-track.eplug
+lib/evolution/2.2/plugins/org-gnome-subject-thread.eplug
+lib/pkgconfig/evolution-plugin-2.2.pc
+lib/pkgconfig/evolution-shell-2.2.pc
+libexec/evolution/2.2/csv2vcard
+libexec/evolution/2.2/evolution-addressbook-clean
+libexec/evolution/2.2/evolution-addressbook-export
+libexec/evolution/2.2/evolution-alarm-notify
+libexec/evolution/2.2/killev
+share/applications/evolution-2.2.desktop
+share/evolution/2.2/addresstypes.xml
+share/evolution/2.2/default/C/mail/local/Inbox
+share/evolution/2.2/default/de/mail/local/Inbox
+share/evolution/2.2/default/ja/mail/local/Inbox
+share/evolution/2.2/default/nl/mail/local/Inbox
+share/evolution/2.2/default/pt/mail/local/Inbox
+share/evolution/2.2/default/zh_CN/mail/local/Inbox
+share/evolution/2.2/ecps/medbook.ecps
+share/evolution/2.2/ecps/phonelist.ecps
+share/evolution/2.2/ecps/smallbook.ecps
+share/evolution/2.2/errors/addressbook-errors.xml
+share/evolution/2.2/errors/calendar-errors.xml
+share/evolution/2.2/errors/e-system-errors.xml
+share/evolution/2.2/errors/filter-errors.xml
+share/evolution/2.2/errors/mail-composer-errors.xml
+share/evolution/2.2/errors/mail-errors.xml
+share/evolution/2.2/errors/org-gnome-itip-formatter-errors.xml
+share/evolution/2.2/errors/org-gnome-mailing-list-actions-errors.xml
+share/evolution/2.2/errors/org-gnome-shared-folder-errors.xml
+share/evolution/2.2/errors/shell-errors.xml
+share/evolution/2.2/etspec/e-addressbook-view.etspec
+share/evolution/2.2/etspec/e-cal-list-view.etspec
+share/evolution/2.2/etspec/e-calendar-table.etspec
+share/evolution/2.2/etspec/e-contact-list-editor.etspec
+share/evolution/2.2/etspec/e-meeting-time-sel.etspec
+share/evolution/2.2/etspec/message-list.etspec
+share/evolution/2.2/filtertypes.xml
+share/evolution/2.2/glade/alarm-dialog.glade
+share/evolution/2.2/glade/alarm-list-dialog.glade
+share/evolution/2.2/glade/alarm-notify.glade
+share/evolution/2.2/glade/cal-attachment.glade
+share/evolution/2.2/glade/cal-prefs-dialog.glade
+share/evolution/2.2/glade/contact-editor.glade
+share/evolution/2.2/glade/contact-list-editor.glade
+share/evolution/2.2/glade/e-active-connection-dialog.glade
+share/evolution/2.2/glade/e-contact-print.glade
+share/evolution/2.2/glade/e-delegate-dialog.glade
+share/evolution/2.2/glade/e-itip-control.glade
+share/evolution/2.2/glade/e-msg-composer-attachment.glade
+share/evolution/2.2/glade/e-send-options.glade
+share/evolution/2.2/glade/e-timezone-dialog.glade
+share/evolution/2.2/glade/eab-contact-commit-duplicate-detected.glade
+share/evolution/2.2/glade/eab-contact-duplicate-detected.glade
+share/evolution/2.2/glade/event-page.glade
+share/evolution/2.2/glade/evolution-startup-wizard.glade
+share/evolution/2.2/glade/filter.glade
+share/evolution/2.2/glade/fulladdr.glade
+share/evolution/2.2/glade/fullname.glade
+share/evolution/2.2/glade/goto-dialog.glade
+share/evolution/2.2/glade/im.glade
+share/evolution/2.2/glade/import.glade
+share/evolution/2.2/glade/ldap-config.glade
+share/evolution/2.2/glade/mail-config.glade
+share/evolution/2.2/glade/mail-dialogs.glade
+share/evolution/2.2/glade/meeting-page.glade
+share/evolution/2.2/glade/properties.glade
+share/evolution/2.2/glade/recurrence-page.glade
+share/evolution/2.2/glade/schedule-page.glade
+share/evolution/2.2/glade/smime-ui.glade
+share/evolution/2.2/glade/task-details-page.glade
+share/evolution/2.2/glade/task-page.glade
+share/evolution/2.2/glade/url-editor-dialog.glade
+share/evolution/2.2/help/quickref/C/quickref.pdf
+share/evolution/2.2/images/about-box.png
+share/evolution/2.2/images/bcg.png
+share/evolution/2.2/images/evolution-contacts-mini.png
+share/evolution/2.2/images/monkey-16.png
+share/evolution/2.2/images/offline.png
+share/evolution/2.2/images/online.png
+share/evolution/2.2/images/world_map-960.png
+share/evolution/2.2/searchtypes.xml
+share/evolution/2.2/ui/evolution-addressbook.xml
+share/evolution/2.2/ui/evolution-calendar.xml
+share/evolution/2.2/ui/evolution-composer-entries.xml
+share/evolution/2.2/ui/evolution-executive-summary.xml
+share/evolution/2.2/ui/evolution-mail-global.xml
+share/evolution/2.2/ui/evolution-mail-list.xml
+share/evolution/2.2/ui/evolution-mail-message.xml
+share/evolution/2.2/ui/evolution-mail-messagedisplay.xml
+share/evolution/2.2/ui/evolution-message-composer.xml
+share/evolution/2.2/ui/evolution-signature-editor.xml
+share/evolution/2.2/ui/evolution-subscribe.xml
+share/evolution/2.2/ui/evolution-tasks.xml
+share/evolution/2.2/ui/evolution.xml
+share/evolution/2.2/vfoldertypes.xml
+share/evolution/2.2/views/addressbook/Address_Cards.galview
+share/evolution/2.2/views/addressbook/By_Company.galview
+share/evolution/2.2/views/addressbook/Phone_List.galview
+share/evolution/2.2/views/addressbook/galview.xml
+share/evolution/2.2/views/calendar/List_View.galview
+share/evolution/2.2/views/calendar/galview.xml
+share/evolution/2.2/views/mail/As_Sent_Folder.galview
+share/evolution/2.2/views/mail/By_Follow_Up_Flag.galview
+share/evolution/2.2/views/mail/By_Sender.galview
+share/evolution/2.2/views/mail/By_Status.galview
+share/evolution/2.2/views/mail/By_Subject.galview
+share/evolution/2.2/views/mail/Messages.galview
+share/evolution/2.2/views/mail/galview.xml
+share/evolution/2.2/views/tasks/Tasks.galview
+share/evolution/2.2/views/tasks/With_DueDate.galview
+share/evolution/2.2/views/tasks/With_Status.galview
+share/evolution/2.2/views/tasks/galview.xml
+share/evolution/2.2/weather/category_weather_cloudy_16.png
+share/evolution/2.2/weather/category_weather_fog_16.png
+share/evolution/2.2/weather/category_weather_partly_cloudy_16.png
+share/evolution/2.2/weather/category_weather_rain_16.png
+share/evolution/2.2/weather/category_weather_snow_16.png
+share/evolution/2.2/weather/category_weather_sun_16.png
+share/evolution/2.2/weather/category_weather_tstorm_16.png
+share/gconf/schemas/apps_evolution_addressbook-2.2.schemas
+share/gconf/schemas/apps_evolution_calendar-2.2.schemas
+share/gconf/schemas/apps_evolution_shell-2.2.schemas
+share/gconf/schemas/evolution-mail-2.2.schemas
+share/gnome/help/evolution-2.2/C/evolution-2.2.xml
+share/gnome/help/evolution-2.2/C/figures/calendar.png
+share/gnome/help/evolution-2.2/C/figures/config-cal.png
+share/gnome/help/evolution-2.2/C/figures/config-mail.png
+share/gnome/help/evolution-2.2/C/figures/contact-editor.png
+share/gnome/help/evolution-2.2/C/figures/contact.png
+share/gnome/help/evolution-2.2/C/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_account_info_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_email_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_gwreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_identity_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_mereceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_newmess_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_popreceive_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_receive_setup_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_rule_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_send_setup_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_timezone_a.png
+share/gnome/help/evolution-2.2/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution-2.2/C/figures/exchange-delegation.png
+share/gnome/help/evolution-2.2/C/figures/exchange-identity.png
+share/gnome/help/evolution-2.2/C/figures/exchange-receive-options.png
+share/gnome/help/evolution-2.2/C/figures/exchange-receive.png
+share/gnome/help/evolution-2.2/C/figures/filter-new-fig.png
+share/gnome/help/evolution-2.2/C/figures/full-1.png
+share/gnome/help/evolution-2.2/C/figures/full-2.png
+share/gnome/help/evolution-2.2/C/figures/full-3.png
+share/gnome/help/evolution-2.2/C/figures/full-4.png
+share/gnome/help/evolution-2.2/C/figures/full-5.png
+share/gnome/help/evolution-2.2/C/figures/full-6.png
+share/gnome/help/evolution-2.2/C/figures/full-7.png
+share/gnome/help/evolution-2.2/C/figures/mail-druid-pic.png
+share/gnome/help/evolution-2.2/C/figures/mail-inbox.png
+share/gnome/help/evolution-2.2/C/figures/mail-threaded.png
+share/gnome/help/evolution-2.2/C/figures/mail_mainwindow_a.png
+share/gnome/help/evolution-2.2/C/figures/mainwindow-pic.png
+share/gnome/help/evolution-2.2/C/figures/newmsg.png
+share/gnome/help/evolution-2.2/C/figures/replymsg.png
+share/gnome/help/evolution-2.2/C/figures/schedule.png
+share/gnome/help/evolution-2.2/C/figures/vfolder-createrule-fig.png
+share/idl/evolution-2.2/Composer.idl
+share/idl/evolution-2.2/Evolution-Component.idl
+share/idl/evolution-2.2/Evolution-Composer.idl
+share/idl/evolution-2.2/Evolution-ConfigControl.idl
+share/idl/evolution-2.2/Evolution-Offline.idl
+share/idl/evolution-2.2/Evolution-Shell.idl
+share/idl/evolution-2.2/Evolution-Wizard.idl
+share/idl/evolution-2.2/Evolution-common.idl
+share/idl/evolution-2.2/Evolution.idl
+share/idl/evolution-2.2/GNOME_Evolution_Importer.idl
+share/idl/evolution-2.2/evolution-calendar.idl
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evolution-2.2.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evolution-2.2.mo
+share/mime-info/evolution-2.2.keys
+share/mime-info/evolution-2.2.mime
+share/omf/evolution/evolution-2.2-C.omf
+share/pixmaps/evolution-2.2.png
@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/omf/evolution
@comment in scrollkeeper: @dirrm share/omf
@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/idl/evolution-2.0
+@dirrm share/idl/evolution-2.2
@comment in ORBit2: @dirrm share/idl
-@dirrm share/gnome/help/evolution-2.0/C/figures
-@dirrm share/gnome/help/evolution-2.0/C
-@dirrm share/gnome/help/evolution-2.0
+@dirrm share/gnome/help/evolution-2.2/C/figures
+@dirrm share/gnome/help/evolution-2.2/C
+@dirrm share/gnome/help/evolution-2.2
@comment in gnome2-dirs: @dirrm share/gnome/help
@comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/evolution/2.0/views/tasks
-@dirrm share/evolution/2.0/views/mail
-@dirrm share/evolution/2.0/views/calendar
-@dirrm share/evolution/2.0/views/addressbook
-@dirrm share/evolution/2.0/views
-@dirrm share/evolution/2.0/ui
-@dirrm share/evolution/2.0/images
-@dirrm share/evolution/2.0/help/quickref/C
-@dirrm share/evolution/2.0/help/quickref
-@dirrm share/evolution/2.0/help
-@dirrm share/evolution/2.0/glade
-@dirrm share/evolution/2.0/etspec
-@dirrm share/evolution/2.0/errors
-@dirrm share/evolution/2.0/ecps
-@dirrm share/evolution/2.0/default/C/mail/local
-@dirrm share/evolution/2.0/default/C/mail
-@dirrm share/evolution/2.0/default/C
-@dirrm share/evolution/2.0/default
-@dirrm share/evolution/2.0
+@dirrm share/evolution/2.2/weather
+@dirrm share/evolution/2.2/views/tasks
+@dirrm share/evolution/2.2/views/mail
+@dirrm share/evolution/2.2/views/calendar
+@dirrm share/evolution/2.2/views/addressbook
+@dirrm share/evolution/2.2/views
+@dirrm share/evolution/2.2/ui
+@dirrm share/evolution/2.2/images
+@dirrm share/evolution/2.2/help/quickref/C
+@dirrm share/evolution/2.2/help/quickref
+@dirrm share/evolution/2.2/help
+@dirrm share/evolution/2.2/glade
+@dirrm share/evolution/2.2/etspec
+@dirrm share/evolution/2.2/errors
+@dirrm share/evolution/2.2/ecps
+@dirrm share/evolution/2.2/default/zh_CN/mail/local
+@dirrm share/evolution/2.2/default/zh_CN/mail
+@dirrm share/evolution/2.2/default/zh_CN
+@dirrm share/evolution/2.2/default/pt/mail/local
+@dirrm share/evolution/2.2/default/pt/mail
+@dirrm share/evolution/2.2/default/pt
+@dirrm share/evolution/2.2/default/nl/mail/local
+@dirrm share/evolution/2.2/default/nl/mail
+@dirrm share/evolution/2.2/default/nl
+@dirrm share/evolution/2.2/default/ja/mail/local
+@dirrm share/evolution/2.2/default/ja/mail
+@dirrm share/evolution/2.2/default/ja
+@dirrm share/evolution/2.2/default/de/mail/local
+@dirrm share/evolution/2.2/default/de/mail
+@dirrm share/evolution/2.2/default/de
+@dirrm share/evolution/2.2/default/C/mail/local
+@dirrm share/evolution/2.2/default/C/mail
+@dirrm share/evolution/2.2/default/C
+@dirrm share/evolution/2.2/default
+@dirrm share/evolution/2.2
@dirrm share/evolution
@comment in xdg-dirs: @dirrm share/applications
-@dirrm libexec/evolution/2.0/camel
-@dirrm libexec/evolution/2.0
+@dirrm libexec/evolution/2.2
@dirrm libexec/evolution
-@dirrm lib/evolution/2.0/evolution-calendar-importers
-@dirrm lib/evolution/2.0/evolution-addressbook-importers
-@dirrm lib/evolution/2.0/components
-@dirrm lib/evolution/2.0/camel-providers
-@dirrm lib/evolution/2.0
+@dirrm lib/evolution/2.2/plugins
+@dirrm lib/evolution/2.2/evolution-calendar-importers
+@dirrm lib/evolution/2.2/evolution-addressbook-importers
+@dirrm lib/evolution/2.2/components
+@dirrm lib/evolution/2.2
@dirrm lib/evolution
@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/evolution-2.0/widgets
-@dirrm include/evolution-2.0/shell
-@dirrm include/evolution-2.0/importer
-@dirrm include/evolution-2.0/e-util
-@dirrm include/evolution-2.0/e-conduit
-@dirrm include/evolution-2.0/camel
-@dirrm include/evolution-2.0
+@dirrm include/evolution-2.2/widgets
+@dirrm include/evolution-2.2/shell
+@dirrm include/evolution-2.2/importer
+@dirrm include/evolution-2.2/e-util
+@dirrm include/evolution-2.2/e-conduit
+@dirrm include/evolution-2.2/calendar/gui
+@dirrm include/evolution-2.2/calendar
+@dirrm include/evolution-2.2
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
new file mode 100644
index 00000000000..4a1db921bc1
--- /dev/null
+++ b/mail/evolution/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:39:39 jmmv Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+EVOLUTION_BUILDLINK3_MK:= ${EVOLUTION_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= evolution
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution}
+BUILDLINK_PACKAGES+= evolution
+
+.if !empty(EVOLUTION_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.evolution+= evolution>=2.2.0
+BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution
+.endif # EVOLUTION_BUILDLINK3_MK
+
+PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution\/2.2$$/ \
+ { print "@comment in evolution: " $$0; next }
+PRINT_PLIST_AWK+= /^@dirrm libexec\/evolution$$/ \
+ { print "@comment in evolution: " $$0; next }
+
+.include "../../devel/gal2/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index b83b4f4aa49..f9cd9c44ada 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.35 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.36 2005/03/22 16:39:39 jmmv Exp $
-SHA1 (evolution-2.0.4.tar.bz2) = 2f6ad658e5426999dfe83f7bb2f2e8a87a9a7213
-RMD160 (evolution-2.0.4.tar.bz2) = 980400d7de33dee702c0624ee3312b3c4556baed
-Size (evolution-2.0.4.tar.bz2) = 15395184 bytes
-SHA1 (patch-aa) = a89da54c40813c07af76dd98f876dd2e979c2554
+SHA1 (evolution-2.2.0.tar.bz2) = a1999958663180be9ec5153118cc616bbe751cdd
+RMD160 (evolution-2.2.0.tar.bz2) = bb69485643c46451fa18688150b19ecddbe10023
+Size (evolution-2.2.0.tar.bz2) = 13344133 bytes
SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
SHA1 (patch-ac) = 5150f3163e7307e03ed82757e1d31a54310feae3
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
deleted file mode 100644
index 87af32c90ff..00000000000
--- a/mail/evolution/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2005/01/04 08:08:28 rh Exp $
-
---- camel/camel-service.c.orig 2004-12-06 17:46:51.000000000 +1000
-+++ camel/camel-service.c
-@@ -36,6 +36,7 @@
- #include <errno.h>
-
- #include <sys/poll.h>
-+#include <sys/socket.h>
-
- #include "e-util/e-msgport.h"
-