Hi All, hopefully the last gpgme mail thread for this year [1] [2]. This E-Mail is for the sake of clarity. Please find below the final diff to update gpgme to 1.10.0 which also includes a FLAVOR to replace x11/kde-applications/gpgmepp.
A list of all changes: - Bump all consumers because the dependency changes (Reported by landry@): -@depend security/gpgme:gpgme-*:gpgme-1.9.0p0 +@depend security/gpgme,-main:gpgme-*:gpgme-1.10.0 - Rename KDE4 pimlibs pgpme*, qpgpme libs and adjust the CMake module. - Bump and regen all pimlibs-gpgme consumers - trojita_qgpgme.diff Patch trojita to play with qgpgme from GPGME, based on the idea from archlinux[1]. Tested on amd64. All tests are green. Positiv feedback from maintainer. Thanks you sthen@ and landry@ for your support. bulk? ok? Best regards, Rafael Sadowsk [1]: https://marc.info/?l=openbsd-ports&m=151876281029139&w=2 [2]: https://marc.info/?l=openbsd-ports&m=151939035728584&w=2 Index: mail/claws-mail/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail/Makefile,v retrieving revision 1.111 diff -u -p -u -p -r1.111 Makefile --- mail/claws-mail/Makefile 21 Jan 2018 19:24:41 -0000 1.111 +++ mail/claws-mail/Makefile 26 Mar 2018 14:49:21 -0000 @@ -13,6 +13,7 @@ PKGNAME-bogofilter= claws-mail-bogofilte PKGNAME-spamassassin= claws-mail-spamassassin-${V} PKGNAME-pdfviewer= claws-mail-pdfviewer-${V} PKGNAME-gdata= claws-mail-gdata-${V} +REVISION-main= 0 CATEGORIES= mail news Index: mail/gmime/Makefile =================================================================== RCS file: /cvs/ports/mail/gmime/Makefile,v retrieving revision 1.58 diff -u -p -u -p -r1.58 Makefile --- mail/gmime/Makefile 2 Dec 2017 12:44:33 -0000 1.58 +++ mail/gmime/Makefile 26 Mar 2018 14:49:21 -0000 @@ -6,7 +6,7 @@ COMMENT= MIME messages creation and par GNOME_PROJECT= gmime GNOME_VERSION= 2.6.23 -REVISION= 1 +REVISION= 2 SHARED_LIBS += gmime-2.6 0.2 # 623.0 Index: mail/gmime30/Makefile =================================================================== RCS file: /cvs/ports/mail/gmime30/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- mail/gmime30/Makefile 21 Dec 2017 08:15:21 -0000 1.8 +++ mail/gmime30/Makefile 26 Mar 2018 14:49:21 -0000 @@ -5,6 +5,7 @@ COMMENT= MIME messages creation and par GNOME_PROJECT= gmime GNOME_VERSION= 3.2.0 PKGNAME= gmime30-${GNOME_VERSION} +REVISION= 0 SHARED_LIBS += gmime-3.0 2.0 # 200.0 Index: mail/mu/Makefile =================================================================== RCS file: /cvs/ports/mail/mu/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- mail/mu/Makefile 2 Dec 2017 12:44:33 -0000 1.11 +++ mail/mu/Makefile 26 Mar 2018 14:49:21 -0000 @@ -5,7 +5,7 @@ COMMENT= maildir indexer and searcher wi GH_TAGNAME= 0.9.18 GH_ACCOUNT= djcb GH_PROJECT= mu -REVISION= 1 +REVISION= 2 CATEGORIES= mail HOMEPAGE= http://www.djcbsoftware.nl/code/mu/ Index: mail/mutt/Makefile =================================================================== RCS file: /cvs/ports/mail/mutt/Makefile,v retrieving revision 1.104 diff -u -p -u -p -r1.104 Makefile --- mail/mutt/Makefile 4 Mar 2018 01:07:51 -0000 1.104 +++ mail/mutt/Makefile 26 Mar 2018 14:49:21 -0000 @@ -4,6 +4,7 @@ COMMENT= tty-based e-mail client DISTNAME= mutt-1.9.4 EPOCH= 3 +REVISION= 0 CATEGORIES= mail HOMEPAGE= http://www.mutt.org/ Index: mail/neomutt/Makefile =================================================================== RCS file: /cvs/ports/mail/neomutt/Makefile,v retrieving revision 1.25 diff -u -p -u -p -r1.25 Makefile --- mail/neomutt/Makefile 23 Feb 2018 20:02:48 -0000 1.25 +++ mail/neomutt/Makefile 26 Mar 2018 14:49:21 -0000 @@ -6,6 +6,7 @@ GH_ACCOUNT= neomutt GH_PROJECT= neomutt GH_TAGNAME= neomutt-20180223 DISTNAME= ${GH_TAGNAME} +REVISION= 0 CATEGORIES= mail HOMEPAGE= http://www.neomutt.org/ Index: mail/sylpheed/Makefile =================================================================== RCS file: /cvs/ports/mail/sylpheed/Makefile,v retrieving revision 1.119 diff -u -p -u -p -r1.119 Makefile --- mail/sylpheed/Makefile 4 Feb 2018 20:51:48 -0000 1.119 +++ mail/sylpheed/Makefile 26 Mar 2018 14:49:21 -0000 @@ -3,6 +3,7 @@ COMMENT = lightweight and user-friendly e-mail client DISTNAME = sylpheed-3.7.0 +REVISION = 0 SHARED_LIBS += sylph-0 4.1 # 4.0 SHARED_LIBS += sylpheed-plugin-0 4.0 # 4.0 Index: mail/trojita/Makefile =================================================================== RCS file: /cvs/ports/mail/trojita/Makefile,v retrieving revision 1.25 diff -u -p -u -p -r1.25 Makefile --- mail/trojita/Makefile 2 Dec 2017 12:44:33 -0000 1.25 +++ mail/trojita/Makefile 26 Mar 2018 14:49:21 -0000 @@ -3,7 +3,7 @@ COMMENT = fast Qt IMAP e-mail client DISTNAME = trojita-0.7 -REVISION = 4 +REVISION = 5 SHARED_LIBS = trojita_plugins 2.0 # 2.0 @@ -17,11 +17,9 @@ EXTRACT_SUFX = .tar.xz # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c m pthread z KF5Gpgmepp-pthread KF5QGpgme -WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Sql Qt5WebKit -WANTLIB += Qt5WebKitWidgets Qt5Widgets qt5keychain gpg-error -WANTLIB += gpgme mimetic assuan -WANTLIB += ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += Qt5Sql Qt5WebKit Qt5WebKitWidgets Qt5Widgets c gpgmepp +WANTLIB += m mimetic qt5keychain z MODULES = devel/cmake x11/qt5 @@ -33,14 +31,25 @@ RUN_DEPENDS = devel/desktop-file-utils LIB_DEPENDS = mail/mimetic \ security/qtkeychain,qt5 \ - x11/kde-applications/gpgmepp \ + security/gpgme,,-qt \ x11/qt5/qtwebkit CONFIGURE_ENV += QTDIR="${MODQT_LIBDIR}" -CONFIGURE_ARGS += -DWITH_RAGEL=OFF \ - -DGIT_EXECUTABLE="" +CONFIGURE_ARGS += -DGIT_EXECUTABLE="" \ + -DWITH_CLEARTEXT_PLUGIN:Bool=ON \ + -DWITH_DBUS:Bool=ON \ + -DWITH_DESKTOP:Bool=ON \ + -DWITH_QTKEYCHAIN_PLUGIN:Bool=ON \ + -DWITH_RAGEL:Bool=OFF \ + -DWITH_SHARED_PLUGINS:Bool=ON \ + -DWITH_TESTS:Bool=ON \ + -DWITH_ZLIB:Bool=ON \ + -DWITH_QT5:Bool=ON TEST_IS_INTERACTIVE = X11 + +pre-configure: + ${SUBST_CMD} ${WRKDIST}/CMakeLists.txt post-configure: ln -sf ${MODQT_LIBDIR}/bin/lconvert ${WRKDIR}/bin Index: mail/trojita/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/mail/trojita/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-CMakeLists_txt --- mail/trojita/patches/patch-CMakeLists_txt 4 Sep 2016 14:03:00 -0000 1.2 +++ mail/trojita/patches/patch-CMakeLists_txt 26 Mar 2018 14:49:21 -0000 @@ -1,7 +1,35 @@ $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() +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -61,7 +61,9 @@ trojita_option(WITH_ZLIB "Build with zlib library" AUT + trojita_option(WITH_SHARED_PLUGINS "Enable shared dynamic plugins" ON) + trojita_option(WITH_TESTS "Build tests" ON) + trojita_option(WITH_MIMETIC "Build with client-side MIME parsing" AUTO) +-trojita_option(WITH_GPGMEPP "Build with the GpgME++ library for cryptography" AUTO) ++trojita_option(WITH_GPGMEPP "Use GpgME's native C++ bindings" ON) ++trojita_option(WITH_KF5_GPGMEPP "Use legacy discontinued GpgME++ library from KDE frameworks" OFF) ++ + + if(WIN32) + trojita_option(WITH_NSIS "Build Windows NSIS installer" AUTO "WITH_DESKTOP") +@@ -94,8 +96,13 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qt + trojita_find_package(Git "" "" "" "") + + trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html"; "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC) +-trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) +-trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") ++trojita_find_package(Gpgmepp "1.8.0" "https://gnupg.org/related_software/gpgme/index.html"; "C++/Qt bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) ++if(NOT WITH_GPGMEPP) ++ trojita_find_package(KF5Gpgmepp "" "https://commits.kde.org/gpgmepp?path=/"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_KF5_GPGMEPP) ++ trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_KF5_GPGMEPP") ++else() ++ trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") ++endif() + + if(WIN32) + trojita_find_package(MakeNSIS "" "http://nsis.sourceforge.net"; "Nullsoft Scriptable Install System" "Needed for building Windows installer" WITH_NSIS) +@@ -154,14 +161,6 @@ else() set(CMAKE_CXX_FLAGS_DEBUG "-Werror ${CMAKE_CXX_FLAGS_DEBUG}") # Also see CMP0043... @@ -16,7 +44,57 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201 # 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) +@@ -207,7 +206,7 @@ else() + set(TROJITA_HAVE_MIMETIC False) + endif() + +-if(WITH_GPGMEPP) ++if(WITH_GPGMEPP OR WITH_KF5_GPGMEPP) + set(TROJITA_HAVE_GPGMEPP True) + else() + set(TROJITA_HAVE_GPGMEPP False) +@@ -321,12 +320,10 @@ if(WITH_MIMETIC) + ) + endif() + if(WITH_CRYPTO_MESSAGES) +- if(WITH_GPGMEPP) + set(libCryptography_SOURCES + ${libCryptography_SOURCES} + ${path_Cryptography}/GpgMe++.cpp + ) +- endif() + endif() + + if(WITH_ZLIB) +@@ -622,16 +619,20 @@ set_property(TARGET Cryptography APPEND PROPERTY COMPI + target_link_libraries(Cryptography Common Imap) + if(WITH_MIMETIC) + target_link_libraries(Cryptography ${MIMETIC_LIBRARIES}) +- set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES ${MIMETIC_INCLUDE_DIRS}) ++ set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES /usr/local/include) + endif() + if(WITH_CRYPTO_MESSAGES) +- if(WITH_GPGMEPP) +- if (WIN32) +- target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) +- else() +- target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) ++ if(WITH_GPGMEPP) ++ target_link_libraries(Cryptography gpgmepp qgpgme gpgme) ++ set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES /usr/local/include/gpgme++) ++ set_property(TARGET Cryptography APPEND PROPERTY INCLUDE_DIRECTORIES /usr/local/include/qgpgme) ++ elseif(WITH_KF5_GPGMEPP) ++ if(WIN32) ++ target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) ++ else() ++ target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) ++ endif() + endif() +- endif() + endif() + + ## ClearText password plugin +@@ -786,32 +787,6 @@ if(WITH_TESTS) trojita_test(Imap Imap_Offline) trojita_test(Imap Imap_CopyAndFlagOperations) trojita_test(Cryptography Cryptography_MessageModel) Index: mail/trojita/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/trojita/pkg/PLIST,v retrieving revision 1.7 diff -u -p -u -p -r1.7 PLIST --- mail/trojita/pkg/PLIST 4 Sep 2016 14:03:00 -0000 1.7 +++ mail/trojita/pkg/PLIST 26 Mar 2018 14:49:21 -0000 @@ -3,6 +3,7 @@ @bin bin/trojita @lib lib/libtrojita_plugins.so.${LIBtrojita_plugins_VERSION} lib/trojita/ +lib/trojita/trojita_plugin_ClearTextPasswordPlugin.so lib/trojita/trojita_plugin_QtKeychainPasswordPlugin.so share/appdata/ share/appdata/trojita.appdata.xml Index: misc/reprepro/Makefile =================================================================== RCS file: /cvs/ports/misc/reprepro/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- misc/reprepro/Makefile 3 Aug 2017 20:26:49 -0000 1.2 +++ misc/reprepro/Makefile 26 Mar 2018 14:49:23 -0000 @@ -3,7 +3,7 @@ COMMENT= Debian package repository producer V= 5.1.1 -REVISION= 0 +REVISION= 1 PKGNAME= reprepro-${V} DISTNAME= reprepro_${V}.orig WRKDIST= ${WRKDIR}/reprepro-${V} Index: net/centerim/Makefile =================================================================== RCS file: /cvs/ports/net/centerim/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- net/centerim/Makefile 21 Nov 2017 00:13:02 -0000 1.9 +++ net/centerim/Makefile 26 Mar 2018 14:49:24 -0000 @@ -3,7 +3,7 @@ COMMENT= text based IM client DISTNAME= centerim-4.22.10 -REVISION= 4 +REVISION= 5 CATEGORIES= net HOMEPAGE= http://www.centerim.org/ Index: net/mcabber/Makefile =================================================================== RCS file: /cvs/ports/net/mcabber/Makefile,v retrieving revision 1.33 diff -u -p -u -p -r1.33 Makefile --- net/mcabber/Makefile 23 Sep 2017 07:41:13 -0000 1.33 +++ net/mcabber/Makefile 26 Mar 2018 14:49:24 -0000 @@ -3,7 +3,7 @@ COMMENT= console jabber client DISTNAME= mcabber-1.1.0 CATEGORIES= net -REVISION= 0 +REVISION= 1 HOMEPAGE= https://mcabber.com/ Index: net/profanity/Makefile =================================================================== RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- net/profanity/Makefile 6 Feb 2017 21:57:55 -0000 1.5 +++ net/profanity/Makefile 26 Mar 2018 14:49:26 -0000 @@ -3,6 +3,7 @@ COMMENT = console based XMPP client DISTNAME = profanity-0.5.1 CATEGORIES = net +REVISION = 0 HOMEPAGE = http://www.profanity.im/ MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org> Index: net/retroshare/Makefile =================================================================== RCS file: /cvs/ports/net/retroshare/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- net/retroshare/Makefile 26 Jul 2017 22:45:28 -0000 1.12 +++ net/retroshare/Makefile 26 Mar 2018 14:49:26 -0000 @@ -6,7 +6,7 @@ DISTNAME = retroshare_0.5.5-0.7068 PKGNAME = retroshare-${V} CATEGORIES = net security HOMEPAGE = http://retroshare.sourceforge.net -REVISION = 2 +REVISION = 3 # GPLv2 PERMIT_PACKAGE_CDROM = Yes Index: productivity/kmymoney/Makefile =================================================================== RCS file: /cvs/ports/productivity/kmymoney/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- productivity/kmymoney/Makefile 21 Mar 2018 19:21:33 -0000 1.21 +++ productivity/kmymoney/Makefile 26 Mar 2018 14:49:27 -0000 @@ -5,7 +5,7 @@ HOMEPAGE = https://kmymoney.org/ MAINTAINER = Vadim Zhukov <z...@openbsd.org> VERSION = 4.8.1.1 DISTNAME = kmymoney-${VERSION} -REVISION = 2 +REVISION = 3 SHARED_LIBS += kmm_kdchart 1.1 # 0.0 SHARED_LIBS += kmm_mymoney 1.1 # 0.0 @@ -32,8 +32,8 @@ WANTLIB += ${KDE4LIB}/nepomukutils WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kmime WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kpimutils -WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme -WANTLIB += ical icalss ofx osp qgpgme soprano +WANTLIB += alkimia assuan gmp gpg-error gpgme4++-pthread gpgme +WANTLIB += ical icalss ofx osp soprano qgpgme4 WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar WANTLIB += QtDeclarative QtScript krosscore Index: security/gpgme/Makefile =================================================================== RCS file: /cvs/ports/security/gpgme/Makefile,v retrieving revision 1.40 diff -u -p -u -p -r1.40 Makefile --- security/gpgme/Makefile 30 Jan 2018 15:06:37 -0000 1.40 +++ security/gpgme/Makefile 26 Mar 2018 14:49:27 -0000 @@ -1,43 +1,75 @@ # $OpenBSD: Makefile,v 1.40 2018/01/30 15:06:37 jca Exp $ -COMMENT= GnuPG Made Easy +COMMENT-main = GnuPG Made Easy +COMMENT-qt = Qt bindings for GPGme -DISTNAME= gpgme-1.9.0 -REVISION= 0 -CATEGORIES= security devel +VERSION = 1.10.0 +DISTNAME = gpgme-${VERSION} +PKGNAME-main = gpgme-${VERSION} +PKGNAME-qt = gpgme-qt-${VERSION} -SHARED_LIBS += gpgme 21.0 # 29.0 +CATEGORIES = security devel -HOMEPAGE= https://www.gnupg.org/software/gpgme/index.html +SHARED_LIBS += gpgme 21.0# 29.0 +SHARED_LIBS += gpgmepp 0.0 # 11.0 +SHARED_LIBS += qgpgme 0.0 # 10.0 + +HOMEPAGE = https://www.gnupg.org/software/gpgme/index.html + +MASTER_SITES = ${MASTER_SITE_GNUPG:=gpgme/} +EXTRACT_SUFX = .tar.bz2 # GPLv2 - LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += assuan c gpg-error iconv intl - -MASTER_SITES= ${MASTER_SITE_GNUPG:=gpgme/} -EXTRACT_SUFX= .tar.bz2 +WANTLIB = assuan gpg-error iconv intl +WANTLIB-main = ${WANTLIB} c +WANTLIB-qt = ${COMPILER_LIBCXX} ${WANTLIB} Qt5Core execinfo glib-2.0 +WANTLIB-qt += gthread-2.0 icudata icui18n icuuc m pcre pcre2-16 z gpgme + +COMPILER = base-clang ports-clang ports-gcc + +MULTI_PACKAGES = -main -qt +PSEUDO_FLAVORS = no_qt +FLAVOR ?= -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS += --enable-languages='' +CONFIGURE_STYLE = gnu # Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg. -BUILD_DEPENDS= gnupg->=2:security/gnupg2 +BUILD_DEPENDS = gnupg->=2:security/gnupg2 + # gnupg-* is normally the default anyway, but gnupg1 overrides PKGSPEC # so we must be explicit here. -RUN_DEPENDS= gnupg-*:security/gnupg -LIB_DEPENDS= devel/gettext \ +RUN_DEPENDS = gnupg-*:security/gnupg +LIB_DEPENDS += devel/gettext \ security/libgpg-error>=1.4 \ security/libassuan +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.arch.mk> + +.if ${BUILD_PACKAGES:M-qt} +MODULES += x11/qt5 +CONFIGURE_ARGS += --enable-languages='cpp qt' +CXXFLAGS += "-std=c++11" +LIB_DEPENDS-qt += ${LIB_DEPENDS} \ + ${BUILD_PKGPATH},-main +.else +COMPILER_LANGS = c +CONFIGURE_ARGS += --enable-languages='' +.endif + +# needed for the regression tests +USE_GMAKE = Yes + # The tests target gpg2. Running with gpg version 1 will give: # `./t-support.h:160: GPGME: Invalid crypto engine' # https://dev.gnupg.org/T3512 TEST_DEPENDS += security/gnupg2 -pre-test: +pre-build: ln -sf ${LOCALBASE}/bin/gpg2 ${WRKDIR}/bin/gpg -# needed for the regression tests -USE_GMAKE= Yes .include <bsd.port.mk> Index: security/gpgme/distinfo =================================================================== RCS file: /cvs/ports/security/gpgme/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- security/gpgme/distinfo 2 Dec 2017 12:44:33 -0000 1.13 +++ security/gpgme/distinfo 26 Mar 2018 14:49:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs= -SIZE (gpgme-1.9.0.tar.bz2) = 1344222 +SHA256 (gpgme-1.10.0.tar.bz2) = Go/tEZfDuZw19AMGa7NEomIk0pKvwEjP38TM1WkKBpM= +SIZE (gpgme-1.10.0.tar.bz2) = 1370162 Index: security/gpgme/pkg/DESCR =================================================================== RCS file: security/gpgme/pkg/DESCR diff -N security/gpgme/pkg/DESCR --- security/gpgme/pkg/DESCR 15 Dec 2003 21:55:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -GnuPG Made Easy (GPGME) is a library designed to make access to -GnuPG easier for applications. - -It provides a High-Level Crypto API for encryption, decryption, -signing, signature verification and key management. Currently it -uses GnuPG as it's backend but the API isn't restricted to this -engine; in fact it is planned to add other backends to it. Index: security/gpgme/pkg/DESCR-main =================================================================== RCS file: security/gpgme/pkg/DESCR-main diff -N security/gpgme/pkg/DESCR-main --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/gpgme/pkg/DESCR-main 26 Mar 2018 14:49:27 -0000 @@ -0,0 +1,7 @@ +GnuPG Made Easy (GPGME) is a library designed to make access to +GnuPG easier for applications. + +It provides a High-Level Crypto API for encryption, decryption, +signing, signature verification and key management. Currently it +uses GnuPG as it's backend but the API isn't restricted to this +engine; in fact it is planned to add other backends to it. Index: security/gpgme/pkg/DESCR-qt =================================================================== RCS file: security/gpgme/pkg/DESCR-qt diff -N security/gpgme/pkg/DESCR-qt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/gpgme/pkg/DESCR-qt 26 Mar 2018 14:49:27 -0000 @@ -0,0 +1 @@ +Qt and C++ bindings for GnuPG Made Easy (GPGME). Index: security/gpgme/pkg/PLIST =================================================================== RCS file: security/gpgme/pkg/PLIST diff -N security/gpgme/pkg/PLIST --- security/gpgme/pkg/PLIST 2 Dec 2017 12:44:33 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.9 2017/12/02 12:44:33 edd Exp $ -bin/gpgme-config -@bin bin/gpgme-tool -include/gpgme.h -@info info/gpgme.info -lib/libgpgme.a -lib/libgpgme.la -@lib lib/libgpgme.so.${LIBgpgme_VERSION} -share/aclocal/gpgme.m4 Index: security/gpgme/pkg/PLIST-main =================================================================== RCS file: security/gpgme/pkg/PLIST-main diff -N security/gpgme/pkg/PLIST-main --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/gpgme/pkg/PLIST-main 26 Mar 2018 14:49:27 -0000 @@ -0,0 +1,9 @@ +@comment $OpenBSD$ +bin/gpgme-config +@bin bin/gpgme-tool +include/gpgme.h +@info info/gpgme.info +lib/libgpgme.a +lib/libgpgme.la +@lib lib/libgpgme.so.${LIBgpgme_VERSION} +share/aclocal/gpgme.m4 Index: security/gpgme/pkg/PLIST-qt =================================================================== RCS file: security/gpgme/pkg/PLIST-qt diff -N security/gpgme/pkg/PLIST-qt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/gpgme/pkg/PLIST-qt 26 Mar 2018 14:49:27 -0000 @@ -0,0 +1,129 @@ +@comment $OpenBSD$ +include/QGpgME/ +include/QGpgME/AbstractImportJob +include/QGpgME/AddUserIDJob +include/QGpgME/ChangeExpiryJob +include/QGpgME/ChangeOwnerTrustJob +include/QGpgME/ChangePasswdJob +include/QGpgME/CryptoConfig +include/QGpgME/DN +include/QGpgME/DataProvider +include/QGpgME/DecryptJob +include/QGpgME/DecryptVerifyJob +include/QGpgME/DefaultKeyGenerationJob +include/QGpgME/DeleteJob +include/QGpgME/DownloadJob +include/QGpgME/EncryptJob +include/QGpgME/ExportJob +include/QGpgME/HierarchicalKeyKistJob +include/QGpgME/ImportFromKeyserverJob +include/QGpgME/ImportJob +include/QGpgME/Job +include/QGpgME/KeyForMailboxJob +include/QGpgME/KeyGenerationJob +include/QGpgME/KeyListJob +include/QGpgME/ListAllKeysJob +include/QGpgME/MultiDeleteJob +include/QGpgME/Protocol +include/QGpgME/QGpgMENewCryptoConfig +include/QGpgME/QuickJob +include/QGpgME/RefreshKeysJob +include/QGpgME/SignEncryptJob +include/QGpgME/SignJob +include/QGpgME/SignKeyJob +include/QGpgME/SpecialJob +include/QGpgME/TofuPolicyJob +include/QGpgME/VerifyDetachedJob +include/QGpgME/VerifyOpaqueJob +include/QGpgME/WKSPublishJob +include/gpgme++/ +include/gpgme++/configuration.h +include/gpgme++/context.h +include/gpgme++/data.h +include/gpgme++/decryptionresult.h +include/gpgme++/defaultassuantransaction.h +include/gpgme++/editinteractor.h +include/gpgme++/encryptionresult.h +include/gpgme++/engineinfo.h +include/gpgme++/error.h +include/gpgme++/eventloopinteractor.h +include/gpgme++/exception.h +include/gpgme++/global.h +include/gpgme++/gpgadduserideditinteractor.h +include/gpgme++/gpgagentgetinfoassuantransaction.h +include/gpgme++/gpggencardkeyinteractor.h +include/gpgme++/gpgmefw.h +include/gpgme++/gpgmepp_export.h +include/gpgme++/gpgmepp_version.h +include/gpgme++/gpgsetexpirytimeeditinteractor.h +include/gpgme++/gpgsetownertrusteditinteractor.h +include/gpgme++/gpgsignkeyeditinteractor.h +include/gpgme++/importresult.h +include/gpgme++/interfaces/ +include/gpgme++/interfaces/assuantransaction.h +include/gpgme++/interfaces/dataprovider.h +include/gpgme++/interfaces/passphraseprovider.h +include/gpgme++/interfaces/progressprovider.h +include/gpgme++/key.h +include/gpgme++/keygenerationresult.h +include/gpgme++/keylistresult.h +include/gpgme++/notation.h +include/gpgme++/result.h +include/gpgme++/scdgetinfoassuantransaction.h +include/gpgme++/signingresult.h +include/gpgme++/swdbresult.h +include/gpgme++/tofuinfo.h +include/gpgme++/trustitem.h +include/gpgme++/verificationresult.h +include/gpgme++/vfsmountresult.h +include/qgpgme/ +include/qgpgme/abstractimportjob.h +include/qgpgme/adduseridjob.h +include/qgpgme/changeexpiryjob.h +include/qgpgme/changeownertrustjob.h +include/qgpgme/changepasswdjob.h +include/qgpgme/cryptoconfig.h +include/qgpgme/dataprovider.h +include/qgpgme/decryptjob.h +include/qgpgme/decryptverifyjob.h +include/qgpgme/defaultkeygenerationjob.h +include/qgpgme/deletejob.h +include/qgpgme/dn.h +include/qgpgme/downloadjob.h +include/qgpgme/encryptjob.h +include/qgpgme/exportjob.h +include/qgpgme/hierarchicalkeylistjob.h +include/qgpgme/importfromkeyserverjob.h +include/qgpgme/importjob.h +include/qgpgme/job.h +include/qgpgme/keyformailboxjob.h +include/qgpgme/keygenerationjob.h +include/qgpgme/keylistjob.h +include/qgpgme/listallkeysjob.h +include/qgpgme/multideletejob.h +include/qgpgme/protocol.h +include/qgpgme/qgpgme_export.h +include/qgpgme/qgpgme_version.h +include/qgpgme/qgpgmenewcryptoconfig.h +include/qgpgme/quickjob.h +include/qgpgme/refreshkeysjob.h +include/qgpgme/signencryptjob.h +include/qgpgme/signjob.h +include/qgpgme/signkeyjob.h +include/qgpgme/specialjob.h +include/qgpgme/tofupolicyjob.h +include/qgpgme/verifydetachedjob.h +include/qgpgme/verifyopaquejob.h +include/qgpgme/wkspublishjob.h +lib/cmake/Gpgmepp/ +lib/cmake/Gpgmepp/GpgmeppConfig.cmake +lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake +lib/cmake/QGpgme/ +lib/cmake/QGpgme/QGpgmeConfig.cmake +lib/cmake/QGpgme/QGpgmeConfigVersion.cmake +lib/libgpgmepp.a +lib/libgpgmepp.la +@lib lib/libgpgmepp.so.${LIBgpgmepp_VERSION} +lib/libqgpgme.a +lib/libqgpgme.la +@lib lib/libqgpgme.so.${LIBqgpgme_VERSION} Index: security/p5-Crypt-GpgME/Makefile =================================================================== RCS file: /cvs/ports/security/p5-Crypt-GpgME/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- security/p5-Crypt-GpgME/Makefile 21 Nov 2017 00:13:03 -0000 1.21 +++ security/p5-Crypt-GpgME/Makefile 26 Mar 2018 14:49:28 -0000 @@ -3,7 +3,7 @@ COMMENT= Perl interface to gpgme DISTNAME= Crypt-GpgME-0.09 -REVISION= 4 +REVISION= 5 CATEGORIES= devel security # Perl Index: security/ruby-gpgme/Makefile =================================================================== RCS file: /cvs/ports/security/ruby-gpgme/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- security/ruby-gpgme/Makefile 23 Feb 2018 11:23:45 -0000 1.2 +++ security/ruby-gpgme/Makefile 26 Mar 2018 14:49:28 -0000 @@ -4,6 +4,7 @@ COMMENT = Ruby language binding for gpg DISTNAME = gpgme-2.0.16 CATEGORIES = security +REVISION = 0 HOMEPAGE = http://github.com/ueno/ruby-gpgme MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org> Index: x11/gnome/libcryptui/Makefile =================================================================== RCS file: /cvs/ports/x11/gnome/libcryptui/Makefile,v retrieving revision 1.33 diff -u -p -u -p -r1.33 Makefile --- x11/gnome/libcryptui/Makefile 10 Nov 2017 06:57:04 -0000 1.33 +++ x11/gnome/libcryptui/Makefile 26 Mar 2018 14:49:35 -0000 @@ -4,7 +4,7 @@ COMMENT= interface components for OpenPG GNOME_PROJECT= libcryptui GNOME_VERSION= 3.12.2 -REVISION= 6 +REVISION= 7 SHARED_LIBS += cryptui 2.0 # 0.0 Index: x11/gnome/seahorse/Makefile =================================================================== RCS file: /cvs/ports/x11/gnome/seahorse/Makefile,v retrieving revision 1.109 diff -u -p -u -p -r1.109 Makefile --- x11/gnome/seahorse/Makefile 10 Nov 2017 07:05:38 -0000 1.109 +++ x11/gnome/seahorse/Makefile 26 Mar 2018 14:49:35 -0000 @@ -4,7 +4,7 @@ COMMENT= GNOME encryption interface GNOME_PROJECT= seahorse GNOME_VERSION= 3.20.0 -REVISION= 0 +REVISION= 1 CATEGORIES= security Index: x11/kde4/kget/Makefile =================================================================== RCS file: /cvs/ports/x11/kde4/kget/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- x11/kde4/kget/Makefile 24 Feb 2018 14:07:30 -0000 1.14 +++ x11/kde4/kget/Makefile 26 Mar 2018 14:49:35 -0000 @@ -2,7 +2,7 @@ COMMENT = download manager for KDE DISTNAME = kget-${MODKDE4_VERSION} -REVISION = 7 +REVISION = 8 CATEGORIES = net HOMEPAGE = http://projects.kde.org/projects/kde/kdenetwork/kget @@ -17,7 +17,8 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kworkspace ${KDE4LIB}/nepomuk WANTLIB += ${KDE4LIB}/nepomukcore ${KDE4LIB}/nepomukutils WANTLIB += ${KDE4LIB}/nepomukwidgets ${KDE4LIB}/plasma ${KDE4LIB}/solid -WANTLIB += assuan gpg-error gpgme++-pthread gpgme mms qca qgpgme soprano +WANTLIB += assuan gpg-error gpgme gpgme4++-pthread mms qca qgpgme4 +WANTLIB += soprano MODULES = multimedia/phonon MODKDE4_USE = pim workspace Index: x11/kde4/pim/Makefile =================================================================== RCS file: /cvs/ports/x11/kde4/pim/Makefile,v retrieving revision 1.34 diff -u -p -u -p -r1.34 Makefile --- x11/kde4/pim/Makefile 2 Dec 2017 12:44:33 -0000 1.34 +++ x11/kde4/pim/Makefile 26 Mar 2018 14:49:35 -0000 @@ -3,7 +3,7 @@ COMMENT = KDE personal information management DISTNAME = kdepim-4.14.10 PKGSPEC = kdepim-${MODKDE4_SPEC} -REVISION = 5 +REVISION = 6 DPB_PROPERTIES += parallel MASTER_SITES = ${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/} @@ -33,7 +33,6 @@ SHARED_LIBS += eventviews SHARED_LIBS += incidenceeditorsng 54.0 # 4.7 SHARED_LIBS += incidenceeditorsngmobile 54.0 # 4.7 SHARED_LIBS += kdepimdbusinterfaces 54.0 # 4.7 -#SHARED_LIBS += kdepimmobileui 51.0 # 4.7 SHARED_LIBS += kdgantt2 54.0 # 0.1 SHARED_LIBS += kleopatraclientcore 54.0 # 0.3 SHARED_LIBS += kleopatraclientgui 54.0 # 0.3 @@ -47,8 +46,6 @@ SHARED_LIBS += templateparser SHARED_LIBS += pimcommon 54.0 # 4.10 SHARED_LIBS += composereditorng 3.0 # 4.11 -#SHARED_LIBS += grammar 0.0 # 4.11 -#SHARED_LIBS += pimactivity 0.0 # 4.11 SHARED_LIBS += sendlater 3.0 # 4.11 SHARED_LIBS += grantleetheme 2.0 # 4.13 @@ -97,8 +94,8 @@ WANTLIB += ${KDE4LIB}/baloopim ${KDE4LIB WANTLIB += ${KDE4LIB}/kidletime ${KDE4LIB}/kutils WANTLIB += ${KDE4LIB}/balooqueryparser ${KDE4LIB}/kfile WANTLIB += akonadiprotocolinternals prison soprano -WANTLIB += assuan gpg-error gpgme++ gpgme++-pthread gpgme -WANTLIB += grantlee_core grantlee_gui iconv intl qjson qgpgme sasl2 +WANTLIB += assuan gpg-error gpgme gpgme4++ gpgme4++-pthread qgpgme4 +WANTLIB += grantlee_core grantlee_gui iconv intl qjson sasl2 MODULES = multimedia/phonon Index: x11/kde4/pimlibs/Makefile =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/Makefile,v retrieving revision 1.44 diff -u -p -u -p -r1.44 Makefile --- x11/kde4/pimlibs/Makefile 2 Dec 2017 12:44:33 -0000 1.44 +++ x11/kde4/pimlibs/Makefile 26 Mar 2018 14:49:35 -0000 @@ -2,7 +2,7 @@ COMMENT = libraries for KDE PIM services DISTNAME = kdepimlibs-4.14.10 -REVISION = 3 +REVISION = 5 DPB_PROPERTIES = parallel @@ -18,14 +18,11 @@ SHARED_LIBS += kresources 54.0 SHARED_LIBS += ktnef 54.0 # .4.0 SHARED_LIBS += kxmlrpcclient 54.0 # .4.0 SHARED_LIBS += syndication 54.0 # .1.0 -SHARED_LIBS += gpgme++ 51.0 # .1.0 -SHARED_LIBS += gpgme++-pthread 51.0 # .1.0 SHARED_LIBS += kblog 54.0 # .4.0 SHARED_LIBS += kimap 54.0 # .4.0 SHARED_LIBS += kpimidentities 54.0 # .4.0 SHARED_LIBS += kpimutils 54.0 # .4.0 SHARED_LIBS += mailtransport 54.0 # .4.0 -SHARED_LIBS += qgpgme 54.0 # .1.0 SHARED_LIBS += akonadi-contact 54.0 # .4.4 SHARED_LIBS += akonadi-kabc 54.0 # .4.4 SHARED_LIBS += akonadi-kcal 54.0 # .4.4 @@ -45,6 +42,10 @@ SHARED_LIBS += kmbox 54.0 # 4.7 SHARED_LIBS += akonadi-socialutils 54.0 # 4.10 SHARED_LIBS += akonadi-xml 2.0 # 4.13 + +SHARED_LIBS += qgpgme4 0.0 # 1.0 +SHARED_LIBS += gpgme4++-pthread 0.0 # 2.8 +SHARED_LIBS += gpgme4++ 0.0 # 2.8 WANTLIB = c m pthread WANTLIB += ${COMPILER_LIBCXX} Index: x11/kde4/pimlibs/patches/patch-akonadi_CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/patches/patch-akonadi_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-akonadi_CMakeLists_txt --- x11/kde4/pimlibs/patches/patch-akonadi_CMakeLists_txt 9 Jul 2014 20:03:30 -0000 1.2 +++ x11/kde4/pimlibs/patches/patch-akonadi_CMakeLists_txt 26 Mar 2018 14:49:35 -0000 @@ -1,8 +1,9 @@ $OpenBSD: patch-akonadi_CMakeLists_txt,v 1.2 2014/07/09 20:03:30 zhuk Exp $ Fix linking. ---- akonadi/CMakeLists.txt.orig Thu May 8 11:26:48 2014 -+++ akonadi/CMakeLists.txt Sun May 18 20:22:24 2014 -@@ -461,7 +461,7 @@ if(QT_QTDESIGNER_FOUND) +Index: akonadi/CMakeLists.txt +--- akonadi/CMakeLists.txt.orig ++++ akonadi/CMakeLists.txt +@@ -467,7 +467,7 @@ if(QT_QTDESIGNER_FOUND) kde4_add_plugin(akonadiwidgets ${akonadiwidgets_PART_SRCS}) Index: x11/kde4/pimlibs/patches/patch-cmake_modules_FindQGpgme_cmake =================================================================== RCS file: x11/kde4/pimlibs/patches/patch-cmake_modules_FindQGpgme_cmake diff -N x11/kde4/pimlibs/patches/patch-cmake_modules_FindQGpgme_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde4/pimlibs/patches/patch-cmake_modules_FindQGpgme_cmake 26 Mar 2018 14:49:35 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: cmake/modules/FindQGpgme.cmake +--- cmake/modules/FindQGpgme.cmake.orig ++++ cmake/modules/FindQGpgme.cmake +@@ -13,14 +13,14 @@ find_package(Gpgme QUIET) + if(GPGME_FOUND) + + if ( WIN32 ) +- find_library(_QGPGME_EXTRA_LIBRARY gpgme++ ++ find_library(_QGPGME_EXTRA_LIBRARY gpgme4++ + HINTS ${GPGME_LIBRARY_DIR}) + else ( WIN32 ) +- find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread ++ find_library(_QGPGME_EXTRA_LIBRARY gpgme4++-pthread + HINTS ${GPGME_LIBRARY_DIR}) + endif() + +- find_library(QGPGME_LIBRARY qgpgme ++ find_library(QGPGME_LIBRARY qgpgme4 + HINTS ${GPGME_LIBRARY_DIR}) + + if (QGPGME_LIBRARY) Index: x11/kde4/pimlibs/patches/patch-gpgme++_CMakeLists_txt =================================================================== RCS file: x11/kde4/pimlibs/patches/patch-gpgme++_CMakeLists_txt diff -N x11/kde4/pimlibs/patches/patch-gpgme++_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde4/pimlibs/patches/patch-gpgme++_CMakeLists_txt 26 Mar 2018 14:49:35 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ + +Index: gpgme++/CMakeLists.txt +--- gpgme++/CMakeLists.txt.orig ++++ gpgme++/CMakeLists.txt +@@ -56,10 +56,10 @@ if ( GPGME_VANILLA_FOUND ) + set_target_properties( gpgmepp PROPERTIES + VERSION ${_gpgmepp_version} + SOVERSION ${_gpgmepp_soversion} +- OUTPUT_NAME gpgme++ ++ OUTPUT_NAME gpgme4++ + ) + get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION ) +- install(TARGETS gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel) ++ install(TARGETS gpgmepp RENAME gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel) + + endif() + +@@ -98,7 +98,7 @@ if ( GPGME_PTHREAD_FOUND ) + set_target_properties( gpgmepp-pthread PROPERTIES + VERSION ${_gpgmepp_version} + SOVERSION ${_gpgmepp_soversion} +- OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL gpgmepp_EXPORTS ++ OUTPUT_NAME gpgme4++-pthread DEFINE_SYMBOL gpgmepp_EXPORTS + ) + get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION ) + install(TARGETS gpgmepp-pthread EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) Index: x11/kde4/pimlibs/patches/patch-kabc_CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/patches/patch-kabc_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-kabc_CMakeLists_txt --- x11/kde4/pimlibs/patches/patch-kabc_CMakeLists_txt 9 Jul 2014 20:03:30 -0000 1.2 +++ x11/kde4/pimlibs/patches/patch-kabc_CMakeLists_txt 26 Mar 2018 14:49:35 -0000 @@ -1,8 +1,9 @@ $OpenBSD: patch-kabc_CMakeLists_txt,v 1.2 2014/07/09 20:03:30 zhuk Exp $ Fix linking. ---- kabc/CMakeLists.txt.orig Thu May 8 11:26:48 2014 -+++ kabc/CMakeLists.txt Sun May 18 20:22:24 2014 -@@ -91,12 +91,12 @@ endif() +Index: kabc/CMakeLists.txt +--- kabc/CMakeLists.txt.orig ++++ kabc/CMakeLists.txt +@@ -96,12 +96,12 @@ endif() add_library(kabc ${LIBRARY_TYPE} ${kabc_LIB_SRCS}) generate_export_header(kabc) Index: x11/kde4/pimlibs/patches/patch-kabc_tests_CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/patches/patch-kabc_tests_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-kabc_tests_CMakeLists_txt --- x11/kde4/pimlibs/patches/patch-kabc_tests_CMakeLists_txt 9 Jul 2014 20:03:30 -0000 1.1 +++ x11/kde4/pimlibs/patches/patch-kabc_tests_CMakeLists_txt 26 Mar 2018 14:49:35 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-kabc_tests_CMakeLists_txt,v 1.1 2014/07/09 20:03:30 zhuk Exp $ Fix linking. ---- kabc/tests/CMakeLists.txt.orig Sun May 18 20:54:31 2014 -+++ kabc/tests/CMakeLists.txt Sun May 18 20:57:19 2014 +Index: kabc/tests/CMakeLists.txt +--- kabc/tests/CMakeLists.txt.orig ++++ kabc/tests/CMakeLists.txt @@ -8,7 +8,7 @@ set(addresstest_SRCS addresstest.cpp) kde4_add_unit_test(addresstest TESTNAME kabc-addresstest ${addresstest_SRCS}) @@ -164,9 +165,12 @@ Fix linking. ########### next target ############### -@@ -184,4 +184,4 @@ set(vcarddragtest_SRCS vcarddragtest.cpp) +@@ -184,7 +184,7 @@ set(vcarddragtest_SRCS vcarddragtest.cpp) kde4_add_unit_test(vcarddragtest TESTNAME kabc-vcarddragtest ${vcarddragtest_SRCS}) -target_link_libraries(vcarddragtest ${KDE4_KDECORE_LIBS} kabc ${QT_QTTEST_LIBRARY}) +target_link_libraries(vcarddragtest kabc ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) + + + ########### next target ############### Index: x11/kde4/pimlibs/patches/patch-kmime_kmime_util_cpp =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/patches/patch-kmime_kmime_util_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-kmime_kmime_util_cpp --- x11/kde4/pimlibs/patches/patch-kmime_kmime_util_cpp 9 Jul 2014 20:03:30 -0000 1.2 +++ x11/kde4/pimlibs/patches/patch-kmime_kmime_util_cpp 26 Mar 2018 14:49:35 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-kmime_kmime_util_cpp,v 1.2 2014/07/09 20:03:30 zhuk Exp $ MINOR SECURITY FIX. Remove erroneous bikeshedding. ---- kmime/kmime_util.cpp.orig Thu May 8 11:26:48 2014 -+++ kmime/kmime_util.cpp Sun May 18 20:22:24 2014 +Index: kmime/kmime_util.cpp +--- kmime/kmime_util.cpp.orig ++++ kmime/kmime_util.cpp @@ -38,6 +38,7 @@ #include <kcharsets.h> #include <kcodecs.h> @@ -10,7 +11,7 @@ MINOR SECURITY FIX. Remove erroneous bik #include <QtCore/QList> #include <QtCore/QString> -@@ -540,29 +541,7 @@ QString decodeRFC2231String( const QByteArray &src ) +@@ -542,29 +543,7 @@ QString decodeRFC2231String( const QByteArray &src ) QByteArray uniqueString() { Index: x11/kde4/pimlibs/patches/patch-qgpgme_CMakeLists_txt =================================================================== RCS file: x11/kde4/pimlibs/patches/patch-qgpgme_CMakeLists_txt diff -N x11/kde4/pimlibs/patches/patch-qgpgme_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde4/pimlibs/patches/patch-qgpgme_CMakeLists_txt 26 Mar 2018 14:49:35 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: qgpgme/CMakeLists.txt +--- qgpgme/CMakeLists.txt.orig ++++ qgpgme/CMakeLists.txt +@@ -49,6 +49,7 @@ if ( _any_gpgme_found ) + set_target_properties( qgpgme PROPERTIES + VERSION ${_qgpgme_version} + SOVERSION ${_qgpgme_soversion} ++ OUTPUT_NAME qgpgme4 + ) + + install( TARGETS qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) Index: x11/kde4/pimlibs/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/kde4/pimlibs/pkg/PLIST,v retrieving revision 1.20 diff -u -p -u -p -r1.20 PLIST --- x11/kde4/pimlibs/pkg/PLIST 5 May 2015 12:35:49 -0000 1.20 +++ x11/kde4/pimlibs/pkg/PLIST 26 Mar 2018 14:49:35 -0000 @@ -1184,8 +1184,6 @@ lib/kde4/kio_smtp.so @lib ${KDE4LIB}/libakonadi-notes.so.${LIBakonadi-notes_VERSION} @lib ${KDE4LIB}/libakonadi-socialutils.so.${LIBakonadi-socialutils_VERSION} @lib ${KDE4LIB}/libakonadi-xml.so.${LIBakonadi-xml_VERSION} -@lib ${KDE4LIB}/libgpgme++-pthread.so.${LIBgpgme++-pthread_VERSION} -@lib ${KDE4LIB}/libgpgme++.so.${LIBgpgme++_VERSION} @lib ${KDE4LIB}/libkabc.so.${LIBkabc_VERSION} @lib ${KDE4LIB}/libkabc_file_core.so.${LIBkabc_file_core_VERSION} @lib ${KDE4LIB}/libkalarmcal.so.${LIBkalarmcal_VERSION} @@ -1207,7 +1205,7 @@ lib/kde4/kio_smtp.so @lib ${KDE4LIB}/libkxmlrpcclient.so.${LIBkxmlrpcclient_VERSION} @lib ${KDE4LIB}/libmailtransport.so.${LIBmailtransport_VERSION} @lib ${KDE4LIB}/libmicroblog.so.${LIBmicroblog_VERSION} -@lib ${KDE4LIB}/libqgpgme.so.${LIBqgpgme_VERSION} +@lib ${KDE4LIB}/libqgpgme4.so.${LIBqgpgme4_VERSION} @lib ${KDE4LIB}/libsyndication.so.${LIBsyndication_VERSION} lib/kde4/plugins/designer/akonadiwidgets.so lib/kde4/plugins/designer/kholidayswidgets.so @@ -1220,8 +1218,8 @@ lib/kde4/plugins/designer/kholidayswidge @lib lib/libakonadi-notes.so.${LIBakonadi-notes_VERSION} @lib lib/libakonadi-socialutils.so.${LIBakonadi-socialutils_VERSION} @lib lib/libakonadi-xml.so.${LIBakonadi-xml_VERSION} -@lib lib/libgpgme++-pthread.so.${LIBgpgme++-pthread_VERSION} -@lib lib/libgpgme++.so.${LIBgpgme++_VERSION} +@lib lib/libgpgme4++-pthread.so.${LIBgpgme4++-pthread_VERSION} +@lib lib/libgpgme4++.so.${LIBgpgme4++_VERSION} @lib lib/libkabc.so.${LIBkabc_VERSION} @lib lib/libkabc_file_core.so.${LIBkabc_file_core_VERSION} @lib lib/libkalarmcal.so.${LIBkalarmcal_VERSION} @@ -1243,7 +1241,7 @@ lib/kde4/plugins/designer/kholidayswidge @lib lib/libkxmlrpcclient.so.${LIBkxmlrpcclient_VERSION} @lib lib/libmailtransport.so.${LIBmailtransport_VERSION} @lib lib/libmicroblog.so.${LIBmicroblog_VERSION} -@lib lib/libqgpgme.so.${LIBqgpgme_VERSION} +@lib lib/libqgpgme4.so.${LIBqgpgme4_VERSION} @lib lib/libsyndication.so.${LIBsyndication_VERSION} share/akonadi/ share/akonadi/agents/ Index: x11/kde4/runtime/Makefile =================================================================== RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v retrieving revision 1.36 diff -u -p -u -p -r1.36 Makefile --- x11/kde4/runtime/Makefile 2 Dec 2017 12:44:33 -0000 1.36 +++ x11/kde4/runtime/Makefile 26 Mar 2018 14:49:35 -0000 @@ -6,7 +6,7 @@ DISTNAME = kde-runtime-${MODKDE4_VERSIO PKGNAME-main = ${DISTNAME} PKGNAME-locale = kde4-locale-${MODKDE4_VERSION} PKG_ARCH-locale = * -REVISION-main = 12 +REVISION-main = 13 REVISION-locale = 2 DPB_PROPERTIES = parallel @@ -35,10 +35,10 @@ WANTLIB-main += ${KDE4LIB}/kmediaplayer WANTLIB-main += ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts ${KDE4LIB}/kpty WANTLIB-main += ${KDE4LIB}/kxmlrpcclient ${KDE4LIB}/nepomuk WANTLIB-main += ${KDE4LIB}/nepomukutils -WANTLIB-main += ${KDE4LIB}/plasma ${KDE4LIB}/qgpgme ${KDE4LIB}/solid +WANTLIB-main += ${KDE4LIB}/plasma ${KDE4LIB}/qgpgme4 ${KDE4LIB}/solid WANTLIB-main += attica canberra exiv2 glib-2.0 jpeg pulse WANTLIB-main += pulse-mainloop-glib smbclient ssh soprano webp -WANTLIB-main += assuan gcrypt gpg-error gpgme++-pthread gpgme +WANTLIB-main += assuan gcrypt gpg-error gpgme4++-pthread gpgme WANTLIB-locale =
