update to 2.28.1

This switches to the gnome-2.28 release branch.

11 files changed, 404 insertions, 470 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index bc2a8492f03..0d628d3c2ed 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2009/08/26 19:57:57 sno Exp $
+# $NetBSD: Makefile,v 1.93 2009/10/21 17:24:28 drochner Exp $
 #
 
-DISTNAME=	evolution-data-server-2.26.3
-PKGREVISION=	1
+DISTNAME=	evolution-data-server-2.28.1
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -72,14 +71,14 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
+#.include "../../devel/libgnome/buildlink3.mk"
+#.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgweather/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+#.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.43
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
index 5d356c0d4bb..8d5448fbdf7 100644
--- a/mail/evolution-data-server/PLIST
+++ b/mail/evolution-data-server/PLIST
@@ -1,260 +1,263 @@
-@comment $NetBSD: PLIST,v 1.28 2009/06/14 18:04:32 joerg Exp $
-include/evolution-data-server-2.26/camel/camel-address.h
-include/evolution-data-server-2.26/camel/camel-arg.h
-include/evolution-data-server-2.26/camel/camel-block-file.h
-include/evolution-data-server-2.26/camel/camel-certdb.h
-include/evolution-data-server-2.26/camel/camel-charset-map.h
-include/evolution-data-server-2.26/camel/camel-cipher-context.h
-include/evolution-data-server-2.26/camel/camel-data-cache.h
-include/evolution-data-server-2.26/camel/camel-data-wrapper.h
-include/evolution-data-server-2.26/camel/camel-db.h
-include/evolution-data-server-2.26/camel/camel-debug.h
-include/evolution-data-server-2.26/camel/camel-digest-folder.h
-include/evolution-data-server-2.26/camel/camel-digest-store.h
-include/evolution-data-server-2.26/camel/camel-digest-summary.h
-include/evolution-data-server-2.26/camel/camel-disco-diary.h
-include/evolution-data-server-2.26/camel/camel-disco-folder.h
-include/evolution-data-server-2.26/camel/camel-disco-store.h
-include/evolution-data-server-2.26/camel/camel-exception-list.def
-include/evolution-data-server-2.26/camel/camel-exception.h
-include/evolution-data-server-2.26/camel/camel-file-utils.h
-include/evolution-data-server-2.26/camel/camel-filter-driver.h
-include/evolution-data-server-2.26/camel/camel-filter-search.h
-include/evolution-data-server-2.26/camel/camel-folder-search.h
-include/evolution-data-server-2.26/camel/camel-folder-summary.h
-include/evolution-data-server-2.26/camel/camel-folder-thread.h
-include/evolution-data-server-2.26/camel/camel-folder.h
-include/evolution-data-server-2.26/camel/camel-gpg-context.h
-include/evolution-data-server-2.26/camel/camel-html-parser.h
-include/evolution-data-server-2.26/camel/camel-http-stream.h
-include/evolution-data-server-2.26/camel/camel-i18n.h
-include/evolution-data-server-2.26/camel/camel-iconv.h
-include/evolution-data-server-2.26/camel/camel-index.h
-include/evolution-data-server-2.26/camel/camel-internet-address.h
-include/evolution-data-server-2.26/camel/camel-junk-plugin.h
-include/evolution-data-server-2.26/camel/camel-list-utils.h
-include/evolution-data-server-2.26/camel/camel-lock-client.h
-include/evolution-data-server-2.26/camel/camel-lock-helper.h
-include/evolution-data-server-2.26/camel/camel-lock.h
-include/evolution-data-server-2.26/camel/camel-medium.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-basic.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-bestenc.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-canon.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-charset.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-crlf.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-enriched.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-from.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-gzip.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-html.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-index.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-linewrap.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-pgp.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-progress.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-save.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-tohtml.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-windows.h
-include/evolution-data-server-2.26/camel/camel-mime-filter-yenc.h
-include/evolution-data-server-2.26/camel/camel-mime-filter.h
-include/evolution-data-server-2.26/camel/camel-mime-message.h
-include/evolution-data-server-2.26/camel/camel-mime-parser.h
-include/evolution-data-server-2.26/camel/camel-mime-part-utils.h
-include/evolution-data-server-2.26/camel/camel-mime-part.h
-include/evolution-data-server-2.26/camel/camel-mime-utils.h
-include/evolution-data-server-2.26/camel/camel-movemail.h
-include/evolution-data-server-2.26/camel/camel-msgport.h
-include/evolution-data-server-2.26/camel/camel-multipart-encrypted.h
-include/evolution-data-server-2.26/camel/camel-multipart-signed.h
-include/evolution-data-server-2.26/camel/camel-multipart.h
-include/evolution-data-server-2.26/camel/camel-net-utils.h
-include/evolution-data-server-2.26/camel/camel-news-address.h
-include/evolution-data-server-2.26/camel/camel-nntp-address.h
-include/evolution-data-server-2.26/camel/camel-object.h
-include/evolution-data-server-2.26/camel/camel-offline-folder.h
-include/evolution-data-server-2.26/camel/camel-offline-journal.h
-include/evolution-data-server-2.26/camel/camel-offline-store.h
-include/evolution-data-server-2.26/camel/camel-operation.h
-include/evolution-data-server-2.26/camel/camel-partition-table.h
-include/evolution-data-server-2.26/camel/camel-process.h
-include/evolution-data-server-2.26/camel/camel-provider.h
-include/evolution-data-server-2.26/camel/camel-sasl-anonymous.h
-include/evolution-data-server-2.26/camel/camel-sasl-cram-md5.h
-include/evolution-data-server-2.26/camel/camel-sasl-digest-md5.h
-include/evolution-data-server-2.26/camel/camel-sasl-gssapi.h
-include/evolution-data-server-2.26/camel/camel-sasl-kerberos4.h
-include/evolution-data-server-2.26/camel/camel-sasl-login.h
-include/evolution-data-server-2.26/camel/camel-sasl-ntlm.h
-include/evolution-data-server-2.26/camel/camel-sasl-plain.h
-include/evolution-data-server-2.26/camel/camel-sasl-popb4smtp.h
-include/evolution-data-server-2.26/camel/camel-sasl.h
-include/evolution-data-server-2.26/camel/camel-search-private.h
-include/evolution-data-server-2.26/camel/camel-search-sql-sexp.h
-include/evolution-data-server-2.26/camel/camel-search-sql.h
-include/evolution-data-server-2.26/camel/camel-seekable-stream.h
-include/evolution-data-server-2.26/camel/camel-seekable-substream.h
-include/evolution-data-server-2.26/camel/camel-service.h
-include/evolution-data-server-2.26/camel/camel-session.h
-include/evolution-data-server-2.26/camel/camel-smime-context.h
-include/evolution-data-server-2.26/camel/camel-store-summary.h
-include/evolution-data-server-2.26/camel/camel-store.h
-include/evolution-data-server-2.26/camel/camel-stream-buffer.h
-include/evolution-data-server-2.26/camel/camel-stream-filter.h
-include/evolution-data-server-2.26/camel/camel-stream-fs.h
-include/evolution-data-server-2.26/camel/camel-stream-mem.h
-include/evolution-data-server-2.26/camel/camel-stream-null.h
-include/evolution-data-server-2.26/camel/camel-stream-process.h
-include/evolution-data-server-2.26/camel/camel-stream-vfs.h
-include/evolution-data-server-2.26/camel/camel-stream.h
-include/evolution-data-server-2.26/camel/camel-string-utils.h
-include/evolution-data-server-2.26/camel/camel-tcp-stream-raw.h
-include/evolution-data-server-2.26/camel/camel-tcp-stream-ssl.h
-include/evolution-data-server-2.26/camel/camel-tcp-stream.h
-include/evolution-data-server-2.26/camel/camel-text-index.h
-include/evolution-data-server-2.26/camel/camel-transport.h
-include/evolution-data-server-2.26/camel/camel-trie.h
-include/evolution-data-server-2.26/camel/camel-types.h
-include/evolution-data-server-2.26/camel/camel-uid-cache.h
-include/evolution-data-server-2.26/camel/camel-url-scanner.h
-include/evolution-data-server-2.26/camel/camel-url.h
-include/evolution-data-server-2.26/camel/camel-utf8.h
-include/evolution-data-server-2.26/camel/camel-vee-folder.h
-include/evolution-data-server-2.26/camel/camel-vee-store.h
-include/evolution-data-server-2.26/camel/camel-vee-summary.h
-include/evolution-data-server-2.26/camel/camel-vtrash-folder.h
-include/evolution-data-server-2.26/camel/camel.h
-include/evolution-data-server-2.26/exchange/e-folder-exchange.h
-include/evolution-data-server-2.26/exchange/e-folder.h
-include/evolution-data-server-2.26/exchange/e-storage.h
-include/evolution-data-server-2.26/exchange/e2k-autoconfig.h
-include/evolution-data-server-2.26/exchange/e2k-context.h
-include/evolution-data-server-2.26/exchange/e2k-freebusy.h
-include/evolution-data-server-2.26/exchange/e2k-global-catalog-ldap.h
-include/evolution-data-server-2.26/exchange/e2k-global-catalog.h
-include/evolution-data-server-2.26/exchange/e2k-http-utils.h
-include/evolution-data-server-2.26/exchange/e2k-marshal.h
-include/evolution-data-server-2.26/exchange/e2k-operation.h
-include/evolution-data-server-2.26/exchange/e2k-properties.h
-include/evolution-data-server-2.26/exchange/e2k-propnames.h
-include/evolution-data-server-2.26/exchange/e2k-restriction.h
-include/evolution-data-server-2.26/exchange/e2k-result.h
-include/evolution-data-server-2.26/exchange/e2k-security-descriptor.h
-include/evolution-data-server-2.26/exchange/e2k-sid.h
-include/evolution-data-server-2.26/exchange/e2k-types.h
-include/evolution-data-server-2.26/exchange/e2k-uri.h
-include/evolution-data-server-2.26/exchange/e2k-utils.h
-include/evolution-data-server-2.26/exchange/e2k-validate.h
-include/evolution-data-server-2.26/exchange/e2k-xml-utils.h
-include/evolution-data-server-2.26/exchange/exchange-account.h
-include/evolution-data-server-2.26/exchange/exchange-constants.h
-include/evolution-data-server-2.26/exchange/exchange-esource.h
-include/evolution-data-server-2.26/exchange/exchange-folder-size.h
-include/evolution-data-server-2.26/exchange/exchange-hierarchy-foreign.h
-include/evolution-data-server-2.26/exchange/exchange-hierarchy-somedav.h
-include/evolution-data-server-2.26/exchange/exchange-hierarchy-webdav.h
-include/evolution-data-server-2.26/exchange/exchange-hierarchy.h
-include/evolution-data-server-2.26/exchange/exchange-oof.h
-include/evolution-data-server-2.26/exchange/exchange-types.h
-include/evolution-data-server-2.26/exchange/mapi.h
-include/evolution-data-server-2.26/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-2.26/google/libgdata/gdata-entry.h
-include/evolution-data-server-2.26/google/libgdata/gdata-feed.h
-include/evolution-data-server-2.26/google/libgdata/gdata-service-iface.h
-include/evolution-data-server-2.26/groupwise/e-gw-connection.h
-include/evolution-data-server-2.26/groupwise/e-gw-container.h
-include/evolution-data-server-2.26/groupwise/e-gw-filter.h
-include/evolution-data-server-2.26/groupwise/e-gw-item.h
-include/evolution-data-server-2.26/groupwise/e-gw-message.h
-include/evolution-data-server-2.26/groupwise/e-gw-proxy.h
-include/evolution-data-server-2.26/groupwise/e-gw-recur-utils.h
-include/evolution-data-server-2.26/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-2.26/groupwise/soup-soap-message.h
-include/evolution-data-server-2.26/groupwise/soup-soap-response.h
-include/evolution-data-server-2.26/libebackend/e-data-server-module.h
-include/evolution-data-server-2.26/libebackend/e-db3-utils.h
-include/evolution-data-server-2.26/libebackend/e-dbhash.h
-include/evolution-data-server-2.26/libebackend/e-file-cache.h
-include/evolution-data-server-2.26/libebook/e-address-western.h
-include/evolution-data-server-2.26/libebook/e-book-query.h
-include/evolution-data-server-2.26/libebook/e-book-types.h
-include/evolution-data-server-2.26/libebook/e-book-view.h
-include/evolution-data-server-2.26/libebook/e-book.h
-include/evolution-data-server-2.26/libebook/e-contact.h
-include/evolution-data-server-2.26/libebook/e-destination.h
-include/evolution-data-server-2.26/libebook/e-name-western.h
-include/evolution-data-server-2.26/libebook/e-vcard.h
-include/evolution-data-server-2.26/libecal/e-cal-check-timezones.h
-include/evolution-data-server-2.26/libecal/e-cal-component.h
-include/evolution-data-server-2.26/libecal/e-cal-recur.h
-include/evolution-data-server-2.26/libecal/e-cal-time-util.h
-include/evolution-data-server-2.26/libecal/e-cal-types.h
-include/evolution-data-server-2.26/libecal/e-cal-util.h
-include/evolution-data-server-2.26/libecal/e-cal-view.h
-include/evolution-data-server-2.26/libecal/e-cal.h
-include/evolution-data-server-2.26/libedata-book/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-cache.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-db-cache.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-factory.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-sexp.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-summary.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend-sync.h
-include/evolution-data-server-2.26/libedata-book/e-book-backend.h
-include/evolution-data-server-2.26/libedata-book/e-data-book-factory.h
-include/evolution-data-server-2.26/libedata-book/e-data-book-types.h
-include/evolution-data-server-2.26/libedata-book/e-data-book-view.h
-include/evolution-data-server-2.26/libedata-book/e-data-book.h
-include/evolution-data-server-2.26/libedata-cal/Evolution-DataServer-Calendar.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-cache.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-factory.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-loader-factory.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-sync.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-2.26/libedata-cal/e-cal-backend.h
-include/evolution-data-server-2.26/libedata-cal/e-data-cal-common.h
-include/evolution-data-server-2.26/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-2.26/libedata-cal/e-data-cal-view.h
-include/evolution-data-server-2.26/libedata-cal/e-data-cal.h
-include/evolution-data-server-2.26/libedataserver/e-account-list.h
-include/evolution-data-server-2.26/libedataserver/e-account.h
-include/evolution-data-server-2.26/libedataserver/e-categories.h
-include/evolution-data-server-2.26/libedataserver/e-component-listener.h
-include/evolution-data-server-2.26/libedataserver/e-data-server-util.h
-include/evolution-data-server-2.26/libedataserver/e-flag.h
-include/evolution-data-server-2.26/libedataserver/e-iconv.h
-include/evolution-data-server-2.26/libedataserver/e-iterator.h
-include/evolution-data-server-2.26/libedataserver/e-list-iterator.h
-include/evolution-data-server-2.26/libedataserver/e-list.h
-include/evolution-data-server-2.26/libedataserver/e-memory.h
-include/evolution-data-server-2.26/libedataserver/e-msgport.h
-include/evolution-data-server-2.26/libedataserver/e-proxy.h
-include/evolution-data-server-2.26/libedataserver/e-sexp.h
-include/evolution-data-server-2.26/libedataserver/e-source-group.h
-include/evolution-data-server-2.26/libedataserver/e-source-list.h
-include/evolution-data-server-2.26/libedataserver/e-source.h
-include/evolution-data-server-2.26/libedataserver/e-time-utils.h
-include/evolution-data-server-2.26/libedataserver/e-trie.h
-include/evolution-data-server-2.26/libedataserver/e-uid.h
-include/evolution-data-server-2.26/libedataserver/e-url.h
-include/evolution-data-server-2.26/libedataserver/e-xml-hash-utils.h
-include/evolution-data-server-2.26/libedataserver/e-xml-utils.h
-include/evolution-data-server-2.26/libedataserver/eds-version.h
-include/evolution-data-server-2.26/libedataserver/md5-utils.h
-include/evolution-data-server-2.26/libedataserverui/e-book-auth-util.h
-include/evolution-data-server-2.26/libedataserverui/e-categories-dialog.h
-include/evolution-data-server-2.26/libedataserverui/e-category-completion.h
-include/evolution-data-server-2.26/libedataserverui/e-cell-renderer-color.h
-include/evolution-data-server-2.26/libedataserverui/e-contact-store.h
-include/evolution-data-server-2.26/libedataserverui/e-destination-store.h
-include/evolution-data-server-2.26/libedataserverui/e-name-selector-dialog.h
-include/evolution-data-server-2.26/libedataserverui/e-name-selector-entry.h
-include/evolution-data-server-2.26/libedataserverui/e-name-selector-list.h
-include/evolution-data-server-2.26/libedataserverui/e-name-selector-model.h
-include/evolution-data-server-2.26/libedataserverui/e-name-selector.h
-include/evolution-data-server-2.26/libedataserverui/e-passwords.h
-include/evolution-data-server-2.26/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-2.26/libedataserverui/e-source-option-menu.h
-include/evolution-data-server-2.26/libedataserverui/e-source-selector-dialog.h
-include/evolution-data-server-2.26/libedataserverui/e-source-selector.h
-include/evolution-data-server-2.26/libedataserverui/e-tree-model-generator.h
+@comment $NetBSD: PLIST,v 1.29 2009/10/21 17:24:28 drochner Exp $
+include/evolution-data-server-2.28/camel/camel-address.h
+include/evolution-data-server-2.28/camel/camel-arg.h
+include/evolution-data-server-2.28/camel/camel-block-file.h
+include/evolution-data-server-2.28/camel/camel-certdb.h
+include/evolution-data-server-2.28/camel/camel-charset-map.h
+include/evolution-data-server-2.28/camel/camel-cipher-context.h
+include/evolution-data-server-2.28/camel/camel-data-cache.h
+include/evolution-data-server-2.28/camel/camel-data-wrapper.h
+include/evolution-data-server-2.28/camel/camel-db.h
+include/evolution-data-server-2.28/camel/camel-debug.h
+include/evolution-data-server-2.28/camel/camel-digest-folder.h
+include/evolution-data-server-2.28/camel/camel-digest-store.h
+include/evolution-data-server-2.28/camel/camel-digest-summary.h
+include/evolution-data-server-2.28/camel/camel-disco-diary.h
+include/evolution-data-server-2.28/camel/camel-disco-folder.h
+include/evolution-data-server-2.28/camel/camel-disco-store.h
+include/evolution-data-server-2.28/camel/camel-exception-list.def
+include/evolution-data-server-2.28/camel/camel-exception.h
+include/evolution-data-server-2.28/camel/camel-file-utils.h
+include/evolution-data-server-2.28/camel/camel-filter-driver.h
+include/evolution-data-server-2.28/camel/camel-filter-search.h
+include/evolution-data-server-2.28/camel/camel-folder-search.h
+include/evolution-data-server-2.28/camel/camel-folder-summary.h
+include/evolution-data-server-2.28/camel/camel-folder-thread.h
+include/evolution-data-server-2.28/camel/camel-folder.h
+include/evolution-data-server-2.28/camel/camel-gpg-context.h
+include/evolution-data-server-2.28/camel/camel-html-parser.h
+include/evolution-data-server-2.28/camel/camel-http-stream.h
+include/evolution-data-server-2.28/camel/camel-i18n.h
+include/evolution-data-server-2.28/camel/camel-iconv.h
+include/evolution-data-server-2.28/camel/camel-index.h
+include/evolution-data-server-2.28/camel/camel-internet-address.h
+include/evolution-data-server-2.28/camel/camel-junk-plugin.h
+include/evolution-data-server-2.28/camel/camel-list-utils.h
+include/evolution-data-server-2.28/camel/camel-lock-client.h
+include/evolution-data-server-2.28/camel/camel-lock-helper.h
+include/evolution-data-server-2.28/camel/camel-lock.h
+include/evolution-data-server-2.28/camel/camel-medium.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-basic.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-canon.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-charset.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-from.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-html.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-index.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-pgp.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-progress.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-save.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-windows.h
+include/evolution-data-server-2.28/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-2.28/camel/camel-mime-filter.h
+include/evolution-data-server-2.28/camel/camel-mime-message.h
+include/evolution-data-server-2.28/camel/camel-mime-parser.h
+include/evolution-data-server-2.28/camel/camel-mime-part-utils.h
+include/evolution-data-server-2.28/camel/camel-mime-part.h
+include/evolution-data-server-2.28/camel/camel-mime-utils.h
+include/evolution-data-server-2.28/camel/camel-movemail.h
+include/evolution-data-server-2.28/camel/camel-msgport.h
+include/evolution-data-server-2.28/camel/camel-multipart-encrypted.h
+include/evolution-data-server-2.28/camel/camel-multipart-signed.h
+include/evolution-data-server-2.28/camel/camel-multipart.h
+include/evolution-data-server-2.28/camel/camel-net-utils.h
+include/evolution-data-server-2.28/camel/camel-news-address.h
+include/evolution-data-server-2.28/camel/camel-nntp-address.h
+include/evolution-data-server-2.28/camel/camel-object.h
+include/evolution-data-server-2.28/camel/camel-offline-folder.h
+include/evolution-data-server-2.28/camel/camel-offline-journal.h
+include/evolution-data-server-2.28/camel/camel-offline-store.h
+include/evolution-data-server-2.28/camel/camel-operation.h
+include/evolution-data-server-2.28/camel/camel-partition-table.h
+include/evolution-data-server-2.28/camel/camel-process.h
+include/evolution-data-server-2.28/camel/camel-provider.h
+include/evolution-data-server-2.28/camel/camel-sasl-anonymous.h
+include/evolution-data-server-2.28/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-2.28/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-2.28/camel/camel-sasl-gssapi.h
+include/evolution-data-server-2.28/camel/camel-sasl-kerberos4.h
+include/evolution-data-server-2.28/camel/camel-sasl-login.h
+include/evolution-data-server-2.28/camel/camel-sasl-ntlm.h
+include/evolution-data-server-2.28/camel/camel-sasl-plain.h
+include/evolution-data-server-2.28/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-2.28/camel/camel-sasl.h
+include/evolution-data-server-2.28/camel/camel-search-private.h
+include/evolution-data-server-2.28/camel/camel-search-sql-sexp.h
+include/evolution-data-server-2.28/camel/camel-search-sql.h
+include/evolution-data-server-2.28/camel/camel-seekable-stream.h
+include/evolution-data-server-2.28/camel/camel-seekable-substream.h
+include/evolution-data-server-2.28/camel/camel-service.h
+include/evolution-data-server-2.28/camel/camel-session.h
+include/evolution-data-server-2.28/camel/camel-smime-context.h
+include/evolution-data-server-2.28/camel/camel-store-summary.h
+include/evolution-data-server-2.28/camel/camel-store.h
+include/evolution-data-server-2.28/camel/camel-stream-buffer.h
+include/evolution-data-server-2.28/camel/camel-stream-filter.h
+include/evolution-data-server-2.28/camel/camel-stream-fs.h
+include/evolution-data-server-2.28/camel/camel-stream-mem.h
+include/evolution-data-server-2.28/camel/camel-stream-null.h
+include/evolution-data-server-2.28/camel/camel-stream-process.h
+include/evolution-data-server-2.28/camel/camel-stream-vfs.h
+include/evolution-data-server-2.28/camel/camel-stream.h
+include/evolution-data-server-2.28/camel/camel-string-utils.h
+include/evolution-data-server-2.28/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-2.28/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-2.28/camel/camel-tcp-stream.h
+include/evolution-data-server-2.28/camel/camel-text-index.h
+include/evolution-data-server-2.28/camel/camel-transport.h
+include/evolution-data-server-2.28/camel/camel-trie.h
+include/evolution-data-server-2.28/camel/camel-types.h
+include/evolution-data-server-2.28/camel/camel-uid-cache.h
+include/evolution-data-server-2.28/camel/camel-url-scanner.h
+include/evolution-data-server-2.28/camel/camel-url.h
+include/evolution-data-server-2.28/camel/camel-utf8.h
+include/evolution-data-server-2.28/camel/camel-vee-folder.h
+include/evolution-data-server-2.28/camel/camel-vee-store.h
+include/evolution-data-server-2.28/camel/camel-vee-summary.h
+include/evolution-data-server-2.28/camel/camel-vtrash-folder.h
+include/evolution-data-server-2.28/camel/camel.h
+include/evolution-data-server-2.28/exchange/e-folder-exchange.h
+include/evolution-data-server-2.28/exchange/e-folder.h
+include/evolution-data-server-2.28/exchange/e-storage.h
+include/evolution-data-server-2.28/exchange/e2k-autoconfig.h
+include/evolution-data-server-2.28/exchange/e2k-context.h
+include/evolution-data-server-2.28/exchange/e2k-freebusy.h
+include/evolution-data-server-2.28/exchange/e2k-global-catalog-ldap.h
+include/evolution-data-server-2.28/exchange/e2k-global-catalog.h
+include/evolution-data-server-2.28/exchange/e2k-http-utils.h
+include/evolution-data-server-2.28/exchange/e2k-marshal.h
+include/evolution-data-server-2.28/exchange/e2k-operation.h
+include/evolution-data-server-2.28/exchange/e2k-properties.h
+include/evolution-data-server-2.28/exchange/e2k-propnames.h
+include/evolution-data-server-2.28/exchange/e2k-restriction.h
+include/evolution-data-server-2.28/exchange/e2k-result.h
+include/evolution-data-server-2.28/exchange/e2k-security-descriptor.h
+include/evolution-data-server-2.28/exchange/e2k-sid.h
+include/evolution-data-server-2.28/exchange/e2k-types.h
+include/evolution-data-server-2.28/exchange/e2k-uri.h
+include/evolution-data-server-2.28/exchange/e2k-utils.h
+include/evolution-data-server-2.28/exchange/e2k-validate.h
+include/evolution-data-server-2.28/exchange/e2k-xml-utils.h
+include/evolution-data-server-2.28/exchange/exchange-account.h
+include/evolution-data-server-2.28/exchange/exchange-constants.h
+include/evolution-data-server-2.28/exchange/exchange-esource.h
+include/evolution-data-server-2.28/exchange/exchange-folder-size.h
+include/evolution-data-server-2.28/exchange/exchange-hierarchy-foreign.h
+include/evolution-data-server-2.28/exchange/exchange-hierarchy-somedav.h
+include/evolution-data-server-2.28/exchange/exchange-hierarchy-webdav.h
+include/evolution-data-server-2.28/exchange/exchange-hierarchy.h
+include/evolution-data-server-2.28/exchange/exchange-oof.h
+include/evolution-data-server-2.28/exchange/exchange-types.h
+include/evolution-data-server-2.28/exchange/mapi.h
+include/evolution-data-server-2.28/google/libgdata-google/gdata-google-service.h
+include/evolution-data-server-2.28/google/libgdata/gdata-entry.h
+include/evolution-data-server-2.28/google/libgdata/gdata-feed.h
+include/evolution-data-server-2.28/google/libgdata/gdata-service-iface.h
+include/evolution-data-server-2.28/groupwise/e-gw-connection.h
+include/evolution-data-server-2.28/groupwise/e-gw-container.h
+include/evolution-data-server-2.28/groupwise/e-gw-filter.h
+include/evolution-data-server-2.28/groupwise/e-gw-item.h
+include/evolution-data-server-2.28/groupwise/e-gw-message.h
+include/evolution-data-server-2.28/groupwise/e-gw-proxy.h
+include/evolution-data-server-2.28/groupwise/e-gw-recur-utils.h
+include/evolution-data-server-2.28/groupwise/e-gw-sendoptions.h
+include/evolution-data-server-2.28/groupwise/soup-soap-message.h
+include/evolution-data-server-2.28/groupwise/soup-soap-response.h
+include/evolution-data-server-2.28/libebackend/e-data-server-module.h
+include/evolution-data-server-2.28/libebackend/e-db3-utils.h
+include/evolution-data-server-2.28/libebackend/e-dbhash.h
+include/evolution-data-server-2.28/libebackend/e-file-cache.h
+include/evolution-data-server-2.28/libebook/e-address-western.h
+include/evolution-data-server-2.28/libebook/e-book-query.h
+include/evolution-data-server-2.28/libebook/e-book-types.h
+include/evolution-data-server-2.28/libebook/e-book-view.h
+include/evolution-data-server-2.28/libebook/e-book.h
+include/evolution-data-server-2.28/libebook/e-contact.h
+include/evolution-data-server-2.28/libebook/e-destination.h
+include/evolution-data-server-2.28/libebook/e-name-western.h
+include/evolution-data-server-2.28/libebook/e-vcard.h
+include/evolution-data-server-2.28/libecal/e-cal-check-timezones.h
+include/evolution-data-server-2.28/libecal/e-cal-component.h
+include/evolution-data-server-2.28/libecal/e-cal-recur.h
+include/evolution-data-server-2.28/libecal/e-cal-system-timezone.h
+include/evolution-data-server-2.28/libecal/e-cal-time-util.h
+include/evolution-data-server-2.28/libecal/e-cal-types.h
+include/evolution-data-server-2.28/libecal/e-cal-util.h
+include/evolution-data-server-2.28/libecal/e-cal-view.h
+include/evolution-data-server-2.28/libecal/e-cal.h
+include/evolution-data-server-2.28/libedata-book/Evolution-DataServer-Addressbook.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-db-cache.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-factory.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-sexp.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-summary.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend-sync.h
+include/evolution-data-server-2.28/libedata-book/e-book-backend.h
+include/evolution-data-server-2.28/libedata-book/e-data-book-factory.h
+include/evolution-data-server-2.28/libedata-book/e-data-book-types.h
+include/evolution-data-server-2.28/libedata-book/e-data-book-view.h
+include/evolution-data-server-2.28/libedata-book/e-data-book.h
+include/evolution-data-server-2.28/libedata-cal/Evolution-DataServer-Calendar.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-cache.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-factory.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-file-store.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-loader-factory.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-sexp.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-store.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-sync.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend-util.h
+include/evolution-data-server-2.28/libedata-cal/e-cal-backend.h
+include/evolution-data-server-2.28/libedata-cal/e-data-cal-common.h
+include/evolution-data-server-2.28/libedata-cal/e-data-cal-factory.h
+include/evolution-data-server-2.28/libedata-cal/e-data-cal-view.h
+include/evolution-data-server-2.28/libedata-cal/e-data-cal.h
+include/evolution-data-server-2.28/libedataserver/e-account-list.h
+include/evolution-data-server-2.28/libedataserver/e-account.h
+include/evolution-data-server-2.28/libedataserver/e-categories.h
+include/evolution-data-server-2.28/libedataserver/e-component-listener.h
+include/evolution-data-server-2.28/libedataserver/e-data-server-util.h
+include/evolution-data-server-2.28/libedataserver/e-flag.h
+include/evolution-data-server-2.28/libedataserver/e-iconv.h
+include/evolution-data-server-2.28/libedataserver/e-iterator.h
+include/evolution-data-server-2.28/libedataserver/e-list-iterator.h
+include/evolution-data-server-2.28/libedataserver/e-list.h
+include/evolution-data-server-2.28/libedataserver/e-memory.h
+include/evolution-data-server-2.28/libedataserver/e-msgport.h
+include/evolution-data-server-2.28/libedataserver/e-proxy.h
+include/evolution-data-server-2.28/libedataserver/e-sexp.h
+include/evolution-data-server-2.28/libedataserver/e-source-group.h
+include/evolution-data-server-2.28/libedataserver/e-source-list.h
+include/evolution-data-server-2.28/libedataserver/e-source.h
+include/evolution-data-server-2.28/libedataserver/e-time-utils.h
+include/evolution-data-server-2.28/libedataserver/e-trie.h
+include/evolution-data-server-2.28/libedataserver/e-uid.h
+include/evolution-data-server-2.28/libedataserver/e-url.h
+include/evolution-data-server-2.28/libedataserver/e-xml-hash-utils.h
+include/evolution-data-server-2.28/libedataserver/e-xml-utils.h
+include/evolution-data-server-2.28/libedataserver/eds-version.h
+include/evolution-data-server-2.28/libedataserver/md5-utils.h
+include/evolution-data-server-2.28/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-2.28/libedataserverui/e-categories-dialog.h
+include/evolution-data-server-2.28/libedataserverui/e-category-completion.h
+include/evolution-data-server-2.28/libedataserverui/e-cell-renderer-color.h
+include/evolution-data-server-2.28/libedataserverui/e-contact-store.h
+include/evolution-data-server-2.28/libedataserverui/e-destination-store.h
+include/evolution-data-server-2.28/libedataserverui/e-name-selector-dialog.h
+include/evolution-data-server-2.28/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-2.28/libedataserverui/e-name-selector-list.h
+include/evolution-data-server-2.28/libedataserverui/e-name-selector-model.h
+include/evolution-data-server-2.28/libedataserverui/e-name-selector.h
+include/evolution-data-server-2.28/libedataserverui/e-passwords.h
+include/evolution-data-server-2.28/libedataserverui/e-source-combo-box.h
+include/evolution-data-server-2.28/libedataserverui/e-source-option-menu.h
+include/evolution-data-server-2.28/libedataserverui/e-source-selector-dialog.h
+include/evolution-data-server-2.28/libedataserverui/e-source-selector.h
+include/evolution-data-server-2.28/libedataserverui/e-tree-model-generator.h
 lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
