CVS commit: pkgsrc/security/gpgme

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  5 08:58:24 UTC 2017

Modified Files:
        pkgsrc/security/gpgme: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/gpgme/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gpgme/options.mk
diff -u pkgsrc/security/gpgme/options.mk:1.4 pkgsrc/security/gpgme/options.mk:1.5
--- pkgsrc/security/gpgme/options.mk:1.4        Wed Nov 25 12:58:02 2015
+++ pkgsrc/security/gpgme/options.mk    Wed Apr  5 08:58:24 2017
@@ -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