46 files changed, 275 insertions, 31 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 69267b138456..c46b649c8f47 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -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 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="kontact_plugin"
 
 .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
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index a35b614f0aa3..409c85e1c93b 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -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
diff --git a/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp
new file mode 100644
index 000000000000..97e25a6dccc6
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp
@@ -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() {
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in
new file mode 100644
index 000000000000..1aa8958d5236
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in
@@ -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
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp
new file mode 100644
index 000000000000..f36684554b48
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp
@@ -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 );
+   }
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h
new file mode 100644
index 000000000000..4ecdfe064735
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h
@@ -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 );
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 52d3770874d6..cc91f01ecb53 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -594,7 +594,7 @@ lib/libakregatorprivate.so
 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
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 758d7d058777..03f1e4493597 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -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
diff --git a/deskutils/kdepim4/files/patch-kleopatra-main.cpp b/deskutils/kdepim4/files/patch-kleopatra-main.cpp
new file mode 100644
index 000000000000..71c03cb69e39
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-kleopatra-main.cpp
@@ -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 <QEventLoop>
+ #include <QThreadPool>
+ 
++#include <gpgme++/global.h>
++
+ #include <boost/shared_ptr.hpp>
+ 
+ #include <cassert>
+@@ -153,6 +155,8 @@
+     QTime timer;
+     timer.start();
+ 
++    GpgME::initializeLibrary();
++
+   {
+       const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
+       QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
diff --git a/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
new file mode 100644
index 000000000000..729a1e523dcc
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
@@ -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() {
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 758d7d058777..03f1e4493597 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -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
diff --git a/deskutils/kdepim44/files/patch-kleopatra-main.cpp b/deskutils/kdepim44/files/patch-kleopatra-main.cpp
new file mode 100644
index 000000000000..71c03cb69e39
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kleopatra-main.cpp
@@ -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 <QEventLoop>
+ #include <QThreadPool>
+ 
++#include <gpgme++/global.h>
++
+ #include <boost/shared_ptr.hpp>
+ 
+ #include <cassert>
+@@ -153,6 +155,8 @@
+     QTime timer;
+     timer.start();
+ 
++    GpgME::initializeLibrary();
++
+   {
+       const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
+       QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
diff --git a/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
new file mode 100644
index 000000000000..729a1e523dcc
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
@@ -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() {
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index e45ac6b8f99f..d0d87d15ddd1 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -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
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt
new file mode 100644
index 000000000000..1e2d4068c8db
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt
@@ -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} )
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp b/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp
new file mode 100644
index 000000000000..836e10518d8d
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp
@@ -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 <cassert>
+ 
+ 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 );
+   }
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-global.h b/deskutils/kdepimlibs4/files/patch-gpgme++-global.h
new file mode 100644
index 000000000000..dddc6eb5afe3
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-gpgme++-global.h
@@ -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 };
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index 5a5c45511002..f124fec81144 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -366,13 +366,13 @@ lib/libakonadi-kmime.so.5
 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
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 09ce6369f8ac..bc4d5fd4ad60 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -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 @@ BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		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
diff --git a/devel/baz/files/patch-pfs-signatures.c b/devel/baz/files/patch-pfs-signatures.c
index 7952b9ff2d90..bba90405458b 100644
--- a/devel/baz/files/patch-pfs-signatures.c
+++ b/devel/baz/files/patch-pfs-signatures.c
@@ -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));
diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile
index 09ce6369f8ac..bc4d5fd4ad60 100644
--- a/devel/bazaar/Makefile
+++ b/devel/bazaar/Makefile
@@ -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 @@ BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		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
diff --git a/devel/bazaar/files/patch-pfs-signatures.c b/devel/bazaar/files/patch-pfs-signatures.c
index 7952b9ff2d90..bba90405458b 100644
--- a/devel/bazaar/files/patch-pfs-signatures.c
+++ b/devel/bazaar/files/patch-pfs-signatures.c
@@ -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));
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index c3d83a5d74b7..caeb09e3a70d 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 MASTER_SITES=	SF
 
