3 files changed, 79 insertions, 69 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index f08068a09b90..a2c86d66d05a 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.1 2007/11/30 21:39:26 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.110 2008/03/13 03:13:38 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.12.3
+PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,11 +23,11 @@ RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
+USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget ltasneededhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
@@ -34,10 +35,10 @@ CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--disable-compile-warnings \
 		--with-libdb=${LOCALBASE}
 
-EVO_VERSION=	2.12
-VERSION=	2.12
+EVO_VERSION=	2.22
+VERSION=	2.22
 PLIST_SUB=	VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
-		EDS_VERSION="1.2" OLDDOCSDIR="share/doc/ximian-connector"
+		EDS_VERSION="1.2"
 
 GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 0f94b27c8bf1..b7986d562b64 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.12.3.tar.bz2) = 1bdda76724a17fb7606abcdfdb6ec170
-SHA256 (gnome2/evolution-exchange-2.12.3.tar.bz2) = 96f86d5a36f9f5583e5d4c14e6e48d0a42ccd4f7e4e04bf8b5616232cd82b50b
-SIZE (gnome2/evolution-exchange-2.12.3.tar.bz2) = 1064907
+MD5 (gnome2/evolution-exchange-2.22.0.tar.bz2) = fea02f97cc8fe62dca0d50ffdc19e416
+SHA256 (gnome2/evolution-exchange-2.22.0.tar.bz2) = fb1296b0690625a3ce3ef196f36857fdd682f8a574c8003f2834bb23659a3b94
+SIZE (gnome2/evolution-exchange-2.22.0.tar.bz2) = 1091609
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 7ee15d2a4bdb..84f53a2cad42 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -5,64 +5,63 @@ 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
-%%OLDDOCSDIR%%/E2kContext.html
-%%OLDDOCSDIR%%/E2kGlobalCatalog.html
-%%OLDDOCSDIR%%/E2kSecurityDescriptor.html
-%%OLDDOCSDIR%%/ch01.html
-%%OLDDOCSDIR%%/ch02.html
-%%OLDDOCSDIR%%/ch03.html
-%%OLDDOCSDIR%%/ch04.html
-%%OLDDOCSDIR%%/ch05.html
-%%OLDDOCSDIR%%/ch06.html
-%%OLDDOCSDIR%%/home.png
-%%OLDDOCSDIR%%/index.html
-%%OLDDOCSDIR%%/index.sgml
-%%OLDDOCSDIR%%/left.png
-%%OLDDOCSDIR%%/right.png
-%%OLDDOCSDIR%%/style.css
-%%OLDDOCSDIR%%/up.png
-%%OLDDOCSDIR%%/ximian-connector-E2kAutoconfig.html
-%%OLDDOCSDIR%%/ximian-connector-E2kContext-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kOperation-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kOperation.html
-%%OLDDOCSDIR%%/ximian-connector-E2kProperties.html
-%%OLDDOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
-%%OLDDOCSDIR%%/ximian-connector-E2kResult-(private).html
-%%OLDDOCSDIR%%/ximian-connector-E2kSid.html
-%%OLDDOCSDIR%%/ximian-connector-E2kUserDialog.html
-%%OLDDOCSDIR%%/ximian-connector-MAPI.html
-%%OLDDOCSDIR%%/ximian-connector-autoconfig.html
-%%OLDDOCSDIR%%/ximian-connector-bug-private.html
-%%OLDDOCSDIR%%/ximian-connector-bug-xml.html
-%%OLDDOCSDIR%%/ximian-connector-calendar.html
-%%OLDDOCSDIR%%/ximian-connector-delegation.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-action.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-encoding-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-freebusy.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-http-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-kerberos.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-restriction.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-result.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-rule.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-uri.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-utils.html
-%%OLDDOCSDIR%%/ximian-connector-e2k-xml-utils.html
-%%OLDDOCSDIR%%/ximian-connector-favorites.html
-%%OLDDOCSDIR%%/ximian-connector-fba.html
-%%OLDDOCSDIR%%/ximian-connector-freebusy.html
-%%OLDDOCSDIR%%/ximian-connector-mail-threading.html
-%%OLDDOCSDIR%%/ximian-connector-mail.html
-%%OLDDOCSDIR%%/ximian-connector-ntlm.html
-%%OLDDOCSDIR%%/ximian-connector-oof.html
-%%OLDDOCSDIR%%/ximian-connector-other-users.html
-%%OLDDOCSDIR%%/ximian-connector-permissions.html
-%%OLDDOCSDIR%%/ximian-connector-test-utils.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm-des.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm-md4.html
-%%OLDDOCSDIR%%/ximian-connector-xntlm.html
-%%OLDDOCSDIR%%/ximian-connector.devhelp
-%%OLDDOCSDIR%%/ximian-connector.devhelp2
-%%OLDDOCSDIR%%/ximian-connnector-booking.html
+%%DOCSDIR%%/E2kContext.html
+%%DOCSDIR%%/E2kGlobalCatalog.html
+%%DOCSDIR%%/E2kSecurityDescriptor.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html
+%%DOCSDIR%%/evolution-exchange-E2kContext-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kOperation.html
+%%DOCSDIR%%/evolution-exchange-E2kProperties.html
+%%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html
+%%DOCSDIR%%/evolution-exchange-E2kResult-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kSid.html
+%%DOCSDIR%%/evolution-exchange-E2kUserDialog.html
+%%DOCSDIR%%/evolution-exchange-MAPI.html
+%%DOCSDIR%%/evolution-exchange-e2k-action.html
+%%DOCSDIR%%/evolution-exchange-e2k-freebusy.html
+%%DOCSDIR%%/evolution-exchange-e2k-http-utils.html
+%%DOCSDIR%%/evolution-exchange-e2k-kerberos.html
+%%DOCSDIR%%/evolution-exchange-e2k-restriction.html
+%%DOCSDIR%%/evolution-exchange-e2k-result.html
+%%DOCSDIR%%/evolution-exchange-e2k-rule.html
+%%DOCSDIR%%/evolution-exchange-e2k-uri.html
+%%DOCSDIR%%/evolution-exchange-e2k-utils.html
+%%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html
+%%DOCSDIR%%/evolution-exchange-test-utils.html
+%%DOCSDIR%%/evolution-exchange-xntlm-des.html
+%%DOCSDIR%%/evolution-exchange-xntlm-md4.html
+%%DOCSDIR%%/evolution-exchange-xntlm.html
+%%DOCSDIR%%/evolution-exchange.devhelp
+%%DOCSDIR%%/evolution-exchange.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/ximian-connector-autoconfig.html
+%%DOCSDIR%%/ximian-connector-bug-private.html
+%%DOCSDIR%%/ximian-connector-bug-xml.html
+%%DOCSDIR%%/ximian-connector-calendar.html
+%%DOCSDIR%%/ximian-connector-delegation.html
+%%DOCSDIR%%/ximian-connector-favorites.html
+%%DOCSDIR%%/ximian-connector-fba.html
+%%DOCSDIR%%/ximian-connector-freebusy.html
+%%DOCSDIR%%/ximian-connector-mail-threading.html
+%%DOCSDIR%%/ximian-connector-mail.html
+%%DOCSDIR%%/ximian-connector-ntlm.html
+%%DOCSDIR%%/ximian-connector-oof.html
+%%DOCSDIR%%/ximian-connector-other-users.html
+%%DOCSDIR%%/ximian-connector-permissions.html
+%%DOCSDIR%%/ximian-connnector-booking.html
 %%DATADIR%%/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
 %%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade
 %%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade
@@ -76,6 +75,7 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
 %%DATADIR%%/%%VERSION%%/images/exchange-oof-48.png
 %%DATADIR%%/%%VERSION%%/ui/ximian-connector.xml
 share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -97,6 +97,7 @@ share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/gu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -110,6 +111,7 @@ share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -124,6 +126,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ro/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -144,18 +147,24 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrm %%DATADIR%%/%%VERSION%%/glade
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
-@dirrm %%OLDDOCSDIR%%
+@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as