Update to 0.4.1

6 files changed, 68 insertions, 43 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index de66f35..5656f65 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 4876d7f..bbefa2dfd 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.3.1.tar.gz) = 20ba7a8d88ec8f0e27048a6c8877a2f9
+MD5 (evolution-0.4.1.tar.gz) = 80598f887c2f30e3e0aeadd2499ec386
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
index 9f226d0..24da7e0 100644
--- a/mail/evolution-devel/files/patch-aa
+++ b/mail/evolution-devel/files/patch-aa
@@ -1,16 +1,5 @@
 --- configure.orig	Fri Jul 28 11:18:54 2000
 +++ configure	Wed Aug 16 17:16:40 2000
-@@ -5738,8 +5738,8 @@
- 
- saved_CFLAGS="$CFLAGS"
- saved_LDFLAGS="$LDFLAGS"
--CFLAGS="$CFLAGS `gnome-config --cflags bonobo`"
--LDFLAGS="$LDFLAGS `gnome-config --libs bonobo`"
-+CFLAGS="$CFLAGS `gnome-config --cflags bonobox`"
-+LDFLAGS="$LDFLAGS `gnome-config --libs bonobox`"
- cat > conftest.$ac_ext <<EOF
- #line 5745 "configure"
- #include "confdefs.h"
 @@ -5799,8 +5799,8 @@
      { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
  fi
@@ -22,35 +11,6 @@
  
  
  
-@@ -5813,13 +5813,13 @@
- 
- 
- 
--BONOBO_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`"
--BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `"
-+BONOBO_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`"
-+BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `"
- 
- 
- 
--BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS"
--BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS"
-+BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS"
-+BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS"
- 
- 
- 
-@@ -5930,8 +5930,8 @@
- CFLAGS="$saved_CFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- 
--BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
--BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-+BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-+BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
- 
- 
- 
 @@ -7837,10 +7837,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
diff --git a/mail/evolution-devel/files/patch-ac b/mail/evolution-devel/files/patch-ac
index ea98267..e106b51 100644
--- a/mail/evolution-devel/files/patch-ac
+++ b/mail/evolution-devel/files/patch-ac
@@ -12,6 +12,20 @@
 -libcamelmbox_la_LDFLAGS = -version-info 0:0:0
 +libcamelmbox_la_LDFLAGS = -avoid-version
  
+--- camel/providers/mh/Makefile.in.orig	Sat Aug 19 19:26:36 2000
++++ camel/providers/mh/Makefile.in	Wed Aug 23 11:39:46 2000
+@@ -180,3 +180,3 @@
+ 
+-libcamelmh_la_LDFLAGS = -version-info 0:0:0
++libcamelmh_la_LDFLAGS = -avoid-version
+ 
+--- camel/providers/nntp/Makefile.in.orig	Sat Aug 19 19:26:36 2000
++++ camel/providers/nntp/Makefile.in	Wed Aug 23 11:40:11 2000
+@@ -180,3 +180,3 @@
+ 
+-libcamelnntp_la_LDFLAGS = -version-info 0:0:0
++libcamelnntp_la_LDFLAGS = -avoid-version
+ 
 --- camel/providers/pop3/Makefile.in.orig	Fri Jun  2 15:48:48 2000
 +++ camel/providers/pop3/Makefile.in	Wed Jun 28 18:54:35 2000
 @@ -167,3 +167,3 @@
diff --git a/mail/evolution-devel/files/patch-ah b/mail/evolution-devel/files/patch-ah
new file mode 100644
index 0000000..2ccd356
--- /dev/null
+++ b/mail/evolution-devel/files/patch-ah
@@ -0,0 +1,27 @@
+--- filter/Makefile.in.orig	Sat Aug 19 19:26:37 2000
++++ filter/Makefile.in	Wed Aug 23 12:09:59 2000
+@@ -164,3 +164,3 @@
+ 
+-gladedir = $(prefix)/share/evolution/glade
++gladedir = $(datadir)/evolution/glade
+ glade_DATA = filter.glade
+--- mail/mail-crypto.c.orig	Fri Aug 11 15:27:12 2000
++++ mail/mail-crypto.c	Wed Aug 23 11:17:44 2000
+@@ -189,7 +189,7 @@
+ 
+         passwd_next = passphrase;
+         passwd_remaining = strlen (passphrase);
+-        passwd_incr = fpathconf (passwd_fds[1], _PC_PIPE_BUF);
++        passwd_incr = 1024; /* XXX: no fpathconf() in libc_r? */
+ 	/* Use a reasonable default value on error. */
+         if (passwd_incr <= 0)
+ 		passwd_incr = 1024;
+@@ -197,7 +197,7 @@
+ 
+ 	input_next = input;
+ 	input_remaining = strlen (input);
+-	input_incr = fpathconf (ip_fds[1], _PC_PIPE_BUF);
++	input_incr = 1024; /* XXX: no fpathconf() in libc_r? */
+ 	if (input_incr <= 0)
+                 input_incr = 1024;
+ 	input_eof_seen = FALSE;
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index d9d2313..08e9ddc 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -15,11 +15,15 @@ include/camel/camel-folder.h
 include/camel/camel-imap-folder.h
 include/camel/camel-imap-store.h
 include/camel/camel-imap-stream.h
+include/camel/camel-imap-utils.h
 include/camel/camel-internet-address.h
 include/camel/camel-mbox-folder.h
 include/camel/camel-mbox-store.h
 include/camel/camel-mbox-summary.h
 include/camel/camel-medium.h
+include/camel/camel-mh-folder.h
+include/camel/camel-mh-store.h
+include/camel/camel-mh-summary.h
 include/camel/camel-mime-filter-basic.h
 include/camel/camel-mime-filter-charset.h
 include/camel/camel-mime-filter-crlf.h
@@ -34,6 +38,10 @@ include/camel/camel-mime-part.h
 include/camel/camel-mime-utils.h
 include/camel/camel-movemail.h
 include/camel/camel-multipart.h
+include/camel/camel-nntp-folder.h
+include/camel/camel-nntp-newsrc.h
+include/camel/camel-nntp-store.h
+include/camel/camel-nntp-utils.h
 include/camel/camel-object.h
 include/camel/camel-pop3-folder.h
 include/camel/camel-pop3-store.h
@@ -52,6 +60,7 @@ include/camel/camel-stream-mem.h
 include/camel/camel-stream.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-vee-folder.h
 include/camel/camel-vee-store.h
@@ -100,6 +109,10 @@ lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelmh.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelmh.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelnntp.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelnntp.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so
@@ -160,13 +173,15 @@ share/gnome/evolution/glade/e-table-config.glade
 share/gnome/evolution/glade/e-table-field-chooser.glade
 share/gnome/evolution/glade/e-table-group.glade
 share/gnome/evolution/glade/event-editor-dialog.glade
+share/gnome/evolution/glade/filter.glade
 share/gnome/evolution/glade/fullname.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade.h
+share/gnome/evolution/glade/local-config.glade
 share/gnome/evolution/glade/mail-config.glade
+share/gnome/evolution/glade/mail-config-druid.glade
 share/gnome/evolution/glade/select-names.glade
 share/gnome/evolution/glade/task-editor-dialog.glade
-share/gnome/help/evolution/C/docbook.css
 share/gnome/help/evolution/C/fig/calendar.png
 share/gnome/help/evolution/C/fig/config-cal.png
 share/gnome/help/evolution/C/fig/config-mail.png
@@ -179,6 +194,13 @@ share/gnome/html/evolution-cal-client-decl.txt
 share/gnome/html/evolution-cal-client-sections.txt
 share/gnome/html/evolution-cal-client.hierarchy
 share/gnome/html/evolution-cal-client.types
+share/gnome/html/evolution-devel-guide.html
+share/gnome/html/evolution-devel-guide/book1.html
+share/gnome/html/evolution-devel-guide/calendar-architecture.html
+share/gnome/html/evolution-devel-guide/p51.html
+share/gnome/html/evolution-devel-guide/p9.html
+share/gnome/html/evolution-devel-guide/r55.html
+share/gnome/html/evolution-devel-guide/x34.html
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
 share/gnome/images/evolution/briefcase.png
@@ -198,6 +220,7 @@ share/gnome/images/evolution/evolution-today.png
 share/gnome/images/evolution/globe.png
 share/gnome/images/evolution/house.png
 share/gnome/images/evolution/malehead.png
+share/gnome/mime-info/evolution.keys
 share/gnome/oaf/addressbook.oafinfo
 share/gnome/oaf/calendar-control.oafinfo
 share/gnome/oaf/evolution-addressbook-select-names.oafinfo
@@ -210,6 +233,7 @@ share/locale/de/LC_MESSAGES/evolution.mo
 share/locale/el/LC_MESSAGES/evolution.mo
 share/locale/es/LC_MESSAGES/evolution.mo
 share/locale/fr/LC_MESSAGES/evolution.mo
+share/locale/ga/LC_MESSAGES/evolution.mo
 share/locale/gl/LC_MESSAGES/evolution.mo
 share/locale/hu/LC_MESSAGES/evolution.mo
 share/locale/it/LC_MESSAGES/evolution.mo