4 files changed, 25 insertions, 28 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c85600b4535b..2352de3063a0 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.39 2005/10/04 04:32:19 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.59 2006/04/13 07:52:36 bland Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	kiesel@schlund.de
@@ -21,21 +20,20 @@ BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
-USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no \
 		--disable-compile-warnings
 
-EVO_VERSION=	2.4
-PLIST_SUB=	VERSION="2.4" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+EVO_VERSION=	2.6
+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 bbd27e390bb7..18f4c48f2fd3 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.4.2.tar.bz2) = 67802f9c0be1528edaa0612188588914
-SHA256 (gnome2/evolution-exchange-2.4.2.tar.bz2) = beaa8e806e5babb2cd479446720ea492ed854db65036df678d7717c682cc332c
-SIZE (gnome2/evolution-exchange-2.4.2.tar.bz2) = 1100845
+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-configure b/mail/evolution-exchange/files/patch-configure
index 43668716a0d1..f5d9a43d8c25 100644
--- a/mail/evolution-exchange/files/patch-configure
+++ b/mail/evolution-exchange/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Aug 20 15:26:49 2004
-+++ configure	Fri Aug 20 15:27:21 2004
-@@ -23754,8 +23754,8 @@
+--- configure.orig	Thu Nov 10 17:41:52 2005
++++ configure	Thu Nov 10 17:43:52 2005
+@@ -24837,8 +24837,8 @@
  				# libldap might depend on OpenSSL... We need to pull
  				# in the dependency libs explicitly here since we're
  				# not using libtool for the configure test.
@@ -11,12 +11,3 @@
  				fi
  			else
  				LDAP_LIBS="-llber $LDAP_LIBS"
-@@ -24006,7 +24006,7 @@
- 
- 
- mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
- 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
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 24e31d9d08e3..5c2509a6dee8 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -62,9 +62,6 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
 %%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
@@ -81,14 +78,17 @@ 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/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
 share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -100,7 +100,9 @@ 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/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mk/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
@@ -112,6 +114,7 @@ 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/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/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -122,13 +125,18 @@ share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/th/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/vi/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_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%%/etspec
 @dirrm share/gnome/evolution-exchange/%%VERSION%%
 @dirrm share/gnome/evolution-exchange
 @dirrm %%OLDDOCSDIR%%