Update to 2.3.3.

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

4 files changed, 23 insertions, 22 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 5fce812db..b55d99793 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -32,6 +32,7 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nss-libs=${LOCALBASE}/lib \
 		--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
+		--enable-mono=no \
 		--with-sub-version=" FreeBSD GNOME Team Port"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -113,6 +114,8 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \
 		${WRKSRC}/evolution-shell.pc.in \
 		${WRKSRC}/evolution-plugin.pc.in
+	@${REINPLACE_CMD} -e 's|plugins/mono/Makefile||g' \
+		${WRKSRC}/configure
 
 post-install:
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index b92f3cb75..7e94356d9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.3.2.tar.bz2) = 85734761158bb728e0be6b99d70a82f3
-SIZE (gnome2/evolution-2.3.2.tar.bz2) = 10476350
+MD5 (gnome2/evolution-2.3.3.tar.bz2) = c6e9e6d08d273afba8501fe0f42fb9d5
+SIZE (gnome2/evolution-2.3.3.tar.bz2) = 10539090
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index eadafd847..5051d0125 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Sep 29 14:06:43 2004
-+++ configure	Wed Sep 29 14:24:28 2004
-@@ -24206,6 +24206,7 @@
+--- configure.orig	Wed Jun  8 18:17:36 2005
++++ configure	Wed Jun  8 18:18:04 2005
+@@ -25553,6 +25553,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -8,7 +8,7 @@
  
  
  int
-@@ -25772,7 +25773,7 @@
+@@ -27123,7 +27124,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -17,7 +17,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
-@@ -26928,10 +26929,10 @@
+@@ -28293,10 +28294,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
         				else
@@ -30,7 +30,7 @@
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -30807,7 +30808,7 @@
+@@ -32154,7 +32155,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index f3cadcb4c..a9607dad6 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -23,6 +23,7 @@ include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
+include/evolution-%%VERSION%%/e-util/e-import.h
 include/evolution-%%VERSION%%/e-util/e-iterator.h
 include/evolution-%%VERSION%%/e-util/e-list-iterator.h
 include/evolution-%%VERSION%%/e-util/e-list.h
@@ -79,6 +80,7 @@ include/evolution-%%VERSION%%/mail/message-list.h
 include/evolution-%%VERSION%%/shell/Evolution.h
 include/evolution-%%VERSION%%/shell/e-shell-utils.h
 include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h
+include/evolution-%%VERSION%%/shell/evolution-component.h
 include/evolution-%%VERSION%%/shell/evolution-config-control.h
 include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h
 include/evolution-%%VERSION%%/widgets/e-activity-handler.h
@@ -172,62 +174,57 @@ lib/evolution/%%VERSION%%/libmenus.a
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so
 %%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-compose-send-options.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.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-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-account-settings.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
 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-prefer-plain.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.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-send-options.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug
 %%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.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-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-account-setup.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
 %%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-send-options.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-shared-folder.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-status-track.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server
@@ -265,7 +262,7 @@ share/gnome/evolution/%%VERSION%%/errors/mail-composer.error
 share/gnome/evolution/%%VERSION%%/errors/mail.error
 share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
 share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
 share/gnome/evolution/%%VERSION%%/errors/shell.error
 share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
@@ -409,6 +406,7 @@ share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
+share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Offline.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution.idl