Tue Mar 7 20:42:28 2017 UTC ()
Provide gssapi pkg option for {,neo}mutt.


(elric)
diff -r1.27 -r1.28 pkgsrc/mail/mutt/options.mk
diff -r1.4 -r1.5 pkgsrc/mail/neomutt/options.mk
cvs diff -r1.27 -r1.28 pkgsrc/mail/mutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt/options.mk 2017/02/24 23:31:24 1.27
+++ pkgsrc/mail/mutt/options.mk 2017/03/07 20:42:28 1.28
@@ -1,28 +1,39 @@ @@ -1,28 +1,39 @@
1# $NetBSD: options.mk,v 1.27 2017/02/24 23:31:24 wiz Exp $ 1# $NetBSD: options.mk,v 1.28 2017/03/07 20:42:28 elric Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt 5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 6PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= curses wide-curses slang 7PKG_OPTIONS_GROUP.display= curses wide-curses slang
8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl 8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
9# TODO: add kyoto cabinet and lmdb backend options for header cache 9# TODO: add kyoto cabinet and lmdb backend options for header cache
10PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 10PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
 11PKG_SUPPORTED_OPTIONS+= gssapi
11PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl 12PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
 13PKG_SUGGESTED_OPTIONS+= gssapi
12PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses 14PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses
13 15
14.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
15 17
 18###
 19### GSSAPI
 20###
 21
 22.if !empty(PKG_OPTIONS:Mgssapi)
 23. include "../../mk/krb5.buildlink3.mk"
 24CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
 25.endif
 26
16### curses 27### curses
17### 28###
18.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses) 29.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
19. include "../../mk/curses.buildlink3.mk" 30. include "../../mk/curses.buildlink3.mk"
20CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.curses} 31CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.curses}
21. if !empty(CURSES_TYPE:Mcurses) 32. if !empty(CURSES_TYPE:Mcurses)
22OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS 33OPSYSVARS+= BUILDLINK_PASSTHRU_DIRS
23BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4 34BUILDLINK_PASSTHRU_DIRS.SunOS+= /usr/xpg4
24CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4 35CONFIGURE_ARGS.SunOS+= --with-curses=/usr/xpg4
25LDFLAGS.SunOS+= -L/usr/xpg4/lib${LIBABISUFFIX} 36LDFLAGS.SunOS+= -L/usr/xpg4/lib${LIBABISUFFIX}
26LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX} 37LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
27. endif 38. endif
28.endif 39.endif
cvs diff -r1.4 -r1.5 pkgsrc/mail/neomutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/neomutt/options.mk 2017/01/17 12:32:42 1.4
+++ pkgsrc/mail/neomutt/options.mk 2017/03/07 20:42:28 1.5
@@ -1,33 +1,43 @@ @@ -1,33 +1,43 @@
1# $NetBSD: options.mk,v 1.4 2017/01/17 12:32:42 wiz Exp $ 1# $NetBSD: options.mk,v 1.5 2017/03/07 20:42:28 elric Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt 5PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 6PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses 7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl 8PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
11PKG_SUPPORTED_OPTIONS+= mutt-sidebar 11PKG_SUPPORTED_OPTIONS+= mutt-sidebar
12PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache mutt-smtp sasl smime ssl 12PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache mutt-smtp sasl smime ssl
 13PKG_SUGGESTED_OPTIONS+= gssapi
13PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 14PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
14PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 15PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
15PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 16PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
16PKG_SUGGESTED_OPTIONS+= mutt-sidebar 17PKG_SUGGESTED_OPTIONS+= mutt-sidebar
17 18
18.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
19 20
20### 21###
 22### GSSAPI
 23###
 24
 25.if !empty(PKG_OPTIONS:Mgssapi)
 26. include "../../mk/krb5.buildlink3.mk"
 27CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
 28.endif
 29
 30###
21### Slang 31### Slang
22### 32###
23.if !empty(PKG_OPTIONS:Mslang) 33.if !empty(PKG_OPTIONS:Mslang)
24. include "../../devel/libslang/buildlink3.mk" 34. include "../../devel/libslang/buildlink3.mk"
25CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 35CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
26.endif 36.endif
27 37
28### 38###
29### ncurses 39### ncurses
30### 40###
31.if !empty(PKG_OPTIONS:Mncurses) 41.if !empty(PKG_OPTIONS:Mncurses)
32USE_NCURSES= yes 42USE_NCURSES= yes
33. include "../../devel/ncurses/buildlink3.mk" 43. include "../../devel/ncurses/buildlink3.mk"