diff options
| -rw-r--r-- | mail/evolution/Makefile | 16 | ||||
| -rw-r--r-- | mail/evolution/PLIST | 334 | ||||
| -rw-r--r-- | mail/evolution/distinfo | 20 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ab | 16 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ac | 18 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ad | 9 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ae | 24 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ak | 20 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-al | 12 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-am | 13 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-an | 13 |
11 files changed, 322 insertions, 173 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 44e6f85e0f6..1465e9528cb 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2002/12/24 06:10:10 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2003/01/09 13:59:25 rh Exp $ -DISTNAME= evolution-1.0.8 -PKGREVISION= 5 +DISTNAME= evolution-1.2.1 CATEGORIES= mail time gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/1.0/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/1.2/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= rh@netbsd.org @@ -16,7 +15,11 @@ BUILD_USES_MSGFMT= YES # Using a wildcard here doesn't make sense because the version number of # "db3" is hardcoded in the "configure" script and some source modules. -BUILDLINK_DEPENDS.db3= db3-3.11.2 +BUILDLINK_DEPENDS.db3= db3-3.11.2 +BUILDLINK_DEPENDS.gnome-vfs= gnome-vfs>=1.0.5 +BUILDLINK_DEPENDS.libxml= libxml>=1.8.17 +BUILDLINK_DEPENDS.gal= gal>=0.22 +BUILDLINK_DEPENDS.gtkhtml= gtkhtml>=1.1.7 GNU_CONFIGURE= YES USE_GMAKE= YES @@ -37,10 +40,12 @@ REPLACE_PERL+= tools/evolution-addressbook-clean.in REPLACE_PERL+= tools/killev CONFIGURE_ARGS+= --with-openldap --without-static-ldap CONFIGURE_ARGS+= --enable-nntp=yes +CONFIGURE_ARGS+= --enable-openssl=yes CONFIGURE_ARGS+= --with-krb5=/usr --with-krb4=/usr CONFIGURE_ARGS+= --with-db3-includes=${LOCALBASE}/include/db3 CONFIGURE_ARGS+= --with-db3-libs=${LOCALBASE}/lib CONFIGURE_ENV+= CFLAGS="-D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}" +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 pre-configure: @@ -85,4 +90,5 @@ pre-build: checkforx .include "../../devel/oaf/buildlink2.mk" .include "../../devel/gal/buildlink2.mk" .include "../../net/ORBit/buildlink2.mk" +.include "../../net/soup/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST index b60b5dbd2ed..2a154f4a919 100644 --- a/mail/evolution/PLIST +++ b/mail/evolution/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2002/12/01 15:37:58 salo Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/01/09 13:59:25 rh Exp $ bin/csv2vcard bin/evolution bin/evolution-addressbook @@ -11,8 +11,10 @@ bin/evolution-calendar-importer bin/evolution-elm-importer bin/evolution-executive-summary bin/evolution-gnomecard-importer +bin/evolution-launch-composer bin/evolution-ldif-importer bin/evolution-mail +bin/evolution-mail-upgrade bin/evolution-move-tasks bin/evolution-netscape-importer bin/evolution-pine-importer @@ -23,11 +25,17 @@ bin/load-pine-addressbook bin/wombat include/camel/broken-date-parser.h include/camel/camel-address.h +include/camel/camel-arg.h +include/camel/camel-block-file.h +include/camel/camel-certdb.h include/camel/camel-charset-map.h include/camel/camel-cipher-context.h include/camel/camel-cms-context.h +include/camel/camel-data-cache.h include/camel/camel-data-wrapper.h include/camel/camel-digest-folder.h +include/camel/camel-digest-store.h +include/camel/camel-digest-summary.h include/camel/camel-disco-diary.h include/camel/camel-disco-folder.h include/camel/camel-disco-store.h @@ -40,15 +48,19 @@ include/camel/camel-folder-search.h include/camel/camel-folder-summary.h include/camel/camel-folder-thread.h include/camel/camel-folder.h +include/camel/camel-gpg-context.h +include/camel/camel-http-stream.h include/camel/camel-imap-command.h include/camel/camel-imap-folder.h include/camel/camel-imap-message-cache.h include/camel/camel-imap-search.h +include/camel/camel-imap-store-summary.h include/camel/camel-imap-store.h include/camel/camel-imap-summary.h include/camel/camel-imap-types.h include/camel/camel-imap-utils.h include/camel/camel-imap-wrapper.h +include/camel/camel-index.h include/camel/camel-internet-address.h include/camel/camel-local-folder.h include/camel/camel-local-store.h @@ -67,13 +79,16 @@ include/camel/camel-mh-store.h include/camel/camel-mh-summary.h include/camel/camel-mime-filter-basic.h include/camel/camel-mime-filter-bestenc.h +include/camel/camel-mime-filter-canon.h include/camel/camel-mime-filter-charset.h +include/camel/camel-mime-filter-chomp.h include/camel/camel-mime-filter-crlf.h include/camel/camel-mime-filter-from.h include/camel/camel-mime-filter-html.h include/camel/camel-mime-filter-index.h include/camel/camel-mime-filter-linewrap.h include/camel/camel-mime-filter-save.h +include/camel/camel-mime-filter-tohtml.h include/camel/camel-mime-filter.h include/camel/camel-mime-message.h include/camel/camel-mime-parser.h @@ -81,28 +96,28 @@ include/camel/camel-mime-part-utils.h include/camel/camel-mime-part.h include/camel/camel-mime-utils.h include/camel/camel-movemail.h +include/camel/camel-multipart-encrypted.h +include/camel/camel-multipart-signed.h include/camel/camel-multipart.h -include/camel/camel-nntp-auth.h include/camel/camel-nntp-folder.h -include/camel/camel-nntp-grouplist.h -include/camel/camel-nntp-newsrc.h -include/camel/camel-nntp-resp-codes.h include/camel/camel-nntp-store.h -include/camel/camel-nntp-types.h -include/camel/camel-nntp-utils.h +include/camel/camel-nntp-stream.h +include/camel/camel-nntp-summary.h include/camel/camel-object.h include/camel/camel-operation.h -include/camel/camel-pgp-context.h +include/camel/camel-partition-table.h include/camel/camel-pgp-mime.h +include/camel/camel-pop3-engine.h include/camel/camel-pop3-folder.h include/camel/camel-pop3-store.h +include/camel/camel-pop3-stream.h include/camel/camel-provider.h -include/camel/camel-remote-store.h include/camel/camel-sasl-anonymous.h include/camel/camel-sasl-cram-md5.h include/camel/camel-sasl-digest-md5.h include/camel/camel-sasl-kerberos4.h include/camel/camel-sasl-login.h +include/camel/camel-sasl-ntlm.h include/camel/camel-sasl-plain.h include/camel/camel-sasl-popb4smtp.h include/camel/camel-sasl.h @@ -117,6 +132,7 @@ include/camel/camel-smtp-transport.h include/camel/camel-spool-folder.h include/camel/camel-spool-store.h include/camel/camel-spool-summary.h +include/camel/camel-store-summary.h include/camel/camel-store.h include/camel/camel-stream-buffer.h include/camel/camel-stream-filter.h @@ -127,10 +143,12 @@ include/camel/camel-stream.h include/camel/camel-tcp-stream-raw.h include/camel/camel-tcp-stream-ssl.h include/camel/camel-tcp-stream.h +include/camel/camel-text-index.h include/camel/camel-transport.h include/camel/camel-types.h include/camel/camel-uid-cache.h include/camel/camel-url.h +include/camel/camel-utf8.h include/camel/camel-vee-folder.h include/camel/camel-vee-store.h include/camel/camel-vtrash-folder.h @@ -150,6 +168,39 @@ include/evolution/cal-util/cal-component.h include/evolution/cal-util/cal-recur.h include/evolution/cal-util/cal-util.h include/evolution/cal-util/timeutil.h +include/evolution/e-conduit/e-pilot-map.h +include/evolution/e-conduit/e-pilot-settings.h +include/evolution/e-conduit/e-pilot-util.h +include/evolution/e-db3util/e-db3-utils.h +include/evolution/e-db3util/e-dbhash.h +include/evolution/e-util/e-bonobo-factory-util.h +include/evolution/e-util/e-categories-config.h +include/evolution/e-util/e-categories-master-list-wombat.h +include/evolution/e-util/e-component-listener.h +include/evolution/e-util/e-config-listener.h +include/evolution/e-util/e-corba-utils.h +include/evolution/e-util/e-dialog-utils.h +include/evolution/e-util/e-dialog-widgets.h +include/evolution/e-util/e-gtk-utils.h +include/evolution/e-util/e-gui-utils.h +include/evolution/e-util/e-host-utils.h +include/evolution/e-util/e-html-utils.h +include/evolution/e-util/e-iterator.h +include/evolution/e-util/e-lang-utils.h +include/evolution/e-util/e-list-iterator.h +include/evolution/e-util/e-list.h +include/evolution/e-util/e-memory.h +include/evolution/e-util/e-mktemp.h +include/evolution/e-util/e-msgport.h +include/evolution/e-util/e-passwords.h +include/evolution/e-util/e-path.h +include/evolution/e-util/e-proxy.h +include/evolution/e-util/e-request.h +include/evolution/e-util/e-sexp.h +include/evolution/e-util/e-time-utils.h +include/evolution/e-util/e-url.h +include/evolution/e-util/md5-utils.h +include/evolution/ebook/addressbook.h include/evolution/ebook/e-book-listener.h include/evolution/ebook/e-book-types.h include/evolution/ebook/e-book-util.h @@ -168,9 +219,31 @@ include/evolution/importer/evolution-importer-client.h include/evolution/importer/evolution-importer-listener.h include/evolution/importer/evolution-importer.h include/evolution/importer/evolution-intelligent-importer.h +include/evolution/pas/addressbook.h +include/evolution/pas/pas-backend-card-sexp.h +include/evolution/pas/pas-backend-summary.h +include/evolution/pas/pas-backend.h +include/evolution/pas/pas-book-factory.h +include/evolution/pas/pas-book-view.h +include/evolution/pas/pas-book.h +include/evolution/pas/pas-card-cursor.h +include/evolution/pcs/cal-backend-util.h +include/evolution/pcs/cal-backend.h +include/evolution/pcs/cal-common.h +include/evolution/pcs/cal-factory.h +include/evolution/pcs/cal.h +include/evolution/pcs/evolution-calendar.h +include/evolution/pcs/job.h +include/evolution/pcs/query-backend.h +include/evolution/pcs/query.h include/evolution/shell/Evolution.h +include/evolution/shell/e-folder-list.h include/evolution/shell/e-folder-tree.h +include/evolution/shell/e-folder.h +include/evolution/shell/e-shell-corba-icon-utils.h include/evolution/shell/evolution-activity-client.h +include/evolution/shell/evolution-config-control.h +include/evolution/shell/evolution-folder-selector-button.h include/evolution/shell/evolution-session.h include/evolution/shell/evolution-shell-client.h include/evolution/shell/evolution-shell-component-client.h @@ -182,53 +255,86 @@ include/evolution/shell/evolution-storage-listener.h include/evolution/shell/evolution-storage-set-view-listener.h include/evolution/shell/evolution-storage.h include/evolution/shell/evolution-wizard.h +include/evolution/widgets/e-bonobo-widget.h +include/evolution/widgets/e-calendar-item.h +include/evolution/widgets/e-calendar.h +include/evolution/widgets/e-cell-date-edit.h +include/evolution/widgets/e-cell-percent.h +include/evolution/widgets/e-charset-picker.h +include/evolution/widgets/e-clipped-label.h +include/evolution/widgets/e-combo-button.h +include/evolution/widgets/e-config-page.h +include/evolution/widgets/e-dateedit.h +include/evolution/widgets/e-dropdown-button.h +include/evolution/widgets/e-map.h +include/evolution/widgets/e-messagebox.h +include/evolution/widgets/e-multi-config-dialog.h +include/evolution/widgets/e-search-bar.h +include/evolution/widgets/e-title-bar.h +include/evolution/widgets/e-url-entry.h include/evolution/wombat/wombat-client.h -lib/evolution/camel-providers/1.0/libcamelimap.a -lib/evolution/camel-providers/1.0/libcamelimap.la -lib/evolution/camel-providers/1.0/libcamelimap.so -lib/evolution/camel-providers/1.0/libcamelimap.so.0 -lib/evolution/camel-providers/1.0/libcamelimap.so.0.0 -lib/evolution/camel-providers/1.0/libcamelimap.urls -lib/evolution/camel-providers/1.0/libcamellocal.a -lib/evolution/camel-providers/1.0/libcamellocal.la -lib/evolution/camel-providers/1.0/libcamellocal.so -lib/evolution/camel-providers/1.0/libcamellocal.so.0 -lib/evolution/camel-providers/1.0/libcamellocal.so.0.0 -lib/evolution/camel-providers/1.0/libcamellocal.urls -lib/evolution/camel-providers/1.0/libcamelnntp.a -lib/evolution/camel-providers/1.0/libcamelnntp.la -lib/evolution/camel-providers/1.0/libcamelnntp.so -lib/evolution/camel-providers/1.0/libcamelnntp.so.0 -lib/evolution/camel-providers/1.0/libcamelnntp.so.0.0 -lib/evolution/camel-providers/1.0/libcamelnntp.urls -lib/evolution/camel-providers/1.0/libcamelpop3.a -lib/evolution/camel-providers/1.0/libcamelpop3.la -lib/evolution/camel-providers/1.0/libcamelpop3.so -lib/evolution/camel-providers/1.0/libcamelpop3.so.0 -lib/evolution/camel-providers/1.0/libcamelpop3.so.0.0 -lib/evolution/camel-providers/1.0/libcamelpop3.urls -lib/evolution/camel-providers/1.0/libcamelsendmail.a -lib/evolution/camel-providers/1.0/libcamelsendmail.la -lib/evolution/camel-providers/1.0/libcamelsendmail.so -lib/evolution/camel-providers/1.0/libcamelsendmail.so.0 -lib/evolution/camel-providers/1.0/libcamelsendmail.so.0.0 -lib/evolution/camel-providers/1.0/libcamelsendmail.urls -lib/evolution/camel-providers/1.0/libcamelsmtp.a -lib/evolution/camel-providers/1.0/libcamelsmtp.la -lib/evolution/camel-providers/1.0/libcamelsmtp.so -lib/evolution/camel-providers/1.0/libcamelsmtp.so.0 -lib/evolution/camel-providers/1.0/libcamelsmtp.so.0.0 -lib/evolution/camel-providers/1.0/libcamelsmtp.urls -lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.a -lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.la -lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.so -lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.so.0 -lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.so.0.0 -lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.a -lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.la -lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.so -lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.so.0 -lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.so.0.0 +lib/camelConf.sh +lib/evolution/1.2/camel-providers/libcamelimap.a +lib/evolution/1.2/camel-providers/libcamelimap.la +lib/evolution/1.2/camel-providers/libcamelimap.so +lib/evolution/1.2/camel-providers/libcamelimap.urls +lib/evolution/1.2/camel-providers/libcamellocal.a +lib/evolution/1.2/camel-providers/libcamellocal.la +lib/evolution/1.2/camel-providers/libcamellocal.so +lib/evolution/1.2/camel-providers/libcamellocal.urls +lib/evolution/1.2/camel-providers/libcamelnntp.a +lib/evolution/1.2/camel-providers/libcamelnntp.la +lib/evolution/1.2/camel-providers/libcamelnntp.so +lib/evolution/1.2/camel-providers/libcamelnntp.urls +lib/evolution/1.2/camel-providers/libcamelpop3.a +lib/evolution/1.2/camel-providers/libcamelpop3.la +lib/evolution/1.2/camel-providers/libcamelpop3.so +lib/evolution/1.2/camel-providers/libcamelpop3.urls +lib/evolution/1.2/camel-providers/libcamelsendmail.a +lib/evolution/1.2/camel-providers/libcamelsendmail.la +lib/evolution/1.2/camel-providers/libcamelsendmail.so +lib/evolution/1.2/camel-providers/libcamelsendmail.urls +lib/evolution/1.2/camel-providers/libcamelsmtp.a +lib/evolution/1.2/camel-providers/libcamelsmtp.la +lib/evolution/1.2/camel-providers/libcamelsmtp.so +lib/evolution/1.2/camel-providers/libcamelsmtp.urls +lib/evolution/1.2/evolution-mail-importers/libmbox.a +lib/evolution/1.2/evolution-mail-importers/libmbox.la +lib/evolution/1.2/evolution-mail-importers/libmbox.so +lib/evolution/1.2/evolution-mail-importers/liboutlook.a +lib/evolution/1.2/evolution-mail-importers/liboutlook.la +lib/evolution/1.2/evolution-mail-importers/liboutlook.so +lib/evolution/1.2/libcal-util-static.a +lib/evolution/1.2/libcal-util-static.la +lib/evolution/1.2/libebook-static.a +lib/evolution/1.2/libebook-static.la +lib/evolution/1.2/libebook.a +lib/evolution/1.2/libebook.la +lib/evolution/1.2/libebook.so +lib/evolution/1.2/libebook.so.0 +lib/evolution/1.2/libebook.so.0.0 +lib/evolution/1.2/libeconduit.a +lib/evolution/1.2/libeconduit.la +lib/evolution/1.2/libeconduit.so +lib/evolution/1.2/libeconduit.so.0 +lib/evolution/1.2/libeconduit.so.0.0 +lib/evolution/1.2/libedb3util.a +lib/evolution/1.2/libedb3util.la +lib/evolution/1.2/libedb3util.so +lib/evolution/1.2/libedb3util.so.0 +lib/evolution/1.2/libedb3util.so.0.0 +lib/evolution/1.2/libemiscwidgets.a +lib/evolution/1.2/libeutil.a +lib/evolution/1.2/libeutil.la +lib/evolution/1.2/libeutil.so +lib/evolution/1.2/libeutil.so.0 +lib/evolution/1.2/libeutil.so.0.0 +lib/evolution/1.2/libpas.a +lib/evolution/1.2/libpcs.a +lib/evolution/1.2/libversit.a +lib/evolution_addressbookConf.sh +lib/evolution_calendarConf.sh +lib/evolution_shellConf.sh lib/libcal-client.a lib/libcal-client.la lib/libcal-client.so @@ -244,11 +350,6 @@ lib/libcamel.la lib/libcamel.so lib/libcamel.so.0 lib/libcamel.so.0.0 -lib/libebook.a -lib/libebook.la -lib/libebook.so -lib/libebook.so.0 -lib/libebook.so.0.0 lib/libename.a lib/libename.la lib/libename.so @@ -274,12 +375,18 @@ lib/libical-evolution.la lib/libical-evolution.so lib/libical-evolution.so.0 lib/libical-evolution.so.0.0 +lib/libicalvcal-evolution.a +lib/libicalvcal-evolution.la +lib/libicalvcal-evolution.so +lib/libicalvcal-evolution.so.0 +lib/libicalvcal-evolution.so.0.0 lib/libwombat.a lib/libwombat.la lib/libwombat.so lib/libwombat.so.0 lib/libwombat.so.0.0 man/man1/evolution.1 +sbin/camel-index-control sbin/camel-lock-helper share/evolution/Locations share/evolution/addresstypes.xml @@ -299,17 +406,23 @@ share/evolution/default_user/local/Sent/mbox share/evolution/default_user/local/Tasks/folder-metadata.xml share/evolution/default_user/local/Trash/folder-metadata.xml share/evolution/default_user/searches.xml +share/evolution/default_user/vfolders.xml share/evolution/ecps/medbook.ecps share/evolution/ecps/phonelist.ecps share/evolution/ecps/smallbook.ecps +share/evolution/etspec/addressbook-config.etspec +share/evolution/etspec/e-addressbook-view.etspec share/evolution/etspec/e-calendar-table.etspec +share/evolution/etspec/e-contact-list-editor.etspec share/evolution/etspec/e-meeting-time-sel.etspec +share/evolution/etspec/e-select-names.etspec share/evolution/etspec/e-storage-set-view.etspec +share/evolution/etspec/mail-accounts.etspec share/evolution/etspec/meeting-page.etspec share/evolution/etspec/message-list.etspec share/evolution/etspec/subscribe-dialog.etspec +share/evolution/evolutionperson.schema share/evolution/filtertypes.xml -share/evolution/glade/addressbook-config.glade share/evolution/glade/alarm-notify.glade share/evolution/glade/alarm-options.glade share/evolution/glade/alarm-page.glade @@ -322,20 +435,25 @@ share/evolution/glade/e-card-merging-book-commit-duplicate-detected.glade share/evolution/glade/e-contact-editor-confirm-delete.glade share/evolution/glade/e-contact-print.glade share/evolution/glade/e-delegate-dialog.glade +share/evolution/glade/e-folder-list.glade share/evolution/glade/e-itip-control.glade share/evolution/glade/e-msg-composer-attachment.glade +share/evolution/glade/e-shell-config-default-folders.glade share/evolution/glade/e-shell-folder-creation-dialog.glade +share/evolution/glade/e-shell-shared-folder-picker-dialog.glade share/evolution/glade/e-timezone-dialog.glade share/evolution/glade/event-page.glade share/evolution/glade/evolution-startup-wizard.glade share/evolution/glade/evolution.png share/evolution/glade/file-exists.glade share/evolution/glade/filter.glade +share/evolution/glade/flag-for-followup-48.png share/evolution/glade/fulladdr.glade share/evolution/glade/fullname.glade share/evolution/glade/goto-dialog.glade share/evolution/glade/import.glade share/evolution/glade/import.png +share/evolution/glade/ldap-config.glade share/evolution/glade/local-config.glade share/evolution/glade/mail-config-druid-account-name.png share/evolution/glade/mail-config-druid-identity.png @@ -344,7 +462,7 @@ share/evolution/glade/mail-config-druid-send.png share/evolution/glade/mail-config-druid.png share/evolution/glade/mail-config.glade share/evolution/glade/meeting-page.glade -share/evolution/glade/meeting_widget.png +share/evolution/glade/message-tags.glade share/evolution/glade/my-evolution.glade share/evolution/glade/recurrence-page.glade share/evolution/glade/schedule-page.glade @@ -354,11 +472,15 @@ share/evolution/glade/task-details-page.glade share/evolution/glade/task-page.glade share/evolution/glade/thankyou.png share/evolution/glade/timezone-48.png +share/evolution/sounds/default_alarm.wav share/evolution/vfoldertypes.xml +share/evolution/views/addressbook/Address_Cards.galview share/evolution/views/addressbook/By_Company.galview share/evolution/views/addressbook/Phone_List.galview share/evolution/views/addressbook/galview.xml share/evolution/views/calendar/galview.xml +share/evolution/views/mail/As_Sent_Folder.galview +share/evolution/views/mail/By_Follow_Up_Flag.galview share/evolution/views/mail/By_Sender.galview share/evolution/views/mail/By_Status.galview share/evolution/views/mail/By_Subject.galview @@ -368,10 +490,10 @@ share/evolution/views/tasks/Tasks.galview share/evolution/views/tasks/With_Category.galview share/evolution/views/tasks/galview.xml share/gnome/apps/Applications/evolution.desktop -@exec ${MKDIR} %D/share/gnome/help/cal -@exec ${MKDIR} %D/share/gnome/help/cal/C share/gnome/help/evolution/C/access.html +share/gnome/help/evolution/C/apx-fdl.html share/gnome/help/evolution/C/apx-gloss.html +share/gnome/help/evolution/C/apx-gpl.html share/gnome/help/evolution/C/authors.html share/gnome/help/evolution/C/bugs.html share/gnome/help/evolution/C/config-prefs-cal.html @@ -385,6 +507,18 @@ share/gnome/help/evolution/C/contact-search.html share/gnome/help/evolution/C/customizing-summary.html share/gnome/help/evolution/C/docbook.css share/gnome/help/evolution/C/encryption.html +share/gnome/help/evolution/C/fdl-section1.html +share/gnome/help/evolution/C/fdl-section10.html +share/gnome/help/evolution/C/fdl-section2.html +share/gnome/help/evolution/C/fdl-section3.html +share/gnome/help/evolution/C/fdl-section4.html +share/gnome/help/evolution/C/fdl-section5.html +share/gnome/help/evolution/C/fdl-section6.html +share/gnome/help/evolution/C/fdl-section7.html +share/gnome/help/evolution/C/fdl-section8.html +share/gnome/help/evolution/C/fdl-section9.html +share/gnome/help/evolution/C/fdl-using.html +share/gnome/help/evolution/C/features.html share/gnome/help/evolution/C/figures/calendar.png share/gnome/help/evolution/C/figures/config-cal.png share/gnome/help/evolution/C/figures/config-mail.png @@ -408,7 +542,6 @@ share/gnome/help/evolution/C/figures/mail-inbox.png share/gnome/help/evolution/C/figures/mail-threaded.png share/gnome/help/evolution/C/figures/mainwindow-pic.png share/gnome/help/evolution/C/figures/newmsg.png -share/gnome/help/evolution/C/figures/outline.png share/gnome/help/evolution/C/figures/print-dest.png share/gnome/help/evolution/C/figures/print-preview.png share/gnome/help/evolution/C/figures/replymsg.png @@ -423,6 +556,8 @@ share/gnome/help/evolution/C/install.html share/gnome/help/evolution/C/introduction.html share/gnome/help/evolution/C/ln20.html share/gnome/help/evolution/C/menuref.html +share/gnome/help/evolution/C/organization.html +share/gnome/help/evolution/C/other-help.html share/gnome/help/evolution/C/print-destination.html share/gnome/help/evolution/C/quickref-cal.html share/gnome/help/evolution/C/quickref-contact.html @@ -430,15 +565,17 @@ share/gnome/help/evolution/C/quickref-mail.html share/gnome/help/evolution/C/rsvp-stuff.html share/gnome/help/evolution/C/sgml/apx-authors.sgml share/gnome/help/evolution/C/sgml/apx-bugs.sgml +share/gnome/help/evolution/C/sgml/apx-fdl.sgml share/gnome/help/evolution/C/sgml/apx-gloss.sgml +share/gnome/help/evolution/C/sgml/apx-gpl.sgml share/gnome/help/evolution/C/sgml/config-prefs.sgml share/gnome/help/evolution/C/sgml/config-sync.sgml -share/gnome/help/evolution/C/sgml/evolution-faq.sgml share/gnome/help/evolution/C/sgml/evolution.sgml share/gnome/help/evolution/C/sgml/menuref.sgml share/gnome/help/evolution/C/sgml/preface.sgml share/gnome/help/evolution/C/sgml/usage-calendar.sgml share/gnome/help/evolution/C/sgml/usage-contact.sgml +share/gnome/help/evolution/C/sgml/usage-exchange.sgml share/gnome/help/evolution/C/sgml/usage-exec-summary.sgml share/gnome/help/evolution/C/sgml/usage-mail-org.sgml share/gnome/help/evolution/C/sgml/usage-mail.sgml @@ -457,6 +594,7 @@ share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif share/gnome/help/evolution/C/stylesheet-images/up.gif share/gnome/help/evolution/C/stylesheet-images/warning.gif +share/gnome/help/evolution/C/terms.html share/gnome/help/evolution/C/topic.dat share/gnome/help/evolution/C/typography.html share/gnome/help/evolution/C/ui-intro.html @@ -484,6 +622,7 @@ share/gnome/help/evolution/C/usage-print.html share/gnome/help/evolution/C/usage-summary.html share/gnome/help/evolution/C/usage-sync.html share/gnome/help/evolution/C/usage.html +share/gnome/help/evolution/C/whats-new-in-one-two.html share/gnome/help/evolution/no/apx-gloss.html share/gnome/help/evolution/no/authors.html share/gnome/help/evolution/no/bugs.html @@ -635,7 +774,9 @@ share/gnome/ui/evolution.xml share/gnome/ui/my-evolution.xml share/idl/Composer.idl share/idl/Evolution-Activity.idl +share/idl/Evolution-Addressbook-SelectNames.idl share/idl/Evolution-Composer.idl +share/idl/Evolution-ConfigControl.idl share/idl/Evolution-Offline.idl share/idl/Evolution-Session.idl share/idl/Evolution-Shell.idl @@ -646,9 +787,11 @@ share/idl/Evolution-Shortcuts.idl share/idl/Evolution-Storage.idl share/idl/Evolution-StorageSetView.idl share/idl/Evolution-Wizard.idl +share/idl/Evolution-Wombat.idl share/idl/Evolution-common.idl share/idl/Evolution.idl share/idl/GNOME_Evolution_Importer.idl +share/idl/Mailer.idl share/idl/addressbook.idl share/idl/evolution-calendar.idl share/images/evolution/16_copy.png @@ -693,8 +836,10 @@ share/images/evolution/buttons/send-24.png share/images/evolution/buttons/weekview.xpm share/images/evolution/buttons/workweekview.xpm share/images/evolution/buttons/yearview.xpm +share/images/evolution/calendar-and-tasks-settings.png share/images/evolution/cellphone.png share/images/evolution/compose-message.png +share/images/evolution/composer-settings.png share/images/evolution/conduits/evo-16-address-conduit.png share/images/evolution/conduits/evo-16-calendar-conduit.png share/images/evolution/conduits/evo-16-todo-conduit.png @@ -705,7 +850,9 @@ share/images/evolution/configure_16_addressbook.xpm share/images/evolution/configure_16_calendar.xpm share/images/evolution/configure_16_folder.xpm share/images/evolution/configure_16_mail.xpm +share/images/evolution/connect_to_url-16.xpm share/images/evolution/contact-is-a-list.png +share/images/evolution/contact-list-16.png share/images/evolution/copy_16_message.xpm share/images/evolution/edit.xpm share/images/evolution/empty.gif @@ -734,9 +881,14 @@ share/images/evolution/faq-16.png share/images/evolution/fetch-mail.png share/images/evolution/find_contact.xpm share/images/evolution/find_message.xpm +share/images/evolution/flag-for-followup-16.png share/images/evolution/folder-copy-16.png +share/images/evolution/folder-mini.png share/images/evolution/folder-move-16.png +share/images/evolution/folder-settings.png +share/images/evolution/folder.png share/images/evolution/folder.xpm +share/images/evolution/font.png share/images/evolution/forward.xpm share/images/evolution/globe.png share/images/evolution/goto-16.png @@ -750,18 +902,26 @@ share/images/evolution/ico-rdf.png share/images/evolution/ico-weather.png share/images/evolution/import.png share/images/evolution/import.xpm -share/images/evolution/inbox-16.png -share/images/evolution/inbox-full-16.png +share/images/evolution/inbox-mini.png +share/images/evolution/inbox.png +share/images/evolution/info-bulb.png share/images/evolution/ldap-mini.png +share/images/evolution/ldap-settings.png share/images/evolution/ldap.png +share/images/evolution/mail-accounts-settings.png share/images/evolution/mail-config-druid-account-name.png share/images/evolution/mail-config-druid-identity.png share/images/evolution/mail-config-druid-receive.png share/images/evolution/mail-config-druid-send.png share/images/evolution/mail-config-druid.png +share/images/evolution/mail-new.xpm +share/images/evolution/mail-read.xpm +share/images/evolution/mail.png share/images/evolution/malehead.png share/images/evolution/mark-as-important-16.png +share/images/evolution/meeting-request-16.png share/images/evolution/meeting-request.png +share/images/evolution/monkey-16.png share/images/evolution/move_message.xpm share/images/evolution/myevo-appointments.png share/images/evolution/myevo-mail-summary.png @@ -774,26 +934,34 @@ share/images/evolution/myweather-storm.png share/images/evolution/myweather-sun.png share/images/evolution/myweather-suncloud.png share/images/evolution/new-message.xpm +share/images/evolution/new_all_day_event.png share/images/evolution/new_appointment.xpm share/images/evolution/new_contact.xpm share/images/evolution/new_task-16.png share/images/evolution/offline.png share/images/evolution/online.png share/images/evolution/open-in-new-window-16.png -share/images/evolution/outbox-16.png -share/images/evolution/outbox-full-16.png +share/images/evolution/outbox-mini.png +share/images/evolution/outbox.png share/images/evolution/pattern.png share/images/evolution/pgp-signature-bad.png share/images/evolution/pgp-signature-nokey.png share/images/evolution/pgp-signature-ok.png +share/images/evolution/post-message-16.png +share/images/evolution/post-reply-24.png share/images/evolution/print-preview.xpm share/images/evolution/print.xpm +share/images/evolution/priority-high.xpm +share/images/evolution/public-folder-mini.png +share/images/evolution/public-folder.png share/images/evolution/rdf.png share/images/evolution/reply.xpm share/images/evolution/reply_to_all.xpm share/images/evolution/save-16.png share/images/evolution/save-as-16.png share/images/evolution/save.xpm +share/images/evolution/schedule-meeting-16.xpm +share/images/evolution/schedule-meeting-24.png share/images/evolution/search-16.png share/images/evolution/search-and-replace-16.png share/images/evolution/send-16.png @@ -809,8 +977,12 @@ share/images/evolution/service-right-disabled.png share/images/evolution/service-right.png share/images/evolution/service-up-disabled.png share/images/evolution/service-up.png +share/images/evolution/settings-16.png +share/images/evolution/settings.png share/images/evolution/show_all_messages.xpm share/images/evolution/splash.png +share/images/evolution/summary-settings.png +share/images/evolution/summary_preferences-16.png share/images/evolution/talking-heads.png share/images/evolution/task.png share/images/evolution/task.xpm @@ -822,6 +994,7 @@ share/images/evolution/wax-seal-broken.png share/images/evolution/wax-seal.png share/images/evolution/work_offline.xpm share/images/evolution/work_online-16.png +share/images/evolution/working-16.png share/images/evolution/world_map-960.png share/libical-evolution/zoneinfo/Africa/Abidjan.ics share/libical-evolution/zoneinfo/Africa/Accra.ics @@ -1047,20 +1220,16 @@ share/libical-evolution/zoneinfo/Asia/Kuala_Lumpur.ics share/libical-evolution/zoneinfo/Asia/Kuching.ics share/libical-evolution/zoneinfo/Asia/Kuwait.ics share/libical-evolution/zoneinfo/Asia/Macao.ics -share/libical-evolution/zoneinfo/Asia/Macau.ics share/libical-evolution/zoneinfo/Asia/Magadan.ics -share/libical-evolution/zoneinfo/Asia/Makassar.ics share/libical-evolution/zoneinfo/Asia/Manila.ics share/libical-evolution/zoneinfo/Asia/Muscat.ics share/libical-evolution/zoneinfo/Asia/Nicosia.ics share/libical-evolution/zoneinfo/Asia/Novosibirsk.ics share/libical-evolution/zoneinfo/Asia/Omsk.ics -share/libical-evolution/zoneinfo/Asia/Oral.ics share/libical-evolution/zoneinfo/Asia/Phnom_Penh.ics share/libical-evolution/zoneinfo/Asia/Pontianak.ics share/libical-evolution/zoneinfo/Asia/Pyongyang.ics share/libical-evolution/zoneinfo/Asia/Qatar.ics -share/libical-evolution/zoneinfo/Asia/Qyzylorda.ics share/libical-evolution/zoneinfo/Asia/Rangoon.ics share/libical-evolution/zoneinfo/Asia/Riyadh.ics share/libical-evolution/zoneinfo/Asia/Saigon.ics @@ -1209,6 +1378,7 @@ share/libical-evolution/zoneinfo/zones.tab ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evolution.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution.mo @@ -1284,7 +1454,6 @@ share/pixmaps/evolution.png @dirrm share/images/evolution/conduits @dirrm share/images/evolution/buttons @dirrm share/images/evolution -@dirrm share/images @dirrm share/gnome/html/evolution-devel-guide @exec ${MKDIR} %D/share/gnome/html/evolution-cal-util @dirrm share/gnome/html/evolution-cal-util @@ -1299,6 +1468,7 @@ share/pixmaps/evolution.png @dirrm share/gnome/help/evolution/C/figures @dirrm share/gnome/help/evolution/C @dirrm share/gnome/help/evolution +@exec ${MKDIR} %D/share/gnome/help/cal/C @dirrm share/gnome/help/cal/C @dirrm share/gnome/help/cal @dirrm share/evolution/views/tasks @@ -1306,6 +1476,7 @@ share/pixmaps/evolution.png @dirrm share/evolution/views/calendar @dirrm share/evolution/views/addressbook @dirrm share/evolution/views +@dirrm share/evolution/sounds @dirrm share/evolution/glade @dirrm share/evolution/etspec @dirrm share/evolution/ecps @@ -1326,15 +1497,20 @@ share/pixmaps/evolution.png @dirrm share/evolution/default_user/config @dirrm share/evolution/default_user @dirrm share/evolution -@dirrm lib/evolution/evolution-mail-importers/${PKGVERSION} -@dirrm lib/evolution/evolution-mail-importers -@dirrm lib/evolution/camel-providers/1.0 -@dirrm lib/evolution/camel-providers +@dirrm lib/evolution/1.2/evolution-mail-importers +@dirrm lib/evolution/1.2/camel-providers +@dirrm lib/evolution/1.2 @dirrm lib/evolution @dirrm include/evolution/wombat +@dirrm include/evolution/widgets @dirrm include/evolution/shell +@dirrm include/evolution/pcs +@dirrm include/evolution/pas @dirrm include/evolution/importer @dirrm include/evolution/ebook +@dirrm include/evolution/e-util +@dirrm include/evolution/e-db3util +@dirrm include/evolution/e-conduit @dirrm include/evolution/cal-util @dirrm include/evolution/cal-client @dirrm include/evolution diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 8e970dd0bec..fec3f35481d 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,18 +1,16 @@ -$NetBSD: distinfo,v 1.18 2002/12/01 15:37:59 salo Exp $ +$NetBSD: distinfo,v 1.19 2003/01/09 13:59:25 rh Exp $ -SHA1 (evolution-1.0.8.tar.bz2) = 68e0545f15f7ab3bc43f386ff8f829f1836e05ef -Size (evolution-1.0.8.tar.bz2) = 10772710 bytes +SHA1 (evolution-1.2.1.tar.bz2) = ec9eb4709eaed8ac850905e8f0be3988db263757 +Size (evolution-1.2.1.tar.bz2) = 12218363 bytes SHA1 (patch-aa) = e571e75bcb93801bc6132bb2ca3f96abbde22494 -SHA1 (patch-ab) = 3715bf4f43c80c902bbe346a25370fd14126722f -SHA1 (patch-ac) = c9feb5ca0dff4b4751bdd3e1d48468eb59fb14d0 -SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e -SHA1 (patch-ae) = 155e692bc82f32d25c37a5c37aa8145615a50329 +SHA1 (patch-ab) = 0e0f5fd6efe83f14aee9be54e855a4844ae2f3ef +SHA1 (patch-ac) = 3622582ad55b0afe7662787747958bda677833f5 +SHA1 (patch-ad) = 364fc8c885eba81b77cc219dab678cac2714f130 +SHA1 (patch-ae) = a78bb477e3ebcade556ae9c0c1ef0ffc05f05e36 SHA1 (patch-af) = dbbd2272d21079d6fe28d59e75f9acb26634f438 SHA1 (patch-ag) = 57d64084a79c6e3a687b7a148fdea02b0f1eefbd SHA1 (patch-ah) = cdd1973d64ca10a52dc4c868bc7a6a15156526ae SHA1 (patch-ai) = 2d73b5a3a2a006bb29b83650154ca64d721ef09d SHA1 (patch-aj) = 0e132d78a59631d443a8fe03a838033089e1802c -SHA1 (patch-ak) = b9ab6bd5cfc3645ff606c34df01fec4ce0054a43 -SHA1 (patch-al) = 3774d3bb23974df3c21699be2b744e0ab3cf9204 -SHA1 (patch-am) = ff3becd8e70f76bcf001cc95c96a066b39338660 -SHA1 (patch-an) = dfa533ff026ca7333d350239f87d8fad15d47b21 +SHA1 (patch-ak) = 3c1f314f16743221a2ce9db659c0877b70f00f51 +SHA1 (patch-al) = de0b84420c20aabe4d9eadf5f322b117a71ca2dc diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab index 2e2be3e26d2..0e20a47ab8b 100644 --- a/mail/evolution/patches/patch-ab +++ b/mail/evolution/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2002/10/11 09:29:59 rh Exp $ +$NetBSD: patch-ab,v 1.5 2003/01/09 13:59:25 rh Exp $ ---- mail/main.c.orig Tue Dec 18 02:21:53 2001 +--- mail/main.c.orig Sat Sep 14 02:53:20 2002 +++ mail/main.c @@ -36,6 +36,26 @@ #include "mail.h" @@ -29,14 +29,14 @@ $NetBSD: patch-ab,v 1.4 2002/10/11 09:29:59 rh Exp $ /*#define DO_MCHECK*/ #ifdef DO_MCHECK -@@ -152,6 +172,10 @@ main (int argc, char *argv []) - g_mutex_free (gdk_threads_mutex); - gdk_threads_mutex = NULL; - } -+ +@@ -156,6 +176,10 @@ main (int argc, char *argv []) + + g_print ("Evolution Mail ready and running.\n"); + +#ifdef _PTH_PTHREAD_H_ + gtk_timeout_add (200, pth_nbschedule, NULL); +#endif - ++ GDK_THREADS_ENTER (); bonobo_main (); + diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac index 55b018a85c5..087e646a901 100644 --- a/mail/evolution/patches/patch-ac +++ b/mail/evolution/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.5 2002/10/11 09:29:59 rh Exp $ +$NetBSD: patch-ac,v 1.6 2003/01/09 13:59:25 rh Exp $ ---- shell/main.c.orig Tue Dec 18 02:21:02 2001 +--- shell/main.c.orig Tue Nov 19 07:35:13 2002 +++ shell/main.c -@@ -63,6 +63,25 @@ static char *evolution_directory = NULL; - static gboolean no_splash = FALSE; +@@ -77,6 +77,25 @@ static gboolean force_upgrade = FALSE; + extern char *evolution_debug_log; +#ifdef __NetBSD__ @@ -28,18 +28,18 @@ $NetBSD: patch-ac,v 1.5 2002/10/11 09:29:59 rh Exp $ static GtkWidget * quit_box_new (void) -@@ -190,6 +209,10 @@ idle_cb (void *data) - - uri_list = (GSList *) data; +@@ -307,6 +326,10 @@ idle_cb (void *data) + else + startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE; +#ifdef _PTH_PTHREAD_H_ + sched_yield(); +#endif + - shell = e_shell_new (evolution_directory, ! no_splash, &result); + shell = e_shell_new (evolution_directory, ! no_splash, startup_line_mode, &result); g_free (evolution_directory); -@@ -350,6 +373,10 @@ main (int argc, char **argv) +@@ -496,6 +519,10 @@ main (int argc, char **argv) } gtk_idle_add (idle_cb, uri_list); diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad index 57bdb999a5c..9642d4aaad3 100644 --- a/mail/evolution/patches/patch-ad +++ b/mail/evolution/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2001/08/11 18:39:25 rh Exp $ +$NetBSD: patch-ad,v 1.3 2003/01/09 13:59:25 rh Exp $ ---- camel/providers/imap/camel-imap-store.c.orig Thu Jul 26 21:07:40 2001 +--- camel/providers/imap/camel-imap-store.c.orig Fri Dec 6 03:06:49 2002 +++ camel/providers/imap/camel-imap-store.c -@@ -24,6 +24,11 @@ +@@ -24,6 +24,10 @@ * */ @@ -10,7 +10,6 @@ $NetBSD: patch-ad,v 1.2 2001/08/11 18:39:25 rh Exp $ +#undef _POSIX_THREAD_SYSCALL_SOFT +#endif +#define _POSIX_THREAD_SYSCALL_SOFT 0 -+ + #ifdef HAVE_CONFIG_H #include <config.h> - #endif diff --git a/mail/evolution/patches/patch-ae b/mail/evolution/patches/patch-ae index d3a53b649b9..c2f01bc4302 100644 --- a/mail/evolution/patches/patch-ae +++ b/mail/evolution/patches/patch-ae @@ -1,16 +1,12 @@ -$NetBSD: patch-ae,v 1.2 2001/08/11 18:39:25 rh Exp $ +$NetBSD: patch-ae,v 1.3 2003/01/09 13:59:25 rh Exp $ ---- camel/camel-remote-store.c.orig Tue Jul 17 23:22:19 2001 -+++ camel/camel-remote-store.c -@@ -23,6 +23,11 @@ - * - */ +--- camel/providers/nntp/camel-nntp-summary.h.orig Tue May 7 23:53:40 2002 ++++ camel/providers/nntp/camel-nntp-summary.h +@@ -24,7 +24,6 @@ + #include <camel/camel-folder-summary.h> + #include <camel/camel-folder.h> + #include <camel/camel-exception.h> +-#include <libibex/ibex.h> -+#ifdef _POSIX_THREAD_SYSCALL_SOFT -+#undef _POSIX_THREAD_SYSCALL_SOFT -+#endif -+#define _POSIX_THREAD_SYSCALL_SOFT 0 -+ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif + #define CAMEL_NNTP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary) + #define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass) diff --git a/mail/evolution/patches/patch-ak b/mail/evolution/patches/patch-ak index 6c3918d2028..d9f011901f1 100644 --- a/mail/evolution/patches/patch-ak +++ b/mail/evolution/patches/patch-ak @@ -1,15 +1,15 @@ -$NetBSD: patch-ak,v 1.2 2002/03/26 20:50:13 rh Exp $ +$NetBSD: patch-ak,v 1.3 2003/01/09 13:59:25 rh Exp $ ---- composer/e-msg-composer.c.orig Mon Mar 18 22:01:42 2002 -+++ composer/e-msg-composer.c Tue Mar 26 15:02:46 2002 -@@ -93,6 +93,10 @@ +--- composer/e-msg-composer.c.orig Tue Dec 3 04:29:51 2002 ++++ composer/e-msg-composer.c +@@ -51,6 +51,10 @@ + #include <sys/wait.h> + #include <unistd.h> - #define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor" - -+#ifdef send ++#ifdef send +#undef send +#endif + - - #define DEFAULT_WIDTH 600 - #define DEFAULT_HEIGHT 500 + #include <gtk/gtkoptionmenu.h> + #include <gal/unicode/gunicode.h> + #include <gal/util/e-unicode-i18n.h> diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al index c0029b4a158..b7548473533 100644 --- a/mail/evolution/patches/patch-al +++ b/mail/evolution/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.5 2002/10/07 12:44:36 wiz Exp $ +$NetBSD: patch-al,v 1.6 2003/01/09 13:59:25 rh Exp $ ---- doc/devel/calendar/cal-util/Makefile.in.orig Sat Oct 5 06:36:07 2002 +--- doc/devel/calendar/cal-util/Makefile.in.orig Fri Dec 6 09:14:26 2002 +++ doc/devel/calendar/cal-util/Makefile.in -@@ -242,7 +242,7 @@ extra_files = - GTKDOC_CFLAGS = -I$(top_srcdir)/calendar -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) +@@ -266,7 +266,7 @@ extra_files = + GTKDOC_CFLAGS = -I$(top_srcdir)/calendar -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(EVOLUTION_CALENDAR_CFLAGS) --GTKDOC_LIBS = $(BONOBO_VFS_GNOME_LIBS) $(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al $(top_builddir)/libical/src/libical/.libs/libical-static.al $(top_builddir)/libversit/.libs/libversit.al -+GTKDOC_LIBS = $(BONOBO_VFS_GNOME_LIBS) $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libical/src/libical/libical-evolution.la +-GTKDOC_LIBS = $(EVOLUTION_CALENDAR_LIBS) $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.a ++GTKDOC_LIBS = $(EVOLUTION_CALENDAR_LIBS) $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libical/src/libical/libical-evolution.la GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) diff --git a/mail/evolution/patches/patch-am b/mail/evolution/patches/patch-am deleted file mode 100644 index b4f5c57bc46..00000000000 --- a/mail/evolution/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.3 2002/03/26 20:50:13 rh Exp $ - ---- libibex/Makefile.in.orig Sat Mar 23 20:04:00 2002 -+++ libibex/Makefile.in Tue Mar 26 15:03:06 2002 -@@ -198,7 +198,7 @@ - libibex_la_SOURCES = wordindexmem.c block.c ibex.h hash.c disktail.c ibex_block.c - - --libibex_la_LDFLAGS = -static -+libibex_la_LDFLAGS = - - libibex_la_LIBADD = $(GAL_LIBS) - diff --git a/mail/evolution/patches/patch-an b/mail/evolution/patches/patch-an deleted file mode 100644 index 1253e2e1a62..00000000000 --- a/mail/evolution/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.2 2002/10/07 12:44:36 wiz Exp $ - ---- doc/devel/calendar/cal-client/Makefile.in.orig Sun Oct 6 16:58:03 2002 -+++ doc/devel/calendar/cal-client/Makefile.in -@@ -242,7 +242,7 @@ extra_files = - GTKDOC_CFLAGS = -I$(top_srcdir)/calendar -I$(top_builddir)/calendar/cal-client -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) $(BONOBO_CONF_CFLAGS) - - --GTKDOC_LIBS = $(BONOBO_VFS_GNOME_LIBS) $(BONOBO_CONF_LIBS) $(top_builddir)/calendar/cal-client/.libs/libcal-client-static.al $(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al $(top_builddir)/libical/src/libical/.libs/libical-static.al $(top_builddir)/libversit/.libs/libversit.al $(top_builddir)/libwombat/libwombat.la -+GTKDOC_LIBS = $(BONOBO_VFS_GNOME_LIBS) $(BONOBO_CONF_LIBS) $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libversit/libversit.la $(top_builddir)/libwombat/libwombat.la - - - GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) |