Update to 2.6.1.

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

4 files changed, 69 insertions, 16 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 9678ad0bf..e1745c359 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.56 2006/03/14 00:49:14 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.57 2006/03/17 20:36:59 mezz Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
@@ -33,7 +33,8 @@ CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--disable-compile-warnings
 
 EVO_VERSION=	2.6
-PLIST_SUB=	VERSION="2.6" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
+PLIST_SUB=	VERSION="2.6" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+		OLDDOCSDIR="share/doc/ximian-connector"
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index f7e0a364f..18f4c48f2 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.6.0.tar.bz2) = f83177e571fdac31e6d32904a46a2029
-SHA256 (gnome2/evolution-exchange-2.6.0.tar.bz2) = 5e53be3d0fd97ae560d34b5b2cdbfa15956845b24e3a48a469887afe95398140
-SIZE (gnome2/evolution-exchange-2.6.0.tar.bz2) = 970464
+MD5 (gnome2/evolution-exchange-2.6.1.tar.bz2) = 027cc03c5d8f95f4eb26603781e49816
+SHA256 (gnome2/evolution-exchange-2.6.1.tar.bz2) = fbb9120984ea440c9b29ecf707bc7e39e1a93b4455ec79d89183233b718dfd21
+SIZE (gnome2/evolution-exchange-2.6.1.tar.bz2) = 1022518
diff --git a/mail/evolution-exchange/files/patch-docs_reference_Makefile.in b/mail/evolution-exchange/files/patch-docs_reference_Makefile.in
deleted file mode 100644
index 802bf2eb1..000000000
--- a/mail/evolution-exchange/files/patch-docs_reference_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- docs/reference/Makefile.in.orig	Fri Mar 17 14:29:38 2006
-+++ docs/reference/Makefile.in	Fri Mar 17 14:30:02 2006
-@@ -575,7 +575,6 @@
- 	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- 	(installfiles=`echo $(srcdir)/html/*`; \
- 	if test "$$installfiles" = '$(srcdir)/html/*'; \
- 	then echo '-- Nothing to install' ; \
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index b33ac8e3f..5c2509a6d 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -5,6 +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-connnector-booking.html
 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
@@ -23,8 +80,10 @@ share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/dz/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
@@ -73,8 +132,11 @@ share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @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%%
 @dirrm share/gnome/evolution-exchange
+@dirrm %%OLDDOCSDIR%%