On Fri, Nov 17, 2017 at 12:23:59PM +0000, Edd Barrett wrote: > Below is a revised diff which updates gpgme and fixes the WANTLIBs > on the above ports
Here's another which forces the test suite to run under gpg2. This means we exercise the gpg-agent tests and avoid a failing test (I think due to a missing feature test for a crypto engine missing in gpg1). https://dev.gnupg.org/T3512 Index: audio/rhythmbox/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/audio/rhythmbox/Makefile,v retrieving revision 1.164 diff -u -p -r1.164 Makefile --- audio/rhythmbox/Makefile 15 Nov 2017 16:48:41 -0000 1.164 +++ audio/rhythmbox/Makefile 17 Nov 2017 14:52:07 -0000 @@ -4,7 +4,7 @@ COMMENT= integrated music management ap GNOME_PROJECT= rhythmbox GNOME_VERSION= 3.4.2 -REVISION= 3 +REVISION= 4 SHARED_LIBS += rhythmbox-core 0.0 # 7.0 @@ -21,7 +21,7 @@ WANTLIB += Xrandr Xrender Xtst archive a WANTLIB += atspi bz2 c cairo cairo-gobject crypto dbus-1 epoxy WANTLIB += expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmime-3.0 gmodule-2.0 -WANTLIB += gobject-2.0 gpg-error gpgme-pthread gpod graphite2 +WANTLIB += gobject-2.0 gpg-error gpgme gpod graphite2 WANTLIB += grilo-0.3 gstaudio-1.0 gstbase-1.0 gstcontroller-1.0 WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0 WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv idn intl json-glib-1.0 Index: mail/gmime/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/mail/gmime/Makefile,v retrieving revision 1.57 diff -u -p -r1.57 Makefile --- mail/gmime/Makefile 25 Apr 2017 09:00:26 -0000 1.57 +++ mail/gmime/Makefile 17 Nov 2017 14:52:07 -0000 @@ -6,7 +6,7 @@ COMMENT= MIME messages creation and par GNOME_PROJECT= gmime GNOME_VERSION= 2.6.23 -REVISION= 0 +REVISION= 1 SHARED_LIBS += gmime-2.6 0.2 # 623.0 @@ -20,7 +20,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot PERMIT_PACKAGE_CDROM= Yes WANTLIB += assuan ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gpg-error gpgme-pthread gthread-2.0 iconv intl pcre +WANTLIB += gpg-error gpgme gthread-2.0 iconv intl pcre WANTLIB += pthread z MODULES= x11/gnome Index: mail/gmime30/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/mail/gmime30/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- mail/gmime30/Makefile 29 Oct 2017 15:27:02 -0000 1.4 +++ mail/gmime30/Makefile 17 Nov 2017 14:52:07 -0000 @@ -5,6 +5,7 @@ COMMENT= MIME messages creation and par GNOME_PROJECT= gmime GNOME_VERSION= 3.0.3 PKGNAME= gmime30-${GNOME_VERSION} +REVISION = 0 SHARED_LIBS += gmime-3.0 1.0 # 0.2 @@ -18,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot PERMIT_PACKAGE_CDROM= Yes WANTLIB += assuan ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gpg-error gpgme-pthread gthread-2.0 iconv idn intl +WANTLIB += gpg-error gpgme gthread-2.0 iconv idn intl WANTLIB += pcre pthread z MODULES= x11/gnome Index: mail/mu/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/mail/mu/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- mail/mu/Makefile 26 Jul 2017 22:45:26 -0000 1.10 +++ mail/mu/Makefile 17 Nov 2017 14:52:07 -0000 @@ -5,7 +5,7 @@ COMMENT= maildir indexer and searcher wi GH_TAGNAME= 0.9.18 GH_ACCOUNT= djcb GH_PROJECT= mu -REVISION= 0 +REVISION= 1 CATEGORIES= mail HOMEPAGE= http://www.djcbsoftware.nl/code/mu/ @@ -24,7 +24,7 @@ LIB_DEPENDS= databases/xapian-core \ security/gpgme WANTLIB += assuan c ffi gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0 -WANTLIB += gobject-2.0 gpg-error gpgme-pthread gthread-2.0 iconv +WANTLIB += gobject-2.0 gpg-error gpgme gthread-2.0 iconv WANTLIB += intl m pcre pthread ${COMPILER_LIBCXX} uuid xapian z AUTOCONF_VERSION= 2.69 Index: mail/trojita/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/mail/trojita/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- mail/trojita/Makefile 30 Jul 2017 15:00:39 -0000 1.24 +++ mail/trojita/Makefile 17 Nov 2017 14:52:07 -0000 @@ -3,7 +3,7 @@ COMMENT = fast Qt IMAP e-mail client DISTNAME = trojita-0.7 -REVISION = 3 +REVISION = 4 SHARED_LIBS = trojita_plugins 2.0 # 2.0 @@ -20,7 +20,7 @@ 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-pthread mimetic assuan +WANTLIB += gpgme mimetic assuan WANTLIB += ${COMPILER_LIBCXX} MODULES = devel/cmake x11/qt5 Index: net/pidgin-sipe/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/net/pidgin-sipe/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- net/pidgin-sipe/Makefile 9 Nov 2017 19:44:12 -0000 1.28 +++ net/pidgin-sipe/Makefile 17 Nov 2017 14:52:07 -0000 @@ -5,7 +5,7 @@ BROKEN-hppa = -Werror + sip-csta.c:707: COMMENT = SIPE plugin for Pidgin DISTNAME = pidgin-sipe-1.20.0 -REVISION = 3 +REVISION = 4 CATEGORIES = net @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += crypto dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0 gmime-2.6 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 idn lzma m nspr4 WANTLIB += nss3 nssutil3 pcre plc4 plds4 pthread purple smime3 -WANTLIB += sqlite3 ssl3 xml2 z assuan gpg-error gpgme-pthread +WANTLIB += ssl3 xml2 z assuan gpg-error gpgme MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sipe/} Index: productivity/kmymoney/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/productivity/kmymoney/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- productivity/kmymoney/Makefile 8 Nov 2017 05:36:11 -0000 1.14 +++ productivity/kmymoney/Makefile 17 Nov 2017 14:52:07 -0000 @@ -5,7 +5,7 @@ HOMEPAGE = https://kmymoney.org/ MAINTAINER = Vadim Zhukov <z...@openbsd.org> VERSION = 4.8.0 DISTNAME = kmymoney-${VERSION} -REVISION = 2 +REVISION = 3 SHARED_LIBS = kmm_kdchart 1.1 SHARED_LIBS += kmm_mymoney 1.1 @@ -31,7 +31,7 @@ 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-pthread +WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme WANTLIB += ical icalss ofx osp qgpgme soprano WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar WANTLIB += QtDeclarative QtScript krosscore Index: x11/gnome/grilo/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/gnome/grilo/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- x11/gnome/grilo/Makefile 9 Nov 2017 19:44:12 -0000 1.53 +++ x11/gnome/grilo/Makefile 17 Nov 2017 14:52:08 -0000 @@ -7,7 +7,7 @@ COMMENT= framework for making media disc GNOME_PROJECT= grilo GNOME_VERSION= 0.3.4 API= 0.3 -REVISION= 4 +REVISION= 5 SUBST_VARS= API @@ -25,7 +25,7 @@ WANTLIB += Xrandr Xrender Xtst archive a WANTLIB += atspi bz2 c cairo cairo-gobject crypto curl dbus-1 WANTLIB += epoxy expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0 gobject-2.0 -WANTLIB += gpg-error gpgme-pthread graphite2 gthread-2.0 gtk-3 +WANTLIB += gpg-error gpgme graphite2 gthread-2.0 gtk-3 WANTLIB += harfbuzz iconv idn intl lz4 lzma m nghttp2 nspr4 nss3 WANTLIB += oauth pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 WANTLIB += plc4 plds4 png pthread smime3 nssutil3 soup-2.4 sqlite3 Index: x11/gnome/grilo-plugins/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/gnome/grilo-plugins/Makefile,v retrieving revision 1.70 diff -u -p -r1.70 Makefile --- x11/gnome/grilo-plugins/Makefile 9 Nov 2017 19:44:12 -0000 1.70 +++ x11/gnome/grilo-plugins/Makefile 17 Nov 2017 14:52:08 -0000 @@ -8,7 +8,7 @@ COMMENT= plugins for Grilo GNOME_PROJECT= grilo-plugins GNOME_VERSION= 0.3.5 -REVISION= 2 +REVISION= 3 API= 0.3 SUBST_VARS= API @@ -22,7 +22,7 @@ WANTLIB += archive assuan avahi-client a WANTLIB += avahi-gobject bz2 crypto curl dbus-1 expat ffi gck-1 WANTLIB += gcr-base-3 gcrypt gdata gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmime-3.0 gmodule-2.0 goa-1.0 gobject-2.0 gpg-error -WANTLIB += gpgme-pthread grilo-0.3 grlnet-0.3 grlpls-0.3 gthread-2.0 +WANTLIB += gpgme grilo-0.3 grlnet-0.3 grlpls-0.3 gthread-2.0 WANTLIB += iconv icudata icui18n icuuc idn intl json-glib-1.0 WANTLIB += kvm lz4 lzma m mediaart-2.0 nghttp2 nspr4 nss3 oauth WANTLIB += p11-kit pcre plc4 plds4 png pthread smime3 nssutil3 Index: x11/gnome/tracker-miners/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/gnome/tracker-miners/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- x11/gnome/tracker-miners/Makefile 15 Nov 2017 20:35:35 -0000 1.2 +++ x11/gnome/tracker-miners/Makefile 17 Nov 2017 14:52:08 -0000 @@ -2,6 +2,7 @@ TRACKER_API= 2.0 SUBST_VARS= TRACKER_API +REVISION = 0 COMMENT= tracker miners and metadata extractors @@ -16,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xrender archive assuan WANTLIB += bz2 c cairo crypto cue enca exempi exif expat ffi fontconfig WANTLIB += freetype gcrypt gif gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0 -WANTLIB += gobject-2.0 gpg-error gpgme-pthread gsf-1 gstaudio-1.0 +WANTLIB += gobject-2.0 gpg-error gpgme gsf-1 gstaudio-1.0 WANTLIB += gstbase-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 WANTLIB += gstvideo-1.0 gthread-2.0 gxps iconv icudata icui18n WANTLIB += icuuc idn intl iptcdata jpeg json-glib-1.0 kvm lcms2 Index: x11/kde-applications/gpgmepp/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/kde-applications/gpgmepp/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- x11/kde-applications/gpgmepp/Makefile 27 Jul 2017 10:15:29 -0000 1.5 +++ x11/kde-applications/gpgmepp/Makefile 17 Nov 2017 14:52:08 -0000 @@ -3,14 +3,14 @@ COMMENT = C++ bindings/wrapper for gpgme VERSION= 16.04.0 DISTNAME = gpgmepp-${VERSION} -REVISION = 2 +REVISION = 3 CATEGORIES = security SHARED_LIBS = KF5QGpgme 0.0 # 4.80 SHARED_LIBS += KF5Gpgmepp-pthread 0.0 # 4.80 SHARED_LIBS += KF5Gpgmepp 0.0 # 4.80 -WANTLIB = Qt5Core assuan gpg-error gpgme gpgme-pthread m pthread +WANTLIB = Qt5Core assuan gpg-error gpgme m pthread WANTLIB += ${COMPILER_LIBCXX} KDE5 = Yes Index: x11/kde4/kget/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/kde4/kget/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- x11/kde4/kget/Makefile 27 Jul 2017 11:57:49 -0000 1.11 +++ x11/kde4/kget/Makefile 17 Nov 2017 14:52:08 -0000 @@ -2,7 +2,7 @@ COMMENT = download manager for KDE DISTNAME = kget-${MODKDE4_VERSION} -REVISION = 4 +REVISION = 5 CATEGORIES = net HOMEPAGE = http://projects.kde.org/projects/kde/kdenetwork/kget @@ -19,7 +19,7 @@ WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/ WANTLIB += ${KDE4LIB}/kworkspace ${KDE4LIB}/nepomuk WANTLIB += ${KDE4LIB}/nepomukcore ${KDE4LIB}/nepomukutils WANTLIB += ${KDE4LIB}/nepomukwidgets ${KDE4LIB}/plasma ${KDE4LIB}/solid -WANTLIB += assuan gpg-error gpgme++-pthread gpgme-pthread mms +WANTLIB += assuan gpg-error gpgme++-pthread gpgme mms WANTLIB += qca qgpgme soprano MODULES = devel/gettext multimedia/phonon Index: x11/kde4/pim/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/kde4/pim/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- x11/kde4/pim/Makefile 27 Jul 2017 11:57:50 -0000 1.32 +++ x11/kde4/pim/Makefile 17 Nov 2017 14:52:08 -0000 @@ -3,7 +3,7 @@ COMMENT = KDE personal information management DISTNAME = kdepim-4.14.10 PKGSPEC = kdepim-${MODKDE4_SPEC} -REVISION = 3 +REVISION = 4 DPB_PROPERTIES += parallel MASTER_SITES = ${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/} @@ -97,7 +97,7 @@ 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-pthread +WANTLIB += assuan gpg-error gpgme++ gpgme++-pthread gpgme WANTLIB += grantlee_core grantlee_gui qjson qgpgme sasl2 MODULES = devel/gettext multimedia/phonon Index: x11/kde4/pimlibs/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/kde4/pimlibs/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- x11/kde4/pimlibs/Makefile 8 Nov 2017 05:37:50 -0000 1.42 +++ x11/kde4/pimlibs/Makefile 17 Nov 2017 14:52:08 -0000 @@ -2,7 +2,7 @@ COMMENT = libraries for KDE PIM services DISTNAME = kdepimlibs-4.14.10 -REVISION = 1 +REVISION = 2 DPB_PROPERTIES = parallel @@ -54,7 +54,7 @@ WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk WANTLIB += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid WANTLIB += akonadiprotocolinternals assuan uuid gpg-error gpgme -WANTLIB += gpgme-pthread ical icalss lber ldap prison qjson sasl2 +WANTLIB += gpgme ical icalss lber ldap prison qjson sasl2 WANTLIB += soprano xml2 MODULES = devel/gettext multimedia/phonon Index: x11/kde4/runtime/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/kde4/runtime/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- x11/kde4/runtime/Makefile 27 Jul 2017 11:57:50 -0000 1.35 +++ x11/kde4/runtime/Makefile 17 Nov 2017 14:52:08 -0000 @@ -6,7 +6,7 @@ DISTNAME = kde-runtime-${MODKDE4_VERSIO PKGNAME-main = ${DISTNAME} PKGNAME-locale = kde4-locale-${MODKDE4_VERSION} PKG_ARCH-locale = * -REVISION-main = 11 +REVISION-main = 12 REVISION-locale = 2 DPB_PROPERTIES = parallel @@ -38,7 +38,7 @@ WANTLIB-main += ${KDE4LIB}/nepomukutils WANTLIB-main += ${KDE4LIB}/plasma ${KDE4LIB}/qgpgme ${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-pthread +WANTLIB-main += assuan gcrypt gpg-error gpgme++-pthread gpgme WANTLIB-locale = Index: x11/pinot/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/x11/pinot/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- x11/pinot/Makefile 23 Oct 2017 17:11:05 -0000 1.69 +++ x11/pinot/Makefile 17 Nov 2017 14:52:08 -0000 @@ -3,7 +3,7 @@ COMMENT= personal search and metasearch DISTNAME= pinot-1.06 -REVISION= 13 +REVISION= 14 SHARED_LIBS += xapianbackend 0.0 # 1.0 @@ -14,8 +14,8 @@ HOMEPAGE= https://code.google.com/p/pino # LGPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atkmm-1.6 atspi c cairo +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0 atkmm-1.6 atspi c cairo WANTLIB += cairo-gobject cairomm-1.0 crypto curl dbus-1 dbus-glib-1 WANTLIB += epoxy exiv2 expat ffi fontconfig freetype gdk-3 WANTLIB += gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 @@ -24,7 +24,7 @@ WANTLIB += gthread-2.0 gtk-3 gtkmm-3.0 h WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 WANTLIB += pcre pixman-1 png pthread sigc-2.0 sqlite3 ssl WANTLIB += ${LIBCXX} tag textcat uuid xapian xcb xcb-render xcb-shm -WANTLIB += xml++-2.6 xml2 z assuan gpg-error gpgme-pthread +WANTLIB += xml++-2.6 xml2 z assuan gpg-error gpgme MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=pinot-search/} Index: security/gpgme/Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/security/gpgme/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- security/gpgme/Makefile 11 May 2017 00:29:50 -0000 1.38 +++ security/gpgme/Makefile 17 Nov 2017 14:52:08 -0000 @@ -2,27 +2,23 @@ COMMENT= GnuPG Made Easy -DISTNAME= gpgme-1.6.0 -REVISION= 0 +DISTNAME= gpgme-1.9.0 CATEGORIES= security devel -SHARED_LIBS += gpgme 20.0 # 25.0 -SHARED_LIBS += gpgme-pthread 20.0 # 25.0 +SHARED_LIBS += gpgme 21.0 # 29.0 HOMEPAGE= http://www.gnupg.org/gpgme.html # GPLv2 - LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += assuan c gpg-error iconv intl pthread +WANTLIB += assuan c gpg-error iconv intl MASTER_SITES= ${MASTER_SITE_GNUPG:=gpgme/} EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu - -# not without -pthread -CONFIGURE_ENV += gpgme_cv_tls_works=no +CONFIGURE_ARGS += --enable-languages='' # Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg. BUILD_DEPENDS= gnupg->=2:security/gnupg2 @@ -33,10 +29,14 @@ LIB_DEPENDS= devel/gettext \ security/libgpg-error>=1.4 \ security/libassuan -TEST_DEPENDS += security/gnupg +# 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: + 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: /home/edd/source/OpenBSD-CVS//ports/security/gpgme/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- security/gpgme/distinfo 19 Sep 2016 17:13:55 -0000 1.12 +++ security/gpgme/distinfo 17 Nov 2017 14:52:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (gpgme-1.6.0.tar.bz2) = sJ3kGXrCgLECCA4J6uxiEdCB7/8ZY794Ic+PT5kWCZ0= -SIZE (gpgme-1.6.0.tar.bz2) = 983573 +SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs= +SIZE (gpgme-1.9.0.tar.bz2) = 1344222 Index: security/gpgme/pkg/PLIST =================================================================== RCS file: /home/edd/source/OpenBSD-CVS//ports/security/gpgme/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- security/gpgme/pkg/PLIST 19 Sep 2016 17:13:55 -0000 1.8 +++ security/gpgme/pkg/PLIST 17 Nov 2017 14:52:08 -0000 @@ -3,16 +3,7 @@ bin/gpgme-config @bin bin/gpgme-tool include/gpgme.h @info info/gpgme.info -lib/libgpgme-pthread.a -lib/libgpgme-pthread.la -@lib lib/libgpgme-pthread.so.${LIBgpgme-pthread_VERSION} lib/libgpgme.a lib/libgpgme.la @lib lib/libgpgme.so.${LIBgpgme_VERSION} share/aclocal/gpgme.m4 -@comment share/common-lisp/ -@comment share/common-lisp/source/ -@comment share/common-lisp/source/gpgme/ -@comment share/common-lisp/source/gpgme/gpgme-package.lisp -@comment share/common-lisp/source/gpgme/gpgme.asd -@comment share/common-lisp/source/gpgme/gpgme.lisp -- Best Regards Edd Barrett http://www.theunixzoo.co.uk