- Chase security/gpgme update.

Most changes are just PORTREVISION and LIB_DEPENDS fixes. However, the
following ports require a patch to use the new gpgme correctly:
deskutils/kdepim3
deskutils/kdepim3
deskutils/kdepim3
deskutils/kdepim3
deskutils/kdepim4
deskutils/kdepim4
deskutils/kdepimlibs4
deskutils/kdepimlibs4
deskutils/kdepimlibs4
finance/qhacc
mail/mutt-devel
net-im/ayttm
net-im/centericq
net-im/centerim
net-im/centerim-devel
security/openvas-libnasl

These patches were submitted by various people and documented in ports/135911.

PR:		ports/135911

5 files changed, 39 insertions, 3 deletions

diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index e45ac6b8f99..d0d87d15ddd 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 00000000000..1e2d4068c8d
--- /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 00000000000..836e10518d8
--- /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 00000000000..dddc6eb5afe
--- /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 5a5c4551100..f124fec8114 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