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 /mail | |
| parent | 498973bdaa2d3f685ccb2949832e03d662cd9f3e (diff) | |
| download | pkgsrc-ba8f361fc17e4be0af71d79bdf1d591cae9397b0.tar.gz | |
Remove references to gnupg21 in preparation for its removal.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/options.mk | 9 | ||||
| -rw-r--r-- | mail/thunderbird-enigmail/Makefile.common | 5 | ||||
| -rw-r--r-- | mail/thunderbird-enigmail/options.mk | 16 |
3 files changed, 5 insertions, 25 deletions
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index f028818bfbf..b399409e344 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.13 2017/07/09 22:12:12 schmonz Exp $ +# $NetBSD: options.mk,v 1.14 2017/08/29 12:11:35 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin -PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 gnupg21 +PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 # # Default options @@ -53,10 +53,7 @@ DEPENDS+= p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6 # # use gnupg2 instead of gnupg1 # -.if !empty(PKG_OPTIONS:Mgnupg21) -DEPENDS+= gnupg21-[0-9]*:../../security/gnupg21 -GPGPATH= ${PREFIX}/bin/gpg2 -.elif !empty(PKG_OPTIONS:Mgnupg2) +.if !empty(PKG_OPTIONS:Mgnupg2) DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 GPGPATH= ${PREFIX}/bin/gpg2 .else diff --git a/mail/thunderbird-enigmail/Makefile.common b/mail/thunderbird-enigmail/Makefile.common index 491d06ccc72..f0b4bcbdf12 100644 --- a/mail/thunderbird-enigmail/Makefile.common +++ b/mail/thunderbird-enigmail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2017/08/15 18:57:54 wiz Exp $ +# $NetBSD: Makefile.common,v 1.16 2017/08/29 12:11:36 wiz Exp $ # used by mail/thunderbird-enigmail/Makefile # used by mail/seamonkey-enigmail/Makefile @@ -15,8 +15,7 @@ USE_TOOLS+= gmake perl sed unzip zip # https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD MAKE_JOBS_SAFE= no -.include "../../mail/thunderbird-enigmail/options.mk" - +DEPENDS+= gnupg2>=2.0.7:../../security/gnupg2 DEPENDS+= pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2 DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird-enigmail/distinfo diff --git a/mail/thunderbird-enigmail/options.mk b/mail/thunderbird-enigmail/options.mk deleted file mode 100644 index 86799973053..00000000000 --- a/mail/thunderbird-enigmail/options.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2016/05/05 12:06:38 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.enigmail -PKG_OPTIONS_REQUIRED_GROUPS= gnupg -PKG_OPTIONS_GROUP.gnupg= gnupg2 gnupg21 -PKG_SUGGESTED_OPTIONS= gnupg2 - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mgnupg2) -DEPENDS+= gnupg2>=2.0.7:../../security/gnupg2 -.endif - -.if !empty(PKG_OPTIONS:Mgnupg21) -DEPENDS+= gnupg21-[0-9]*:../../security/gnupg21 -.endif |