Update to 0.14.

5 files changed, 58 insertions, 21 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index de77c50eab34..11b7e4f0820c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.13
+PORTVERSION=	0.14
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
-		gtkhtml.15:${PORTSDIR}/www/gtkhtml
+LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf
 #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
 #						   it actually works
 
@@ -24,8 +23,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure libical/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db3-libs=${LOCALBASE}/lib \
 		--with-html-dir=${PREFIX}/share/gnome/html
 # --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index a9d0a9fa59e2..05e1cc68161a 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.13.tar.gz) = c35733ba57648c05d45a7ff9a054c577
+MD5 (evolution-0.14.tar.gz) = 706453bd2271f2b0073cd30188e1a33d
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 8d11003c26ea..77894e6f79f9 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,15 +1,18 @@
---- configure.orig	Thu Sep 13 08:28:28 2001
-+++ configure	Thu Sep 13 08:29:17 2001
-@@ -5554,7 +5554,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Sep 28 13:40:57 2001
++++ configure	Fri Sep 28 13:43:29 2001
+@@ -9255,7 +9255,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
+ CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
 -for ac_hdr in db.h db3/db.h
 +for ac_hdr in db3/db.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -5628,7 +5628,7 @@
+@@ -9329,7 +9329,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -18,17 +21,17 @@
  fi
  rm -f conftest*
  
-@@ -5648,7 +5648,7 @@
+@@ -9349,7 +9349,7 @@
  	ac_cv_db3_ldadd=""
  
  	for name in db db3 db-3.1; do
 -		LIBS="$LIBS_save $with_db3_libs/lib${name}.a"
 +		LIBS="$LIBS_save $with_db3_libs/lib${name}.so"
  		cat > conftest.$ac_ext <<EOF
- #line 5654 "configure"
+ #line 9355 "configure"
  #include "confdefs.h"
-@@ -5669,7 +5669,7 @@
- if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9370,7 +9370,7 @@
+ if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
 -			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a"
@@ -36,7 +39,7 @@
  			break
  		
  else
-@@ -5739,7 +5739,7 @@
+@@ -9440,7 +9440,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -45,7 +48,7 @@
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -9349,10 +9349,10 @@
+@@ -12738,10 +12738,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/mail/evolution/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 9a9b94ff4f69..c715292a1cdd 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -128,6 +128,7 @@ include/camel/string-utils.h
 include/ename/e-address-western.h
 include/ename/e-name-western-tables.h
 include/ename/e-name-western.h
+include/evolution/cal-client/cal-client-multi.h
 include/evolution/cal-client/cal-client-types.h
 include/evolution/cal-client/cal-client.h
 include/evolution/cal-client/cal-query.h
@@ -175,6 +176,7 @@ include/libicalvcal/port.h
 include/libicalvcal/vcaltmp.h
 include/libicalvcal/vcc.h
 include/libicalvcal/vobject.h
+lib/evolution/camel-providers/%%VERSION%%/libcamelimap.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamellocal.a
@@ -256,6 +258,7 @@ share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
 share/gnome/evolution/ecps/smallbook.ecps
 share/gnome/evolution/etspec/e-calendar-table.etspec
+share/gnome/evolution/etspec/e-meeting-time-sel.etspec
 share/gnome/evolution/etspec/e-storage-set-view.etspec
 share/gnome/evolution/etspec/meeting-page.etspec
 share/gnome/evolution/etspec/message-list.etspec
@@ -265,7 +268,6 @@ share/gnome/evolution/glade/addressbook-config.glade
 share/gnome/evolution/glade/alarm-notify.glade
 share/gnome/evolution/glade/alarm-options.glade
 share/gnome/evolution/glade/alarm-page.glade
-share/gnome/evolution/glade/alphabet.glade
 share/gnome/evolution/glade/cal-prefs-dialog.glade
 share/gnome/evolution/glade/contact-editor.glade
 share/gnome/evolution/glade/contact-list-editor.glade
@@ -292,6 +294,7 @@ share/gnome/evolution/glade/mail-config.glade
 share/gnome/evolution/glade/meeting-page.glade
 share/gnome/evolution/glade/my-evolution.glade
 share/gnome/evolution/glade/recurrence-page.glade
+share/gnome/evolution/glade/schedule-page.glade
 share/gnome/evolution/glade/select-names.glade
 share/gnome/evolution/glade/subscribe-dialog.glade
 share/gnome/evolution/glade/task-details-page.glade
@@ -309,7 +312,6 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
-share/gnome/help/evolution/C/aboutbook.html
 share/gnome/help/evolution/C/apx-authors.sgml
 share/gnome/help/evolution/C/apx-bugs.sgml
 share/gnome/help/evolution/C/apx-gloss.html
@@ -325,7 +327,10 @@ share/gnome/help/evolution/C/config-prefs.sgml
 share/gnome/help/evolution/C/config-sync.html
 share/gnome/help/evolution/C/config-sync.sgml
 share/gnome/help/evolution/C/config.html
+share/gnome/help/evolution/C/contact-automation-basic.html
+share/gnome/help/evolution/C/contact-automation-lists.html
 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/evolution-faq.sgml
@@ -363,6 +368,7 @@ share/gnome/help/evolution/C/print-destination.html
 share/gnome/help/evolution/C/quickref-cal.html
 share/gnome/help/evolution/C/quickref-contact.html
 share/gnome/help/evolution/C/quickref-mail.html
