pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
neomutt-git: reduce diffs to mail/neomutt
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Feb 21 16:23:23 2026 +0100
Changeset: aca0ecb70104c3c26f26fd063f060e140d11cdfb
Modified Files:
neomutt-git/Makefile
neomutt-git/PLIST
neomutt-git/options.mk
Log Message:
neomutt-git: reduce diffs to mail/neomutt
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aca0ecb70104c3c26f26fd063f060e140d11cdfb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
neomutt-git/Makefile | 9 ++++++---
neomutt-git/PLIST | 10 ++++++----
neomutt-git/options.mk | 36 ++++++------------------------------
3 files changed, 18 insertions(+), 37 deletions(-)
diffs:
diff --git a/neomutt-git/Makefile b/neomutt-git/Makefile
index ae41be6990..12445ce0e0 100644
--- a/neomutt-git/Makefile
+++ b/neomutt-git/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2021/05/24 19:52:43 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2026/01/06 17:09:42 wiz Exp $
-DISTNAME= neomutt-20230227
+DISTNAME= neomutt-20260105
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/}
#GITHUB_TAG= ${PKGVERSION_NOREV}
@@ -18,7 +18,6 @@ TOOL_DEPENDS+= w3m-[0-9]*:../../www/w3m
DEPENDS+= mime-types-[0-9]*:../../misc/mime-types
USE_TOOLS+= msgfmt gmake perl:build pkg-config
-CONFLICTS= neomutt-[0-9]*
HAS_CONFIGURE= yes
EXTRACT_USING= bsdtar
@@ -32,6 +31,9 @@ CONF_FILES= ${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
INSTALLATION_DIRS+= ${EGDIR}
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
+USE_CC_FEATURES+= c11
+GCC_REQD+= 8
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
@@ -52,6 +54,7 @@ SUBST_SED.interpreter+= -e "s,\#! */usr/bin/env *python3,\#!${PYTHONBIN},"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../wip/mk/git-package.mk"
diff --git a/neomutt-git/PLIST b/neomutt-git/PLIST
index f280f6d90e..092df618ba 100644
--- a/neomutt-git/PLIST
+++ b/neomutt-git/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.28 2025/12/12 11:24:05 wiz Exp $
bin/neomutt
libexec/neomutt/pgpewrap
${PLIST.smime}libexec/neomutt/smime_keys
man/man1/neomutt.1
man/man1/pgpewrap_neomutt.1
-man/man1/smime_keys_neomutt.1
+${PLIST.smime}man/man1/smime_keys_neomutt.1
man/man5/mbox_neomutt.5
man/man5/mmdf_neomutt.5
man/man5/neomuttrc.5
@@ -28,7 +28,7 @@ share/doc/neomutt/miscellany.html
share/doc/neomutt/optionalfeatures.html
share/doc/neomutt/reference.html
share/doc/neomutt/security.html
-share/doc/neomutt/smime-notes.txt
+${PLIST.smime}share/doc/neomutt/smime-notes.txt
share/doc/neomutt/tuning.html
share/examples/neomutt/neomuttrc
share/locale/bg/LC_MESSAGES/neomutt.mo
@@ -69,6 +69,7 @@ share/neomutt/account-command/gpg-json/README.md
share/neomutt/account-command/gpg-json/credentials.sh
share/neomutt/account-command/macos-keychain/README.md
share/neomutt/account-command/macos-keychain/keychain.py
+share/neomutt/colorschemes/ayu-dark-256.neomuttrc
share/neomutt/colorschemes/neonwolf-256.neomuttrc
share/neomutt/colorschemes/solarized-dark-256.neomuttrc
share/neomutt/colorschemes/vombatidae.neomuttrc
@@ -79,7 +80,8 @@ share/neomutt/logo/neomutt-32.png
share/neomutt/logo/neomutt-64.png
share/neomutt/logo/neomutt.svg
share/neomutt/mime.types
+share/neomutt/oauth2/README.md
share/neomutt/oauth2/mutt_oauth2.py
-share/neomutt/oauth2/mutt_oauth2.py.README
+${PLIST.smime}share/neomutt/smime.rc
share/neomutt/vim-keys/README.md
share/neomutt/vim-keys/vim-keys.rc
diff --git a/neomutt-git/options.mk b/neomutt-git/options.mk
index 2f5a6ed541..30fb33eb3e 100644
--- a/neomutt-git/options.mk
+++ b/neomutt-git/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.18 2022/09/20 17:13:24 nikita Exp $
+# $NetBSD: options.mk,v 1.26 2026/02/21 15:22:59 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 idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+= debug gpgme gssapi ssl smime sasl
PKG_SUPPORTED_OPTIONS+= notmuch lua
-PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl
+PKG_SUGGESTED_OPTIONS= gpgme gssapi ncurses sasl smime ssl
PKG_SUGGESTED_OPTIONS+= tokyocabinet notmuch
.include "../../mk/bsd.options.mk"
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-gss=${KRB5BASE}
### ncurses
###
.if !empty(PKG_OPTIONS:Mncurses)
-USE_NCURSES= yes
. include "../../devel/ncurses/buildlink3.mk"
CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.ncurses}
.endif
@@ -48,19 +47,6 @@ LDFLAGS.SunOS+= -L/usr/xpg4/lib${LIBABISUFFIX}
LDFLAGS.SunOS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
.endif
-###
-### ncursesw
-###
-.if !empty(PKG_OPTIONS:Mncursesw)
-. include "../../devel/ncursesw/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
###
@@ -77,7 +63,7 @@ CONFIGURE_ARGS+= --disable-ssl
PLIST_VARS+= smime
.if !empty(PKG_OPTIONS:Msmime)
USE_TOOLS+= perl:run
-REPLACE_PERL+= */*.pl contrib/smime_keys
+REPLACE_PERL+= smime/smime_keys
. include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= --smime
PLIST.smime= yes
@@ -111,16 +97,6 @@ CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
.endif
-###
-### Internationalized Domain Names
-###
-.if !empty(PKG_OPTIONS:Midn)
-. include "../../devel/libidn/buildlink3.mk"
-CONFIGURE_ARGS+= --with-idn=${BUILDLINK_PREFIX.libidn}
-.else
-CONFIGURE_ARGS+= --disable-idn
-.endif
-
###
### Enable debugging support
###
@@ -133,7 +109,7 @@ CFLAGS+= -g
###
.if !empty(PKG_OPTIONS:Mgpgme)
CONFIGURE_ARGS+= --gpgme
-.include "../../security/gpgme/buildlink3.mk"
+. include "../../security/gpgme/buildlink3.mk"
.endif
###
Home |
Main Index |
Thread Index |
Old Index