@@ -312,11 +315,11 @@ lib/pkgconfig/libgdata-1.2.pc
 lib/pkgconfig/libgdata-google-1.2.pc
 libexec/camel-index-control-1.2
 libexec/camel-lock-helper-1.2
-libexec/evolution-data-server-2.26
-share/evolution-data-server-2.26/evolutionperson.schema
-share/evolution-data-server-2.26/glade/e-categories-dialog.glade
-share/evolution-data-server-2.26/glade/e-name-selector-dialog.glade
-share/evolution-data-server-2.26/weather/Locations.xml
+libexec/evolution-data-server-2.28
+share/evolution-data-server-2.28/evolutionperson.schema
+share/evolution-data-server-2.28/glade/e-categories-dialog.glade
+share/evolution-data-server-2.28/glade/e-name-selector-dialog.glade
+share/evolution-data-server-2.28/weather/Locations.xml
 share/gtk-doc/html/camel/Addresses.html
 share/gtk-doc/html/camel/ClassTree.html
 share/gtk-doc/html/camel/Crypto.html
@@ -501,6 +504,7 @@ share/gtk-doc/html/libecal/ix01.html
 share/gtk-doc/html/libecal/left.png
 share/gtk-doc/html/libecal/libecal-e-cal-check-timezones.html
 share/gtk-doc/html/libecal/libecal-e-cal-recur.html
+share/gtk-doc/html/libecal/libecal-e-cal-system-timezone.html
 share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
 share/gtk-doc/html/libecal/libecal-e-cal-types.html
 share/gtk-doc/html/libecal/libecal-e-cal-util.html
@@ -523,9 +527,6 @@ share/gtk-doc/html/libedata-book/index.html
 share/gtk-doc/html/libedata-book/index.sgml
 share/gtk-doc/html/libedata-book/ix01.html
 share/gtk-doc/html/libedata-book/left.png
-share/gtk-doc/html/libedata-book/libedata-book-EDataBookFactory.html
-share/gtk-doc/html/libedata-book/libedata-book-e-book-backend-db-cache.html
-share/gtk-doc/html/libedata-book/libedata-book-ximian-vcard.html
 share/gtk-doc/html/libedata-book/libedata-book.devhelp
 share/gtk-doc/html/libedata-book/libedata-book.devhelp2
 share/gtk-doc/html/libedata-book/right.png
@@ -545,7 +546,6 @@ share/gtk-doc/html/libedata-cal/index.html
 share/gtk-doc/html/libedata-cal/index.sgml
 share/gtk-doc/html/libedata-cal/ix01.html
 share/gtk-doc/html/libedata-cal/left.png
-share/gtk-doc/html/libedata-cal/libedata-cal-e-cal-backend-util.html
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
 share/gtk-doc/html/libedata-cal/right.png
