Index: mail/evolution/Makefile
===================================================================
--- mail/evolution/Makefile	(revision 414971)
+++ mail/evolution/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	3.18.5.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -10,6 +11,12 @@
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
+LICENSE=	GFDL GPLv2+ LGPL21+ OPENLDAP
+LICENSE_COMB=	multi
+LICENSE_NAME_OPENLDAP= OpenLDAP Public License
+LICENSE_FILE_OPENLDAP= ${WRKSRC}/COPYING.OPENLDAP
+LICENSE_PERMS_OPENLDAP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		highlight:textproc/highlight
 LIB_DEPENDS=	libnss3.so:security/nss \
@@ -111,6 +118,7 @@
 		-e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
 		-e 's|-Wl,--no-undefined||g' \
 		-e 's|-Wmissing-include-dirs||g' \
+		-e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
Index: mail/evolution/files/patch-configure
===================================================================
--- mail/evolution/files/patch-configure	(revision 414971)
+++ mail/evolution/files/patch-configure	(working copy)
@@ -1,8 +1,8 @@
---- configure.orig	2011-01-26 18:09:29.000000000 +0000
-+++ configure	2011-01-26 18:11:16.000000000 +0000
-@@ -15450,6 +15450,16 @@
- 	CHAMPLAIN_REQUIREMENT=''
- 	GEOCLUE_REQUIREMENT=''
+--- configure.orig	2016-02-18 10:32:20 UTC
++++ configure
+@@ -15827,6 +15827,16 @@ case "$host" in
+ 	SOFTOKN3_LIB='-lsoftokn3'
+ 	GIO_UNIX_REQUIREMENT='gio-unix-2.0'
  	;;
 +*freebsd*)
 +	os_win32=no
Index: mail/evolution/files/patch-mail_mail-config.ui
===================================================================
--- mail/evolution/files/patch-mail_mail-config.ui	(revision 414971)
+++ mail/evolution/files/patch-mail_mail-config.ui	(working copy)
@@ -6,15 +6,9 @@
 The code expects a reference to a GtkNotebook page, but it wasn't
 the case for the Junk page, which was enclosed in a GtkAlignment.
 This could produce a runtime warning when opening the Preferences.
----
- mail/mail-config.ui | 430 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 212 insertions(+), 218 deletions(-)
-
-diff --git a/mail/mail-config.ui b/mail/mail-config.ui
-index c5edf9b..733f5e7 100644
---- mail/mail-config.ui
+--- mail/mail-config.ui.orig	2015-09-21 09:46:27 UTC
 +++ mail/mail-config.ui
-@@ -3032,47 +3032,65 @@
+@@ -2999,47 +2999,65 @@
        </packing>
      </child>
      <child>
@@ -102,7 +96,7 @@
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="receives_default">False</property>
-@@ -3081,259 +3099,235 @@
+@@ -3048,259 +3066,235 @@
                          <property name="draw_indicator">True</property>
                        </object>
                        <packing>
@@ -534,6 +528,3 @@
        </packing>
      </child>
      <child type="tab">
--- 
-cgit v0.12
-
Index: mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
===================================================================
--- mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c	(revision 414971)
+++ mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c	(working copy)
@@ -1,6 +1,6 @@
---- modules/addressbook/evolution-module-addressbook.c.orig	2010-04-11 12:47:18.000000000 -0400
-+++ modules/addressbook/evolution-module-addressbook.c	2010-04-11 12:48:06.000000000 -0400
-@@ -47,3 +47,16 @@ G_MODULE_EXPORT void
+--- modules/addressbook/evolution-module-addressbook.c.orig	2014-03-24 09:25:23 UTC
++++ modules/addressbook/evolution-module-addressbook.c
+@@ -50,3 +50,16 @@ G_MODULE_EXPORT void
  e_module_unload (GTypeModule *type_module)
  {
  }