Tue Oct 4 21:52:36 2016 UTC ()
Option was renamed, follow suit.


(wiz)
diff -r1.2 -r1.3 pkgsrc/mail/neomutt/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/mail/neomutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/neomutt/options.mk 2016/09/09 06:31:29 1.2
+++ pkgsrc/mail/neomutt/options.mk 2016/10/04 21:52:36 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2016/09/09 06:31:29 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2016/10/04 21:52:36 wiz 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 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+= mutt-compressed-mbox 13PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
14PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 14PKG_SUGGESTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
@@ -87,27 +87,27 @@ REPLACE_PERL+= *.pl */*.pl @@ -87,27 +87,27 @@ REPLACE_PERL+= *.pl */*.pl
87CONFIGURE_ARGS+= --enable-smime 87CONFIGURE_ARGS+= --enable-smime
88PLIST.smime= yes 88PLIST.smime= yes
89.else 89.else
90CONFIGURE_ARGS+= --disable-smime 90CONFIGURE_ARGS+= --disable-smime
91.endif 91.endif
92 92
93### 93###
94### Header cache 94### Header cache
95### 95###
96.if !empty(PKG_OPTIONS:Mmutt-hcache) 96.if !empty(PKG_OPTIONS:Mmutt-hcache)
97. if !empty(PKG_OPTIONS:Mtokyocabinet) 97. if !empty(PKG_OPTIONS:Mtokyocabinet)
98. include "../../databases/tokyocabinet/buildlink3.mk" 98. include "../../databases/tokyocabinet/buildlink3.mk"
99CONFIGURE_ARGS+= --enable-hcache 99CONFIGURE_ARGS+= --enable-hcache
100CONFIGURE_ARGS+= --enable-tokyocabinet 100CONFIGURE_ARGS+= --with-tokyocabinet
101CONFIGURE_ARGS+= --without-gdbm 101CONFIGURE_ARGS+= --without-gdbm
102CONFIGURE_ARGS+= --without-bdb 102CONFIGURE_ARGS+= --without-bdb
103. else 103. else
104BDB_ACCEPTED= db4 db5 104BDB_ACCEPTED= db4 db5
105BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 105BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
106. include "../../mk/bdb.buildlink3.mk" 106. include "../../mk/bdb.buildlink3.mk"
107CONFIGURE_ARGS+= --enable-hcache 107CONFIGURE_ARGS+= --enable-hcache
108CONFIGURE_ARGS+= --without-gdbm 108CONFIGURE_ARGS+= --without-gdbm
109# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate 109# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
110# since the real -I and -L flags are added by buildlink already. 110# since the real -I and -L flags are added by buildlink already.
111CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include 111CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
112CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 112CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
113CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 113CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}