CVS commit: pkgsrc/mail/mutt

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Wed Apr  8 08:40:00 UTC 2020

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

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/mutt/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/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.225 pkgsrc/mail/mutt/Makefile:1.226
--- pkgsrc/mail/mutt/Makefile:1.225     Tue Apr  7 18:04:07 2020
+++ pkgsrc/mail/mutt/Makefile   Wed Apr  8 08:40:00 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.225 2020/04/07 18:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.226 2020/04/08 08:40:00 rhialto Exp $
 
 DISTNAME=              mutt-1.13.4
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.33 pkgsrc/mail/mutt/options.mk:1.34
--- pkgsrc/mail/mutt/options.mk:1.33    Fri Jan 17 16:39:46 2020
+++ pkgsrc/mail/mutt/options.mk Wed Apr  8 08:40:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.33 2020/01/17 16:39:46 nia Exp $
+# $NetBSD: options.mk,v 1.34 2020/04/08 08:40:00 rhialto Exp $
 
 # Global and legacy options
 
@@ -17,6 +17,10 @@ PKG_SUGGESTED_OPTIONS+=              gssapi mutt-com
 PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 PKG_OPTIONS_LEGACY_OPTS+=      ssl:openssl
 
+# Must be at the top; some other buildlink files indirectly
+# include bdb.buildlink3.mk.
+BDB_ACCEPTED=          db4 db5
+
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -105,7 +109,6 @@ CONFIGURE_ARGS+=    --enable-tokyocabinet
 CONFIGURE_ARGS+=       --without-gdbm
 CONFIGURE_ARGS+=       --without-bdb
 .  else
-BDB_ACCEPTED=          db4 db5
 BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .  include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-hcache