3 files changed, 24 insertions, 15 deletions

diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index a63464fbcd62..6baf608cf10f 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,15 +1,14 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/mail/evolution-ews/Makefile 20048 2014-11-10 09:19:46Z gusi $
 
 PORTNAME=	evolution-ews
-PORTVERSION=	3.12.11
+PORTVERSION=	3.16.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Evolution plugin to connect to Microsoft Exchange Web Services
+COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 
 BUILD_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
 LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
@@ -17,8 +16,10 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libical.so:${PORTSDIR}/devel/libical
 RUN_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
 
+PORTSCOUT=	limitw:1,even
+
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix intlhack
+USE_GNOME=	intlhack
 GNU_CONFIGURE=	yes
 USE_SQLITE=	3
 USE_BDB=	5
@@ -26,9 +27,13 @@ USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--datarootdir=${PREFIX}/share \
+		--localedir=${PREFIX}/share/locale \
+		--prefix=${PREFIX}
 INSTALL_TARGET=	install-strip
 
-VERSION=	3.12
-PLIST_SUB=	VERSION=${VERSION}
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(prefix)/$$(DATADIRNAME)/|$$(prefix)/share/|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index 42606862f333..415abb007dee 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-ews-3.12.11.tar.xz) = adbf4efd25e9c2df823a20d14f45027bacbaf14d57ffb5978ae4d33184315e83
-SIZE (gnome3/evolution-ews-3.12.11.tar.xz) = 663288
+SHA256 (gnome3/evolution-ews-3.16.4.tar.xz) = fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4
+SIZE (gnome3/evolution-ews-3.16.4.tar.xz) = 684676
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index e3aac72ef796..23131593bd35 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -10,23 +10,24 @@ include/evolution-data-server/ews/e-ews-message.h
 include/evolution-data-server/ews/e-ews-notification.h
 include/evolution-data-server/ews/e-ews-oof-settings.h
 include/evolution-data-server/ews/ews-errors.h
+lib/evolution-data-server/addressbook-backends/libebookbackendews.so
+lib/evolution-data-server/calendar-backends/libecalbackendews.so
+lib/evolution-data-server/camel-providers/libcamelews.so
+lib/evolution-data-server/camel-providers/libcamelews.urls
 lib/evolution-data-server/libeews-1.2.so
 lib/evolution-data-server/libeews-1.2.so.0
 lib/evolution-data-server/libeews-1.2.so.0.0.0
 lib/evolution-data-server/libewsutils.so
 lib/evolution-data-server/libewsutils.so.0
 lib/evolution-data-server/libewsutils.so.0.0.0
-lib/evolution-data-server/addressbook-backends/libebookbackendews.so
-lib/evolution-data-server/calendar-backends/libecalbackendews.so
-lib/evolution-data-server/camel-providers/libcamelews.so
-lib/evolution-data-server/camel-providers/libcamelews.urls
 lib/evolution-data-server/registry-modules/module-ews-backend.so
-lib/evolution/%%VERSION%%/modules/module-ews-configuration.so
+lib/evolution/modules/module-ews-configuration.so
 share/appdata/evolution-ews.metainfo.xml
 share/evolution-data-server/ews/windowsZones.xml
-share/evolution/%%VERSION%%/errors/module-ews-configuration.error
+share/evolution/errors/module-ews-configuration.error
 share/locale/as/LC_MESSAGES/evolution-ews.mo
-share/locale/bg/LC_MESSAGES/evolution-ews.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-ews.mo
+share/locale/bs/LC_MESSAGES/evolution-ews.mo
 share/locale/ca/LC_MESSAGES/evolution-ews.mo
 share/locale/cs/LC_MESSAGES/evolution-ews.mo
 share/locale/da/LC_MESSAGES/evolution-ews.mo
@@ -38,6 +39,7 @@ share/locale/eu/LC_MESSAGES/evolution-ews.mo
 share/locale/fr/LC_MESSAGES/evolution-ews.mo
 share/locale/gl/LC_MESSAGES/evolution-ews.mo
 share/locale/gu/LC_MESSAGES/evolution-ews.mo
+share/locale/hi/LC_MESSAGES/evolution-ews.mo
 share/locale/hu/LC_MESSAGES/evolution-ews.mo
 share/locale/id/LC_MESSAGES/evolution-ews.mo
 share/locale/ja/LC_MESSAGES/evolution-ews.mo
@@ -48,7 +50,9 @@ share/locale/mr/LC_MESSAGES/evolution-ews.mo
 share/locale/nb/LC_MESSAGES/evolution-ews.mo
 share/locale/or/LC_MESSAGES/evolution-ews.mo
 share/locale/pl/LC_MESSAGES/evolution-ews.mo
+share/locale/pt/LC_MESSAGES/evolution-ews.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-ews.mo
+share/locale/sk/LC_MESSAGES/evolution-ews.mo
 share/locale/sl/LC_MESSAGES/evolution-ews.mo
 share/locale/sr/LC_MESSAGES/evolution-ews.mo
 share/locale/sr@latin/LC_MESSAGES/evolution-ews.mo