diff options
Diffstat (limited to 'mail/mutt/patches')
| -rw-r--r-- | mail/mutt/patches/patch-aa | 18 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ac | 17 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ad | 32 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ag | 12 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ah | 17 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-doc-Muttrc | 38 |
6 files changed, 6 insertions, 128 deletions
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa deleted file mode 100644 index ebf97f65f36..00000000000 --- a/mail/mutt/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2019/05/26 08:43:14 tron Exp $ - ---- send.c.orig 2019-05-10 03:20:15.000000000 +0100 -+++ send.c 2019-05-26 09:32:44.000000000 +0100 -@@ -2196,6 +2196,13 @@ - } - } - -+#ifdef CRYPT_BACKEND_CLASSIC_PGP -+ { -+ /* Extend the PGP expiry time while messages are being sent. */ -+ extern time_t PgpExptime; -+ PgpExptime = time (NULL) + PgpTimeout; -+ } -+#endif - - rv = 0; - diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac deleted file mode 100644 index 16e549c7bbd..00000000000 --- a/mail/mutt/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2015/09/03 14:49:02 wiz Exp $ - ---- config.h.in.orig 2009-08-02 09:34:54 +0300 -+++ config.h.in 2009-08-02 09:36:37 +0300 -@@ -442,6 +442,12 @@ - /* Define to 1 if you have the `__argz_stringify' function. */ - #undef HAVE___ARGZ_STRINGIFY - -+/* Define to 1 if you have the `mvchgat' function. */ -+#undef HAVE_MVCHGAT -+ -+/* Define to 1 if you have the `mvwchgat' function. */ -+#undef HAVE_MVWCHGAT -+ - /* Is mail spooled to the user's home directory? If defined, MAILPATH should - be set to the filename of the spool mailbox relative the the home - directory. use: configure --with-homespool=FILE */ diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad deleted file mode 100644 index c0f99e27d41..00000000000 --- a/mail/mutt/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.11 2015/09/03 21:04:34 wiz Exp $ - ---- contrib/Makefile.in.orig 2015-08-30 17:24:26.000000000 +0000 -+++ contrib/Makefile.in -@@ -459,21 +459,20 @@ uninstall-am: uninstall-local - - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv - for f in $(SAMPLES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir); \ - done - for f in $(srcdir)/iconv/*.rc ; do \ -- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ -+ $(INSTALL) -m 644 $$f $(DESTDIR)$(sysconfdir)/iconv ; \ - done - - uninstall-local: - for f in $(SAMPLES) ; do \ -- rm -f $(DESTDIR)$(docdir)/samples/$$f ; \ -+ rm -f $(DESTDIR)$(sysconfdir)/$$f ; \ - done -- -rm -rf $(DESTDIR)$(docdir)/samples/iconv -- -rmdir $(DESTDIR)$(docdir)/samples -- -rmdir $(DESTDIR)$(docdir) -+ -rm -rf $(DESTDIR)$(sysconfdir)/iconv -+ -rmdir $(DESTDIR)$(sysconfdir) - dist-hook: Makefile $(DISTFILES) - mkdir -p $(distdir)/iconv - for file in $(srcdir)/iconv/*.rc ; do \ diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag index 5d3fd91487b..b8d5c3f8c69 100644 --- a/mail/mutt/patches/patch-ag +++ b/mail/mutt/patches/patch-ag @@ -1,11 +1,11 @@ -$NetBSD: patch-ag,v 1.10 2017/03/08 10:05:34 wiz Exp $ +$NetBSD: patch-ag,v 1.11 2020/06/22 06:24:15 wiz Exp $ ---- doc/Makefile.in.orig 2017-02-24 18:39:56.000000000 +0000 +--- doc/Makefile.in.orig 2020-06-18 21:30:08.000000000 +0000 +++ doc/Makefile.in -@@ -654,7 +654,7 @@ install-data-local: makedoc-all instdoc - test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \ - $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 - ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 +@@ -561,7 +561,7 @@ install-data-local: makedoc-all instdoc + elif [ -f $(srcdir)/muttrc.man ] ; then \ + ./instdoc $(srcdir)/muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 ; \ + fi - ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5 + ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5 ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5 diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah deleted file mode 100644 index 4731c68f917..00000000000 --- a/mail/mutt/patches/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2016/08/21 11:39:31 wiz Exp $ - -mutt_curses.h refers to event_t from mutt,h, and SHORT_STRING from lib.h, -so include those headers here. - ---- mutt_curses.h.orig 2016-08-11 01:47:00.000000000 +0000 -+++ mutt_curses.h -@@ -52,6 +52,9 @@ - # include <curses.h> - #endif - -+#include "lib.h" /* for SHORT_STRING */ -+#include "mutt.h" /* for event_t */ -+ - #define MUTT_ENTER_C '\n' - #define MUTT_ENTER_S "\n" - diff --git a/mail/mutt/patches/patch-doc-Muttrc b/mail/mutt/patches/patch-doc-Muttrc deleted file mode 100644 index c42e9d642e9..00000000000 --- a/mail/mutt/patches/patch-doc-Muttrc +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-doc-Muttrc,v 1.1 2019/12/01 00:02:34 tron Exp $ - -Rewrite hard coded pathnames configuration file documentation - ---- doc/Muttrc.orig 2019-11-30 18:14:44.000000000 +0000 -+++ doc/Muttrc 2019-11-30 23:50:15.102043333 +0000 -@@ -23,7 +23,7 @@ - "call urlview to extract URLs out of a message" - - # Show documentation when pressing F1 --macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation" -+macro generic,pager <F1> "<shell-escape> less @DOCDIR@/manual.txt<Enter>" "show Mutt documentation" - - # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - # note: these macros have been subsumed by the <browse-mailboxes> function. -@@ -1183,11 +1183,11 @@ - # filtered message is read from the standard output. - # - # --# set dotlock_program="/usr/local/bin/mutt_dotlock" -+# set dotlock_program="@PREFIX@/bin/mutt_dotlock" - # - # Name: dotlock_program - # Type: path --# Default: "/usr/local/bin/mutt_dotlock" -+# Default: "@PREFIX@/bin/mutt_dotlock" - # - # - # Contains the path of the mutt_dotlock(8) binary to be used by -@@ -5923,7 +5923,7 @@ - # Setting this variable will cause mutt to open a pipe to a command - # instead of a raw socket. You may be able to use this to set up - # preauthenticated connections to your IMAP/POP3/SMTP server. Example: --# set tunnel="ssh -q mailhost.net /usr/local/libexec/imapd" -+# set tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd" - # - # Note: For this example to work you must be able to log in to the remote - # machine without having to enter a password. |