Wed Apr 8 08:40:00 2020 UTC ()
mail/mutt: move BDB_ACCEPTED to the top of optionsmk

some other buildlink files indirectly include bdb.buildlink3.mk
(at least krb5 in this case).


(rhialto)
diff -r1.225 -r1.226 pkgsrc/mail/mutt/Makefile
diff -r1.33 -r1.34 pkgsrc/mail/mutt/options.mk
cvs diff -r1.225 -r1.226 pkgsrc/mail/mutt/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt/Makefile 2020/04/07 18:04:07 1.225
+++ pkgsrc/mail/mutt/Makefile 2020/04/08 08:40:00 1.226
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.225 2020/04/07 18:04:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.226 2020/04/08 08:40:00 rhialto Exp $
2 2
3DISTNAME= mutt-1.13.4 3DISTNAME= mutt-1.13.4
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ 6MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
7 7
8MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
9HOMEPAGE= http://www.mutt.org/ 9HOMEPAGE= http://www.mutt.org/
10COMMENT= Text-based MIME mail client with PGP & S/MIME support 10COMMENT= Text-based MIME mail client with PGP & S/MIME support
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
12 12
13BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 13BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
14BUILD_DEPENDS+= lynx-[0-9]*:../../www/lynx 14BUILD_DEPENDS+= lynx-[0-9]*:../../www/lynx
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
cvs diff -r1.33 -r1.34 pkgsrc/mail/mutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt/options.mk 2020/01/17 16:39:46 1.33
+++ pkgsrc/mail/mutt/options.mk 2020/04/08 08:40:00 1.34
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1# $NetBSD: options.mk,v 1.33 2020/01/17 16:39:46 nia Exp $ 1# $NetBSD: options.mk,v 1.34 2020/04/08 08:40:00 rhialto 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_OPTIONAL_GROUPS= ssl 7PKG_OPTIONS_OPTIONAL_GROUPS= ssl
8PKG_OPTIONS_GROUP.display= curses wide-curses slang 8PKG_OPTIONS_GROUP.display= curses wide-curses slang
9PKG_OPTIONS_GROUP.ssl= gnutls openssl 9PKG_OPTIONS_GROUP.ssl= gnutls openssl
10PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl 10PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl
11# TODO: add kyoto cabinet and lmdb backend options for header cache 11# TODO: add kyoto cabinet and lmdb backend options for header cache
12PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp 12PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp
13PKG_SUPPORTED_OPTIONS+= gssapi 13PKG_SUPPORTED_OPTIONS+= gssapi
14PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl 14PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl
15PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox sasl 15PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox sasl
16# remove after 2019Q1 16# remove after 2019Q1
17PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses 17PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses
18PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl 18PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl
19 19
 20# Must be at the top; some other buildlink files indirectly
 21# include bdb.buildlink3.mk.
 22BDB_ACCEPTED= db4 db5
 23
20.include "../../mk/bsd.options.mk" 24.include "../../mk/bsd.options.mk"
21 25
22### 26###
23### GSSAPI 27### GSSAPI
24### 28###
25CONFIGURE_ENV+= ac_cv_path_KRB5CFGPATH=${KRB5_CONFIG} 29CONFIGURE_ENV+= ac_cv_path_KRB5CFGPATH=${KRB5_CONFIG}
26.if !empty(PKG_OPTIONS:Mgssapi) 30.if !empty(PKG_OPTIONS:Mgssapi)
27. include "../../mk/krb5.buildlink3.mk" 31. include "../../mk/krb5.buildlink3.mk"
28CONFIGURE_ARGS+= --with-gss=${KRB5BASE} 32CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
29.endif 33.endif
30 34
31### curses 35### curses
32### 36###
@@ -95,27 +99,26 @@ CONFIGURE_ARGS+= --disable-smime @@ -95,27 +99,26 @@ CONFIGURE_ARGS+= --disable-smime
95.endif 99.endif
96 100
97### 101###
98### Header cache 102### Header cache
99### 103###
100.if !empty(PKG_OPTIONS:Mmutt-hcache) 104.if !empty(PKG_OPTIONS:Mmutt-hcache)
101. if !empty(PKG_OPTIONS:Mtokyocabinet) 105. if !empty(PKG_OPTIONS:Mtokyocabinet)
102. include "../../databases/tokyocabinet/buildlink3.mk" 106. include "../../databases/tokyocabinet/buildlink3.mk"
103CONFIGURE_ARGS+= --enable-hcache 107CONFIGURE_ARGS+= --enable-hcache
104CONFIGURE_ARGS+= --enable-tokyocabinet 108CONFIGURE_ARGS+= --enable-tokyocabinet
105CONFIGURE_ARGS+= --without-gdbm 109CONFIGURE_ARGS+= --without-gdbm
106CONFIGURE_ARGS+= --without-bdb 110CONFIGURE_ARGS+= --without-bdb
107. else 111. else
108BDB_ACCEPTED= db4 db5 
109BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 112BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
110. include "../../mk/bdb.buildlink3.mk" 113. include "../../mk/bdb.buildlink3.mk"
111CONFIGURE_ARGS+= --enable-hcache 114CONFIGURE_ARGS+= --enable-hcache
112CONFIGURE_ARGS+= --without-gdbm 115CONFIGURE_ARGS+= --without-gdbm
113# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate 116# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
114# since the real -I and -L flags are added by buildlink already. 117# since the real -I and -L flags are added by buildlink already.
115CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include 118CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include
116CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 119CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
117CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 120CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
118. endif 121. endif
119.else 122.else
120CONFIGURE_ARGS+= --disable-hcache 123CONFIGURE_ARGS+= --disable-hcache
121.endif 124.endif