@@ -569,7 +569,6 @@ share/gtk-doc/html/libedataserver/left.png
 share/gtk-doc/html/libedataserver/libedataserver-EFlag.html
 share/gtk-doc/html/libedataserver/libedataserver-EProxy.html
 share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
-share/gtk-doc/html/libedataserver/libedataserver-Version-Information.html
 share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
 share/gtk-doc/html/libedataserver/libedataserver-e-iconv.html
 share/gtk-doc/html/libedataserver/libedataserver-e-memory.html
@@ -605,10 +604,6 @@ share/gtk-doc/html/libedataserverui/index.html
 share/gtk-doc/html/libedataserverui/index.sgml
 share/gtk-doc/html/libedataserverui/ix01.html
 share/gtk-doc/html/libedataserverui/left.png
-share/gtk-doc/html/libedataserverui/libedataserverui-ECategoryCompletion.html
-share/gtk-doc/html/libedataserverui/libedataserverui-ECellRendererColor.html
-share/gtk-doc/html/libedataserverui/libedataserverui-e-book-auth-util.html
-share/gtk-doc/html/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
 share/gtk-doc/html/libedataserverui/libedataserverui-e-passwords.html
 share/gtk-doc/html/libedataserverui/libedataserverui.devhelp
 share/gtk-doc/html/libedataserverui/libedataserverui.devhelp2
