Index: head/deskutils/kmail/Makefile
===================================================================
--- head/deskutils/kmail/Makefile	(revision 503611)
+++ head/deskutils/kmail/Makefile	(revision 503612)
@@ -1,47 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	kmail
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE mail client
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
 		libqgpgme.so:security/gpgme-qt5
 
 RUN_DEPENDS=	accountwizard:deskutils/kmail-account-wizard \
 		akonadiimportwizard:deskutils/akonadi-import-wizard \
 		mboximporter:deskutils/mbox-importer \
 		sieveeditor:deskutils/pim-sieve-editor
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
 		itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
 		notifications notifyconfig parts service solid sonnet \
 		syntaxhighlighting texteditor textwidgets unitconversion wallet \
 		widgetsaddons windowsystem xmlgui
 # pim components
 USE_KDE+=	akonadi akonadicontacts akonadimime akonadisearch calendarcore \
 		calendarutils contacts gravatar kdepim-apps-libs \
 		identitymanagement libkdepim libkleo libksieve \
 		kontactinterface ldap mailcommon mailtransport messagelib \
 		mime pimcommon pimtextedit tnef \
 		kdepim-runtime5_run
 USE_QT=		core dbus declarative gui location network printsupport \
 		webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
 
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
Index: head/deskutils/kmail/files/patch-git_97e165
===================================================================
--- head/deskutils/kmail/files/patch-git_97e165	(nonexistent)
+++ head/deskutils/kmail/files/patch-git_97e165	(revision 503612)
@@ -0,0 +1,75 @@
+From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 6 Jun 2019 18:10:42 +0200
+Subject: Fix kontact crash on logout.
+
+Summary:
+KMail was creating new Akonadi jobs during mainwindow destruction,
+due to not testing the bool in GuiActivateEvent.
+
+Same bt in bug 404881, apparently quitting from the akregator tray icon
+[which quits all of kontact... separate issue...] gave the same crash.
+
+BUG: 404881
+FIXED-IN: 19.04.2
+
+Test Plan: Run kontact, logout. Hello Drkonqi.
+
+Reviewers: mlaurent, winterz
+
+Reviewed By: mlaurent, winterz
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D21626
+---
+ src/kmail_part.cpp | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp
+index 703a1ee..96c4c07 100644
+--- src/kmail_part.cpp
++++ src/kmail_part.cpp
+@@ -33,6 +33,7 @@
+ 
+ #include <QVBoxLayout>
+ 
++#include <KParts/GUIActivateEvent>
+ #include <kparts/statusbarextension.h>
+ #include <kparts/mainwindow.h>
+ #include <kpluginfactory.h>
+@@ -129,18 +130,18 @@ bool KMailPart::openFile()
+ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
+ {
+     KParts::ReadOnlyPart::guiActivateEvent(e);
+-    mainWidget->initializeFilterActions();
+-    mainWidget->tagActionManager()->createActions();
+-    mainWidget->folderShortcutActionManager()->createActions();
+-    mainWidget->populateMessageListStatusFilterCombo();
+-    mainWidget->initializePluginActions();
+-    /*
+-    FIXME it doesn't work when we switch component.
+-    const QString title = mainWidget->fullCollectionPath();
+-    if (!title.isEmpty()) {
+-        Q_EMIT setWindowCaption(title);
++    if (e->activated()) {
++        mainWidget->initializeFilterActions();
++        mainWidget->tagActionManager()->createActions();
++        mainWidget->folderShortcutActionManager()->createActions();
++        mainWidget->populateMessageListStatusFilterCombo();
++        mainWidget->initializePluginActions();
++
++        const QString title = mainWidget->fullCollectionPath();
++        if (!title.isEmpty()) {
++            Q_EMIT setWindowCaption(title);
++        }
+     }
+-    */
+ }
+ 
+ void KMailPart::exit()
+-- 
+cgit v1.1
+

Property changes on: head/deskutils/kmail/files/patch-git_97e165
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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