From 2ee7d53db39fa82f8b2b4f737b8ff139fc900b72 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 5 Apr 2017 08:58:24 +0000
Subject: Remove unrecognized configure arguments. Set gpg binary name for
 tests.

---
 security/gpgme/options.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'security')

diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk
index f3c61f199c2..606821e574b 100644
--- a/security/gpgme/options.mk
+++ b/security/gpgme/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2015/11/25 12:58:02 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2017/04/05 08:58:24 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=	gnupg
@@ -9,16 +9,14 @@ PKG_SUGGESTED_OPTIONS=		gnupg2
 
 .if !empty(PKG_OPTIONS:Mgnupg21)
 DEPENDS+=		gnupg21>=2.1:../../security/gnupg21
-CONFIGURE_ARGS+=	--with-gpgsm=${LOCALBASE}/bin/gpgsm
-CONFIGURE_ARGS+=	--with-gpg=${LOCALBASE}/bin/gpg2
 REPLACE_SH+=		tests/gpg/pinentry
+GPG_DEFAULT=		${LOCALBASE}/bin/gpg2
+MAKE_FLAGS+=		GPG=${GPG_DEFAULT}
 .elif !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=		gnupg2>=2.0<2.1:../../security/gnupg2
-CONFIGURE_ARGS+=	--with-gpgsm=${LOCALBASE}/bin/gpgsm
-CONFIGURE_ARGS+=	--with-gpg=${LOCALBASE}/bin/gpg2
 REPLACE_SH+=		tests/gpg/pinentry
+GPG_DEFAULT=		${LOCALBASE}/bin/gpg2
+MAKE_FLAGS+=		GPG=${GPG_DEFAULT}
 .else
 DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
-CONFIGURE_ARGS+=	--without-gpgconf
-CONFIGURE_ARGS+=	--without-gpgsm
 .endif
-- 
cgit v1.2.3