diff options
| author | wiz <wiz@pkgsrc.org> | 2017-08-29 12:11:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-08-29 12:11:35 +0000 |
| commit | ba8f361fc17e4be0af71d79bdf1d591cae9397b0 (patch) | |
| tree | 75b822b06b895a6668ae1c60d366a5726ff95c5b /security/gpgme | |
| parent | 498973bdaa2d3f685ccb2949832e03d662cd9f3e (diff) | |
| download | pkgsrc-ba8f361fc17e4be0af71d79bdf1d591cae9397b0.tar.gz | |
Remove references to gnupg21 in preparation for its removal.
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/buildlink3.mk | 9 | ||||
| -rw-r--r-- | security/gpgme/options.mk | 11 |
2 files changed, 6 insertions, 14 deletions
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk index 07e16c620f6..218dac87672 100644 --- a/security/gpgme/buildlink3.mk +++ b/security/gpgme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2017/08/29 11:27:07 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2017/08/29 12:11:35 wiz Exp $ BUILDLINK_TREE+= gpgme @@ -15,11 +15,8 @@ BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme pkgbase:= gpgme .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg21) -DEPENDS+= gnupg21>=2.1:../../security/gnupg21 -GPGME_GPG= ${PREFIX}/bin/gpg2 -.elif !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2) -DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2 +.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2) +DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 GPGME_GPG= ${PREFIX}/bin/gpg2 .else DEPENDS+= gnupg>=1.4.2:../../security/gnupg diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk index 606821e574b..e0ca9b6d9ba 100644 --- a/security/gpgme/options.mk +++ b/security/gpgme/options.mk @@ -1,18 +1,13 @@ -# $NetBSD: options.mk,v 1.5 2017/04/05 08:58:24 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2017/08/29 12:11:35 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme PKG_OPTIONS_REQUIRED_GROUPS= gnupg -PKG_OPTIONS_GROUP.gnupg= gnupg1 gnupg2 gnupg21 +PKG_OPTIONS_GROUP.gnupg= gnupg1 gnupg2 PKG_SUGGESTED_OPTIONS= gnupg2 .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mgnupg21) -DEPENDS+= gnupg21>=2.1:../../security/gnupg21 -REPLACE_SH+= tests/gpg/pinentry -GPG_DEFAULT= ${LOCALBASE}/bin/gpg2 -MAKE_FLAGS+= GPG=${GPG_DEFAULT} -.elif !empty(PKG_OPTIONS:Mgnupg2) +.if !empty(PKG_OPTIONS:Mgnupg2) DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2 REPLACE_SH+= tests/gpg/pinentry GPG_DEFAULT= ${LOCALBASE}/bin/gpg2 |