Update evolution suite to 3.24.

* The build system switched to CMake, with ninja. Drop USES=gmake
 * Remove systemd files, we have no need for them.
 * Add/update WWW to new location

evolution-data-server:
 * Remove double icu dependacy
 * Make LDAP into a option, like mail/evolution
 * Remove BDB warning message. This message was here if the user had a
   nondefault bdb version selected. Due to that the eds only use bdb
   version 5, the message can go.

evolution:
 * Reenable MAPS option
 * Add YTNEF option to support MS Outlook TNEF format
 * Gstreamer is not used anymore

databases/evolution-data-server/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	3.22.7
+PORTVERSION=	3.24.2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,13 +16,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libgcr-base-3.so:security/gcr \
-		liboauth.so:net/liboauth \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
 		libical.so:devel/libical \
-		libicui18n.so:devel/icu \
 		libnss3.so:security/nss \
-		libtasn1.so:security/libtasn1 \
 		libicudata.so:devel/icu \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libjson-glib-1.0.so:devel/json-glib \
@@ -32,21 +29,18 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 bison compiler:c++11-lib gettext gmake gnome gperf \
-		iconv:wchar_t libtool localbase pathfix pkgconfig ssl \
+USES=		bdb:5 cmake compiler:c++11-lib gettext gnome \
+		iconv localbase ninja pathfix pkgconfig python:3.3+,build\
 		sqlite tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
-USE_OPENLDAP=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-static \
-		--with-openldap=yes \
-		--disable-uoa \
-		--enable-vala-bindings \
-		--disable-gtk-doc \
-		--with-libdb=${LOCALBASE}
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-INSTALL_TARGET=	install-strip
+
+CMAKE_ARGS=	-DENABLE_VALA_BINDINGS=ON \
+		-DENABLE_INTROSPECTION=ON \
+		-DENABLE_UOA=OFF
+
+CMAKE_ARGS+=	-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
+		-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
 
 GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution.eds-shell.gschema.xml \
@@ -55,38 +49,31 @@ GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution-data-server.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
-PLIST_SUB=	VERSION="3.22" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="3.24" EVO_VERSION="1.2"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	WEATHER KERBEROS
-OPTIONS_DEFAULT=WEATHER KERBEROS
-WEATHER_DESC=	Weather calendar backend
+OPTIONS_DEFINE=	WEATHER KERBEROS LDAP
+OPTIONS_DEFAULT=WEATHER KERBEROS LDAP
 
+KERBEROS_CMAKE_ON=	-DWITH_KRB5=/usr
+KERBEROS_CMAKE_OFF=	-DWITH_KRB5=OFF
+KERBEROS_USES=		ssl
+
+LDAP_CMAKE_ON=		-DWITH_OPENLDAP=${LOCALBASE}
+LDAP_CMAKE_OFF=		-DWITH_OPENLDAP=OFF
+LDAP_USE=		openldap=yes
+
+WEATHER_DESC=	Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
-WEATHER_CONFIGURE_ENABLE=	weather
+WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MKERBEROS} && exists(/usr/bin/krb5-config)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
-.else
-CONFIGURE_ARGS+=	--without-krb5
-.endif
-
-EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 5."
-
-pre-everything::
-	@if [ x"${BDB_VER}" != x"5" ]; then \
-		${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \
-	fi
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
-		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
-		s|-Wl,--no-undefined||g ; \
-		s|-Wnoexcept||g ; \
-		s|-Wmissing-include-dirs||g' \
-			${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| python| ${PYTHON_VERSION}|g' \
+		${WRKSRC}/CMakeLists.txt
+
+post-install:
+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>

databases/evolution-data-server/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1494102880
-SHA256 (gnome3/evolution-data-server-3.22.7.tar.xz) = 43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203
-SIZE (gnome3/evolution-data-server-3.22.7.tar.xz) = 5564924
+TIMESTAMP = 1496410963
+SHA256 (gnome3/evolution-data-server-3.24.2.tar.xz) = a9bbb98308f935bac8550838b3b5a2b54b38a3d1dd5b0ad91cfb089b46f298fb
+SIZE (gnome3/evolution-data-server-3.24.2.tar.xz) = 4306528

databases/evolution-data-server/files/patch-CMakeLists.txt

@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2017-06-02 14:29:11 UTC
++++ CMakeLists.txt
+@@ -503,6 +503,7 @@ endif(WITH_LIBDB)
+ # ******************************
+ 
+ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
++set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
+ CHECK_C_SOURCE_COMPILES("#include <iconv.h>
+ 			#include <stdlib.h>
+ 			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)

databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c

@@ -1,10 +0,0 @@
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2014-03-14 14:06:17.876564707 +0000
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c	2014-03-14 14:05:42.004562353 +0000
-@@ -36,6 +36,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "e-cal-backend-intervaltree.h"
- 

databases/evolution-data-server/files/patch-camel_camel-net-utils.c

@@ -1,24 +0,0 @@
---- camel/camel-net-utils.c.orig	Tue Dec 21 13:38:52 2004
-+++ camel/camel-net-utils.c	Tue Dec 21 13:40:34 2004
-@@ -143,12 +143,21 @@
- 	case EAI_SERVICE:
- 		return NO_DATA;
- 		break;
-+#ifdef EAI_ADDRFAMILY
- 	case EAI_ADDRFAMILY:
- 		return NO_ADDRESS;
- 		break;
-+#endif
-+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
- 	case EAI_NODATA:
- 		return NO_DATA;
- 		break;
-+#endif
-+#ifdef EAI_NOFAMILY
-+	case EAI_NOFAMILY:
-+		return NO_ADDRESS;
-+		break;
-+#endif
- 	case EAI_MEMORY:
- 		return ENOMEM;
- 		break;

databases/evolution-data-server/files/patch-camel_camel-sasl-gssapi.c

@@ -1,11 +0,0 @@
---- camel/camel-sasl-gssapi.c.orig	2012-05-20 12:44:42.000000000 +0200
-+++ camel/camel-sasl-gssapi.c	2012-05-20 12:45:21.000000000 +0200
-@@ -66,7 +66,7 @@
- #endif /* HAVE_MIT_KRB5 */
- 
- #ifdef HAVE_HEIMDAL_KRB5
--#include <gssapi.h>
-+#include <gssapi/gssapi.h>
- #else
- #ifdef HAVE_SUN_KRB5
- #include <gssapi/gssapi.h>

databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in

@@ -1,11 +0,0 @@
---- camel/providers/imapx/Makefile.in.orig	2014-03-14 14:10:01.171545474 +0000
-+++ camel/providers/imapx/Makefile.in	2014-03-14 14:10:08.618544114 +0000
-@@ -1117,7 +1117,7 @@
- 
- 
- camel-imapx-tokenise.h: camel-imapx-tokens.txt
--	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
-+	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@
- 
- -include $(top_srcdir)/git.mk
- 

databases/evolution-data-server/files/patch-cmake_modules_PkgConfigEx.cmake

@@ -0,0 +1,10 @@
+--- cmake/modules/PkgConfigEx.cmake.orig	2017-06-02 14:39:21 UTC
++++ cmake/modules/PkgConfigEx.cmake
+@@ -85,6 +85,6 @@ macro(add_pkgconfig_file _input _output)
+ 	)
+ 
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_output}
+-		DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
++		DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig
+ 	)
+ endmacro()

databases/evolution-data-server/files/patch-configure

@@ -1,25 +0,0 @@
---- configure.orig	2012-05-14 06:21:51.000000000 +0200
-+++ configure	2012-05-20 12:56:44.000000000 +0200
-@@ -16716,6 +16716,14 @@
- 	DL_LIB=''
- 	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
- 	;;
-+*freebsd*)
-+	os_win32=no
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	DL_LIB=''
-+	SOFTOKN3_LIB='-lsoftokn3'
-+	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
-+	;;
- *)
- 	os_win32='no'
- 	NO_UNDEFINED=''
-@@ -19295,6 +19303,7 @@
- 			#include <com_err.h>
- 			#endif
- 
-+#include <sys/types.h>
- "
- if test "x$ac_cv_header_com_err_h" = xyes; then :
- 

databases/evolution-data-server/pkg-descr

@@ -1,3 +1,5 @@
 Evolution-data-server provides the various backend components for the
 Evolution integrated mail/PIM suite, including the Berkeley database
 backend and the libical calendar components.
+
+WWW: https://wiki.gnome.org/Apps/Evolution

databases/evolution-data-server/pkg-plist

@@ -32,6 +32,8 @@ include/evolution-data-server/camel/camel-lock.h
 include/evolution-data-server/camel/camel-medium.h
 include/evolution-data-server/camel/camel-memchunk.h
 include/evolution-data-server/camel/camel-mempool.h
+include/evolution-data-server/camel/camel-message-info-base.h
+include/evolution-data-server/camel/camel-message-info.h
 include/evolution-data-server/camel/camel-mime-filter-basic.h
 include/evolution-data-server/camel/camel-mime-filter-bestenc.h
 include/evolution-data-server/camel/camel-mime-filter-canon.h
@@ -59,6 +61,8 @@ include/evolution-data-server/camel/camel-msgport.h
 include/evolution-data-server/camel/camel-multipart-encrypted.h
 include/evolution-data-server/camel/camel-multipart-signed.h
 include/evolution-data-server/camel/camel-multipart.h
+include/evolution-data-server/camel/camel-name-value-array.h
+include/evolution-data-server/camel/camel-named-flags.h
 include/evolution-data-server/camel/camel-net-utils.h
 include/evolution-data-server/camel/camel-network-service.h
 include/evolution-data-server/camel/camel-network-settings.h
@@ -107,11 +111,14 @@ include/evolution-data-server/camel/camel-uid-cache.h
 include/evolution-data-server/camel/camel-url-scanner.h
 include/evolution-data-server/camel/camel-url.h
 include/evolution-data-server/camel/camel-utf8.h
+include/evolution-data-server/camel/camel-utils.h
 include/evolution-data-server/camel/camel-vee-data-cache.h
 include/evolution-data-server/camel/camel-vee-folder.h
+include/evolution-data-server/camel/camel-vee-message-info.h
 include/evolution-data-server/camel/camel-vee-store.h
 include/evolution-data-server/camel/camel-vee-summary.h
 include/evolution-data-server/camel/camel-vtrash-folder.h
+include/evolution-data-server/camel/camel-weak-ref-group.h
 include/evolution-data-server/camel/camel.h
 include/evolution-data-server/libebackend/e-backend-enums.h
 include/evolution-data-server/libebackend/e-backend-enumtypes.h
@@ -213,9 +220,9 @@ include/evolution-data-server/libedataserver/e-gdbus-templates.h
 include/evolution-data-server/libedataserver/e-iterator.h
 include/evolution-data-server/libedataserver/e-list-iterator.h
 include/evolution-data-server/libedataserver/e-list.h
-include/evolution-data-server/libedataserver/e-network-monitor.h
 include/evolution-data-server/libedataserver/e-memory.h
 include/evolution-data-server/libedataserver/e-module.h
+include/evolution-data-server/libedataserver/e-network-monitor.h
 include/evolution-data-server/libedataserver/e-operation-pool.h
 include/evolution-data-server/libedataserver/e-proxy.h
 include/evolution-data-server/libedataserver/e-secret-store.h
@@ -226,6 +233,7 @@ include/evolution-data-server/libedataserver/e-source-address-book.h
 include/evolution-data-server/libedataserver/e-source-alarms.h
 include/evolution-data-server/libedataserver/e-source-authentication.h
 include/evolution-data-server/libedataserver/e-source-autocomplete.h
+include/evolution-data-server/libedataserver/e-source-autoconfig.h
 include/evolution-data-server/libedataserver/e-source-backend.h
 include/evolution-data-server/libedataserver/e-source-calendar.h
 include/evolution-data-server/libedataserver/e-source-camel.h
@@ -248,6 +256,7 @@ include/evolution-data-server/libedataserver/e-source-mail-signature.h
 include/evolution-data-server/libedataserver/e-source-mail-submission.h
 include/evolution-data-server/libedataserver/e-source-mail-transport.h
 include/evolution-data-server/libedataserver/e-source-mdn.h
+include/evolution-data-server/libedataserver/e-source-memo-list.h
 include/evolution-data-server/libedataserver/e-source-offline.h
 include/evolution-data-server/libedataserver/e-source-openpgp.h
 include/evolution-data-server/libedataserver/e-source-proxy.h
@@ -258,6 +267,7 @@ include/evolution-data-server/libedataserver/e-source-revision-guards.h
 include/evolution-data-server/libedataserver/e-source-security.h
 include/evolution-data-server/libedataserver/e-source-selectable.h
 include/evolution-data-server/libedataserver/e-source-smime.h
+include/evolution-data-server/libedataserver/e-source-task-list.h
 include/evolution-data-server/libedataserver/e-source-uoa.h
 include/evolution-data-server/libedataserver/e-source-weather.h
 include/evolution-data-server/libedataserver/e-source-webdav.h
@@ -271,114 +281,77 @@ include/evolution-data-server/libedataserver/e-xml-utils.h
 include/evolution-data-server/libedataserver/eds-version.h
 include/evolution-data-server/libedataserver/libedataserver.h
 include/evolution-data-server/libedataserverui/e-cell-renderer-color.h
-include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-password.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-google.h
+include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-password.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter-impl.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter.h
 include/evolution-data-server/libedataserverui/e-trust-prompt.h
 include/evolution-data-server/libedataserverui/e-webdav-discover-widget.h
 include/evolution-data-server/libedataserverui/libedataserverui.h
-lib/evolution-data-server/addressbook-backends/libebookbackendfile.a
 lib/evolution-data-server/addressbook-backends/libebookbackendfile.so
-lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.a
 lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.so
-lib/evolution-data-server/addressbook-backends/libebookbackendldap.a
-lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
-lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.a
+%%LDAP%%lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
 lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.so
-lib/evolution-data-server/calendar-backends/libecalbackendcaldav.a
 lib/evolution-data-server/calendar-backends/libecalbackendcaldav.so
-lib/evolution-data-server/calendar-backends/libecalbackendcontacts.a
 lib/evolution-data-server/calendar-backends/libecalbackendcontacts.so
-lib/evolution-data-server/calendar-backends/libecalbackendfile.a
 lib/evolution-data-server/calendar-backends/libecalbackendfile.so
-lib/evolution-data-server/calendar-backends/libecalbackendgtasks.a
 lib/evolution-data-server/calendar-backends/libecalbackendgtasks.so
-lib/evolution-data-server/calendar-backends/libecalbackendhttp.a
 lib/evolution-data-server/calendar-backends/libecalbackendhttp.so
-%%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.a
 %%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.so
-lib/evolution-data-server/camel-providers/libcamelimapx.a
 lib/evolution-data-server/camel-providers/libcamelimapx.so
 lib/evolution-data-server/camel-providers/libcamelimapx.urls
-lib/evolution-data-server/camel-providers/libcamellocal.a
 lib/evolution-data-server/camel-providers/libcamellocal.so
 lib/evolution-data-server/camel-providers/libcamellocal.urls
-lib/evolution-data-server/camel-providers/libcamelnntp.a
 lib/evolution-data-server/camel-providers/libcamelnntp.so
 lib/evolution-data-server/camel-providers/libcamelnntp.urls
-lib/evolution-data-server/camel-providers/libcamelpop3.a
 lib/evolution-data-server/camel-providers/libcamelpop3.so
 lib/evolution-data-server/camel-providers/libcamelpop3.urls
-lib/evolution-data-server/camel-providers/libcamelsendmail.a
 lib/evolution-data-server/camel-providers/libcamelsendmail.so
 lib/evolution-data-server/camel-providers/libcamelsendmail.urls
-lib/evolution-data-server/camel-providers/libcamelsmtp.a
 lib/evolution-data-server/camel-providers/libcamelsmtp.so
 lib/evolution-data-server/camel-providers/libcamelsmtp.urls
-lib/evolution-data-server/credential-modules/module-credentials-goa.a
 lib/evolution-data-server/credential-modules/module-credentials-goa.so
-lib/evolution-data-server/libedbus-private.a
 lib/evolution-data-server/libedbus-private.so
-lib/evolution-data-server/registry-modules/module-cache-reaper.a
 lib/evolution-data-server/registry-modules/module-cache-reaper.so
-lib/evolution-data-server/registry-modules/module-gnome-online-accounts.a
 lib/evolution-data-server/registry-modules/module-gnome-online-accounts.so
-lib/evolution-data-server/registry-modules/module-google-backend.a
 lib/evolution-data-server/registry-modules/module-google-backend.so
-lib/evolution-data-server/registry-modules/module-outlook-backend.a
 lib/evolution-data-server/registry-modules/module-outlook-backend.so
-lib/evolution-data-server/registry-modules/module-owncloud-backend.a
 lib/evolution-data-server/registry-modules/module-owncloud-backend.so
-lib/evolution-data-server/registry-modules/module-secret-monitor.a
 lib/evolution-data-server/registry-modules/module-secret-monitor.so
-lib/evolution-data-server/registry-modules/module-trust-prompt.a
 lib/evolution-data-server/registry-modules/module-trust-prompt.so
-lib/evolution-data-server/registry-modules/module-yahoo-backend.a
 lib/evolution-data-server/registry-modules/module-yahoo-backend.so
-lib/libcamel-%%EVO_VERSION%%.a
-lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.59
-lib/libcamel-%%EVO_VERSION%%.so.59.0.0
-lib/libebackend-%%EVO_VERSION%%.a
-lib/libebackend-%%EVO_VERSION%%.so
-lib/libebackend-%%EVO_VERSION%%.so.10
-lib/libebackend-%%EVO_VERSION%%.so.10.0.0
-lib/libebook-%%EVO_VERSION%%.a
-lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.16
-lib/libebook-%%EVO_VERSION%%.so.16.3.1
-lib/libebook-contacts-%%EVO_VERSION%%.a
-lib/libebook-contacts-%%EVO_VERSION%%.so
-lib/libebook-contacts-%%EVO_VERSION%%.so.2
-lib/libebook-contacts-%%EVO_VERSION%%.so.2.0.0
-lib/libecal-%%EVO_VERSION%%.a
-lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.19
-lib/libecal-%%EVO_VERSION%%.so.19.0.0
-lib/libedata-book-%%EVO_VERSION%%.a
-lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.25
-lib/libedata-book-%%EVO_VERSION%%.so.25.0.0
-lib/libedata-cal-%%EVO_VERSION%%.a
-lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.28
-lib/libedata-cal-%%EVO_VERSION%%.so.28.0.0
-lib/libedataserver-%%EVO_VERSION%%.a
-lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.22
-lib/libedataserver-%%EVO_VERSION%%.so.22.0.0
-lib/libedataserverui-%%EVO_VERSION%%.a
-lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.1
-lib/libedataserverui-%%EVO_VERSION%%.so.1.0.0
+lib/girepository-1.0/Camel-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EBook-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EBookContacts-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EDataServer-%%EVO_VERSION%%.typelib
-lib/systemd/user/evolution-addressbook-factory.service
-lib/systemd/user/evolution-calendar-factory.service
-lib/systemd/user/evolution-source-registry.service
-lib/systemd/user/evolution-user-prompter.service
+lib/girepository-1.0/EDataServerUI-%%EVO_VERSION%%.typelib
+lib/libcamel-%%EVO_VERSION%%.so
+lib/libcamel-%%EVO_VERSION%%.so.60
+lib/libcamel-%%EVO_VERSION%%.so.60.0.0
+lib/libebackend-%%EVO_VERSION%%.so
+lib/libebackend-%%EVO_VERSION%%.so.10
+lib/libebackend-%%EVO_VERSION%%.so.10.0.0
+lib/libebook-%%EVO_VERSION%%.so
+lib/libebook-%%EVO_VERSION%%.so.19
+lib/libebook-%%EVO_VERSION%%.so.19.1.3
+lib/libebook-contacts-%%EVO_VERSION%%.so
+lib/libebook-contacts-%%EVO_VERSION%%.so.2
+lib/libebook-contacts-%%EVO_VERSION%%.so.2.0.0
+lib/libecal-%%EVO_VERSION%%.so
+lib/libecal-%%EVO_VERSION%%.so.19
+lib/libecal-%%EVO_VERSION%%.so.19.0.0
+lib/libedata-book-%%EVO_VERSION%%.so
+lib/libedata-book-%%EVO_VERSION%%.so.25
+lib/libedata-book-%%EVO_VERSION%%.so.25.0.0
+lib/libedata-cal-%%EVO_VERSION%%.so
+lib/libedata-cal-%%EVO_VERSION%%.so.28
+lib/libedata-cal-%%EVO_VERSION%%.so.28.0.0
+lib/libedataserver-%%EVO_VERSION%%.so
+lib/libedataserver-%%EVO_VERSION%%.so.22
+lib/libedataserver-%%EVO_VERSION%%.so.22.0.0
+lib/libedataserverui-%%EVO_VERSION%%.so
+lib/libedataserverui-%%EVO_VERSION%%.so.1
+lib/libedataserverui-%%EVO_VERSION%%.so.1.0.0
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
@@ -389,28 +362,29 @@ libdata/pkgconfig/libedata-book-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
-libexec/camel-index-control-%%EVO_VERSION%%
 libexec/camel-gpg-photo-saver
-libexec/evolution-data-server/addressbook-export
-libexec/evolution-data-server/csv2vcard
+libexec/camel-index-control-%%EVO_VERSION%%
 @(,mail,2755) libexec/camel-lock-helper-%%EVO_VERSION%%
 libexec/evolution-addressbook-factory
 libexec/evolution-addressbook-factory-subprocess
 libexec/evolution-calendar-factory
 libexec/evolution-calendar-factory-subprocess
+libexec/evolution-data-server/addressbook-export
+libexec/evolution-data-server/csv2vcard
 libexec/evolution-scan-gconf-tree-xml
 libexec/evolution-source-registry
 libexec/evolution-user-prompter
 share/GConf/gsettings/evolution-data-server.convert
-%%DATADIR%%/evolutionperson.schema
 share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
 share/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service
+%%LDAP%%%%DATADIR%%/evolutionperson.schema
 share/gir-1.0/Camel-%%EVO_VERSION%%.gir
 share/gir-1.0/EBook-%%EVO_VERSION%%.gir
 share/gir-1.0/EBookContacts-%%EVO_VERSION%%.gir
 share/gir-1.0/EDataServer-%%EVO_VERSION%%.gir
+share/gir-1.0/EDataServerUI-%%EVO_VERSION%%.gir
 share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -440,6 +414,7 @@ share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/fa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/fur/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ga/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/gu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -524,3 +499,5 @@ share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
 share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
 share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
 share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
+share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
+share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi

mail/evolution-ews/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution-ews
-PORTVERSION=	3.22.6
+PORTVERSION=	3.24.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,6 +12,7 @@ COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 
 BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libicuuc.so:devel/icu \
 		libmspack.so:archivers/libmspack \
 		libsecret-1.so:security/libsecret \
 		libnspr4.so:devel/nspr \
@@ -22,16 +23,8 @@ RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 gettext gmake gnome libtool localbase pathfix \
+USES=		bdb:5 cmake ninja gettext gnome localbase pathfix \
 		pkgconfig sqlite tar:xz
-USE_GNOME=	atk cairo evolutiondataserver3 gdkpixbuf2 gtk30 glib20 \
-		intltool libxml2 pango
-GNU_CONFIGURE=	yes
-USE_OPENLDAP=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--datarootdir=${PREFIX}/share \
-		--localedir=${PREFIX}/share/locale \
-		--prefix=${PREFIX}
-INSTALL_TARGET=	install-strip
+USE_GNOME=	cairo gdkpixbuf2 evolutiondataserver3 intltool
 
 .include <bsd.port.mk>

mail/evolution-ews/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1494106823
-SHA256 (gnome3/evolution-ews-3.22.6.tar.xz) = eddc94d9a7f759a20dc35a8635318a425f8687bb3af5b72b94c996101c8fb0e5
-SIZE (gnome3/evolution-ews-3.22.6.tar.xz) = 715320
+TIMESTAMP = 1496958885
+SHA256 (gnome3/evolution-ews-3.24.2.tar.xz) = 31eb84a204a50b31932696c03394a7d2563ec2c3eefa52a802e63d0346a28851
+SIZE (gnome3/evolution-ews-3.24.2.tar.xz) = 486848

mail/evolution-ews/pkg-descr

@@ -1,4 +1,4 @@
 Evolution-ews is a plugin for Evolution that adds Exchange integration though
 Exchange Web Service.
 
-WWW: https://wiki.gnome.org/Apps/Evolution/EWS
+WWW: https://wiki.gnome.org/Apps/Evolution

mail/evolution-ews/pkg-plist

@@ -1,26 +1,10 @@
-include/evolution-data-server/ews/e-ews-connection-utils.h
-include/evolution-data-server/ews/e-ews-connection.h
-include/evolution-data-server/ews/e-ews-debug.h
-include/evolution-data-server/ews/e-ews-enums.h
-include/evolution-data-server/ews/e-ews-enumtypes.h
-include/evolution-data-server/ews/e-ews-folder.h
-include/evolution-data-server/ews/e-ews-item-change.h
-include/evolution-data-server/ews/e-ews-item.h
-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/registry-modules/module-ews-backend.so
+lib/evolution-ews/libcamelews-priv.so
+lib/evolution-ews/libevolution-ews.so
 lib/evolution/modules/module-ews-configuration.so
 share/appdata/evolution-ews.metainfo.xml
 share/evolution-data-server/ews/windowsZones.xml

mail/evolution/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution
-PORTVERSION=	3.22.6
+PORTVERSION=	3.24.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,39 +17,38 @@ LICENSE_FILE_OPENLDAP=	${WRKSRC}/COPYING.OPENLDAP
 LICENSE_PERMS_OPENLDAP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
+		iso-codes>=0:misc/iso-codes \
 		highlight:textproc/highlight
 LIB_DEPENDS=	libnss3.so:security/nss \
 		libgcr-3.so:security/gcr \
 		libgtkspell3-3.so:textproc/gtkspell3 \
-		libgeocode-glib.so:net/geocode-glib \
+		libgnome-autoar-gtk-0.so:archivers/gnome-autoar \
+		libsoup-2.4.so:devel/libsoup \
+		libicuuc.so:devel/icu \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libnspr4.so:devel/nspr \
 		libical.so:devel/libical \
 		libsecret-1.so:security/libsecret \
 		libenchant.so:textproc/enchant \
 		libp11-kit.so:security/p11-kit \
-		libsoup-2.4.so:devel/libsoup \
 		libcryptui.so:security/libcryptui \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
 RUN_DEPENDS=	highlight:textproc/highlight \
-		gnome-keyring>=3.0.0:security/gnome-keyring
+		iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils bison gettext gmake gnome iconv:wchar_t \
-		libtool localbase pathfix perl5 pkgconfig sqlite tar:xz
+USES=		desktop-file-utils cmake gettext gnome iconv:wchar_t \
+		sqlite libarchive ninja localbase pathfix pkgconfig tar:xz
 USE_GNOME=	cairo evolutiondataserver3 gnomedesktop3 intltool
 GNU_CONFIGURE=	yes
-USE_GSTREAMER1=	yes
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-nss=yes \
-		--disable-autoar \
-		--with-sub-version=" FreeBSD GNOME Team Port"
-INSTALL_TARGET=	install-strip
+CMAKE_ARGS=	-DENABLE_TEXT_HIGHLIGHT=YES \
+		-DVERSION_COMMENT="FreeBSD GNOME Team"
 
 GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.addressbook.gschema.xml \
@@ -70,65 +69,61 @@ GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
 		org.gnome.evolution.plugin.templates.gschema.xml
 
-EVO_VERSION=	3.22
+EVO_VERSION=	3.24
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
-OPTIONS_DEFINE=	LDAP WEATHER CANBERRA PST
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	LDAP WEATHER CANBERRA PST YTNEF MAPS
 OPTIONS_DEFAULT=LDAP WEATHER CANBERRA BOGOFILTER
+
+SPAM_DESC=	Spam filter support
 OPTIONS_GROUP=	SPAM
 OPTIONS_GROUP_SPAM=SPAMASSASSIN BOGOFILTER
 
-OPTIONS_SUB=	yes
-
-CANBERRA_DESC=	Canberra theme audio plugin
-WEATHER_DESC=	Weather calendar backend
-SPAM_DESC=	Spam filter support
-SPAMASSASSIN_DESC=	SpamAssassin spam filtering
-BOGOFILTER_DESC=	Bogofilter spam filtering
-PST_DESC=	Outlook .pst importer
-MAPS_DESC=	Contact maps
-
-LDAP_CONFIGURE_WITH=	openldap
+LDAP_CMAKE_ON=	-DWITH_OPENLDAP=${LOCALBASE}
+LDAP_CMAKE_OFF=	-DWITH_OPENLDAP=OFF
 LDAP_USE=	OPENLDAP=yes
 
-WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
-WEATHER_CONFIGURE_ENABLE=	weather
+YTNEF_DESC=		Support MS Outlook TNEF format
+YTNEF_LIB_DEPENDS=	libytnef.so:converters/ytnef
+YTNEF_CMAKE_BOOL=	ENABLE_YTNEF
 
-SPAMASSASSIN_CONFIGURE_WITH=	spamassassin=${LOCALBASE}/bin/spamassassin \
-				sa-learn=${LOCALBASE}/bin/sa-learn
+WEATHER_DESC=		Weather calendar backend
+WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
+WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
+
+SPAMASSASSIN_DESC=		SpamAssassin spam filtering
+SPAMASSASSIN_CMAKE_ON=		-DWITH_SPAMASSASSIN=${LOCALBASE}/spamassassin \
+				-DWITH_SA_LEARN=${LOCALBASE}/bin/sa-learn
+SPAMASSASSIN_CMAKE_OFF=		-DWITH_SPAMASSASSIN=NO
 SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:mail/spamassassin
 SPAMASSASSIN_RUN_DEPENDS=	spamassassin:mail/spamassassin
 
-BOGOFILTER_CONFIGURE_WITH=	bogofilter=${LOCALBASE}/bin/bogofilter
+BOGOFILTER_DESC=		Bogofilter spam filtering
+BOGOFILTER_CMAKE_ON=		-DWITH_BOGOFILTER=${LOCALBASE}/bin/bogofilter
+BOGOFILTER_CMAKE_OFF=		-DWITH_BOGOFILTER=OFF
 BOGOFILTER_BUILD_DEPENDS=	bogofilter:mail/bogofilter
-BOGOFILTER_RUN_DEPENDS=	bogofilter:mail/bogofilter
+BOGOFILTER_RUN_DEPENDS=		bogofilter:mail/bogofilter
 
+CANBERRA_DESC=		Canberra theme audio plugin
 CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 			libcanberra-gtk3.so:audio/libcanberra-gtk3
-CANBERRA_CONFIGURE_ENABLE=	canberra
+CANBERRA_CMAKE_BOOL=	ENABLE_CANBERRA
 
-PST_CONFIGURE_ENABLE=	pst-import
+PST_DESC=	Outlook .pst importer
+PST_CMAKE_BOOL=		ENABLE_PST_IMPORT
 PST_BUILD_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 PST_RUN_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 
-CONFIGURE_ARGS+=--disable-contact-maps
-#MAPS_CONFIGURE_ENABLE=	contact-maps
-#MAPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
-#			libclutter-gtk-1.0.so:graphics/clutter-gtk3
-#MAPS_BUILD_DEPENDS=	geoclue>=0:net/geoclue
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
-		-e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
-		-e 's|-Wl,--no-undefined||g' \
-		-e 's|-Wmissing-include-dirs||g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
-		${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
-		${WRKSRC}/modules/bogofilter/evolution-bogofilter.c
-#	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
+MAPS_DESC=	Contact maps
+MAPS_CMAKE_BOOL=	ENABLE_CONTACT_MAPS
+MAPS_LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+			libgeocode-glib.so:net/geocode-glib \
+			libcogl.so:graphics/cogl \
+			libclutter-1.0.so:graphics/clutter \
+			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+			libchamplain-0.12.so:graphics/libchamplain
+MAPS_USE=		xorg=xcomposite,xdamage,xext,xfixes,xi,xrandr gl=egl
 
 .include <bsd.port.mk>

mail/evolution/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1494104477
-SHA256 (gnome3/evolution-3.22.6.tar.xz) = 9f4be4a1d5ee4d5eb9b132cf751ba3afc833025aa6dc7baa1f9483489d8a943e
-SIZE (gnome3/evolution-3.22.6.tar.xz) = 12288232
+TIMESTAMP = 1496947688
+SHA256 (gnome3/evolution-3.24.2.tar.xz) = e7b35a60f4ad53bb5416d8e96390aa79c8601b09a71e635c1de730b94f3aebdf
+SIZE (gnome3/evolution-3.24.2.tar.xz) = 12132032

mail/evolution/files/fix-plugins.sh

@@ -1,48 +0,0 @@
-#!/bin/sh
-
-plugin_srcs="attachment-reminder/attachment-reminder.c bbdb/bbdb.c dbx-import/dbx-importer.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c image-inline/image-inline.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c pst-import/pst-importer.c publish-calendar/publish-calendar.c save-calendar/save-calendar.c templates/templates.c"
-
-module_srcs="addressbook/evolution-module-addressbook.c audio-inline/evolution-module-audio-inline.c backup-restore/evolution-backup-tool.c bogofilter/evolution-bogofilter.c book-config-google/evolution-book-config-google.c book-config-ldap/evolution-book-config-ldap.c book-config-local/evolution-book-config-local.c book-config-webdav/evolution-book-config-webdav.c cal-config-caldav/evolution-cal-config-caldav.c cal-config-contacts/evolution-cal-config-contacts.c cal-config-google/evolution-cal-config-google.c cal-config-local/evolution-cal-config-local.c cal-config-weather/evolution-cal-config-weather.c cal-config-webcal/evolution-cal-config-webcal.c calendar/evolution-module-calendar.c composer-autosave/evolution-composer-autosave.c imap-features/evolution-imap-features.c itip-formatter/itip-view.c itip-formatter/plugin/config-ui.c mail-config/evolution-mail-config.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c mdn/evolution-mdn.c offline-alert/evolution-offline-alert.c online-accounts/evolution-online-accounts.c plugin-lib/evolution-module-plugin-lib.c plugin-manager/evolution-plugin-manager.c prefer-plain/evolution-module-prefer-plain.c prefer-plain/plugin/config-ui.c spamassassin/evolution-spamassassin.c startup-wizard/evolution-startup-wizard.c text-highlight/languages.c tnef-attachment/evolution-module-tnef-attachment.c vcard-inline/evolution-module-vcard-inline.c web-inspector/evolution-web-inspector.c"
-
-WRKSRC=$1
-
-for i in ${plugin_srcs}; do
-    if [ ! -f ${WRKSRC}/plugins/${i} ]; then
-	echo "WARNING: Failed to find plugin source file ${WRKSRC}/plugins/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/plugins/${i} ${WRKSRC}/plugins/${i}.bak
-    printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/plugins/${i}
-    printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/plugins/${i}
-    dir=$(dirname ${WRKSRC}/plugins/${i})
-    if ! grep -q e_plugin_lib_enable ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint e_plugin_lib_enable (EPlugin *ep, gint enable);\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint\ne_plugin_lib_enable (EPlugin *ep, gint enable) {\n\treturn 0;\n}\n" >> ${WRKSRC}/plugins/${i}
-    fi
-    if ! grep -q e_plugin_lib_get_configure_widget ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *\ne_plugin_lib_get_configure_widget (EPlugin *plugin) {\n\treturn NULL;\n}" >> ${WRKSRC}/plugins/${i}
-    fi
-done
-
-for i in ${module_srcs}; do
-    if [ ! -f ${WRKSRC}/modules/${i} ]; then
-	echo "WARNING: Failed to find module source file ${WRKSRC}/modules/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/modules/${i} ${WRKSRC}/modules/${i}.bak
-    dir=$(dirname ${WRKSRC}/modules/${i})
-    if ! grep -q g_module_check_init ${dir}/*.c; then
-        printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-    if ! grep g_module_unload ${dir}/*.c; then
-        printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-done
-

mail/evolution/files/patch-CMakeLists.txt

@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2017-06-08 20:52:16.741243000 +0200
++++ CMakeLists.txt	2017-06-08 20:52:25.747544000 +0200
+@@ -329,6 +329,7 @@
+ # ******************************
+ 
+ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
++set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
+ CHECK_C_SOURCE_COMPILES("#include <iconv.h>
+ 			#include <stdlib.h>
+ 			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)

mail/evolution/files/patch-configure

@@ -1,19 +0,0 @@
---- 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=''
- 	;;
-+*freebsd*)
-+	os_win32=no
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	SOEXT='.so'
-+	SA_JUNK_PLUGIN=sa-junk-plugin
-+	BF_JUNK_PLUGIN=bogo-junk-plugin
-+	DL_LIB=''
-+	SOFTOKN3_LIB='-lsoftokn3'
-+	;;
- *)
- 	os_win32=no
- 	NO_UNDEFINED='-no-undefined'