CVS commit: pkgsrc/mail

["Roland Dowdeswell" <elric%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   elric
Date:           Tue Mar  7 20:42:28 UTC 2017

Modified Files:
        pkgsrc/mail/mutt: options.mk
        pkgsrc/mail/neomutt: options.mk

Log Message:
Provide gssapi pkg option for {,neo}mutt.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/mutt/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/neomutt/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.27 pkgsrc/mail/mutt/options.mk:1.28
--- pkgsrc/mail/mutt/options.mk:1.27    Fri Feb 24 23:31:24 2017
+++ pkgsrc/mail/mutt/options.mk Tue Mar  7 20:42:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2017/02/24 23:31:24 wiz Exp $
+# $NetBSD: options.mk,v 1.28 2017/03/07 20:42:28 elric Exp $
 
 # Global and legacy options
 
@@ -8,11 +8,22 @@ PKG_OPTIONS_GROUP.display=    curses wide-c
 PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
 # TODO: add kyoto cabinet and lmdb backend options for header cache
 PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
+PKG_SUPPORTED_OPTIONS+=        gssapi
 PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
+PKG_SUGGESTED_OPTIONS+= gssapi
 PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
 
+###
+### GSSAPI
+###
+
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
+.endif
+
 ### curses
 ###
 .if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.4 pkgsrc/mail/neomutt/options.mk:1.5
--- pkgsrc/mail/neomutt/options.mk:1.4  Tue Jan 17 12:32:42 2017
+++ pkgsrc/mail/neomutt/options.mk      Tue Mar  7 20:42:28 2017
@@ -1,15 +1,16 @@
-# $NetBSD: options.mk,v 1.4 2017/01/17 12:32:42 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2017/03/07 20:42:28 elric Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_GROUP.display=     slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
 PKG_SUPPORTED_OPTIONS+=        mutt-compressed-mbox
 PKG_SUPPORTED_OPTIONS+=        mutt-sidebar
 PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache mutt-smtp sasl smime ssl
+PKG_SUGGESTED_OPTIONS+=        gssapi
 PKG_SUGGESTED_OPTIONS+=        mutt-compressed-mbox
 PKG_SUGGESTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
 PKG_SUGGESTED_OPTIONS+=        mutt-compressed-mbox
@@ -18,6 +19,15 @@ PKG_SUGGESTED_OPTIONS+=      mutt-sidebar
 .include "../../mk/bsd.options.mk"
 
 ###
+### GSSAPI
+###
+
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
+.endif
+
+###
 ### Slang
 ###
 .if !empty(PKG_OPTIONS:Mslang)