summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-10-31 18:17:11 +0000
committertnn <tnn@pkgsrc.org>2015-10-31 18:17:11 +0000
commit86a8012f615b00c6f576b971edcbf4c5214f392f (patch)
treeb78e44b9a0d73734fc1a77b0968709561af9ba49 /security
parent014b410d6b60a2f8bb971fcdd0328629ed07cb0f (diff)
downloadpkgsrc-86a8012f615b00c6f576b971edcbf4c5214f392f.tar.gz
match options.mk options and simplify a bit
Diffstat (limited to 'security')
-rw-r--r--security/gpgme/buildlink3.mk12
1 files changed, 5 insertions, 7 deletions
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 085f06199bc..ca7d8f88b79 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2015/10/31 17:46:12 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2015/10/31 18:17:11 tnn Exp $
BUILDLINK_TREE+= gpgme
@@ -16,19 +16,17 @@ BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
pkgbase:= gpgme
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgpgsm)
-. if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg21)
+.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg21)
DEPENDS+= gnupg21>=2.1:../../security/gnupg21
-. else
+GPGME_GPG= ${PREFIX}/bin/gpg2
+.elif !empty(PKG_OPTIONS:Mgnupg2)
DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2
-. endif
GPGME_GPG= ${PREFIX}/bin/gpg2
-CONFIGURE_ARGS+= ac_cv_path_GNUPG=${GPGME_GPG}
.else
DEPENDS+= gnupg>=1.4.2:../../security/gnupg
GPGME_GPG= ${PREFIX}/bin/gpg
-CONFIGURE_ARGS+= ac_cv_path_GNUPG=${GPGME_GPG}
.endif
+CONFIGURE_ARGS+= ac_cv_path_GNUPG=${GPGME_GPG}
.endif # GPGME_BUILDLINK3_MK