+share/gnome/help/evolution/C/rsvp-stuff.html
 share/gnome/help/evolution/C/stylesheet-images/caution.gif
 share/gnome/help/evolution/C/stylesheet-images/home.gif
 share/gnome/help/evolution/C/stylesheet-images/important.gif
@@ -376,19 +382,18 @@ 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/topic.dat
+share/gnome/help/evolution/C/typography.html
 share/gnome/help/evolution/C/ui-intro.html
 share/gnome/help/evolution/C/usage-calendar-apts.html
 share/gnome/help/evolution/C/usage-calendar-multiple.html
 share/gnome/help/evolution/C/usage-calendar-todo.html
 share/gnome/help/evolution/C/usage-calendar.html
 share/gnome/help/evolution/C/usage-calendar.sgml
-share/gnome/help/evolution/C/usage-contact-automate.html
 share/gnome/help/evolution/C/usage-contact-organize.html
 share/gnome/help/evolution/C/usage-contact-sharing.html
 share/gnome/help/evolution/C/usage-contact.html
 share/gnome/help/evolution/C/usage-contact.sgml
 share/gnome/help/evolution/C/usage-encryption.sgml
-share/gnome/help/evolution/C/usage-exec-summary.html
 share/gnome/help/evolution/C/usage-exec-summary.sgml
 share/gnome/help/evolution/C/usage-mail-getnsend-get.html
 share/gnome/help/evolution/C/usage-mail-getnsend-send.html
@@ -401,10 +406,12 @@ share/gnome/help/evolution/C/usage-mail-organize.html
 share/gnome/help/evolution/C/usage-mail-subscriptions.html
 share/gnome/help/evolution/C/usage-mail.html
 share/gnome/help/evolution/C/usage-mail.sgml
+share/gnome/help/evolution/C/usage-mainwindow-starting.html
 share/gnome/help/evolution/C/usage-mainwindow.html
 share/gnome/help/evolution/C/usage-mainwindow.sgml
 share/gnome/help/evolution/C/usage-print.html
 share/gnome/help/evolution/C/usage-print.sgml
+share/gnome/help/evolution/C/usage-summary.html
 share/gnome/help/evolution/C/usage-sync.html
 share/gnome/help/evolution/C/usage-sync.sgml
 share/gnome/help/evolution/C/usage.html
@@ -633,6 +640,7 @@ share/gnome/images/evolution/import.png
 share/gnome/images/evolution/import.xpm
 share/gnome/images/evolution/inbox-16.png
 share/gnome/images/evolution/inbox-full-16.png
+share/gnome/images/evolution/ldap-16.png
 share/gnome/images/evolution/mail-config-druid-account-name.png
 share/gnome/images/evolution/mail-config-druid-identity.png
 share/gnome/images/evolution/mail-config-druid-receive.png
@@ -640,6 +648,7 @@ share/gnome/images/evolution/mail-config-druid-send.png
 share/gnome/images/evolution/mail-config-druid.png
 share/gnome/images/evolution/malehead.png
 share/gnome/images/evolution/mark-as-important-16.png
+share/gnome/images/evolution/meeting-request.png
 share/gnome/images/evolution/move_message.xpm
 share/gnome/images/evolution/myevo-appointments.png
 share/gnome/images/evolution/myevo-mail-summary.png
@@ -661,6 +670,9 @@ share/gnome/images/evolution/open-in-new-window-16.png
 share/gnome/images/evolution/outbox-16.png
 share/gnome/images/evolution/outbox-full-16.png
 share/gnome/images/evolution/pattern.png
+share/gnome/images/evolution/pgp-signature-bad.png
+share/gnome/images/evolution/pgp-signature-nokey.png
+share/gnome/images/evolution/pgp-signature-ok.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
 share/gnome/images/evolution/rdf.png
@@ -689,6 +701,8 @@ share/gnome/images/evolution/splash.png
 share/gnome/images/evolution/talking-heads.png
 share/gnome/images/evolution/task.xpm
 share/gnome/images/evolution/thankyou.png
+share/gnome/images/evolution/timezone-16.xpm
+share/gnome/images/evolution/timezone-48.png
 share/gnome/images/evolution/undelete_message-16.png
 share/gnome/images/evolution/wax-seal-broken.png
 share/gnome/images/evolution/wax-seal.png
@@ -1108,6 +1122,7 @@ share/gnome/ui/evolution-tasks.xml
 share/gnome/ui/evolution.xml
 share/gnome/ui/my-evolution.xml
 share/locale/az/LC_MESSAGES/evolution.mo
+share/locale/bg/LC_MESSAGES/evolution.mo
 share/locale/ca/LC_MESSAGES/evolution.mo
 share/locale/da/LC_MESSAGES/evolution.mo
 share/locale/de/LC_MESSAGES/evolution.mo
@@ -1155,6 +1170,9 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
+@dirrm share/gnome/html/evolution-devel-guide
+@dirrm share/gnome/html/evolution-cal-util
+@dirrm share/gnome/html/evolution-cal-client
 @dirrm share/gnome/help/evolution/no/stylesheet-images
 @dirrm share/gnome/help/evolution/no/figures
 @dirrm share/gnome/help/evolution/no