Update to 0.4.7.

Noteworthy changes in version 0.4.7 (2004-04-29)
------------------------------------------------

 * Correctly initialize the fields expired, revoked, invalid, and
   disabled in the gpgme_key_t structures.

 * A bug fix: The flag wrong_key_usage of gpgme_signature_t was
   accidently of type int instead unsigned int.

Noteworthy changes in version 0.4.6 (2004-04-06)
------------------------------------------------

 * Bug fixes


Noteworthy changes in version 0.4.5 (2004-03-07)
------------------------------------------------

 * GPGME is now compiled with LFS (large file support) by default.

 * New key listing mode GPGME_KEYLIST_MODE_VALIDATE for validation of
   the listed keys.

 * New interface gpgme_cancel() that can be used to cancel
   asynchronous operations.

Noteworthy changes in version 0.4.4 (2004-01-12)
------------------------------------------------

 * The member "class" in gpgme_key_sig_t and gpgme_new_signature_t has
   been renamed to "sig_class", to avoid clash with C++ compilers.  In
   the C API, the old name "class" has been preserved for backwards
   compatibility, but is deprecated.

4 files changed, 18 insertions, 18 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 355a27b3865..6e288e3f3bf 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/07/11 00:48:42 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/08/21 10:54:47 markd Exp $
 #
 
-DISTNAME=	gpgme-0.4.3
+DISTNAME=	gpgme-0.4.7
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/ \
 		ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST
index d8e223e7670..157dad3f6b7 100644
--- a/security/gpgme/PLIST
+++ b/security/gpgme/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2004/03/09 23:10:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/08/21 10:54:47 markd Exp $
 bin/gpgme-config
 include/gpgme.h
 lib/libgpgme-pthread.a
 lib/libgpgme-pthread.la
 lib/libgpgme-pthread.so
-lib/libgpgme-pthread.so.12
-lib/libgpgme-pthread.so.12.0
+lib/libgpgme-pthread.so.13
+lib/libgpgme-pthread.so.13.2
 lib/libgpgme.a
 lib/libgpgme.la
 lib/libgpgme.so
-lib/libgpgme.so.12
-lib/libgpgme.so.12.0
+lib/libgpgme.so.13
+lib/libgpgme.so.13.2
 share/aclocal/gpgme.m4
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index ed35065c00e..238ed7049e6 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/12/14 15:05:01 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/08/21 10:54:47 markd Exp $
 
-SHA1 (gpgme-0.4.3.tar.gz) = f3e0dc62e65f78f58905efc33810d52869cee029
-Size (gpgme-0.4.3.tar.gz) = 795277 bytes
-SHA1 (patch-aa) = 5ec43329cee54c1f9f9401f8d1acd9d59447bad0
+SHA1 (gpgme-0.4.7.tar.gz) = 545d0db828789b75e7ad34ba8e4c6c5d088a755e
+Size (gpgme-0.4.7.tar.gz) = 822365 bytes
+SHA1 (patch-aa) = 84c43809bc8892c34650ed8abde2b9beaa9c4971
 SHA1 (patch-ab) = d73b151c643d6ae5b2a321e58291a6b48892fd03
diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa
index 493c43a238d..1c8fafd651f 100644
--- a/security/gpgme/patches/patch-aa
+++ b/security/gpgme/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2003/12/14 15:05:01 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/21 10:54:47 markd Exp $
 
---- gpgme/gpgme-config.in.orig	2003-09-03 22:59:35.000000000 +0200
+--- gpgme/gpgme-config.in.orig	2004-03-08 06:45:28.000000000 +1300
 +++ gpgme/gpgme-config.in
-@@ -84,7 +84,7 @@ while test $# -gt 0; do
- 	    output="$output $gpg_error_cflags"
+@@ -93,7 +93,7 @@ while test $# -gt 0; do
  	    ;;
  	--libs)
--            output="$output -L$libdir"
-+            output="$output -Wl,-R$libdir -L$libdir"
+ 	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+-		output="$output -L$libdir"
++		output="$output -Wl,-R$libdir -L$libdir"
+ 	    fi
  	    case "$thread_module" in
  		pthread)
- 	            output="$output -lgpgme-pthread $libs_pthread"