@@ -56,7 +56,7 @@ PLIST_SUB+=	SQLITE="@comment "
 .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
diff --git a/finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp b/finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp
new file mode 100644
index 000000000000..ce4133454c49
--- /dev/null
+++ b/finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp
@@ -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, 
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 08253ff1859d..53932a69361f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -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 @@ OPTIONS=	LDAP "Enable LDAP support" on \
 .include <bsd.port.pre.mk>
 
 .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
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 74c33f1e5507..64b6b6a33358 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	claws-mail
 PORTVERSION=	3.7.2
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	SF/sylpheed-claws
 
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index fb2352b0382e..d46d26d1d5e6 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -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
diff --git a/mail/mutt-devel/files/patch-crypt-gpgme.c b/mail/mutt-devel/files/patch-crypt-gpgme.c
new file mode 100644
index 000000000000..2fb9536f3cd6
--- /dev/null
+++ b/mail/mutt-devel/files/patch-crypt-gpgme.c
@@ -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));
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 635e77c497de..3a87fbce9477 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -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-imlib
 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
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index e6c1d84e0c30..9cf56fe36fb1 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -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 @@ CONFIGURE_ARGS+=--disable-ssl
 .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
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index e6c1d84e0c30..9cf56fe36fb1 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -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 @@ CONFIGURE_ARGS+=--disable-ssl
 .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
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index a7e98fb5d283..5b4e2ec794fc 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -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 @@ COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 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 \
diff --git a/net-im/ayttm/files/patch-modules__aycryption__aycryption.c b/net-im/ayttm/files/patch-modules__aycryption__aycryption.c
new file mode 100644
index 000000000000..9f0693f740ea
--- /dev/null
+++ b/net-im/ayttm/files/patch-modules__aycryption__aycryption.c
@@ -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;
+ 
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index ae218f380148..8d94f9159806 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--disable-jabber
 .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
diff --git a/net-im/centericq/files/patch-src_impgp.cc b/net-im/centericq/files/patch-src_impgp.cc
new file mode 100644
index 000000000000..cfa38bebf5f7
--- /dev/null
+++ b/net-im/centericq/files/patch-src_impgp.cc
@@ -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;
+ }
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 47df155c3c1f..46b549f7130b 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--disable-jabber
 .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
diff --git a/net-im/centerim-devel/files/patch-src__impgp.cc b/net-im/centerim-devel/files/patch-src__impgp.cc
new file mode 100644
index 000000000000..9cb74b224d92
--- /dev/null
+++ b/net-im/centerim-devel/files/patch-src__impgp.cc
@@ -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;
+ }
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 080e936323ac..92f2dfb74816 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--disable-jabber
 .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
diff --git a/net-im/centerim/files/patch-src__impgp.cc b/net-im/centerim/files/patch-src__impgp.cc
new file mode 100644
index 000000000000..2cd5b217ddb5
--- /dev/null
+++ b/net-im/centerim/files/patch-src__impgp.cc
@@ -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;
+ }
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 23f96dc44b1d..9bdc3214e07b 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -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 @@ LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
 .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
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 6b845deb5516..b49fe55d661a 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -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/
 
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index 47699a4a5acb..9954e5cc946a 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -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 @@ COMMENT=	NASL libraries for OpenVAS
 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
diff --git a/security/openvas-libnasl/files/patch-nasl__nasl_signature.c b/security/openvas-libnasl/files/patch-nasl__nasl_signature.c
new file mode 100644
index 000000000000..c8bd3cff8cca
--- /dev/null
+++ b/security/openvas-libnasl/files/patch-nasl__nasl_signature.c
@@ -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)
+     {
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index 6b4d1d809c36..5abdecd3b9bf 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -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 @@ DIST_SUBDIR=	PECL
 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
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index 47947f8ff73c..bc6f85d5c49a 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyme
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index bb65f7871ed3..d9fb84368cdd 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -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 @@ COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
 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