CVS commit: pkgsrc/mail/neomutt

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  6 13:46:14 UTC 2024

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

Log Message:
neomutt: deprecate ncursesw option

Does the same as the ncurses option now


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/neomutt/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/neomutt/Makefile
diff -u pkgsrc/mail/neomutt/Makefile:1.96 pkgsrc/mail/neomutt/Makefile:1.97
--- pkgsrc/mail/neomutt/Makefile:1.96   Mon May  6 08:40:28 2024
+++ pkgsrc/mail/neomutt/Makefile        Mon May  6 13:46:13 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2024/05/06 08:40:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.97 2024/05/06 13:46:13 wiz Exp $
 
 DISTNAME=              neomutt-20240425
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=            ${PKGVERSION_NOREV}

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.23 pkgsrc/mail/neomutt/options.mk:1.24
--- pkgsrc/mail/neomutt/options.mk:1.23 Mon May  6 08:33:51 2024
+++ pkgsrc/mail/neomutt/options.mk      Mon May  6 13:46:13 2024
@@ -1,14 +1,17 @@
-# $NetBSD: options.mk,v 1.23 2024/05/06 08:33:51 jperkin Exp $
+# $NetBSD: options.mk,v 1.24 2024/05/06 13:46:13 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
-PKG_OPTIONS_GROUP.display=     curses ncurses ncursesw
+PKG_OPTIONS_GROUP.display=     curses ncurses
 PKG_SUPPORTED_OPTIONS=         tokyocabinet lmdb
 PKG_SUPPORTED_OPTIONS+=                debug gpgme gssapi ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=                notmuch lua
-PKG_SUGGESTED_OPTIONS=         gpgme gssapi ncursesw sasl smime ssl
+PKG_SUGGESTED_OPTIONS=         gpgme gssapi ncurses sasl smime ssl
 PKG_SUGGESTED_OPTIONS+=                tokyocabinet notmuch
 
+# remove after pkgsrc-2024Q3
+PKG_OPTIONS_LEGACY_OPTS+=      ncursesw:ncurses
+
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -48,19 +51,6 @@ LDFLAGS.SunOS+=                      ${COMPILER_RPATH_FLAG}
 .endif
 
 ###
-### ncursesw
-###
-.if !empty(PKG_OPTIONS:Mncursesw)
-.  include "../../devel/ncurses/buildlink3.mk"
-.else
-SUBST_CLASSES+=                curse
-SUBST_MESSAGE.curse=   Fixing mutt to avoid ncursesw
-SUBST_STAGE.curse=     pre-configure
-SUBST_FILES.curse=     configure.ac
-SUBST_SED.curse=       -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
-.endif
-
-###
 ### SSL
 ###
 .if !empty(PKG_OPTIONS:Mssl)