@@ -618,85 +613,87 @@ share/gtk-doc/html/libedataserverui/up.png
 share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
 share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
 share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
-share/locale/am/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/kn/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/mai/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/si/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.26.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.26.mo
+share/locale/am/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ar/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ast/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/az/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/be/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/bn/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/cy/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/da/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/de/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/el/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/es/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/et/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/fa/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/gu/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/id/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/it/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/mai/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ne/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/or/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/pa/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/rw/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/si/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/th/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/vi/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/xh/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.28.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.28.mo
 share/pixmaps/evolution-data-server/category_birthday_16.png
 share/pixmaps/evolution-data-server/category_business_16.png
 share/pixmaps/evolution-data-server/category_favorites_16.png
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 940fff169d2..3988f6c76d0 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.62 2009/07/09 17:51:42 drochner Exp $
+$NetBSD: distinfo,v 1.63 2009/10/21 17:24:28 drochner Exp $
 
-SHA1 (evolution-data-server-2.26.3.tar.bz2) = a9406b748d5a002df9570d17c91066575f2ba408
-RMD160 (evolution-data-server-2.26.3.tar.bz2) = 83f68a464a0cfb50511f33e662d8a24ede42b9e6
-Size (evolution-data-server-2.26.3.tar.bz2) = 7167764 bytes
+SHA1 (evolution-data-server-2.28.1.tar.bz2) = 41d5200dd15a046fd59146169c1ad5ce4878e7d0
+RMD160 (evolution-data-server-2.28.1.tar.bz2) = 786b11a75ce05c80adbdba3e8f057b0502d315db
+Size (evolution-data-server-2.28.1.tar.bz2) = 22309681 bytes
 SHA1 (patch-ab) = fff3e022aee934c463d7a66b681e020d3bebe1b0
