Update to 2.3.1.

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

4 files changed, 135 insertions, 143 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index bffb82aee..3e4771c8c 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,17 +1,16 @@
-# New ports collection makefile for:   ximian-connector
-# Date created:        30 May 2004
-# Whom:                kiesel
+# New ports collection makefile for:	evolution-exchange
+# Date created:				28 April, 2005
+# Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
-# $FreeBSD: ports/mail/ximian-connector/Makefile,v 1.13 2005/04/11 23:41:11 adamw Exp $
+# $FreeBSD$
 #
 
-PORTNAME=	ximian
-PORTVERSION=	2.2.2
+PORTNAME=	evolution-exchange
+PORTVERSION=	2.3.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.2
-PKGNAMESUFFIX=	-connector
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.3
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
@@ -21,6 +20,7 @@ RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
@@ -31,9 +31,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 EVO_VERSION=	2.4
-PLIST_SUB=	VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
+PLIST_SUB=	VERSION="2.4" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+		OLDDOCSDIR="share/doc/ximian-connector"
 
 .include <bsd.port.pre.mk>
 
@@ -53,10 +53,4 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
 .endif
 
-# XXX - remove this reinplacement at the next update
-post-patch:
-	@${REINPLACE_CMD} -e "/^EVOLUTION_API_VERSION=/s/2.2/${EVO_VERSION}/; \
-		s|evolution-shell-2.2|evolution-shell-2.4|g" \
-		${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index e80523bf6..967e7f308 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,2 +1,2 @@
-MD5 (ximian-connector-2.2.2.tar.bz2) = 2cee47bdf6030d30a5ac82e5028b58ed
-SIZE (ximian-connector-2.2.2.tar.bz2) = 1367526
+MD5 (gnome2/evolution-exchange-2.3.1.tar.bz2) = ec20da62bf84b5028d67a0e5517925da
+SIZE (gnome2/evolution-exchange-2.3.1.tar.bz2) = 1387648
diff --git a/mail/evolution-exchange/pkg-descr b/mail/evolution-exchange/pkg-descr
index c89d7aba8..1f9266823 100644
--- a/mail/evolution-exchange/pkg-descr
+++ b/mail/evolution-exchange/pkg-descr
@@ -1,7 +1,7 @@
-Ximian Connector is a plugin for Evolution that adds Exchange client
+Evolution-exchange is a plugin for Evolution that adds Exchange client
 capabilities to Evolution.
 
-With the Evolution Connector installed, Evolution functions as an
+With Evolution-Exchange installed, Evolution functions as an
 Exchange client, enabling users to become full participants in company-wide
 group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD
 users can access public folders, Global Address Lists, email, calendar,
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index a5872eab9..90129ba84 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,127 +1,125 @@
 bin/ximian-connector-setup-%%VERSION%%
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
-lib/evolution/%%EVO_VERSION%%/libexchange.a
-lib/evolution/%%EVO_VERSION%%/libexchange.so
-lib/evolution/%%EVO_VERSION%%/libexchange.so.0
 libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
 libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
-%%DOCSDIR%%/E2kContext.html
-%%DOCSDIR%%/E2kGlobalCatalog.html
-%%DOCSDIR%%/E2kSecurityDescriptor.html
-%%DOCSDIR%%/E2kSid.html
-%%DOCSDIR%%/E2kUserDialog.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/ch05.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/ximian-connector-E2kAutoconfig.html
-%%DOCSDIR%%/ximian-connector-E2kContext-(private).html
-%%DOCSDIR%%/ximian-connector-E2kOperation-(private).html
-%%DOCSDIR%%/ximian-connector-E2kOperation.html
-%%DOCSDIR%%/ximian-connector-E2kProperties.html
-%%DOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
-%%DOCSDIR%%/ximian-connector-E2kResult-(private).html
-%%DOCSDIR%%/ximian-connector-MAPI.html
-%%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-e2k-action.html
-%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html
-%%DOCSDIR%%/ximian-connector-e2k-freebusy.html
-%%DOCSDIR%%/ximian-connector-e2k-http-utils.html
-%%DOCSDIR%%/ximian-connector-e2k-kerberos.html
-%%DOCSDIR%%/ximian-connector-e2k-restriction.html
-%%DOCSDIR%%/ximian-connector-e2k-result.html
-%%DOCSDIR%%/ximian-connector-e2k-rule.html
-%%DOCSDIR%%/ximian-connector-e2k-uri.html
-%%DOCSDIR%%/ximian-connector-e2k-utils.html
-%%DOCSDIR%%/ximian-connector-e2k-xml-utils.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-connector-test-utils.html
-%%DOCSDIR%%/ximian-connector-xntlm-des.html
-%%DOCSDIR%%/ximian-connector-xntlm-md4.html
-%%DOCSDIR%%/ximian-connector-xntlm.html
-%%DOCSDIR%%/ximian-connector.devhelp
-%%DOCSDIR%%/ximian-connnector-booking.html
-share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec
-share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade
-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
-share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png
-share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png
-share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml
-share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
-@dirrm share/gnome/ximian-connector/%%VERSION%%/ui
-@dirrm share/gnome/ximian-connector/%%VERSION%%/images
-@dirrm share/gnome/ximian-connector/%%VERSION%%/glade
-@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec
-@dirrm share/gnome/ximian-connector/%%VERSION%%
-@dirrm share/gnome/ximian-connector
-@dirrm %%DOCSDIR%%
+%%OLDDOCSDIR%%/E2kContext.html
+%%OLDDOCSDIR%%/E2kGlobalCatalog.html
+%%OLDDOCSDIR%%/E2kSecurityDescriptor.html
+%%OLDDOCSDIR%%/E2kSid.html
+%%OLDDOCSDIR%%/E2kUserDialog.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-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-connnector-booking.html
+share/gnome/evolution-exchange/%%VERSION%%/etspec/e-storage-set-view.etspec
+share/gnome/evolution-exchange/%%VERSION%%/glade/e-folder-creation-dialog.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/e-foreign-folder-dialog.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-change-password.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-delegates.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-oof.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-passwd-expiry.glade
+share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-permissions-dialog.glade
+share/gnome/evolution-exchange/%%VERSION%%/images/connector-mini.png
+share/gnome/evolution-exchange/%%VERSION%%/images/connector.png
+share/gnome/evolution-exchange/%%VERSION%%/images/exchange-delegates-48.png
+share/gnome/evolution-exchange/%%VERSION%%/images/exchange-oof-48.png
+share/gnome/evolution-exchange/%%VERSION%%/ui/ximian-connector.xml
+share/locale/ar/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
+share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/gu/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
+share/locale/it/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/lt/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
+share/locale/nl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/etspec
+@dirrm share/gnome/evolution-exchange/%%VERSION%%
+@dirrm share/gnome/evolution-exchange
+@dirrm %%OLDDOCSDIR%%