summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorwiz <wiz>2017-04-05 08:58:24 +0000
committerwiz <wiz>2017-04-05 08:58:24 +0000
commit2ee7d53db39fa82f8b2b4f737b8ff139fc900b72 (patch)
tree519afb19ebff8f4267727f4b47ce4f01509c2e78 /security
parent2209f89fb2ed73ee843b8a598bcbacb1597d0d6a (diff)
downloadpkgsrc-2ee7d53db39fa82f8b2b4f737b8ff139fc900b72.tar.gz
Remove unrecognized configure arguments. Set gpg binary name for tests.
Diffstat (limited to 'security')
-rw-r--r--security/gpgme/options.mk12
1 files changed, 5 insertions, 7 deletions
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