diff options
| author | wiz <wiz@pkgsrc.org> | 2019-01-22 13:19:44 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-01-22 13:19:44 +0000 |
| commit | 62d3e72f5a61a08f77d6401a1f23b1965e792afe (patch) | |
| tree | 662d3efe2fca851e62f4de1bc8837ca85e6df05c /mail | |
| parent | 34e9d84f17d6d3133d29e2032f889477ffd50536 (diff) | |
| download | pkgsrc-62d3e72f5a61a08f77d6401a1f23b1965e792afe.tar.gz | |
mutt: add a gnutls option
Make the smime option error out if neither openssl nor gnutls are
enabled instead of hardcoding openssl.
No change to defaults.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt/options.mk | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index 6abf2baa7f6..e022f12e1e8 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,17 +1,21 @@ -# $NetBSD: options.mk,v 1.30 2017/06/25 14:34:25 joerg Exp $ +# $NetBSD: options.mk,v 1.31 2019/01/22 13:19:44 wiz Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.mutt PKG_OPTIONS_REQUIRED_GROUPS= display +PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.display= curses wide-curses slang -PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl +PKG_OPTIONS_GROUP.ssl= gnutls openssl +PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl # TODO: add kyoto cabinet and lmdb backend options for header cache PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp PKG_SUPPORTED_OPTIONS+= gssapi -PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl +PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox +# remove after 2019Q1 PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses +PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl .include "../../mk/bsd.options.mk" @@ -39,6 +43,16 @@ LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX} .endif ### +### GnuTLS +### +.if !empty(PKG_OPTIONS:Mgnutls) +. include "../../security/gnutls/buildlink3.mk" +CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls} +.else +CONFIGURE_ARGS+= --without-gnutls +.endif + +### ### Slang ### .if !empty(PKG_OPTIONS:Mslang) @@ -57,7 +71,7 @@ CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} ### ### SSL ### -.if !empty(PKG_OPTIONS:Mssl) +.if !empty(PKG_OPTIONS:Mopenssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .else @@ -71,7 +85,9 @@ PLIST_VARS+= smime .if !empty(PKG_OPTIONS:Msmime) USE_TOOLS+= perl:run REPLACE_PERL+= *.pl */*.pl -. include "../../security/openssl/buildlink3.mk" +.if empty(PKG_OPTIONS:Mopenssl) && empty(PKG_OPTIONS:Mgnutls) +PKG_FAIL_REASON+= "The smime option requires the openssl or gnutls options." +.endif CONFIGURE_ARGS+= --enable-smime PLIST.smime= yes .else |