CVS commit: pkgsrc/mail/mutt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  6 13:33:23 UTC 2024

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

Log Message:
mutt: deprecate wide-curses option

It does the same as the curses option now.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.37 pkgsrc/mail/mutt/options.mk:1.38
--- pkgsrc/mail/mutt/options.mk:1.37    Thu Apr 25 13:12:42 2024
+++ pkgsrc/mail/mutt/options.mk Mon May  6 13:33:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.37 2024/04/25 13:12:42 wiz Exp $
+# $NetBSD: options.mk,v 1.38 2024/05/06 13:33:23 wiz Exp $
 
 # Global and legacy options
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_VAR=                PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_OPTIONAL_GROUPS=   db ssl
 PKG_OPTIONS_GROUP.db=          tokyocabinet lmdb
-PKG_OPTIONS_GROUP.display=     curses wide-curses slang
+PKG_OPTIONS_GROUP.display=     curses slang
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 PKG_SUPPORTED_OPTIONS=         debug gpgme idn smime sasl
 PKG_SUPPORTED_OPTIONS+=                mutt-hcache mutt-compressed-mbox mutt-smtp
@@ -14,6 +14,9 @@ PKG_SUPPORTED_OPTIONS+=               gssapi
 PKG_SUGGESTED_OPTIONS=         curses gpgme mutt-hcache mutt-smtp smime openssl
 PKG_SUGGESTED_OPTIONS+=                gssapi mutt-compressed-mbox sasl
 
+# remove after pkgsrc-2024Q3
+PKG_OPTIONS_LEGACY_OPTS+=      wide-curses:curses
+
 # Must be at the top; some other buildlink files indirectly
 # include bdb.buildlink3.mk.
 BDB_ACCEPTED=          db4 db5
@@ -31,7 +34,7 @@ CONFIGURE_ARGS+=      --with-gss=${KRB5BASE}
 
 ### curses
 ###
-.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
+.if !empty(PKG_OPTIONS:Mcurses)
 .  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.curses}
 .  if ${CURSES_TYPE:U} == curses