-SHA1 (patch-af) = 1e458720684cfe3823b3b73665044336588c4620
-SHA1 (patch-ak) = 0aab77d3bf0fa8a3f962ba5a849947830bae3902
+SHA1 (patch-ak) = 45cc217524d484aaad6700326d501db09b5c13a4
 SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
 SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
 SHA1 (patch-at) = 32bb4f9de33a3799ad7a1a00dd072b38a800185c
diff --git a/mail/evolution-data-server/patches/patch-af b/mail/evolution-data-server/patches/patch-af
deleted file mode 100644
index 7d277d29e66..00000000000
--- a/mail/evolution-data-server/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/06/11 15:05:39 wiz Exp $
-
---- config.h.in.orig	2006-05-29 13:25:13.000000000 +0000
-+++ config.h.in
-@@ -274,3 +274,8 @@
- 
- /* Define to appropriate type if socklen_t is not defined */
- #undef socklen_t
-+
-+/* __PRETTY_FUNCTION__ is a GNUism only */
-+#ifndef __GNUC__
-+#define __PRETTY_FUNCTION__ __func__
-+#endif
diff --git a/mail/evolution-data-server/patches/patch-ak b/mail/evolution-data-server/patches/patch-ak
index 15f6fa76cac..e83d21c37cc 100644
--- a/mail/evolution-data-server/patches/patch-ak
+++ b/mail/evolution-data-server/patches/patch-ak
@@ -1,16 +1,8 @@
-$NetBSD: patch-ak,v 1.10 2009/05/28 20:25:25 wiz Exp $
+$NetBSD: patch-ak,v 1.11 2009/10/21 17:24:29 drochner Exp $
 
---- configure.orig	2009-05-18 02:45:48.000000000 +0000
+--- configure.orig	2009-09-18 12:49:40.000000000 +0200
 +++ configure
