Update to 2.5.2.

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

4 files changed, 20 insertions, 66 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9d2a8c8dd..9f07a9bd6 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.76 2005/10/09 11:09:15 kwm Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.78 2005/11/10 22:14:27 marcus Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 15e0fbd6a..911bcfea0 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.5.1.tar.bz2) = dd57d789cec476808a111a496a7528a0
-SHA256 (gnome2/evolution-2.5.1.tar.bz2) = ae25efff4a5faa11e8ebeac5051e386544f6955c24f6f96941f25ee91120ed6b
-SIZE (gnome2/evolution-2.5.1.tar.bz2) = 11131509
+MD5 (gnome2/evolution-2.5.2.tar.bz2) = 2e7ca9a2ca5ce5d3c20a9e49c0d3cd91
+SHA256 (gnome2/evolution-2.5.2.tar.bz2) = d53ac6a77b76f25111204957e6a1dd2fc625c0b3ce0c38ea45a147cd8119fedc
+SIZE (gnome2/evolution-2.5.2.tar.bz2) = 11197295
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index ba830d7c2..f09892fc8 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,8 +1,8 @@
---- configure.orig	Thu Nov 10 16:09:41 2005
-+++ configure	Thu Nov 10 16:12:35 2005
-@@ -23731,6 +23731,14 @@
-     DL_LIB=''
+--- configure.orig	Tue Nov 15 17:58:33 2005
++++ configure	Tue Nov 15 18:02:37 2005
+@@ -23732,6 +23732,15 @@
      SOFTOKN3_LIB=''
+     HAL_REQUIREMENT=''
      ;;
 +*freebsd*) os_win32=no
 +    NO_UNDEFINED=''
@@ -11,11 +11,12 @@
 +    SA_JUNK_PLUGIN=sa-junk-plugin
 +    DL_LIB=''
 +    SOFTOKN3_LIB='-lsoftokn3'
++    HAL_REQUIREMENT=''
 +    ;;
  *)  os_win32=no
      NO_UNDEFINED=''
      SOEXT='.so'
-@@ -26278,6 +26286,7 @@
+@@ -26280,6 +26289,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -23,7 +24,7 @@
  
  
  int
-@@ -27978,7 +27987,7 @@
+@@ -27980,7 +27990,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -32,61 +33,7 @@
  	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
-@@ -32679,12 +32688,12 @@
-   if test "x$ac_cv_env_EVOLUTION_CALENDAR_CFLAGS_set" = "xset"; then
- 	pkg_cv_EVOLUTION_CALENDAR_CFLAGS=$ac_cv_env_EVOLUTION_CALENDAR_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-\$GTKHTML_PACKAGE >= \$GTKHTML_REQUIRED libebook-\$EDS_PACKAGE >= \$EDS_REQUIRED libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED libedataserverui-\$EDS_PACKAGE >= \$EDS_REQUIRED hal\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-\$GTKHTML_PACKAGE >= \$GTKHTML_REQUIRED libebook-\$EDS_PACKAGE >= \$EDS_REQUIRED libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED libedataserverui-\$EDS_PACKAGE >= \$EDS_REQUIRED \" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED " >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_EVOLUTION_CALENDAR_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal" 2>/dev/null`
-+		pkg_cv_EVOLUTION_CALENDAR_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED " 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -32702,12 +32711,12 @@
-   if test "x$ac_cv_env_EVOLUTION_CALENDAR_LIBS_set" = "xset"; then
- 	pkg_cv_EVOLUTION_CALENDAR_LIBS=$ac_cv_env_EVOLUTION_CALENDAR_LIBS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-\$GTKHTML_PACKAGE >= \$GTKHTML_REQUIRED libebook-\$EDS_PACKAGE >= \$EDS_REQUIRED libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED libedataserverui-\$EDS_PACKAGE >= \$EDS_REQUIRED hal\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-\$GTKHTML_PACKAGE >= \$GTKHTML_REQUIRED libebook-\$EDS_PACKAGE >= \$EDS_REQUIRED libecal-\$EDS_PACKAGE >= \$EDS_REQUIRED libedataserverui-\$EDS_PACKAGE >= \$EDS_REQUIRED \" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED " >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_EVOLUTION_CALENDAR_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal" 2>/dev/null`
-+		pkg_cv_EVOLUTION_CALENDAR_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED " 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -32719,18 +32728,18 @@
- echo "${ECHO_T}$pkg_cv_EVOLUTION_CALENDAR_LIBS" >&6
- 
- if test $pkg_failed = yes; then
--	EVOLUTION_CALENDAR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal"`
-+	EVOLUTION_CALENDAR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED "`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$EVOLUTION_CALENDAR_PKG_ERRORS" 1>&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal) were not met.
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
- Alternatively you may set the EVOLUTION_CALENDAR_CFLAGS and EVOLUTION_CALENDAR_LIBS environment variables
- to avoid the need to call pkg-config.  See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED hal) were not met.
-+echo "$as_me: error: Package requirements (libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
-@@ -33141,7 +33150,7 @@
+@@ -33143,7 +33153,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index aa0f705e6..51c10c9f8 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -324,6 +324,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
@@ -350,6 +351,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
@@ -483,6 +485,8 @@ share/gnome/evolution/%%VERSION%%/searchtypes.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-editor.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-executive-summary.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml
@@ -616,6 +620,7 @@ share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -647,6 +652,8 @@ share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
+@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku 2> /dev/null || true
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution-%%VERSION%%/C/figures