[pkgsrc/trunk]: pkgsrc/security/gpgme minor fixes for gnupg2 support:

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48ff5a33e5dd
branches:  trunk
changeset: 568611:48ff5a33e5dd
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Dec 15 19:15:38 2009 +0000

description:
minor fixes for gnupg2 support:
-don't pull in gnupg2's "gpgconf" if both gnupg1 and gnupg2 are installed
 but we are building against gnupg1, this caused a build failure
-fix a selftest to work with gnupg2

diffstat:

 security/gpgme/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 28eba65add51 -r 48ff5a33e5dd security/gpgme/Makefile
--- a/security/gpgme/Makefile   Tue Dec 15 19:02:00 2009 +0000
+++ b/security/gpgme/Makefile   Tue Dec 15 19:15:38 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/12/03 15:22:39 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2009/12/15 19:15:38 drochner Exp $
 #
 
 DISTNAME=      gpgme-1.1.8
@@ -62,8 +62,10 @@
 .  include "../../security/gnupg2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
 CONFIGURE_ARGS+=       --with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2
+REPLACE_SH+=           tests/gpg/pinentry
 .else
 CONFIGURE_ARGS+=       --without-gpgsm
+CONFIGURE_ARGS+=       --without-gpgconf
 .endif
 
 .include "../../mk/bsd.prefs.mk"