Update to 2.3.6.1.

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

6 files changed, 39 insertions, 30 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 466c29352..38da376c9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.69 2005/07/13 21:44:30 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.70 2005/07/16 16:56:28 marcus Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.3.5.1
-PORTREVISION=	1
+PORTVERSION=	2.3.6.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index ac890b844..08a159d0b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.3.5.1.tar.bz2) = 2271c695677a8bf8c3c96ec883a05d12
-SIZE (gnome2/evolution-2.3.5.1.tar.bz2) = 11097610
+MD5 (gnome2/evolution-2.3.6.1.tar.bz2) = 53a78b4ec8b2e17c3bc53611444d5b48
+SIZE (gnome2/evolution-2.3.6.1.tar.bz2) = 11205077
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index ed61b346b..0ad426b2d 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,21 @@
---- configure.orig	Wed Jun 15 20:26:15 2005
-+++ configure	Wed Jun 15 20:26:33 2005
-@@ -24869,6 +24869,7 @@
+--- configure.orig	Fri Jul 29 17:50:28 2005
++++ configure	Fri Jul 29 17:51:42 2005
+@@ -23657,6 +23657,14 @@
+     DL_LIB=''
+     SOFTOKN3_LIB=''
+     ;;
++*freebsd*) os_win32=no
++    NO_UNDEFINED=''
++    SOCKET_LIBS=''
++    SOEXT='.so'
++    SA_JUNK_PLUGIN=sa-junk-plugin
++    DL_LIB=''
++    SOFTOKN3_LIB='-lsoftokn3'
++    ;;
+ *)  os_win32=no
+     NO_UNDEFINED=''
+     SOCKET_LIBS=''
+@@ -26205,6 +26213,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -8,7 +23,7 @@
  
  
  int
-@@ -26345,7 +26346,7 @@
+@@ -27882,7 +27891,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -17,20 +32,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
-@@ -27517,10 +27518,10 @@
- Example: --with-nspr-libs=/usr/lib" >&2;}
-    { (exit 1); exit 1; }; }
-        				else
--	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-+				    nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
- 				fi
- 			else
--				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+			    nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
- 			fi
- 
- 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -31450,7 +31451,7 @@
+@@ -33151,7 +33160,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-plugins_proxy-login_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
index f2fb5c6d4..4d8e131a6 100644
--- a/mail/evolution/files/patch-plugins_proxy-login_proxy-login.c
+++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
@@ -1,6 +1,6 @@
---- plugins/proxy-login/proxy-login.c.orig	Wed Jul 13 17:26:56 2005
-+++ plugins/proxy-login/proxy-login.c	Wed Jul 13 17:27:15 2005
-@@ -237,7 +237,6 @@ proxy_login_get_cnc (EAccount *account)
+--- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
++++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
+@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
  {
  	EGwConnection *cnc;
  	CamelURL *url;
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy.c
new file mode 100644
index 000000000..e7ce2132c
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy.c
@@ -0,0 +1,12 @@
+--- plugins/groupwise-features/proxy.c.orig	Fri Jul 29 18:53:05 2005
++++ plugins/groupwise-features/proxy.c	Fri Jul 29 18:53:27 2005
+@@ -671,8 +671,8 @@ org_gnome_proxy (EPlugin *epl, EConfigHo
+ 		prd = g_object_get_data ((GObject *) account, "prd");
+ 
+ 		if (prd) {
+-			priv = prd->priv;
+ 			int pag_num;
++			priv = prd->priv;
+ 			if (priv) {
+ 			pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
+ 			gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 0eff00bc0..dea916057 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -328,12 +328,10 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
 %%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-proxy.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
-lib/evolution/%%VERSION%%/plugins/libproxy-login.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
@@ -359,8 +357,6 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-proxy-login.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-proxy.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug