[Midnightbsd-cvs] mports [23226] trunk/mail: update evolution

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Apr 29 16:15:43 EDT 2018


Revision: 23226
          http://svnweb.midnightbsd.org/mports/?rev=23226
Author:   laffer1
Date:     2018-04-29 16:15:41 -0400 (Sun, 29 Apr 2018)
Log Message:
-----------
update evolution

Modified Paths:
--------------
    trunk/mail/Makefile
    trunk/mail/evolution/Makefile
    trunk/mail/evolution/distinfo
    trunk/mail/evolution/files/patch-configure
    trunk/mail/evolution/pkg-descr
    trunk/mail/evolution/pkg-plist
    trunk/mail/evolution-mapi/Makefile
    trunk/mail/evolution-mapi/distinfo
    trunk/mail/evolution-mapi/pkg-descr
    trunk/mail/evolution-mapi/pkg-plist

Added Paths:
-----------
    trunk/mail/evolution/files/patch-mail_mail-config.ui
    trunk/mail/evolution-ews/
    trunk/mail/evolution-ews/Makefile
    trunk/mail/evolution-ews/distinfo
    trunk/mail/evolution-ews/pkg-descr
    trunk/mail/evolution-ews/pkg-plist
    trunk/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c

Removed Paths:
-------------
    trunk/mail/evolution-exchange/
    trunk/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c

Modified: trunk/mail/Makefile
===================================================================
--- trunk/mail/Makefile	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/Makefile	2018-04-29 20:15:41 UTC (rev 23226)
@@ -15,7 +15,7 @@
 SUBDIR += dcc-dccd
 SUBDIR += dovecot2
 SUBDIR += evolution
-SUBDIR += evolution-exchange
+SUBDIR += evolution-ews
 SUBDIR += evolution-mapi
 SUBDIR += faces
 SUBDIR += fetchmail

Modified: trunk/mail/evolution/Makefile
===================================================================
--- trunk/mail/evolution/Makefile	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution/Makefile	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	evolution
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.5.1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -9,24 +10,30 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
-LICENSE=	unknown
+LICENSE=	gpl2 lgpl2.1 mpl 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:${PORTSDIR}/textproc/itstool \
-		highlight:${PORTSDIR}/textproc/highlight
-LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libcryptui.so:${PORTSDIR}/security/libcryptui \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	highlight:${PORTSDIR}/textproc/highlight \
-		gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		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 \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libcryptui.so:security/libcryptui \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	highlight:textproc/highlight \
+		gnome-keyring>=3.0.0:security/gnome-keyring
 
-USES=		desktop-file-utils bison gettext gmake libtool \
+PORTSCOUT=	limitw:1,even
+
+USES=		desktop-file-utils bison gettext gmake gnome libtool \
 		pathfix perl5 pkgconfig tar:xz
-USE_GNOME=	evolutiondataserver3 gnomedesktop3 intlhack
+USE_GNOME=	evolutiondataserver3 gnomedesktop3 intltool
 GNU_CONFIGURE=	yes
 USE_GSTREAMER1=	yes
 INSTALLS_ICONS=	yes
@@ -33,7 +40,7 @@
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--disable-autoar \
-		--with-sub-version=" MidnightBSD"
+		--with-sub-version="BSD GNOME Team Port"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
@@ -57,7 +64,7 @@
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
 		org.gnome.evolution.plugin.templates.gschema.xml
 
-EVO_VERSION=	3.16
+EVO_VERSION=	3.18
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
@@ -78,34 +85,35 @@
 LDAP_CONFIGURE_WITH=	openldap
 LDAP_USE=	OPENLDAP=yes
 
-WEATHER_LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather
+WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CONFIGURE_ENABLE=	weather
 
-SPAMASSASSIN_CONFIGURE_WITH=	spamassassin
-SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	spamassassin:${PORTSDIR}/mail/spamassassin
+SPAMASSASSIN_CONFIGURE_WITH=	spamassassin=${LOCALBASE}/bin/spamassassin \
+				sa-learn=${LOCALBASE}/bin/sa-learn
+SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:mail/spamassassin
+SPAMASSASSIN_RUN_DEPENDS=	spamassassin:mail/spamassassin
 
-CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 CANBERRA_CONFIGURE_ENABLE=	canberra
 
 PST_CONFIGURE_ENABLE=	pst-import
-PST_BUILD_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
-PST_RUN_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+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:${PORTSDIR}/graphics/libchamplain \
-#			libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
-#MAPS_BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+#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.mport.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|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
 		-e 's|-Wl,--no-undefined||g' \
 		-e 's|-Wmissing-include-dirs||g' \
-	    	${WRKSRC}/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
 		${WRKSRC}/modules/bogofilter/evolution-bogofilter.c

Modified: trunk/mail/evolution/distinfo
===================================================================
--- trunk/mail/evolution/distinfo	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution/distinfo	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-3.16.4.tar.xz) = 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f
-SIZE (gnome3/evolution-3.16.4.tar.xz) = 11946404
+SHA256 (gnome3/evolution-3.18.5.1.tar.xz) = 20e5acd345107fdfe19ac28cd1ea4252014f28428a59d273890944c415f0590b
+SIZE (gnome3/evolution-3.18.5.1.tar.xz) = 12067580

Modified: trunk/mail/evolution/files/patch-configure
===================================================================
--- trunk/mail/evolution/files/patch-configure	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution/files/patch-configure	2018-04-29 20:15:41 UTC (rev 23226)
@@ -4,7 +4,7 @@
  	CHAMPLAIN_REQUIREMENT=''
  	GEOCLUE_REQUIREMENT=''
  	;;
-+*midnightbsd* | *freebsd*)
++*freebsd*)
 +	os_win32=no
 +	NO_UNDEFINED=''
 +	SOCKET_LIBS=''

Added: trunk/mail/evolution/files/patch-mail_mail-config.ui
===================================================================
--- trunk/mail/evolution/files/patch-mail_mail-config.ui	                        (rev 0)
+++ trunk/mail/evolution/files/patch-mail_mail-config.ui	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,539 @@
+From 2da59292e2ddebc9d72a923580d4a9af00e0c981 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 24 Nov 2015 15:42:22 +0100
+Subject: Mail Preferences->Junk page incorrectly referenced in the code
+
+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
+@@ -3032,47 +3032,65 @@
+       </packing>
+     </child>
+     <child>
+-      <object class="GtkAlignment" id="junk-alignment">
++      <object class="GtkVBox" id="vboxJunk">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="yalign">0</property>
+-        <property name="yscale">0</property>
++        <property name="border_width">12</property>
++        <property name="spacing">12</property>
++        <property name="valign">GTK_ALIGN_START</property>
+         <child>
+-          <object class="GtkVBox" id="vboxJunk">
++          <object class="GtkVBox" id="junk-general-section">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="border_width">12</property>
+-            <property name="spacing">12</property>
++            <property name="spacing">6</property>
+             <child>
+-              <object class="GtkVBox" id="junk-general-section">
++              <object class="GtkLabel" id="junk-general-header">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="spacing">6</property>
++                <property name="xalign">0</property>
++                <property name="label" translatable="yes">General</property>
++                <attributes>
++                  <attribute name="weight" value="bold"/>
++                </attributes>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkTable" id="junk-general-table">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="n_rows">7</property>
++                <property name="row_spacing">4</property>
+                 <child>
+-                  <object class="GtkLabel" id="junk-general-header">
++                  <object class="GtkCheckButton" id="chkCheckIncomingMail">
++                    <property name="label" translatable="yes">Check incoming _messages for junk</property>
+                     <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
+                     <property name="xalign">0</property>
+-                    <property name="label" translatable="yes">General</property>
+-                    <attributes>
+-                      <attribute name="weight" value="bold"/>
+-                    </attributes>
++                    <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">False</property>
+-                    <property name="position">0</property>
++                    <property name="top_attach">0</property>
++                    <property name="bottom_attach">1</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"/>
++                    <property name="x_padding">12</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkTable" id="junk-general-table">
++                  <object class="GtkHBox" id="hbox237">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="n_rows">7</property>
+-                    <property name="row_spacing">4</property>
++                    <property name="spacing">4</property>
+                     <child>
+-                      <object class="GtkCheckButton" id="chkCheckIncomingMail">
+-                        <property name="label" translatable="yes">Check incoming _messages for junk</property>
++                      <object class="GtkCheckButton" id="junk_empty_check">
++                        <property name="label" translatable="yes">_Delete junk messages</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">False</property>
+@@ -3081,259 +3099,235 @@
+                         <property name="draw_indicator">True</property>
+                       </object>
+                       <packing>
+-                        <property name="top_attach">0</property>
+-                        <property name="bottom_attach">1</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options"/>
+-                        <property name="x_padding">12</property>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
+                       </packing>
+                     </child>
+                     <child>
+-                      <object class="GtkHBox" id="hbox237">
++                      <object class="GtkComboBox" id="junk_empty_combobox">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="spacing">4</property>
+-                        <child>
+-                          <object class="GtkCheckButton" id="junk_empty_check">
+-                            <property name="label" translatable="yes">_Delete junk messages</property>
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="receives_default">False</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="xalign">0</property>
+-                            <property name="draw_indicator">True</property>
+-                          </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">0</property>
+-                          </packing>
+-                        </child>
++                        <property name="model">model2</property>
+                         <child>
+-                          <object class="GtkComboBox" id="junk_empty_combobox">
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="model">model2</property>
+-                            <child>
+-                              <object class="GtkCellRendererText" id="renderer2"/>
+-                              <attributes>
+-                                <attribute name="text">0</attribute>
+-                              </attributes>
+-                            </child>
+-                          </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">1</property>
+-                          </packing>
++                          <object class="GtkCellRendererText" id="renderer2"/>
++                          <attributes>
++                            <attribute name="text">0</attribute>
++                          </attributes>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="x_padding">12</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                     <object class="GtkLabel" id="junk-test-opts-header">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="margin-top">12</property>
+-                        <property name="label" translatable="yes">Junk Test Options</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options"/>
+-                        <property name="x_padding">0</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkCheckButton" id="lookup_book">
+-                        <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property>
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
+-                        <property name="receives_default">False</property>
+-                        <property name="use_underline">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="draw_indicator">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options"/>
+-                        <property name="x_padding">12</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkCheckButton" id="junk_lookup_local_only">
+-                        <property name="label" translatable="yes">_Lookup in local address book only</property>
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
+-                        <property name="receives_default">False</property>
+-                        <property name="use_underline">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="draw_indicator">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="top_attach">4</property>
+-                        <property name="bottom_attach">5</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options"/>
+-                        <property name="x_padding">24</property>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
++                  </object>
++                  <packing>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="x_padding">12</property>
++                  </packing>
++                </child>
++                <child>
++                 <object class="GtkLabel" id="junk-test-opts-header">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="margin-top">12</property>
++                    <property name="label" translatable="yes">Junk Test Options</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="top_attach">2</property>
++                    <property name="bottom_attach">3</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"/>
++                    <property name="x_padding">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkCheckButton" id="lookup_book">
++                    <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="xalign">0</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="top_attach">3</property>
++                    <property name="bottom_attach">4</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"/>
++                    <property name="x_padding">12</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkCheckButton" id="junk_lookup_local_only">
++                    <property name="label" translatable="yes">_Lookup in local address book only</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="xalign">0</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="top_attach">4</property>
++                    <property name="bottom_attach">5</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"/>
++                    <property name="x_padding">24</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkCheckButton" id="junk_header_check">
++                    <property name="label" translatable="yes">Check cu_stom headers for junk</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="xalign">0</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="top_attach">5</property>
++                    <property name="bottom_attach">6</property>
++                    <property name="x_options">GTK_FILL</property>
++                    <property name="y_options"/>
++                    <property name="x_padding">12</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkHBox" id="hbox243">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="spacing">6</property>
+                     <child>
+-                      <object class="GtkCheckButton" id="junk_header_check">
+-                        <property name="label" translatable="yes">Check cu_stom headers for junk</property>
++                      <object class="GtkScrolledWindow" id="scrolledwindow51">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="receives_default">False</property>
+-                        <property name="use_underline">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="draw_indicator">True</property>
++                        <property name="shadow_type">in</property>
++                        <child>
++                          <object class="GtkTreeView" id="junk_header_tree">
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <child internal-child="selection">
++                              <object class="GtkTreeSelection" id="treeview-selection"/>
++                            </child>
++                          </object>
++                        </child>
+                       </object>
+                       <packing>
+-                        <property name="top_attach">5</property>
+-                        <property name="bottom_attach">6</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options"/>
+-                        <property name="x_padding">12</property>
++                        <property name="expand">True</property>
++                        <property name="fill">True</property>
++                        <property name="position">0</property>
+                       </packing>
+                     </child>
+                     <child>
+-                      <object class="GtkHBox" id="hbox243">
++                      <object class="GtkVButtonBox" id="vbuttonbox26">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+                         <property name="spacing">6</property>
++                        <property name="layout_style">start</property>
+                         <child>
+-                          <object class="GtkScrolledWindow" id="scrolledwindow51">
++                          <object class="GtkButton" id="junk_header_add">
++                            <property name="label" translatable="yes">_Add</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="shadow_type">in</property>
+-                            <child>
+-                              <object class="GtkTreeView" id="junk_header_tree">
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <child internal-child="selection">
+-                                  <object class="GtkTreeSelection" id="treeview-selection"/>
+-                                </child>
+-                              </object>
+-                            </child>
++                            <property name="can_default">True</property>
++                            <property name="receives_default">True</property>
++                            <property name="use_stock">False</property>
++                            <property name="use-underline">True</property>
+                           </object>
+                           <packing>
+-                            <property name="expand">True</property>
+-                            <property name="fill">True</property>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
+                             <property name="position">0</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkVButtonBox" id="vbuttonbox26">
++                          <object class="GtkButton" id="junk_header_remove">
++                            <property name="label" translatable="yes">_Remove</property>
+                             <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="spacing">6</property>
+-                            <property name="layout_style">start</property>
+-                            <child>
+-                              <object class="GtkButton" id="junk_header_add">
+-                                <property name="label" translatable="yes">_Add</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="can_default">True</property>
+-                                <property name="receives_default">True</property>
+-                                <property name="use_stock">False</property>
+-                                <property name="use-underline">True</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">0</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkButton" id="junk_header_remove">
+-                                <property name="label" translatable="yes">_Remove</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="can_default">True</property>
+-                                <property name="receives_default">True</property>
+-                                <property name="use_stock">False</property>
+-                                <property name="use-underline">True</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">1</property>
+-                              </packing>
+-                            </child>
++                            <property name="can_focus">True</property>
++                            <property name="can_default">True</property>
++                            <property name="receives_default">True</property>
++                            <property name="use_stock">False</property>
++                            <property name="use-underline">True</property>
+                           </object>
+                           <packing>
+                             <property name="expand">False</property>
+-                            <property name="fill">True</property>
++                            <property name="fill">False</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="top_attach">6</property>
+-                        <property name="bottom_attach">7</property>
+-                        <property name="x_padding">12</property>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
++                  </object>
++                  <packing>
++                    <property name="top_attach">6</property>
++                    <property name="bottom_attach">7</property>
++                    <property name="x_padding">12</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="EMailJunkOptions" id="junk-module-options">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="row_spacing">6</property>
++                    <property name="column_spacing">6</property>
+                     <child>
+-                      <object class="EMailJunkOptions" id="junk-module-options">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="row_spacing">6</property>
+-                        <property name="column_spacing">6</property>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                      </object>
+-                      <packing>
+-                        <property name="top_attach">7</property>
+-                        <property name="bottom_attach">8</property>
+-                        <property name="y_options">GTK_FILL</property>
+-                        <property name="y_padding">12</property>
+-                      </packing>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">True</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
++                    <property name="top_attach">7</property>
++                    <property name="bottom_attach">8</property>
++                    <property name="y_options">GTK_FILL</property>
++                    <property name="y_padding">12</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">0</property>
++          </packing>
+         </child>
+       </object>
+       <packing>
+         <property name="position">4</property>
++        <property name="tab_fill">False</property>
+       </packing>
+     </child>
+     <child type="tab">
+-- 
+cgit v0.12
+


Property changes on: trunk/mail/evolution/files/patch-mail_mail-config.ui
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/evolution/pkg-descr
===================================================================
--- trunk/mail/evolution/pkg-descr	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution/pkg-descr	2018-04-29 20:15:41 UTC (rev 23226)
@@ -4,6 +4,6 @@
 in one powerful, fast, and easy to use application.  It also delivers a
 comprehensive set of features that help keep work organized and projects
 on track.  The unique Ximian vFolders[tm] are virtual folders used to
-create and save powerful contextual views of email messages. 
+create and save powerful contextual views of email messages.
 
 WWW: http://www.gnome.org/projects/evolution/

Modified: trunk/mail/evolution/pkg-plist
===================================================================
--- trunk/mail/evolution/pkg-plist	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution/pkg-plist	2018-04-29 20:15:41 UTC (rev 23226)
@@ -117,6 +117,7 @@
 include/evolution/e-util/e-cell-checkbox.h
 include/evolution/e-util/e-cell-combo.h
 include/evolution/e-util/e-cell-date-edit.h
+include/evolution/e-util/e-cell-date-int.h
 include/evolution/e-util/e-cell-date.h
 include/evolution/e-util/e-cell-hbox.h
 include/evolution/e-util/e-cell-number.h
@@ -123,7 +124,6 @@
 include/evolution/e-util/e-cell-percent.h
 include/evolution/e-util/e-cell-pixbuf.h
 include/evolution/e-util/e-cell-popup.h
-include/evolution/e-util/e-cell-renderer-color.h
 include/evolution/e-util/e-cell-size.h
 include/evolution/e-util/e-cell-text.h
 include/evolution/e-util/e-cell-toggle.h
@@ -138,6 +138,7 @@
 include/evolution/e-util/e-color-chooser-widget.h
 include/evolution/e-util/e-color-combo.h
 include/evolution/e-util/e-config.h
+include/evolution/e-util/e-conflict-search-selector.h
 include/evolution/e-util/e-contact-store.h
 include/evolution/e-util/e-data-capture.h
 include/evolution/e-util/e-dateedit.h
@@ -244,6 +245,7 @@
 include/evolution/e-util/e-source-config-backend.h
 include/evolution/e-util/e-source-config-dialog.h
 include/evolution/e-util/e-source-config.h
+include/evolution/e-util/e-source-conflict-search.h
 include/evolution/e-util/e-source-selector-dialog.h
 include/evolution/e-util/e-source-selector.h
 include/evolution/e-util/e-source-util.h
@@ -438,10 +440,12 @@
 include/evolution/mail/e-mail-message-pane.h
 include/evolution/mail/e-mail-migrate.h
 include/evolution/mail/e-mail-paned-view.h
+include/evolution/mail/e-mail-properties.h
 include/evolution/mail/e-mail-print-config-headers.h
 include/evolution/mail/e-mail-printer.h
 include/evolution/mail/e-mail-reader-utils.h
 include/evolution/mail/e-mail-reader.h
+include/evolution/mail/e-mail-remote-content.h
 include/evolution/mail/e-mail-request.h
 include/evolution/mail/e-mail-send-account-override.h
 include/evolution/mail/e-mail-sidebar.h
@@ -504,6 +508,7 @@
 lib/evolution/libgnomecanvas.so
 lib/evolution/modules/module-addressbook.so
 lib/evolution/modules/module-backup-restore.so
+%%BOGOFILTER%%lib/evolution/modules/module-bogofilter.so
 lib/evolution/modules/module-book-config-google.so
 %%LDAP%%lib/evolution/modules/module-book-config-ldap.so
 lib/evolution/modules/module-book-config-local.so
@@ -539,7 +544,6 @@
 lib/evolution/plugins/liborg-gnome-evolution-bbdb.so
 lib/evolution/plugins/liborg-gnome-external-editor.so
 lib/evolution/plugins/liborg-gnome-face.so
-lib/evolution/plugins/liborg-gnome-itip-formatter.so
 lib/evolution/plugins/liborg-gnome-mail-notification.so
 lib/evolution/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/plugins/liborg-gnome-mailing-list-actions.so
@@ -554,7 +558,6 @@
 lib/evolution/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/plugins/org-gnome-external-editor.eplug
 lib/evolution/plugins/org-gnome-face.eplug
-lib/evolution/plugins/org-gnome-itip-formatter.eplug
 lib/evolution/plugins/org-gnome-mail-notification.eplug
 lib/evolution/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/plugins/org-gnome-mailing-list-actions.eplug
@@ -573,6 +576,7 @@
 libexec/evolution/evolution-backup
 libexec/evolution/killev
 share/GConf/gsettings/evolution.convert
+%%BOGOFILTER%%share/appdata/evolution-bogofilter.metainfo.xml
 %%SPAMASSASSIN%%share/appdata/evolution-spamassassin.metainfo.xml
 share/appdata/evolution.appdata.xml
 share/applications/evolution.desktop
@@ -1024,7 +1028,6 @@
 share/gtk-doc/html/evolution-util/ECellPercent.html
 share/gtk-doc/html/evolution-util/ECellPixbuf.html
 share/gtk-doc/html/evolution-util/ECellPopup.html
-share/gtk-doc/html/evolution-util/ECellRendererColor.html
 share/gtk-doc/html/evolution-util/ECellSize.html
 share/gtk-doc/html/evolution-util/ECellText.html
 share/gtk-doc/html/evolution-util/ECellToggle.html

Added: trunk/mail/evolution-ews/Makefile
===================================================================
--- trunk/mail/evolution-ews/Makefile	                        (rev 0)
+++ trunk/mail/evolution-ews/Makefile	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,34 @@
+# $MidnightBSD$
+
+PORTNAME=	evolution-ews
+PORTVERSION=	3.18.5
+CATEGORIES=	mail gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
+
+LICENSE=	gpl3
+
+BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libmspack.so:archivers/libmspack \
+		libical.so:devel/libical
+RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
+
+PORTSCOUT=	limitw:1,even
+
+USES=		bdb:5 gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz
+USE_GNOME=	intltool
+GNU_CONFIGURE=	yes
+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
+
+.include <bsd.port.mk>


Property changes on: trunk/mail/evolution-ews/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/mail/evolution-ews/distinfo
===================================================================
--- trunk/mail/evolution-ews/distinfo	                        (rev 0)
+++ trunk/mail/evolution-ews/distinfo	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,2 @@
+SHA256 (gnome3/evolution-ews-3.18.5.tar.xz) = 7e1ed3b18161a620ba358ebf23e4c7aea85c0c5070be3c20a8a2ef012fbcfc55
+SIZE (gnome3/evolution-ews-3.18.5.tar.xz) = 702984


Property changes on: trunk/mail/evolution-ews/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/mail/evolution-ews/pkg-descr
===================================================================
--- trunk/mail/evolution-ews/pkg-descr	                        (rev 0)
+++ trunk/mail/evolution-ews/pkg-descr	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,5 @@
+Evolution-ews is a plugin for Evolution that adds Exchange integration though
+Exchange Web Service.
+
+See the following link for development.
+https://docs.google.com/spreadsheet/ccc?key=0ArU7C3muFYmHdHlvZUpRQ0FKQkNVck5kc1BpSDhkSGc&hl=en_U


Property changes on: trunk/mail/evolution-ews/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/mail/evolution-ews/pkg-plist
===================================================================
--- trunk/mail/evolution-ews/pkg-plist	                        (rev 0)
+++ trunk/mail/evolution-ews/pkg-plist	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,63 @@
+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/modules/module-ews-configuration.so
+share/appdata/evolution-ews.metainfo.xml
+share/evolution-data-server/ews/windowsZones.xml
+share/evolution/errors/module-ews-configuration.error
+share/locale/as/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
+share/locale/de/LC_MESSAGES/evolution-ews.mo
+share/locale/el/LC_MESSAGES/evolution-ews.mo
+share/locale/en_GB/LC_MESSAGES/evolution-ews.mo
+share/locale/es/LC_MESSAGES/evolution-ews.mo
+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
+share/locale/kn/LC_MESSAGES/evolution-ews.mo
+share/locale/lt/LC_MESSAGES/evolution-ews.mo
+share/locale/lv/LC_MESSAGES/evolution-ews.mo
+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 at latin/LC_MESSAGES/evolution-ews.mo
+share/locale/sv/LC_MESSAGES/evolution-ews.mo
+share/locale/ta/LC_MESSAGES/evolution-ews.mo
+share/locale/te/LC_MESSAGES/evolution-ews.mo
+share/locale/tr/LC_MESSAGES/evolution-ews.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-ews.mo


Property changes on: trunk/mail/evolution-ews/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/evolution-mapi/Makefile
===================================================================
--- trunk/mail/evolution-mapi/Makefile	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution-mapi/Makefile	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,40 +1,36 @@
 # $MidnightBSD$
 
 PORTNAME=	evolution-mapi
-PORTVERSION=	0.30.3
+PORTVERSION=	3.18.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
+COMMENT=	Evolution Microsoft Exchange plugin through OpenChange
+
 LICENSE=	gpl3
 
-BUILD_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
-LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
-RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		evolution>=3.0.0:mail/evolution
+LIB_DEPENDS=	libmapi.so:mail/libmapi
+RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
-PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
+PORTSCOUT=	limitw:1,even
 
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	evolutiondataserver
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
+CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/
+INSTALL_TARGET=	install-strip
 
-EVO_VERSION=	2.30
-EDS_VERSION=	1.2
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
-
-.include <bsd.port.pre.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/src/libexchangemapi/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-	    	${WRKSRC}/configure
+		-e 's|$$(prefix)/$$(DATADIRNAME)/|$$(prefix)/share/|g' \
+		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/mail/evolution-mapi/distinfo
===================================================================
--- trunk/mail/evolution-mapi/distinfo	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution-mapi/distinfo	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,4 +1,2 @@
-MD5 (gnome2/evolution-mapi-0.30.3.tar.bz2) = 82df7fb9212863d78612b6639e0946db
-SHA256 (gnome2/evolution-mapi-0.30.3.tar.bz2) = c2320e47a562913398ae1be1de6bbf0d93eae666010e18d855a00c96317c7f11
-RMD160 (gnome2/evolution-mapi-0.30.3.tar.bz2) = 72389ba7221186b393b3256c47badd29cac0e2a5
-SIZE (gnome2/evolution-mapi-0.30.3.tar.bz2) = 525255
+SHA256 (gnome3/evolution-mapi-3.18.4.tar.xz) = ac277787f3220dd39888c179661883d27e6376920c0b44112e030a1756f9eee2
+SIZE (gnome3/evolution-mapi-3.18.4.tar.xz) = 619984

Deleted: trunk/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
===================================================================
--- trunk/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,24 +0,0 @@
---- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig	2010-03-08 04:03:24.000000000 -0500
-+++ src/account-setup-eplugin/exchange-mapi-account-setup.c	2010-03-13 17:49:17.000000000 -0500
-@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, 
- 	// Update the folder list in the plugin and ExchangeMAPIFolder
- 	return;
- }
-+
-+const char *g_module_check_init (gpointer module);
-+const char *
-+g_module_check_init (gpointer module) {
-+	return NULL;
-+}
-+
-+void g_module_unload (gpointer module);
-+void
-+g_module_unload (gpointer module) {
-+	return;
-+}
-+
-+GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
-+GtkWidget *
-+e_plugin_lib_get_configure_widget (EPlugin *plugin) {
-+	return NULL;
-+}

Added: trunk/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
===================================================================
--- trunk/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c	                        (rev 0)
+++ trunk/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c	2018-04-29 20:15:41 UTC (rev 23226)
@@ -0,0 +1,10 @@
+--- src/libexchangemapi/e-mapi-cal-utils.c.orig	2014-03-24 09:28:56.000000000 +0000
++++ src/libexchangemapi/e-mapi-cal-utils.c	2014-05-07 09:56:54.788424673 +0000
+@@ -462,6 +462,7 @@
+ 	gchar *start = NULL, *end = NULL;
+ 	time_t start_date, end_date;
+ 	icalcomponent *icalcomp = NULL;
++	int daylight;
+ 
+ 	if (!bin)
+ 		return;


Property changes on: trunk/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/evolution-mapi/pkg-descr
===================================================================
--- trunk/mail/evolution-mapi/pkg-descr	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution-mapi/pkg-descr	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1 +1 @@
-WWW:	http://www.go-evolution.org/MAPIProvider
+WWW: http://www.go-evolution.org/MAPIProvider

Modified: trunk/mail/evolution-mapi/pkg-plist
===================================================================
--- trunk/mail/evolution-mapi/pkg-plist	2018-04-29 20:08:39 UTC (rev 23225)
+++ trunk/mail/evolution-mapi/pkg-plist	2018-04-29 20:15:41 UTC (rev 23226)
@@ -1,30 +1,34 @@
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-defs.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-folder.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.so
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.urls
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.so
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.la
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.so
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.so
-lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.la
-lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.so
-lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-exchange-mapi.eplug
-lib/libexchangemapi-1.0.la
+include/evolution-data-server/mapi/e-mapi-book-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-recur-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-tz-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-utils.h
+include/evolution-data-server/mapi/e-mapi-connection.h
+include/evolution-data-server/mapi/e-mapi-debug.h
+include/evolution-data-server/mapi/e-mapi-defs.h
+include/evolution-data-server/mapi/e-mapi-fast-transfer.h
+include/evolution-data-server/mapi/e-mapi-folder.h
+include/evolution-data-server/mapi/e-mapi-mail-utils.h
+include/evolution-data-server/mapi/e-mapi-operation-queue.h
+include/evolution-data-server/mapi/e-mapi-utils.h
+lib/evolution/modules/module-mapi-configuration.so
+lib/evolution-data-server/addressbook-backends/libebookbackendmapi.so
+lib/evolution-data-server/calendar-backends/libecalbackendmapi.so
+lib/evolution-data-server/camel-providers/libcamelmapi.urls
+lib/evolution-data-server/camel-providers/libcamelmapi.so
+lib/evolution-data-server/registry-modules/module-mapi-backend.so
 lib/libexchangemapi-1.0.so
 lib/libexchangemapi-1.0.so.0
+lib/libexchangemapi-1.0.so.0.0.0
+libdata/pkgconfig/libexchangemapi-1.0.pc
+share/appdata/evolution-mapi.metainfo.xml
+share/evolution-data-server/mapi/tz-ical-to-mapi
+share/evolution-data-server/mapi/tz-mapi-to-ical
 share/locale/as/LC_MESSAGES/evolution-mapi.mo
 share/locale/ast/LC_MESSAGES/evolution-mapi.mo
 share/locale/bg/LC_MESSAGES/evolution-mapi.mo
 share/locale/bn/LC_MESSAGES/evolution-mapi.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo
+share/locale/bs/LC_MESSAGES/evolution-mapi.mo
 share/locale/ca/LC_MESSAGES/evolution-mapi.mo
 share/locale/ca at valencia/LC_MESSAGES/evolution-mapi.mo
 share/locale/cs/LC_MESSAGES/evolution-mapi.mo
@@ -31,8 +35,9 @@
 share/locale/da/LC_MESSAGES/evolution-mapi.mo
 share/locale/de/LC_MESSAGES/evolution-mapi.mo
 share/locale/el/LC_MESSAGES/evolution-mapi.mo
+share/locale/en at shaw/LC_MESSAGES/evolution-mapi.mo
 share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
-share/locale/en at shaw/LC_MESSAGES/evolution-mapi.mo
+share/locale/eo/LC_MESSAGES/evolution-mapi.mo
 share/locale/es/LC_MESSAGES/evolution-mapi.mo
 share/locale/et/LC_MESSAGES/evolution-mapi.mo
 share/locale/eu/LC_MESSAGES/evolution-mapi.mo
@@ -73,35 +78,9 @@
 share/locale/te/LC_MESSAGES/evolution-mapi.mo
 share/locale/th/LC_MESSAGES/evolution-mapi.mo
 share/locale/tr/LC_MESSAGES/evolution-mapi.mo
+share/locale/ug/LC_MESSAGES/evolution-mapi.mo
 share/locale/uk/LC_MESSAGES/evolution-mapi.mo
 share/locale/vi/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
-libdata/pkgconfig/libexchangemapi-1.0.pc
-share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
-share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
- at dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
- at dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/si/LC_MESSAGES
- at dirrmtry share/locale/si
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as



More information about the Midnightbsd-cvs mailing list