From a14aff7f07aabaed487cdd1d1ab51a4eed81e615 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Tue, 15 Dec 2009 19:15:38 +0000
Subject: 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

---
 security/gpgme/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'security')

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 59879278b84..f942fe0dbf8 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -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 @@ BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
 .  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"
-- 
cgit v1.2.3