Update to 2.1.2.

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

4 files changed, 8 insertions, 17 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c19b32d34..8e95364db 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ximian
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.1
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 EVO_VERSION=	2.2
-PLIST_SUB=	VERSION="2.2" EVO_VERSION=${EVO_VERSION}
+PLIST_SUB=	VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 2961fcded..d4c61e666 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,2 +1,2 @@
-MD5 (ximian-connector-2.1.1.tar.bz2) = c63ff9b19cf456cb34164b0d3529e34f
-SIZE (ximian-connector-2.1.1.tar.bz2) = 1226407
+MD5 (ximian-connector-2.1.2.tar.bz2) = 2c4b44687137ec79b10c1fa2c7f6f03b
+SIZE (ximian-connector-2.1.2.tar.bz2) = 1238628
diff --git a/mail/evolution-exchange/files/patch-po::Makefile.in.in b/mail/evolution-exchange/files/patch-po::Makefile.in.in
deleted file mode 100644
index 042bef6eb..000000000
--- a/mail/evolution-exchange/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sun Jul 25 18:30:57 2004
-+++ po/Makefile.in.in	Sun Jul 25 18:31:20 2004
-@@ -32,6 +32,8 @@
- gnulocaledir = $(datadir)/locale
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
- subdir = po
-+mkdir_p = @mkdir_p@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 2e505eb7f..4177d7985 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,6 +1,6 @@
 bin/ximian-connector-setup-%%VERSION%%
-lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so
-lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
 libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
 libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
 %%DOCSDIR%%/E2kContext.html
@@ -66,7 +66,9 @@ share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade
 share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
 share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade
 share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade
 share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade
+share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade
 share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade
 share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png
 share/gnome/ximian-connector/%%VERSION%%/images/connector.png