* Update to 1.5.5

* Add Kerberos support [1]

Obtained from:	FreeBSD ports tree [1]


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1961 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 43 insertions, 27 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9827a0e74..3edefa654 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.5
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
@@ -38,7 +38,8 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
 		--enable-openssl=no \
-		--with-sub-version="FreeBSD GNOME Team Port"
+		--with-sub-version="FreeBSD GNOME Team Port" \
+		--with-krb5=/usr
 
 EVO_VERSION=	1.5
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index e36b765ba..007ac1f8b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.5.4.tar.bz2) = ad3a511525d169f9994ccbc2c00bde89
-SIZE (gnome2/evolution-1.5.4.tar.bz2) = 11762732
+MD5 (gnome2/evolution-1.5.5.tar.bz2) = 451dce3d4568cd208873e88281605de1
+SIZE (gnome2/evolution-1.5.5.tar.bz2) = 11910531
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 3f19ab6a4..c3f99f109 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Tue Dec 30 00:39:05 2003
-+++ configure	Tue Dec 30 00:42:14 2003
-@@ -23977,10 +23978,10 @@
+--- configure.orig	Sat Mar  6 04:31:08 2004
++++ configure	Sat Mar  6 04:35:09 2004
+@@ -24518,7 +24518,7 @@
+ 	LDFLAGS_save="$LDFLAGS"
+ 
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
+@@ -25368,10 +25368,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
         				else
@@ -13,7 +22,7 @@
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -27767,7 +27770,7 @@
+@@ -29134,7 +29134,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh
index 96b9d2d83..8c8acdd88 100644
--- a/mail/evolution/files/patch-ltmain.sh
+++ b/mail/evolution/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Sat Feb  8 09:47:44 2003
-+++ ltmain.sh	Mon Feb  9 20:07:47 2004
-@@ -1075,7 +1075,7 @@
+--- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
++++ ltmain.sh	Sat Mar  6 04:33:50 2004
+@@ -1349,7 +1349,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1085,8 +1085,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1364,8 +1364,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2503,6 +2511,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -3059,6 +3067,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4330,10 +4341,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5531,10 +5542,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index bb71ff51b..0936f1ba7 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -293,6 +293,8 @@ lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.urls
 lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
 lib/evolution/%%VERSION%%/components/libevolution-calendar.so
 lib/evolution/%%VERSION%%/components/libevolution-mail.so
+lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so
+lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so
 lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so
 lib/evolution/%%VERSION%%/libcamel.so
 lib/evolution/%%VERSION%%/libcamel.so.0
@@ -312,17 +314,22 @@ lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-importer.so
 lib/evolution/%%VERSION%%/libevolution-importer.so.0
+lib/evolution/%%VERSION%%/libevolution-mail-importers.so
+lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
 %%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so
 %%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.so
 %%PILOT:%%lib/gnome-pilot/conduits/libetodo_conduit.so
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
+libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames_%%VERSION%%.server
+libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server
+libdata/bonobo/servers/GNOME_Evolution_Mail_Importers_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server
 libdata/pkgconfig/camel-%%VERSION%%.pc
 libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
@@ -426,6 +433,7 @@ share/gnome/evolution/%%VERSION%%/images/buttons/delete-message.png
 share/gnome/evolution/%%VERSION%%/images/buttons/fetch-mail.png
 share/gnome/evolution/%%VERSION%%/images/buttons/forward.png
 share/gnome/evolution/%%VERSION%%/images/buttons/goto-24.png
+share/gnome/evolution/%%VERSION%%/images/im-nov.png
 share/gnome/evolution/%%VERSION%%/images/buttons/listview.xpm
 share/gnome/evolution/%%VERSION%%/images/buttons/monthview.xpm
 share/gnome/evolution/%%VERSION%%/images/buttons/move-message.png
@@ -656,7 +664,6 @@ share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution.xml
-share/gnome/evolution/%%VERSION%%/ui/my-evolution.xml
 share/gnome/evolution/%%VERSION%%/vfoldertypes.xml
 share/gnome/evolution/%%VERSION%%/views/addressbook/Address_Cards.galview
 share/gnome/evolution/%%VERSION%%/views/addressbook/By_Company.galview
@@ -706,8 +713,6 @@ share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/print-dest.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/print-preview.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
@@ -720,7 +725,6 @@ share/gnome/help/evolution-%%VERSION%%/C/usage-exchange.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mail-org.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mail.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-mainwindow.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-print.xml
 share/gnome/help/evolution-%%VERSION%%/C/usage-sync.xml
 share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Addressbook-SelectNames.idl
@@ -749,6 +753,7 @@ share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -816,6 +821,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/evolution-calendar-importers
+@dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers
 @dirrm lib/evolution/%%VERSION%%/components
 @dirrm lib/evolution/%%VERSION%%/camel-providers
 @dirrm lib/evolution/%%VERSION%%