Update to trojita 0.7 and switch to qt5, from maintainer Caspar Schutijser.

Note that this is currently broken at runtime because it uses QtWebKit
which still has W^X violations, but runs fine when testing locally w/
USE_WXNEEDED. cmake hacks/fixes for QtWebKit fixes being looked by dcoppa@..

mail/trojita/Makefile

@@ -1,39 +1,38 @@
-# $OpenBSD: Makefile,v 1.17 2016/08/21 22:20:48 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.18 2016/09/04 14:03:00 landry Exp $
 
 USE_WXNEEDED =		Yes # QtWebKit
 
 COMMENT =		fast Qt IMAP e-mail client
 
-DISTNAME =		trojita-0.6
-REVISION =		1
+DISTNAME =		trojita-0.7
 
-SHARED_LIBS =		trojita_plugins	1.0 # 1.0
+SHARED_LIBS =		trojita_plugins	2.0 # 2.0
 
 CATEGORIES =		mail x11
 
 HOMEPAGE =		http://trojita.flaska.net/
 MAINTAINER =		Caspar Schutijser <caspar@schutijser.com>
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=trojita/}
-EXTRACT_SUFX =		.tar.bz2
+EXTRACT_SUFX =		.tar.xz
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += 		lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
-WANTLIB +=		lib/qt4/QtSql lib/qt4/QtWebKit c m pthread z X11
+WANTLIB +=		c m pthread z KF5Gpgmepp-pthread KF5QGpgme
+WANTLIB +=		Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Sql Qt5WebKit
+WANTLIB +=		Qt5WebKitWidgets Qt5Widgets qt5keychain gpg-error
+WANTLIB +=		gpgme-pthread mimetic assuan
 
-MODULES =		devel/cmake gcc4 x11/qt4
-
-MODGCC4_ARCHS =		*
-MODGCC4_LANGS =		c++
+MODULES =		devel/cmake x11/qt5
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+3,-guic
+LIB_DEPENDS =		mail/mimetic \
+			security/qtkeychain,qt5 \
+			x11/kde-applications/gpgmepp
 
 CONFIGURE_ENV +=	QTDIR="${MODQT_LIBDIR}"
 CONFIGURE_ARGS +=	-DWITH_RAGEL=OFF \
-			-DWITH_QT5=OFF \
-			-DWITH_QTKEYCHAIN_PLUGIN=OFF \
 			-DGIT_EXECUTABLE=""
 
 TEST_IS_INTERACTIVE =	X11

mail/trojita/distinfo

@@ -1,2 +1,2 @@
-SHA256 (trojita-0.6.tar.bz2) = TBCD9ItRzDe7MYxaitpntks47ZXYrTC0YhdV/PRe+hA=
-SIZE (trojita-0.6.tar.bz2) = 1409812
+SHA256 (trojita-0.7.tar.xz) = 4I2ogXIcr6AOzXcurva5n9N9Boy3A+61Mt4O0eoBNtk=
+SIZE (trojita-0.7.tar.xz) = 1038212

mail/trojita/patches/patch-CMakeLists_txt

@@ -1,7 +1,7 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2016/08/19 19:42:04 dcoppa Exp $
---- CMakeLists.txt.orig	Fri Aug 19 11:42:02 2016
-+++ CMakeLists.txt	Fri Aug 19 11:42:58 2016
-@@ -236,14 +236,6 @@ else()
+$OpenBSD: patch-CMakeLists_txt,v 1.2 2016/09/04 14:03:00 landry Exp $
+--- CMakeLists.txt.orig	Wed Jun 15 09:17:23 2016
++++ CMakeLists.txt	Sat Aug 20 13:36:13 2016
+@@ -154,14 +154,6 @@ else()
      set(CMAKE_CXX_FLAGS_DEBUG "-Werror ${CMAKE_CXX_FLAGS_DEBUG}")
      # Also see CMP0043...
  
@@ -16,3 +16,36 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 2016/08/19 19:42:04 dcoppa Exp $
      # Build warnings are useful tools (and Trojita should be warning-free anyway), enable them on all
      # configurations. They are warnings, not errors.
      set(CMAKE_CXX_FLAGS "-Wall -Wsign-compare ${CMAKE_CXX_FLAGS}")
+@@ -786,32 +778,6 @@ if(WITH_TESTS)
+     trojita_test(Imap Imap_Offline)
+     trojita_test(Imap Imap_CopyAndFlagOperations)
+     trojita_test(Cryptography Cryptography_MessageModel)
+-
+-    if(WITH_CRYPTO_MESSAGES)
+-      find_program(GPGCONF_BINARY NAMES gpgconf)
+-      if(GPGCONF_BINARY_NOTFOUND)
+-        message(SEND_ERROR "The `gpgconf` binary from GnuPG not found, this is needed for crypto tests.")
+-      endif()
+-
+-      if(NOT UNIX)
+-        message(SEND_ERROR "The Cryptography unit tests really need Unix. Patches welcome.")
+-      endif()
+-
+-      add_library(fake-dev-random SHARED ${CMAKE_CURRENT_SOURCE_DIR}/tests/Utils/fake-dev-random.c)
+-      target_link_libraries(fake-dev-random dl)
+-
+-      # FIXME: it would be nice to depend on the contents of keys/, but in my testing it produces Makefiles
+-      # which suffer from races (the keygen.sh is run multiple times in parallel within the CI environment).
+-      # I wasn't able to track down the root cause behind this; it affected all cmake versions within the CI
+-      # as of Feb 2016, which is 3.1.something up to 3.3.something.
+-      add_custom_command(OUTPUT crypto_test_data.h
+-        COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/tests/Cryptography/keygen.sh ${CMAKE_CURRENT_SOURCE_DIR}
+-        DEPENDS fake-dev-random tests/Cryptography/keygen.sh tests/Cryptography/batch-keygen)
+-      add_custom_target(crypto_test_data DEPENDS crypto_test_data.h)
+-
+-      trojita_test(Cryptography Cryptography_PGP)
+-      add_dependencies(test_Cryptography_PGP crypto_test_data)
+-    endif()
+ 
+     trojita_test(Misc Rfc5322)
+     trojita_test(Misc RingBuffer)

mail/trojita/pkg/PLIST

@@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2016/01/24 02:35:36 jturner Exp $
+@comment $OpenBSD: PLIST,v 1.7 2016/09/04 14:03:00 landry Exp $
 @bin bin/be.contacts
 @bin bin/trojita
 @lib lib/libtrojita_plugins.so.${LIBtrojita_plugins_VERSION}
+lib/trojita/
+lib/trojita/trojita_plugin_QtKeychainPasswordPlugin.so
 share/appdata/
 share/appdata/trojita.appdata.xml
 share/applications/trojita.desktop