-@@ -19851,6 +19851,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 		#include <sys/socket.h>
- 		#include <netinet/in.h>
- 		#include <netdb.h>
-+		#include <stddef.h>
- 
- 
- int
-@@ -22803,13 +22804,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
+@@ -22379,13 +22379,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
  
  
  	PTHREAD_LIB=""
@@ -27,7 +19,7 @@ $NetBSD: patch-ak,v 1.10 2009/05/28 20:25:25 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23073,7 +23074,7 @@ fi
+@@ -22649,7 +22649,7 @@ fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_attr_init_system" >&5
  $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
  if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then
diff --git a/print/evince/Makefile b/print/evince/Makefile
index f18c1b18bf9..169921ad692 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.56 2009/10/21 17:28:02 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/evince/Makefile.common"
-PKGREVISION=		1
 
 COMMENT=		Document viewer
 
@@ -15,6 +14,7 @@ GCONF_SCHEMAS+=	evince-thumbnailer-ps.schemas
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--enable-comics
+CONFIGURE_ARGS+=	--disable-nautilus
 GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 5ccd1b9e36e..b682170cbbb 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.29 2009/07/22 09:01:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2009/10/21 17:28:02 drochner Exp $
 #
 # used by print/evince/Makefile
 # used by print/evince-nautilus/Makefile
 
-DISTNAME=		evince-2.26.2
+DISTNAME=		evince-2.28.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -31,7 +31,6 @@ pre-configure:
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=   glib2>=2.15.6
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.17.1
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index d81ea22b772..5fd8b27ca14 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.26 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.27 2009/10/21 17:28:02 drochner Exp $
 bin/evince
+bin/evince-previewer
 bin/evince-thumbnailer
 include/evince/2.25/evince-document.h
 include/evince/2.25/evince-view.h
+include/evince/2.25/libdocument/ev-annotation.h
 include/evince/2.25/libdocument/ev-async-renderer.h
 include/evince/2.25/libdocument/ev-attachment.h
 include/evince/2.25/libdocument/ev-backends-manager.h
+include/evince/2.25/libdocument/ev-document-annotations.h
 include/evince/2.25/libdocument/ev-document-factory.h
 include/evince/2.25/libdocument/ev-document-find.h
 include/evince/2.25/libdocument/ev-document-fonts.h
@@ -15,6 +18,7 @@ include/evince/2.25/libdocument/ev-document-info.h
 include/evince/2.25/libdocument/ev-document-layers.h
 include/evince/2.25/libdocument/ev-document-links.h
 include/evince/2.25/libdocument/ev-document-misc.h
+include/evince/2.25/libdocument/ev-document-print.h
 include/evince/2.25/libdocument/ev-document-security.h
 include/evince/2.25/libdocument/ev-document-thumbnails.h
 include/evince/2.25/libdocument/ev-document-transition.h
@@ -29,6 +33,7 @@ include/evince/2.25/libdocument/ev-layer.h
 include/evince/2.25/libdocument/ev-link-action.h
 include/evince/2.25/libdocument/ev-link-dest.h
 include/evince/2.25/libdocument/ev-link.h
+include/evince/2.25/libdocument/ev-mapping.h
 include/evince/2.25/libdocument/ev-page.h
 include/evince/2.25/libdocument/ev-render-context.h
 include/evince/2.25/libdocument/ev-selection.h
@@ -37,6 +42,7 @@ include/evince/2.25/libdocument/ev-version.h
 include/evince/2.25/libview/ev-job-scheduler.h
 include/evince/2.25/libview/ev-jobs.h
 include/evince/2.25/libview/ev-page-cache.h
+include/evince/2.25/libview/ev-stock-icons.h
 include/evince/2.25/libview/ev-view-type-builtins.h
 include/evince/2.25/libview/ev-view.h
 lib/evince/1/backends/comicsdocument.evince-backend
@@ -57,6 +63,7 @@ lib/pkgconfig/evince-document-2.25.pc
 lib/pkgconfig/evince-view-2.25.pc
 man/man1/evince.1
 share/applications/evince.desktop
+share/evince/evince-previewer-ui.xml
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
 share/evince/hand-open.png
@@ -78,6 +85,9 @@ share/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
 share/evince/icons/hicolor/24x24/actions/zoom.png
 share/evince/icons/hicolor/32x32/actions/view-page-continuous.png
 share/evince/icons/hicolor/32x32/actions/view-page-facing.png
+share/evince/icons/hicolor/48x48/actions/close.png
+share/evince/icons/hicolor/48x48/actions/resize-se.png
+share/evince/icons/hicolor/48x48/actions/resize-sw.png
 share/evince/icons/hicolor/48x48/actions/view-page-continuous.png
 share/evince/icons/hicolor/48x48/actions/view-page-facing.png
 share/gconf/schemas/evince-thumbnailer-comics.schemas
@@ -127,6 +137,8 @@ share/gnome/help/evince/sv/evince.xml
 share/gnome/help/evince/sv/figures/evince_start_window.png
 share/gnome/help/evince/uk/evince.xml
 share/gnome/help/evince/uk/figures/evince_start_window.png
+share/gnome/help/evince/vi/evince.xml
+share/gnome/help/evince/vi/figures/evince_start_window.png
 share/gnome/help/evince/zh_CN/evince.xml
 share/gnome/help/evince/zh_CN/figures/evince_start_window.png
 share/gtk-doc/html/evince/EvNavigationAction.html
@@ -139,12 +151,11 @@ share/gtk-doc/html/evince/evince-EvPasswordView.html
 share/gtk-doc/html/evince/evince-EvSidebar.html
 share/gtk-doc/html/evince/evince-EvSidebarAttachments.html
 share/gtk-doc/html/evince/evince-EvSidebarLinks.html
+share/gtk-doc/html/evince/evince-EvSidebarPage.html
 share/gtk-doc/html/evince/evince-EvSidebarThumbnails.html
 share/gtk-doc/html/evince/evince-ev-metadata-manager.html
 share/gtk-doc/html/evince/evince-ev-properties-dialog.html
 share/gtk-doc/html/evince/evince-ev-properties-fonts.html
-share/gtk-doc/html/evince/evince-ev-sidebar-page.html
-share/gtk-doc/html/evince/evince-ev-stock-icons.html
 share/gtk-doc/html/evince/evince-ev-utils.html
 share/gtk-doc/html/evince/evince-ev-window-title.html
 share/gtk-doc/html/evince/evince.devhelp
@@ -158,12 +169,25 @@ share/gtk-doc/html/evince/pt01.html
 share/gtk-doc/html/evince/right.png
 share/gtk-doc/html/evince/style.css
 share/gtk-doc/html/evince/up.png
+share/gtk-doc/html/libevdocument/EvAsyncRenderer.html
 share/gtk-doc/html/libevdocument/EvAttachment.html
