Index: deskutils/kdepim3/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/kdepim3/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- deskutils/kdepim3/Makefile 11 Jan 2009 17:41:05 -0000 1.84 +++ deskutils/kdepim3/Makefile 14 Jul 2009 17:15:17 -0000 @@ -7,7 +7,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils mail news palm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src Index: deskutils/kdepim3/pkg-plist =================================================================== RCS file: /home/pcvs/ports/deskutils/kdepim3/pkg-plist,v retrieving revision 1.35 diff -u -r1.35 pkg-plist --- deskutils/kdepim3/pkg-plist 29 Aug 2008 11:29:44 -0000 1.35 +++ deskutils/kdepim3/pkg-plist 14 Jul 2009 17:15:18 -0000 @@ -594,7 +594,7 @@ lib/libgpgme++.a lib/libgpgme++.la lib/libgpgme++.so -lib/libgpgme++.so.3 +lib/libgpgme++.so.4 lib/libgwsoap.a lib/libgwsoap.la lib/libgwsoap.so Index: deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp =================================================================== RCS file: deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp diff -N deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,11 @@ +--- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp.orig 2009-07-01 19:41:54.000000000 -0400 ++++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp 2009-07-01 19:42:25.000000000 -0400 +@@ -54,7 +54,7 @@ + mOpenPGPProtocol( 0 ), + mSMIMEProtocol( 0 ) + { +- ++ GpgME::initializeLibrary(); + } + + Kleo::QGpgMEBackend::~QGpgMEBackend() { Index: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in =================================================================== RCS file: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in diff -N deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,11 @@ +--- libkdenetwork/gpgmepp/Makefile.in.orig 2009-07-01 19:33:31.000000000 -0400 ++++ libkdenetwork/gpgmepp/Makefile.in 2009-07-01 19:39:35.000000000 -0400 +@@ -434,7 +434,7 @@ + # (Interfaces added/removed/changed: CURRENT++, REVISION=0) + # (Interfaces added: AGE++) + # (Interfaces removed/changed: AGE=0) +-libgpgme___la_LDFLAGS = -no-undefined -version-info 3:0:3 ++libgpgme___la_LDFLAGS = -no-undefined -version-info 4:0:4 + libgpgme___la_LIBADD = $(GPGME_LIBS) + libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP) + all: all-recursive Index: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp =================================================================== RCS file: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp diff -N deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,13 @@ +--- libkdenetwork/gpgmepp/context.cpp.orig 2009-07-01 19:33:09.000000000 -0400 ++++ libkdenetwork/gpgmepp/context.cpp 2009-07-01 19:35:46.000000000 -0400 +@@ -53,6 +53,10 @@ + + namespace GpgME { + ++ void initializeLibrary() { ++ gpgme_check_version( 0 ); ++ } ++ + const char * Error::source() const { + return gpgme_strsource( (gpgme_error_t)mErr ); + } Index: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h =================================================================== RCS file: deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h diff -N deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,11 @@ +--- libkdenetwork/gpgmepp/context.h.orig 2009-07-01 19:33:50.000000000 -0400 ++++ libkdenetwork/gpgmepp/context.h 2009-07-01 19:36:53.000000000 -0400 +@@ -287,6 +287,8 @@ + // + // + ++ KDE_EXPORT void initializeLibrary(); ++ + KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value ); + + KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true ); Index: deskutils/kdepim4/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/kdepim4/Makefile,v retrieving revision 1.93 diff -u -r1.93 Makefile --- deskutils/kdepim4/Makefile 3 Jun 2009 11:01:51 -0000 1.93 +++ deskutils/kdepim4/Makefile 14 Jul 2009 17:15:18 -0000 @@ -6,6 +6,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src Index: deskutils/kdepim4/files/patch-kleopatra-main.cpp =================================================================== RCS file: deskutils/kdepim4/files/patch-kleopatra-main.cpp diff -N deskutils/kdepim4/files/patch-kleopatra-main.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim4/files/patch-kleopatra-main.cpp 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,20 @@ +--- ../kleopatra/main.cpp.orig 2009-07-01 18:44:25.000000000 -0400 ++++ ../kleopatra/main.cpp 2009-07-01 18:49:26.000000000 -0400 +@@ -75,6 +75,8 @@ + #include + #include + ++#include ++ + #include + + #include +@@ -153,6 +155,8 @@ + QTime timer; + timer.start(); + ++ GpgME::initializeLibrary(); ++ + { + const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount(); + QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) ); Index: deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp =================================================================== RCS file: deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp diff -N deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp 14 Jul 2009 17:15:18 -0000 @@ -0,0 +1,11 @@ +--- ../libkleo/backends/qgpgme/qgpgmebackend.cpp.orig 2009-07-01 18:51:09.000000000 -0400 ++++ ../libkleo/backends/qgpgme/qgpgmebackend.cpp 2009-07-01 18:57:10.000000000 -0400 +@@ -280,7 +280,7 @@ + mOpenPGPProtocol( 0 ), + mSMIMEProtocol( 0 ) + { +- ++ GpgME::initializeLibrary(); + } + + Kleo::QGpgMEBackend::~QGpgMEBackend() { Index: deskutils/kdepimlibs4/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/kdepimlibs4/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- deskutils/kdepimlibs4/Makefile 3 Jun 2009 11:01:52 -0000 1.12 +++ deskutils/kdepimlibs4/Makefile 14 Jul 2009 17:15:19 -0000 @@ -6,6 +6,7 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src Index: deskutils/kdepimlibs4/pkg-plist =================================================================== RCS file: /home/pcvs/ports/deskutils/kdepimlibs4/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- deskutils/kdepimlibs4/pkg-plist 9 Mar 2009 00:55:28 -0000 1.4 +++ deskutils/kdepimlibs4/pkg-plist 14 Jul 2009 17:15:19 -0000 @@ -366,13 +366,13 @@ lib/libakonadi-kmime.so.5.0.1 %%WITH_PTH%%lib/libgpgme++-pth.so %%WITH_PTH%%lib/libgpgme++-pth.so.2 -%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.2 +%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.3 lib/libgpgme++-pthread.so lib/libgpgme++-pthread.so.2 -lib/libgpgme++-pthread.so.2.0.2 +lib/libgpgme++-pthread.so.2.0.3 lib/libgpgme++.so lib/libgpgme++.so.2 -lib/libgpgme++.so.2.0.2 +lib/libgpgme++.so.2.0.3 lib/libkabc.so lib/libkabc.so.5 lib/libkabc.so.5.0.1 Index: deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt =================================================================== RCS file: deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt diff -N deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,11 @@ +--- ../gpgme++/CMakeLists.txt.orig 2009-07-01 18:28:08.000000000 -0400 ++++ ../gpgme++/CMakeLists.txt 2009-07-01 18:28:36.000000000 -0400 +@@ -32,7 +32,7 @@ + gpgadduserideditinteractor.cpp + ) + +-set( _gpgmepp_version 2.0.2 ) ++set( _gpgmepp_version 2.0.3 ) + set( _gpgmepp_soversion 2 ) + + set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} ) Index: deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp =================================================================== RCS file: deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp diff -N deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,13 @@ +--- ../gpgme++/context.cpp.orig 2009-07-01 18:28:59.000000000 -0400 ++++ ../gpgme++/context.cpp 2009-07-01 18:30:51.000000000 -0400 +@@ -51,6 +51,10 @@ + #include + + namespace GpgME { ++ void initializeLibrary() { ++ gpgme_check_version( 0 ); ++ } ++ + static inline gpgme_error_t makeError( gpg_err_code_t code ) { + return gpg_err_make( (gpg_err_source_t)22, code ); + } Index: deskutils/kdepimlibs4/files/patch-gpgme++-global.h =================================================================== RCS file: deskutils/kdepimlibs4/files/patch-gpgme++-global.h diff -N deskutils/kdepimlibs4/files/patch-gpgme++-global.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ deskutils/kdepimlibs4/files/patch-gpgme++-global.h 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,11 @@ +--- ../gpgme++/global.h.orig 2009-07-01 18:26:50.000000000 -0400 ++++ ../gpgme++/global.h 2009-07-01 18:27:58.000000000 -0400 +@@ -39,6 +39,8 @@ + + namespace GpgME { + ++ GPGMEPP_EXPORT void initializeLibrary(); ++ + enum Protocol { OpenPGP, CMS, UnknownProtocol }; + + enum Engine { GpgEngine, GpgSMEngine, GpgConfEngine, UnknownEngine }; Index: devel/bazaar/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/bazaar/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- devel/bazaar/Makefile 2 Jul 2009 14:23:09 -0000 1.14 +++ devel/bazaar/Makefile 14 Jul 2009 17:15:19 -0000 @@ -7,7 +7,7 @@ PORTNAME= bazaar PORTVERSION= 1.4.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MASTER_SITES= http://bazaar-vcs.org/releases/src/obsolete/ DISTNAME= bazaar_${PORTVERSION} @@ -20,7 +20,7 @@ gtar:${PORTSDIR}/archivers/gtar RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \ - gpgme.17:${PORTSDIR}/security/gpgme + gpgme.18:${PORTSDIR}/security/gpgme USE_GMAKE= yes USE_GETTEXT= yes Index: devel/bazaar/files/patch-pfs-signatures.c =================================================================== RCS file: /home/pcvs/ports/devel/bazaar/files/patch-pfs-signatures.c,v retrieving revision 1.1 diff -u -r1.1 patch-pfs-signatures.c --- devel/bazaar/files/patch-pfs-signatures.c 9 Nov 2005 20:40:59 -0000 1.1 +++ devel/bazaar/files/patch-pfs-signatures.c 14 Jul 2009 17:15:19 -0000 @@ -9,3 +9,11 @@ #include "libarch/pfs-signatures.h" +@@ -1154,6 +1154,7 @@ + gpgme_ctx_t context; + gpgme_data_t signature_data; + gpgme_data_t signed_content; ++ gpgme_check_version (NULL); + invariant (GPG_ERR_NO_ERROR == gpgme_new (&context)); + invariant (GPG_ERR_NO_ERROR == gpgme_data_new_from_mem (&signature_data, *signed_message, str_length (*signed_message), 0)); + invariant (GPG_ERR_NO_ERROR == gpgme_data_new (&signed_content)); Index: finance/qhacc/Makefile =================================================================== RCS file: /home/pcvs/ports/finance/qhacc/Makefile,v retrieving revision 1.70 diff -u -r1.70 Makefile --- finance/qhacc/Makefile 21 Aug 2008 06:16:59 -0000 1.70 +++ finance/qhacc/Makefile 14 Jul 2009 17:15:19 -0000 @@ -7,7 +7,7 @@ PORTNAME= qhacc PORTVERSION= 3.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= finance MASTER_SITES= SF @@ -56,7 +56,7 @@ .endif .if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --enable-gpg PLIST_SUB+= GPGME="" .else Index: finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp =================================================================== RCS file: finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp diff -N finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,10 @@ +--- ./plugins/gpg/gpgplugin.cpp.orig 2009-06-30 00:55:33.000000000 -0400 ++++ ./plugins/gpg/gpgplugin.cpp 2009-06-30 00:59:33.000000000 -0400 +@@ -56,6 +56,7 @@ + const PluginInfo& GPGDBPlugin::info() const { return pinfo; } + + bool GPGDBPlugin::iconnect( QHacc *, const QString&, QString& error ){ ++ gpgme_check_version( NULL ); + madectx=( GPG_ERR_NO_ERROR==gpgme_new( &gpgctx ) ); + if( madectx ){ + gpgme_set_passphrase_cb( gpgctx, GPGDBPlugin::passphrase_cb, Index: mail/mutt-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/mutt-devel/Makefile,v retrieving revision 1.303 diff -u -r1.303 Makefile --- mail/mutt-devel/Makefile 22 Jun 2009 22:52:30 -0000 1.303 +++ mail/mutt-devel/Makefile 14 Jul 2009 17:15:19 -0000 @@ -115,7 +115,7 @@ PORTNAME= mutt-devel PORTVERSION= 1.5.20 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news Index: mail/mutt-devel/files/patch-crypt-gpgme.c =================================================================== RCS file: mail/mutt-devel/files/patch-crypt-gpgme.c diff -N mail/mutt-devel/files/patch-crypt-gpgme.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/mutt-devel/files/patch-crypt-gpgme.c 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,10 @@ +--- ./crypt-gpgme.c.orig 2009-07-01 21:28:51.000000000 -0400 ++++ ./crypt-gpgme.c 2009-07-01 21:31:52.000000000 -0400 +@@ -342,6 +342,7 @@ + gpgme_error_t err; + gpgme_ctx_t ctx; + ++ gpgme_check_version (NULL); + if (!GpgmeLocaleSet) + { + gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); Index: net-im/ayttm/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/ayttm/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- net-im/ayttm/Makefile 30 Jun 2009 14:56:40 -0000 1.56 +++ net-im/ayttm/Makefile 14 Jul 2009 17:15:19 -0000 @@ -7,6 +7,7 @@ PORTNAME= ayttm PORTVERSION= 0.5.0.82 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} @@ -16,7 +17,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ jasper.4:${PORTSDIR}/graphics/jasper \ - gpgme.17:${PORTSDIR}/security/gpgme \ + gpgme.18:${PORTSDIR}/security/gpgme \ pspell.16:${PORTSDIR}/textproc/aspell OPTIONS= ARTS "Enable aRts support" off \ Index: net-im/ayttm/files/patch-modules__aycryption__aycryption.c =================================================================== RCS file: net-im/ayttm/files/patch-modules__aycryption__aycryption.c diff -N net-im/ayttm/files/patch-modules__aycryption__aycryption.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net-im/ayttm/files/patch-modules__aycryption__aycryption.c 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,11 @@ +--- ./modules/aycryption/aycryption.c.orig 2008-08-11 00:50:44.000000000 -0400 ++++ ./modules/aycryption/aycryption.c 2009-07-02 04:06:35.000000000 -0400 +@@ -108,6 +108,8 @@ + + static int aycryption_init() + { ++ gpgme_check_version (NULL); ++ + input_list *il = g_new0(input_list, 1); + plugin_info.prefs = il; + Index: net-im/centericq/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/centericq/Makefile,v retrieving revision 1.115 diff -u -r1.115 Makefile --- net-im/centericq/Makefile 23 Jan 2009 15:42:59 -0000 1.115 +++ net-im/centericq/Makefile 14 Jul 2009 17:15:19 -0000 @@ -8,7 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.21.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net-im MASTER_SITES= http://thekonst.net/download/ @@ -90,7 +90,7 @@ .if !defined(WITH_GPGME) CONFIGURE_ARGS+= --without-gpgme .else -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE} .endif .endif Index: net-im/centericq/files/patch-src_impgp.cc =================================================================== RCS file: net-im/centericq/files/patch-src_impgp.cc diff -N net-im/centericq/files/patch-src_impgp.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net-im/centericq/files/patch-src_impgp.cc 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,10 @@ +--- ./src/impgp.cc.orig 2009-07-01 23:19:00.000000000 -0400 ++++ ./src/impgp.cc 2009-07-01 23:19:29.000000000 -0400 +@@ -12,6 +12,7 @@ + string impgp::passphrase[]; + + impgp::impgp() { ++ gpgme_check_version(NULL); + if(gpgme_new(&ctx)) + ctx = 0; + } Index: net-im/centerim/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/centerim/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- net-im/centerim/Makefile 23 Feb 2009 17:03:42 -0000 1.13 +++ net-im/centerim/Makefile 14 Jul 2009 17:15:19 -0000 @@ -8,6 +8,7 @@ PORTNAME= centerim PORTVERSION= 4.22.7 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.centerim.org/download/releases/ \ ftp://ftp.centerim.org/releases/ @@ -88,7 +89,7 @@ .if !defined(WITH_GPGME) CONFIGURE_ARGS+= --without-gpgme .else -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme #CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE} CONFIGURE_ARGS+= --with-ssl .endif Index: net-im/centerim/files/patch-src__impgp.cc =================================================================== RCS file: net-im/centerim/files/patch-src__impgp.cc diff -N net-im/centerim/files/patch-src__impgp.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net-im/centerim/files/patch-src__impgp.cc 14 Jul 2009 17:15:19 -0000 @@ -0,0 +1,10 @@ +--- ./src/impgp.cc.orig 2009-07-01 23:25:08.000000000 -0400 ++++ ./src/impgp.cc 2009-07-01 23:25:37.000000000 -0400 +@@ -13,6 +13,7 @@ + string impgp::passphrase[]; + + impgp::impgp() { ++ gpgme_check_version(NULL); + if(gpgme_new(&ctx)) + ctx = 0; + } Index: net-im/centerim-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/centerim-devel/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- net-im/centerim-devel/Makefile 9 Jul 2009 09:05:55 -0000 1.28 +++ net-im/centerim-devel/Makefile 14 Jul 2009 17:15:20 -0000 @@ -8,6 +8,7 @@ PORTNAME= centerim DISTVERSION= 4.22.7-36-g6ba0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.centerim.org/download/mobshots/ \ ftp://ftp.centerim.org/mobshots/ @@ -88,7 +89,7 @@ .if !defined(WITH_GPGME) CONFIGURE_ARGS+= --without-gpgme .else -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme #CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE} CONFIGURE_ARGS+= --with-ssl .endif Index: net-im/centerim-devel/files/patch-src__impgp.cc =================================================================== RCS file: net-im/centerim-devel/files/patch-src__impgp.cc diff -N net-im/centerim-devel/files/patch-src__impgp.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net-im/centerim-devel/files/patch-src__impgp.cc 14 Jul 2009 17:15:20 -0000 @@ -0,0 +1,10 @@ +--- ./src/impgp.cc.orig 2009-07-01 23:27:35.000000000 -0400 ++++ ./src/impgp.cc 2009-07-01 23:27:55.000000000 -0400 +@@ -13,6 +13,7 @@ + string impgp::passphrase[]; + + impgp::impgp() { ++ gpgme_check_version(NULL); + if(gpgme_new(&ctx)) + ctx = 0; + } Index: security/openvas-libnasl/Makefile =================================================================== RCS file: /home/pcvs/ports/security/openvas-libnasl/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- security/openvas-libnasl/Makefile 18 Jan 2009 17:04:08 -0000 1.5 +++ security/openvas-libnasl/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,7 +7,7 @@ PORTNAME= openvas-libnasl PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/406/ @@ -17,7 +17,7 @@ LIB_DEPENDS= gcrypt.16:${PORTSDIR}/security/libgcrypt \ gnutls.26:${PORTSDIR}/security/gnutls \ gpg-error.0:${PORTSDIR}/security/libgpg-error \ - gpgme.17:${PORTSDIR}/security/gpgme \ + gpgme.18:${PORTSDIR}/security/gpgme \ openvas.1:${PORTSDIR}/security/openvas-libraries \ openvas_hg.1:${PORTSDIR}/security/openvas-libraries \ tasn1.4:${PORTSDIR}/security/libtasn1 Index: security/openvas-libnasl/files/patch-nasl__nasl_signature.c =================================================================== RCS file: security/openvas-libnasl/files/patch-nasl__nasl_signature.c diff -N security/openvas-libnasl/files/patch-nasl__nasl_signature.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/openvas-libnasl/files/patch-nasl__nasl_signature.c 14 Jul 2009 17:15:20 -0000 @@ -0,0 +1,11 @@ +--- ./nasl/nasl_signature.c.orig 2009-07-01 23:08:30.000000000 -0400 ++++ ./nasl/nasl_signature.c 2009-07-01 23:09:42.000000000 -0400 +@@ -131,6 +131,8 @@ + gpgme_data_t sig = NULL, text = NULL; + char * gpghome = determine_gpghome(); + ++ gpgme_check_version (NULL); ++ + err = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); + if (err) + { Index: deskutils/basket/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/basket/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- deskutils/basket/Makefile 23 Jan 2009 14:12:34 -0000 1.31 +++ deskutils/basket/Makefile 14 Jul 2009 17:15:20 -0000 @@ -6,7 +6,7 @@ PORTNAME= basket PORTVERSION= 1.0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde MASTER_SITES= http://basket.kde.org/downloads/ @@ -33,7 +33,7 @@ .if defined(WITH_GPGME) RUN_DEPENDS+= pinentry-qt:${PORTSDIR}/security/pinentry-qt -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme \ +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme \ gpg-error.0:${PORTSDIR}/security/libgpg-error .else CONFIGURE_ARGS+= --with-encryption=no Index: mail/balsa/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/balsa/Makefile,v retrieving revision 1.138 diff -u -r1.138 Makefile --- mail/balsa/Makefile 20 Jan 2009 02:39:42 -0000 1.138 +++ mail/balsa/Makefile 14 Jul 2009 17:15:20 -0000 @@ -8,6 +8,7 @@ PORTNAME= balsa PORTVERSION= 2.3.28 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ DISTNAME= balsa-${PORTVERSION} @@ -50,7 +51,7 @@ .include .if defined(WITH_GPG) -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}/bin/gpgme-config .endif Index: mail/claws-mail/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/claws-mail/Makefile,v retrieving revision 1.148 diff -u -r1.148 Makefile --- mail/claws-mail/Makefile 4 Jul 2009 23:05:51 -0000 1.148 +++ mail/claws-mail/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,6 +7,7 @@ PORTNAME= claws-mail PORTVERSION= 3.7.2 +PORTREVISION= 1 CATEGORIES= mail news ipv6 MASTER_SITES= SF/sylpheed-claws Index: mail/sylpheed/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/sylpheed/Makefile,v retrieving revision 1.116 diff -u -r1.116 Makefile --- mail/sylpheed/Makefile 12 Jun 2008 14:41:25 -0000 1.116 +++ mail/sylpheed/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,7 +7,7 @@ PORTNAME= sylpheed PORTVERSION= 1.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail ipv6 MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v1.0/ @@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--disable-gdk-pixbuf .endif .if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg CONFIGURE_ARGS+=--enable-gpgme .else Index: mail/sylpheed2/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/sylpheed2/Makefile,v retrieving revision 1.164 diff -u -r1.164 Makefile --- mail/sylpheed2/Makefile 29 Dec 2008 15:45:47 -0000 1.164 +++ mail/sylpheed2/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,6 +7,7 @@ PORTNAME= sylpheed PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ @@ -52,7 +53,7 @@ .endif .if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg CONFIGURE_ARGS+=--enable-gpgme .else Index: net-im/mcabber/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/mcabber/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- net-im/mcabber/Makefile 6 Mar 2009 18:14:33 -0000 1.35 +++ net-im/mcabber/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,6 +7,7 @@ PORTNAME= mcabber PORTVERSION= 0.9.9 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CENKES @@ -37,7 +38,7 @@ .endif .if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+=--enable-gpgme .else CONFIGURE_ARGS+=--disable-gpgme Index: security/gpa/Makefile =================================================================== RCS file: /home/pcvs/ports/security/gpa/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- security/gpa/Makefile 6 Jun 2008 14:00:51 -0000 1.32 +++ security/gpa/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,7 +7,7 @@ PORTNAME= gpa PORTVERSION= 0.7.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/350/ Index: security/pecl-gnupg/Makefile =================================================================== RCS file: /home/pcvs/ports/security/pecl-gnupg/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- security/pecl-gnupg/Makefile 6 Jun 2008 14:01:02 -0000 1.8 +++ security/pecl-gnupg/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,7 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -17,7 +17,7 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= A pecl wrapper around the gpgme library -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme +LIB_DEPENDS= gpgme.18:${PORTSDIR}/security/gpgme USE_PHP= yes USE_PHPEXT= yes Index: security/py-pyme/Makefile =================================================================== RCS file: /home/pcvs/ports/security/py-pyme/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- security/py-pyme/Makefile 28 Dec 2008 11:27:43 -0000 1.1 +++ security/py-pyme/Makefile 14 Jul 2009 17:15:20 -0000 @@ -7,6 +7,7 @@ PORTNAME= pyme PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: security/seahorse/Makefile =================================================================== RCS file: /home/pcvs/ports/security/seahorse/Makefile,v retrieving revision 1.78 diff -u -r1.78 Makefile --- security/seahorse/Makefile 20 May 2009 21:46:27 -0000 1.78 +++ security/seahorse/Makefile 14 Jul 2009 17:15:20 -0000 @@ -8,6 +8,7 @@ PORTNAME= seahorse PORTVERSION= 2.26.2 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +18,7 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ +LIB_DEPENDS= gpgme.18:${PORTSDIR}/security/gpgme \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring:${PORTSDIR}/security/gnome-keyring \ soup-2.4.1:${PORTSDIR}/devel/libsoup Index: security/gpgme/Makefile =================================================================== RCS file: /home/pcvs/ports/security/gpgme/Makefile,v retrieving revision 1.58 diff -u -r1.58 Makefile --- security/gpgme/Makefile 20 Feb 2009 22:51:49 -0000 1.58 +++ security/gpgme/Makefile 14 Jul 2009 17:25:06 -0000 @@ -6,7 +6,7 @@ # PORTNAME= gpgme -PORTVERSION= 1.1.8 +PORTVERSION= 1.2.0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gpgme @@ -18,9 +18,11 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error +USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/gpgme Index: security/gpgme/distinfo =================================================================== RCS file: /home/pcvs/ports/security/gpgme/distinfo,v retrieving revision 1.18 diff -u -r1.18 distinfo --- security/gpgme/distinfo 20 Feb 2009 22:51:49 -0000 1.18 +++ security/gpgme/distinfo 14 Jul 2009 17:25:06 -0000 @@ -1,6 +1,6 @@ -MD5 (gpgme-1.1.8.tar.gz) = 1f500e7b4e81fcc76b901f1249ec09fc -SHA256 (gpgme-1.1.8.tar.gz) = a7f276a6d21b9fef471a3c734d8be5a04ba8364a4d239e437aa137ce18b0afd8 -SIZE (gpgme-1.1.8.tar.gz) = 1085576 -MD5 (gpgme-1.1.8.tar.gz.sig) = c13869d91ba266fd06f4d6be9ed1d7ee -SHA256 (gpgme-1.1.8.tar.gz.sig) = 7c8a3e1f36e82f78881ef6fee32b682cf608a67ae32de632aac722680fe47f4e -SIZE (gpgme-1.1.8.tar.gz.sig) = 315 +MD5 (gpgme-1.2.0.tar.bz2) = 508ee686bd275d908d1dc1938810e045 +SHA256 (gpgme-1.2.0.tar.bz2) = c4ba555ea795a42061f0b03fffe22b3f1cb22fcdbcc0bbbeb0419e59b04ef801 +SIZE (gpgme-1.2.0.tar.bz2) = 845063 +MD5 (gpgme-1.2.0.tar.bz2.sig) = ead07c74f6b82fe77ca632c69897c562 +SHA256 (gpgme-1.2.0.tar.bz2.sig) = 267d6f05d81da2f86c3b34d193cd86ea8ffcdf9b560cc09f6cfec680cd1fac92 +SIZE (gpgme-1.2.0.tar.bz2.sig) = 315 Index: security/gpgme/pkg-plist =================================================================== RCS file: /home/pcvs/ports/security/gpgme/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- security/gpgme/pkg-plist 6 Feb 2007 17:41:56 -0000 1.15 +++ security/gpgme/pkg-plist 14 Jul 2009 17:25:06 -0000 @@ -1,21 +1,21 @@ bin/gpgme-config include/gpgme/gpgme.h -%%WITH_PTH%%lib/libgpgme-pth.a -%%WITH_PTH%%lib/libgpgme-pth.la -%%WITH_PTH%%lib/libgpgme-pth.so -%%WITH_PTH%%lib/libgpgme-pth.so.17 lib/common-lisp/gpgme/gpgme-package.lisp lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp +%%WITH_PTH%%lib/libgpgme-pth.a +%%WITH_PTH%%lib/libgpgme-pth.la +%%WITH_PTH%%lib/libgpgme-pth.so +%%WITH_PTH%%lib/libgpgme-pth.so.18 lib/libgpgme-pthread.a lib/libgpgme-pthread.la lib/libgpgme-pthread.so -lib/libgpgme-pthread.so.17 +lib/libgpgme-pthread.so.18 lib/libgpgme.a lib/libgpgme.la lib/libgpgme.so -lib/libgpgme.so.17 +lib/libgpgme.so.18 share/aclocal/gpgme.m4 -@dirrm include/gpgme @dirrm lib/common-lisp/gpgme @dirrmtry lib/common-lisp +@dirrm include/gpgme Index: security/gpgme/files/patch-src-Makefile.in =================================================================== RCS file: /home/pcvs/ports/security/gpgme/files/patch-src-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-src-Makefile.in --- security/gpgme/files/patch-src-Makefile.in 20 Feb 2009 22:51:49 -0000 1.1 +++ security/gpgme/files/patch-src-Makefile.in 14 Jul 2009 17:25:07 -0000 @@ -1,13 +1,14 @@ ---- ./src/Makefile.in.orig 2009-01-22 19:07:22.000000000 -0500 -+++ ./src/Makefile.in 2009-01-22 19:07:35.000000000 -0500 -@@ -130,13 +130,43 @@ - engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath-pth.c w32-io.c +--- ./src/Makefile.in.orig 2009-06-20 02:58:28.000000000 -0400 ++++ ./src/Makefile.in 2009-06-20 02:58:43.000000000 -0400 +@@ -131,13 +129,45 @@ + sema.h priv-io.h ath.h posix-util.c posix-sema.c posix-io.c \ + w32-util.c w32-sema.c dirinfo.c debug.c debug.h gpgme.c \ + version.c error.c ath-pth.c w32-io.c -@HAVE_DOSISH_SYSTEM_TRUE@am__objects_5 = w32-io.lo -am_libgpgme_pth_la_OBJECTS = $(am__objects_4) ath-pth.lo \ - $(am__objects_5) -+@HAVE_GPGSM_TRUE@am__objects_5 = libgpgme_pth_la-engine-gpgsm.lo ++@HAVE_GPGSM_TRUE@am__objects_5 = libgpgme_pth_la-engine-gpgsm.lo \ ++@HAVE_GPGSM_TRUE@ libgpgme_pth_la-engine-assuan.lo +@HAVE_GPGCONF_TRUE@am__objects_6 = libgpgme_pth_la-engine-gpgconf.lo +@HAVE_DOSISH_SYSTEM_FALSE@am__objects_7 = \ +@HAVE_DOSISH_SYSTEM_FALSE@ libgpgme_pth_la-posix-util.lo \ @@ -32,9 +33,10 @@ + libgpgme_pth_la-import.lo libgpgme_pth_la-export.lo \ + libgpgme_pth_la-genkey.lo libgpgme_pth_la-delete.lo \ + libgpgme_pth_la-edit.lo libgpgme_pth_la-getauditlog.lo \ -+ libgpgme_pth_la-engine.lo libgpgme_pth_la-rungpg.lo \ -+ $(am__objects_5) $(am__objects_6) libgpgme_pth_la-gpgconf.lo \ -+ $(am__objects_7) libgpgme_pth_la-debug.lo \ ++ libgpgme_pth_la-opassuan.lo libgpgme_pth_la-engine.lo \ ++ libgpgme_pth_la-engine-gpg.lo $(am__objects_5) \ ++ $(am__objects_6) libgpgme_pth_la-gpgconf.lo $(am__objects_7) \ ++ libgpgme_pth_la-dirinfo.lo libgpgme_pth_la-debug.lo \ + libgpgme_pth_la-gpgme.lo libgpgme_pth_la-version.lo \ + libgpgme_pth_la-error.lo +@HAVE_DOSISH_SYSTEM_TRUE@am__objects_9 = libgpgme_pth_la-w32-io.lo @@ -47,12 +49,12 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgpgme_pth_la_CFLAGS) \ + $(CFLAGS) $(libgpgme_pth_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_PTH_TRUE@am_libgpgme_pth_la_rpath = -rpath $(libdir) - am__libgpgme_pthread_la_SOURCES_DIST = gpgme.h util.h conversion.c \ - get-env.c context.h ops.h data.h data.c data-fd.c \ -@@ -150,8 +180,9 @@ - engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath-pthread.c w32-io.c + am__libgpgme_pthread_la_SOURCES_DIST = util.h conversion.c get-env.c \ + context.h ops.h data.h data.c data-fd.c data-stream.c \ +@@ -152,8 +182,9 @@ + sema.h priv-io.h ath.h posix-util.c posix-sema.c posix-io.c \ + w32-util.c w32-sema.c dirinfo.c debug.c debug.h gpgme.c \ + version.c error.c ath-pthread.c w32-io.c +@HAVE_DOSISH_SYSTEM_TRUE@am__objects_10 = w32-io.lo am_libgpgme_pthread_la_OBJECTS = $(am__objects_4) ath-pthread.lo \ - $(am__objects_5) @@ -60,24 +62,16 @@ libgpgme_pthread_la_OBJECTS = $(am_libgpgme_pthread_la_OBJECTS) libgpgme_pthread_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -189,7 +220,7 @@ +@@ -192,7 +223,7 @@ engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath.c w32-io.c + posix-sema.c posix-io.c w32-util.c w32-sema.c dirinfo.c \ + debug.c debug.h gpgme.c version.c error.c ath.c w32-io.c -am_libgpgme_la_OBJECTS = $(am__objects_4) ath.lo $(am__objects_5) +am_libgpgme_la_OBJECTS = $(am__objects_4) ath.lo $(am__objects_10) libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS) libgpgme_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -375,6 +406,7 @@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - -@@ -459,10 +491,10 @@ +@@ -465,10 +498,10 @@ # We use a global CFLAGS and CPPFLAGS setting for all library # versions, because then every object file is only compiled once. @@ -90,7 +84,7 @@ @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \ @HAVE_W32_SYSTEM_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ @HAVE_W32_SYSTEM_TRUE@ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -@@ -496,6 +528,7 @@ +@@ -502,6 +535,7 @@ libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \ -lpthread @GPG_ERROR_LIBS@ @NETLIBS@ @@ -98,7 +92,7 @@ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \ $(libgpgme_version_script_cmd) -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ -@@ -668,7 +701,6 @@ +@@ -674,7 +708,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ttyname_r.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@ @@ -106,7 +100,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pthread.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conversion.Plo@am__quote@ -@@ -700,6 +732,55 @@ +@@ -709,6 +742,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdpipeiodevice.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keylist.Plo@am__quote@ @@ -122,9 +116,12 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-decrypt-verify.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-decrypt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-delete.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-dirinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-edit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt-sign.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgsm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine.Plo@am__quote@ @@ -139,12 +136,12 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-key.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-keylist.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-op-support.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-opassuan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-passphrase.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-sema.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-progress.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-rungpg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-sig-notation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-sign.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-signers.Plo@am__quote@ @@ -160,9 +157,9 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-wait-user.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-wait.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/op-support.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opassuan.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passphrase.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix-io.Plo@am__quote@ -@@ -745,6 +826,349 @@ +@@ -754,6 +839,370 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -397,6 +394,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-getauditlog.lo `test -f 'getauditlog.c' || echo '$(srcdir)/'`getauditlog.c + ++libgpgme_pth_la-opassuan.lo: opassuan.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-opassuan.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-opassuan.Tpo -c -o libgpgme_pth_la-opassuan.lo `test -f 'opassuan.c' || echo '$(srcdir)/'`opassuan.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-opassuan.Tpo $(DEPDIR)/libgpgme_pth_la-opassuan.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='opassuan.c' object='libgpgme_pth_la-opassuan.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-opassuan.lo `test -f 'opassuan.c' || echo '$(srcdir)/'`opassuan.c ++ +libgpgme_pth_la-engine.lo: engine.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine.Tpo -c -o libgpgme_pth_la-engine.lo `test -f 'engine.c' || echo '$(srcdir)/'`engine.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine.Tpo $(DEPDIR)/libgpgme_pth_la-engine.Plo @@ -404,12 +408,12 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine.lo `test -f 'engine.c' || echo '$(srcdir)/'`engine.c + -+libgpgme_pth_la-rungpg.lo: rungpg.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-rungpg.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-rungpg.Tpo -c -o libgpgme_pth_la-rungpg.lo `test -f 'rungpg.c' || echo '$(srcdir)/'`rungpg.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-rungpg.Tpo $(DEPDIR)/libgpgme_pth_la-rungpg.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rungpg.c' object='libgpgme_pth_la-rungpg.lo' libtool=yes @AMDEPBACKSLASH@ ++libgpgme_pth_la-engine-gpg.lo: engine-gpg.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpg.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpg.Tpo -c -o libgpgme_pth_la-engine-gpg.lo `test -f 'engine-gpg.c' || echo '$(srcdir)/'`engine-gpg.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-gpg.Tpo $(DEPDIR)/libgpgme_pth_la-engine-gpg.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='engine-gpg.c' object='libgpgme_pth_la-engine-gpg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-rungpg.lo `test -f 'rungpg.c' || echo '$(srcdir)/'`rungpg.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpg.lo `test -f 'engine-gpg.c' || echo '$(srcdir)/'`engine-gpg.c + +libgpgme_pth_la-engine-gpgsm.lo: engine-gpgsm.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpgsm.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpgsm.Tpo -c -o libgpgme_pth_la-engine-gpgsm.lo `test -f 'engine-gpgsm.c' || echo '$(srcdir)/'`engine-gpgsm.c @@ -418,6 +422,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpgsm.lo `test -f 'engine-gpgsm.c' || echo '$(srcdir)/'`engine-gpgsm.c + ++libgpgme_pth_la-engine-assuan.lo: engine-assuan.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-assuan.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo -c -o libgpgme_pth_la-engine-assuan.lo `test -f 'engine-assuan.c' || echo '$(srcdir)/'`engine-assuan.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo $(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='engine-assuan.c' object='libgpgme_pth_la-engine-assuan.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-assuan.lo `test -f 'engine-assuan.c' || echo '$(srcdir)/'`engine-assuan.c ++ +libgpgme_pth_la-engine-gpgconf.lo: engine-gpgconf.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpgconf.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Tpo -c -o libgpgme_pth_la-engine-gpgconf.lo `test -f 'engine-gpgconf.c' || echo '$(srcdir)/'`engine-gpgconf.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Tpo $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Plo @@ -467,6 +478,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-w32-sema.lo `test -f 'w32-sema.c' || echo '$(srcdir)/'`w32-sema.c + ++libgpgme_pth_la-dirinfo.lo: dirinfo.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-dirinfo.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-dirinfo.Tpo -c -o libgpgme_pth_la-dirinfo.lo `test -f 'dirinfo.c' || echo '$(srcdir)/'`dirinfo.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-dirinfo.Tpo $(DEPDIR)/libgpgme_pth_la-dirinfo.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dirinfo.c' object='libgpgme_pth_la-dirinfo.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-dirinfo.lo `test -f 'dirinfo.c' || echo '$(srcdir)/'`dirinfo.c ++ +libgpgme_pth_la-debug.lo: debug.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-debug.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-debug.Tpo -c -o libgpgme_pth_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-debug.Tpo $(DEPDIR)/libgpgme_pth_la-debug.Plo