[pkgsrc/trunk]: pkgsrc/security/gpgme Remove unrecognized configure arguments...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/775de0e26ae4
branches:  trunk
changeset: 360658:775de0e26ae4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 05 08:58:24 2017 +0000

description:
Remove unrecognized configure arguments. Set gpg binary name for tests.

diffstat:

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

diffs (30 lines):

diff -r 7942b680d07e -r 775de0e26ae4 security/gpgme/options.mk
--- a/security/gpgme/options.mk Wed Apr 05 06:55:33 2017 +0000
+++ b/security/gpgme/options.mk Wed Apr 05 08:58:24 2017 +0000
@@ -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 @@
 
 .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