+share/gtk-doc/html/libevdocument/EvDocument.html
+share/gtk-doc/html/libevdocument/EvDocumentFind.html
+share/gtk-doc/html/libevdocument/EvDocumentFonts.html
+share/gtk-doc/html/libevdocument/EvDocumentForms.html
+share/gtk-doc/html/libevdocument/EvDocumentImages.html
+share/gtk-doc/html/libevdocument/EvDocumentLayers.html
+share/gtk-doc/html/libevdocument/EvDocumentLinks.html
+share/gtk-doc/html/libevdocument/EvDocumentSecurity.html
+share/gtk-doc/html/libevdocument/EvDocumentThumbnails.html
+share/gtk-doc/html/libevdocument/EvDocumentTransition.html
+share/gtk-doc/html/libevdocument/EvFileExporter.html
 share/gtk-doc/html/libevdocument/EvFormFieldSignature.html
 share/gtk-doc/html/libevdocument/EvImage.html
 share/gtk-doc/html/libevdocument/EvLayer.html
 share/gtk-doc/html/libevdocument/EvPage.html
 share/gtk-doc/html/libevdocument/EvRenderContext.html
+share/gtk-doc/html/libevdocument/EvSelection.html
 share/gtk-doc/html/libevdocument/data.html
 share/gtk-doc/html/libevdocument/helper.html
 share/gtk-doc/html/libevdocument/home.png
@@ -171,42 +195,30 @@ share/gtk-doc/html/libevdocument/index.html
 share/gtk-doc/html/libevdocument/index.sgml
 share/gtk-doc/html/libevdocument/interfaces.html
 share/gtk-doc/html/libevdocument/left.png
-share/gtk-doc/html/libevdocument/libevdocument-ev-async-renderer.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-backends-manager.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-factory.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-find.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-fonts.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-forms.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-images.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-info.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-layers.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-links.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-misc.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-security.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-thumbnails.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-transition.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-file-exporter.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-file-helpers.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-init.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link-action.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link-dest.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-selection.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-transition-effect.html
 share/gtk-doc/html/libevdocument/libevdocument.devhelp
 share/gtk-doc/html/libevdocument/libevdocument.devhelp2
 share/gtk-doc/html/libevdocument/right.png
 share/gtk-doc/html/libevdocument/style.css
 share/gtk-doc/html/libevdocument/up.png
-share/gtk-doc/html/libevview/EvJobExport.html
 share/gtk-doc/html/libevview/ch01.html
 share/gtk-doc/html/libevview/home.png
 share/gtk-doc/html/libevview/index.html
 share/gtk-doc/html/libevview/index.sgml
 share/gtk-doc/html/libevview/left.png
+share/gtk-doc/html/libevview/libevview-EvJobPrint.html
 share/gtk-doc/html/libevview/libevview-ev-job-scheduler.html
 share/gtk-doc/html/libevview/libevview-ev-page-cache.html
+share/gtk-doc/html/libevview/libevview-ev-stock-icons.html
 share/gtk-doc/html/libevview/libevview-ev-view.html
 share/gtk-doc/html/libevview/libevview.devhelp
 share/gtk-doc/html/libevview/libevview.devhelp2
@@ -229,6 +241,7 @@ share/locale/bn/LC_MESSAGES/evince.mo
 share/locale/bn_IN/LC_MESSAGES/evince.mo
 share/locale/br/LC_MESSAGES/evince.mo
 share/locale/ca/LC_MESSAGES/evince.mo
+share/locale/ca@valencia/LC_MESSAGES/evince.mo
 share/locale/cs/LC_MESSAGES/evince.mo
 share/locale/cy/LC_MESSAGES/evince.mo
 share/locale/da/LC_MESSAGES/evince.mo
@@ -315,4 +328,5 @@ share/omf/evince/evince-ru.omf
 share/omf/evince/evince-sr.omf
 share/omf/evince/evince-sv.omf
 share/omf/evince/evince-uk.omf
+share/omf/evince/evince-vi.omf
 share/omf/evince/evince-zh_CN.omf
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 27c0e1b3b36..2126d5ed77f 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.27 2009/05/19 23:53:34 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/10/21 17:28:02 drochner Exp $
 
-SHA1 (evince-2.26.2.tar.bz2) = 1a789e078b4c95f3e3387a45092ae2f222135013
-RMD160 (evince-2.26.2.tar.bz2) = 00dd3dfa006dc019f8f951a356d7260283bf8bab
-Size (evince-2.26.2.tar.bz2) = 2033141 bytes
-SHA1 (patch-aa) = 546d38dd316cb01d05459d342fb39890d78daee4
+SHA1 (evince-2.28.1.tar.bz2) = 28fb2b9fa0bbe126d0275badcf6091e6e56d0e01
+RMD160 (evince-2.28.1.tar.bz2) = 6658e0516faffacd926de781da39c26e174ae182
+Size (evince-2.28.1.tar.bz2) = 2033193 bytes
diff --git a/print/evince/options.mk b/print/evince/options.mk
index a5363448b21..1da5e49c225 100644
--- a/print/evince/options.mk
+++ b/print/evince/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2009/03/18 00:16:46 jmcneill Exp $
+# $NetBSD: options.mk,v 1.5 2009/10/21 17:28:02 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu gnome
-PKG_SUGGESTED_OPTIONS=	gnome
+PKG_SUPPORTED_OPTIONS=	dvi djvu
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,11 +20,3 @@ PLIST.djvu=		yes
 GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mgnome)
-COMMENT+=		for the GNOME Desktop
-.else
-COMMENT+=		(GTK version)
-CONFIGURE_ARGS+=	--disable-nautilus
-.endif
-
diff --git a/print/evince/patches/patch-aa b/print/evince/patches/patch-aa
deleted file mode 100644
index 9409f9f3fa1..00000000000
--- a/print/evince/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/05/19 23:53:34 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583276
-
---- backend/pdf/ev-poppler.cc.orig	2008-08-29 19:38:51.000000000 +0200
-+++ backend/pdf/ev-poppler.cc
-@@ -885,9 +885,11 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
--	        case POPPLER_DEST_FIT:
-+	        case POPPLER_DEST_FITB:
-+		case POPPLER_DEST_FIT:
- 			ev_dest = ev_link_dest_new_fit (dest->page_num - 1);
- 			break;
-+		case POPPLER_DEST_FITBH:
- 	        case POPPLER_DEST_FITH: {
- 			PopplerPage *poppler_page;
- 			double height;
-@@ -901,6 +903,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
-+		case POPPLER_DEST_FITBV:
- 	        case POPPLER_DEST_FITV:
- 			ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
- 							 dest->left,
-@@ -921,6 +924,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
-+#if 0
- 	        case POPPLER_DEST_FITB:
- 			unimplemented_dest = "POPPLER_DEST_FITB";
- 			break;
-@@ -930,6 +934,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 	        case POPPLER_DEST_FITBV:
- 			unimplemented_dest = "POPPLER_DEST_FITBV";
- 			break;
-+#endif
- 	        case POPPLER_DEST_NAMED:
- 			ev_dest = ev_link_dest_new_named (dest->named_dest);
- 			break;