Remove mutt-kz, superseded by neomutt.

19 files changed, 1 insertions, 505 deletions

diff --git a/mail/Makefile b/mail/Makefile
index e0f7c5a806d..d239c826a5c 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.476 2016/04/17 18:27:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.477 2016/07/11 22:03:45 wiz Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -164,7 +164,6 @@ SUBDIR+=	mpop
 SUBDIR+=	msmtp
 SUBDIR+=	mush
 SUBDIR+=	mutt
-SUBDIR+=	mutt-kz
 SUBDIR+=	netbiff
 SUBDIR+=	newmail
 SUBDIR+=	newspipe
diff --git a/mail/mutt-kz/DESCR b/mail/mutt-kz/DESCR
deleted file mode 100644
index 42a467efbee..00000000000
--- a/mail/mutt-kz/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
-
-``All mail clients suck.  This one just sucks less.'' -me, circa 1995
-
-Mutt is a small but very powerful text-based MIME mail client.
-Mutt is highly configurable, and is well suited to the mail power
-user with advanced features like key bindings, keyboard macros,
-mail threading, color, PGP and S/MIME, POP3, IMAP, various mailbox
-formats, regular expression searches and a powerful pattern matching
-language for selecting groups of messages.
-
-This package contains the mutt-kz fork with notmuch support and
-another improvements.
diff --git a/mail/mutt-kz/Makefile b/mail/mutt-kz/Makefile
deleted file mode 100644
index 3839351e4bd..00000000000
--- a/mail/mutt-kz/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2016/04/09 09:46:26 tron Exp $
-
-DISTNAME=	mutt-kz-1.6.0.1
-PKGNAME=	${DISTNAME:S/-rc/rc/}
-CATEGORIES=	mail
-MASTER_SITES=	ftp://redcrew.org/pub/mutt-kz/v1.6.0.1/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		https://kzak.redcrew.org/doku.php?id=mutt:start
-COMMENT=		Text-based MIME mail client with notmuch, PGP & S/MIME support
-LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or newer
-
-CONFIGURE_ARGS+=	--enable-notmuch --enable-sidebar
-
-# On case-insensitive file systems like on OS X, version.sh is used
-# to re-create VERSION, and fails. Make sure VERSION is newer than
-# version.sh to avoid this.
-pre-build:
-	${TOUCH} ${WRKSRC}/VERSION
-
-.include "../../mail/mutt/Makefile.common"
-
-DEINSTALL_SRC=		${.CURDIR}/../../mail/mutt/DEINSTALL
-INSTALL_SRC=		${.CURDIR}/../../mail/mutt/INSTALL
-
-.include "../../mail/notmuch/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-kz/PLIST b/mail/mutt-kz/PLIST
deleted file mode 100644
index c5af55f421c..00000000000
--- a/mail/mutt-kz/PLIST
+++ /dev/null
@@ -1,112 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/12 17:43:37 wiz Exp $
-bin/flea
-bin/mutt
-bin/mutt_dotlock
-bin/muttbug
-bin/pgpewrap
-bin/pgpring
-${PLIST.smime}bin/smime_keys
-man/man1/flea.1
-man/man1/mutt.1
-man/man1/mutt_dotlock.1
-man/man1/muttbug.1
-man/man1/pgpewrap.1
-man/man1/pgpring.1
-man/man1/smime_keys.1
-man/man5/mutt-mbox.5
-man/man5/mutt-mmdf.5
-man/man5/muttrc.5
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/TODO
-share/doc/mutt/advancedusage.html
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/configuration.html
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/gettingstarted.html
-share/doc/mutt/index.html
-share/doc/mutt/intro.html
-share/doc/mutt/manual.html
-share/doc/mutt/manual.txt
-share/doc/mutt/mimesupport.html
-share/doc/mutt/miscellany.html
-share/doc/mutt/optionalfeatures.html
-share/doc/mutt/patch-notes.txt
-share/doc/mutt/reference.html
-share/doc/mutt/security.html
-share/doc/mutt/smime-notes.txt
-share/doc/mutt/tuning.html
-share/examples/mutt/Mush.rc
-share/examples/mutt/Muttrc
-share/examples/mutt/Muttrc.dist
-share/examples/mutt/Pine.rc
-share/examples/mutt/Tin.rc
-share/examples/mutt/ca-bundle.crt
-share/examples/mutt/colors.default
-share/examples/mutt/colors.linux
-share/examples/mutt/gpg.rc
-share/examples/mutt/iconv/iconv.aix-3.2.5.rc
-share/examples/mutt/iconv/iconv.aix-4.1.5.rc
-share/examples/mutt/iconv/iconv.aix-4.2.0.rc
-share/examples/mutt/iconv/iconv.aix-4.3.2.rc
-share/examples/mutt/iconv/iconv.freebsd-3.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
-share/examples/mutt/iconv/iconv.hpux-10.01.rc
-share/examples/mutt/iconv/iconv.hpux-10.20.rc
-share/examples/mutt/iconv/iconv.hpux-11.00.rc
-share/examples/mutt/iconv/iconv.irix-6.5.rc
-share/examples/mutt/iconv/iconv.osf1-4.0a.rc
-share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-share/examples/mutt/iconv/iconv.solaris-2.4.rc
-share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
-share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
-share/examples/mutt/iconv/iconv.solaris-2.6.rc
-share/examples/mutt/iconv/iconv.solaris-2.7.rc
-share/examples/mutt/mime.types
-share/examples/mutt/mime.types.dist
-share/examples/mutt/mutt_xtitle
-share/examples/mutt/pgp2.rc
-share/examples/mutt/pgp5.rc
-share/examples/mutt/pgp6.rc
-share/examples/mutt/sample.mailcap
-share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-tlr
-share/examples/mutt/smime.rc
-share/examples/mutt/smime_keys_test.pl
-share/locale/bg/LC_MESSAGES/mutt-kz.mo
-share/locale/ca/LC_MESSAGES/mutt-kz.mo
-share/locale/cs/LC_MESSAGES/mutt-kz.mo
-share/locale/da/LC_MESSAGES/mutt-kz.mo
-share/locale/de/LC_MESSAGES/mutt-kz.mo
-share/locale/el/LC_MESSAGES/mutt-kz.mo
-share/locale/eo/LC_MESSAGES/mutt-kz.mo
-share/locale/es/LC_MESSAGES/mutt-kz.mo
-share/locale/et/LC_MESSAGES/mutt-kz.mo
-share/locale/eu/LC_MESSAGES/mutt-kz.mo
-share/locale/fr/LC_MESSAGES/mutt-kz.mo
-share/locale/ga/LC_MESSAGES/mutt-kz.mo
-share/locale/gl/LC_MESSAGES/mutt-kz.mo
-share/locale/hu/LC_MESSAGES/mutt-kz.mo
-share/locale/id/LC_MESSAGES/mutt-kz.mo
-share/locale/it/LC_MESSAGES/mutt-kz.mo
-share/locale/ja/LC_MESSAGES/mutt-kz.mo
-share/locale/ko/LC_MESSAGES/mutt-kz.mo
-share/locale/lt/LC_MESSAGES/mutt-kz.mo
-share/locale/nl/LC_MESSAGES/mutt-kz.mo
-share/locale/pl/LC_MESSAGES/mutt-kz.mo
-share/locale/pt_BR/LC_MESSAGES/mutt-kz.mo
-share/locale/ru/LC_MESSAGES/mutt-kz.mo
-share/locale/sk/LC_MESSAGES/mutt-kz.mo
-share/locale/sv/LC_MESSAGES/mutt-kz.mo
-share/locale/tr/LC_MESSAGES/mutt-kz.mo
-share/locale/uk/LC_MESSAGES/mutt-kz.mo
-share/locale/zh_CN/LC_MESSAGES/mutt-kz.mo
-share/locale/zh_TW/LC_MESSAGES/mutt-kz.mo
diff --git a/mail/mutt-kz/distinfo b/mail/mutt-kz/distinfo
deleted file mode 100644
index 776a3d1a854..00000000000
--- a/mail/mutt-kz/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.6 2016/06/07 12:26:43 wiz Exp $
-
-SHA1 (mutt-kz-1.6.0.1.tar.xz) = 1a951c3051f50d85e90af694f2a3eed3ee841e60
-RMD160 (mutt-kz-1.6.0.1.tar.xz) = 9d5b700e361e570ea562020da6ec35161be175d5
-SHA512 (mutt-kz-1.6.0.1.tar.xz) = 593ab07bad621e4f08d4d09a9b4081942691413e30e6b82323b33f4bd521b2f5c58fc9f5de965086931f085ef141a0752c3a3dadcbd4c06d6bc8ed934a73ef05
-Size (mutt-kz-1.6.0.1.tar.xz) = 1972568 bytes
-SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8
-RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08
-SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9
-Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes
-SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = a6ef9011ecd89fba878e1e7c079cd240f3d29c0f
-SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
-SHA1 (patch-ad) = 22ec3312f5e0bd899a1649d4c67d002170e04d7a
-SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
-SHA1 (patch-af) = 0daf7673517e3d33909a46305771c73e357c3ef9
-SHA1 (patch-ag) = 639a6301fc94ee0386d3335fc914ad00964894ee
-SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
-SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
-SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
-SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
-SHA1 (patch-ao) = f482a4be214a7792e42940458d7ded70de5217fc
-SHA1 (patch-ap) = 810715ebe1c931cf19059261d614dcc9d5cfe82a
-SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
diff --git a/mail/mutt-kz/patches/patch-aa b/mail/mutt-kz/patches/patch-aa
deleted file mode 100644
index 63ea98990a9..00000000000
--- a/mail/mutt-kz/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
---- send.c.orig	Sun Feb  1 12:10:58 2004
-+++ send.c
-@@ -1689,6 +1689,13 @@ full_fcc:
-     }
-   }
- 
-+#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-kz/patches/patch-ab b/mail/mutt-kz/patches/patch-ab
deleted file mode 100644
index b0ec3b4035e..00000000000
--- a/mail/mutt-kz/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2016/04/09 09:46:26 tron Exp $
-
---- Makefile.in.orig	2016-04-05 11:16:26.000000000 +0100
-+++ Makefile.in	2016-04-09 10:05:39.000000000 +0100
-@@ -131,7 +131,7 @@
- 	mutt_notmuch.h
- @BUILD_SIDEBAR_TRUE@am__objects_1 = sidebar.$(OBJEXT)
- @BUILD_NOTMUCH_TRUE@am__objects_2 = mutt_notmuch.$(OBJEXT)
--am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
-+am_mutt_OBJECTS = mvchgat.$(OBJEXT) addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
- 	base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \
- 	color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \
- 	commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \
-@@ -359,7 +359,7 @@
- DBX = @DBX@
- DEBUGGER = @DEBUGGER@
- DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
--	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-+	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
- 	-DHAVE_CONFIG_H=1
- 
- DEPDIR = @DEPDIR@
-@@ -828,6 +828,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvchgat.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_asprintf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
-@@ -1375,11 +1376,6 @@
- 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
- 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- 	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
--	fi
- 
- install-data-local:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
diff --git a/mail/mutt-kz/patches/patch-ac b/mail/mutt-kz/patches/patch-ac
deleted file mode 100644
index 8f45b61313a..00000000000
--- a/mail/mutt-kz/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2014/01/12 17:43:37 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-kz/patches/patch-ad b/mail/mutt-kz/patches/patch-ad
deleted file mode 100644
index 93808167f67..00000000000
--- a/mail/mutt-kz/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2016/04/09 09:46:26 tron Exp $
-
---- contrib/Makefile.in.orig	2016-04-05 11:16:26.000000000 +0100
-+++ contrib/Makefile.in	2016-04-09 10:09:31.000000000 +0100
-@@ -472,20 +472,20 @@
- 
- 
- 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
-+	-rm -rf $(DESTDIR)$(sysconfdir)/iconv
-+	-rmdir $(DESTDIR)$(sysconfdir)
- 	-rmdir $(DESTDIR)$(docdir)
- dist-hook: Makefile $(DISTFILES)
- 	mkdir -p $(distdir)/iconv
diff --git a/mail/mutt-kz/patches/patch-ae b/mail/mutt-kz/patches/patch-ae
deleted file mode 100644
index 1eb5ea18b3c..00000000000
--- a/mail/mutt-kz/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
-Work around the broken IMAP implementation of Exchange 2010.
-Patch taken from here:
-
-http://dev.mutt.org/trac/ticket/3459
-
---- imap/message.c.orig	2010-08-24 17:34:21.000000000 +0100
-+++ imap/message.c	2011-02-03 13:17:56.000000000 +0000
-@@ -242,6 +242,14 @@
-       char *cmd;
- 
-       fetchlast = msgend + 1;
-+      /* Microsoft Exchange 2010 violates the IMAP protocol and 
-+       * starts omitting messages if one FETCHes more than 2047 (or
-+       * or somewhere around that number. We therefore split the
-+       * FETCH into chunks of 2000 messages each. */
-+      if (fetchlast - msgno - 1 > 2000)
-+      {
-+        fetchlast = msgno + 1 + 2000;
-+      }
-       safe_asprintf (&cmd, "FETCH %d:%d (UID FLAGS INTERNALDATE RFC822.SIZE %s)",
-                      msgno + 1, fetchlast, hdrreq);
-       imap_cmd_start (idata, cmd);
diff --git a/mail/mutt-kz/patches/patch-af b/mail/mutt-kz/patches/patch-af
deleted file mode 100644
index e6f64de12e0..00000000000
--- a/mail/mutt-kz/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 2016/04/09 09:46:26 tron Exp $
-
-On some systems, curses.h defines TRUE and FALSE, so conditionalise
-them here to avoid compiler complaints about duplicate definitions.
-
---- lib.h.orig	2016-04-02 19:12:22.000000000 +0100
-+++ lib.h	2016-04-09 09:34:25.000000000 +0100
-@@ -54,8 +54,12 @@
- #  define N_(a) a
- # endif
- 
--# define TRUE 1
--# define FALSE 0
-+# ifndef TRUE
-+#  define TRUE 1
-+# endif
-+# ifndef FALSE
-+#  define FALSE 0
-+# endif
- 
- # define HUGE_STRING     8192
- # define LONG_STRING     1024
diff --git a/mail/mutt-kz/patches/patch-ag b/mail/mutt-kz/patches/patch-ag
deleted file mode 100644
index 7a1abfb58d3..00000000000
--- a/mail/mutt-kz/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2016/04/09 09:46:26 tron Exp $
-
---- doc/Makefile.in.orig	2016-04-05 11:16:26.000000000 +0100
-+++ doc/Makefile.in	2016-04-09 10:11:13.000000000 +0100
-@@ -654,8 +654,8 @@
- 	test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
--	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
--	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
-+	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
-+	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
- 	$(MKDIR_P) $(DESTDIR)$(docdir)
- 	for f in $(topsrcdir_DOCFILES) ; do \
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt-kz/patches/patch-ah b/mail/mutt-kz/patches/patch-ah
deleted file mode 100644
index 9f65afb82ce..00000000000
--- a/mail/mutt-kz/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2014/01/12 17:43:37 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	2008-11-11 21:55:47.000000000 +0200
-+++ mutt_curses.h
-@@ -52,6 +52,9 @@
- # include <curses.h>
- #endif
- 
-+#include "lib.h" /* for SHORT_STRING */
-+#include "mutt.h" /* for event_t */
-+
- #define M_ENTER_C '\n'
- #define M_ENTER_S "\n"
- 
diff --git a/mail/mutt-kz/patches/patch-al b/mail/mutt-kz/patches/patch-al
deleted file mode 100644
index e50a74255ac..00000000000
--- a/mail/mutt-kz/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
---- configure.orig	2010-08-25 16:31:47.000000000 +0000
-+++ configure
-@@ -7836,7 +7836,7 @@ fi
- 
-         old_LIBS="$LIBS"
-         LIBS="$LIBS $MUTTLIBS"
--        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm
-+        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat
- do
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
-@@ -8856,7 +8856,7 @@ fi
- 
- if test x$mutt_cv_setgid = xyes; then
-         DOTLOCK_GROUP='mail'
--        DOTLOCK_PERMISSION=2755
-+        DOTLOCK_PERMISSION=2555
- else
-         DOTLOCK_GROUP=''
-         DOTLOCK_PERMISSION=755
diff --git a/mail/mutt-kz/patches/patch-am b/mail/mutt-kz/patches/patch-am
deleted file mode 100644
index e3337d205ad..00000000000
--- a/mail/mutt-kz/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
-Add change_folder_next option.
-
---- mutt.h.orig	2007-08-29 02:44:16.000000000 +0900
-+++ mutt.h	2007-12-06 17:36:02.000000000 +0900
-@@ -339,6 +339,7 @@
-   OPTBEEPNEW,
-   OPTBOUNCEDELIVERED,
-   OPTBRAILLEFRIENDLY,
-+  OPTCHANGEFOLDERNEXT,
-   OPTCHECKMBOXSIZE,
-   OPTCHECKNEW,
-   OPTCOLLAPSEUNREAD,
diff --git a/mail/mutt-kz/patches/patch-an b/mail/mutt-kz/patches/patch-an
deleted file mode 100644
index a6ccd097434..00000000000
--- a/mail/mutt-kz/patches/patch-an
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-an,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
---- init.h.orig	2010-09-15 15:39:31.000000000 +0000
-+++ init.h
-@@ -355,6 +355,13 @@ struct option_t MuttVars[] = {
-   ** \fBNote:\fP It should only be set in case Mutt isn't able to determine the
-   ** character set used correctly.
-   */
-+  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
-+  /*
-+  ** .pp
-+  ** When this variable is set, the change-folder command will start at the
-+  ** next folder after the current folder in your mailbox list instead of
-+  ** starting at the first folder.
-+  */
-   { "check_mbox_size",	DT_BOOL, R_NONE, OPTCHECKMBOXSIZE, 0 },
-   /*
-   ** .pp
diff --git a/mail/mutt-kz/patches/patch-ao b/mail/mutt-kz/patches/patch-ao
deleted file mode 100644
index 6d21318f74e..00000000000
--- a/mail/mutt-kz/patches/patch-ao
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2016/04/09 09:46:26 tron Exp $
-
-Add change_folder_next option.
-
---- curs_main.c.orig	2016-04-05 11:06:14.000000000 +0100
-+++ curs_main.c	2016-04-09 10:14:56.000000000 +0100
-@@ -1557,6 +1557,11 @@
- #endif
- 	else
- 	{
-+	  if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
-+	  {
-+	    strfcpy (buf, Context->path, sizeof (buf));
-+	    mutt_pretty_mailbox (buf, sizeof (buf));
-+	  }
- 	  mutt_buffy (buf, sizeof (buf));
- 
- #ifdef USE_SIDEBAR
diff --git a/mail/mutt-kz/patches/patch-ap b/mail/mutt-kz/patches/patch-ap
deleted file mode 100644
index 95778865f72..00000000000
--- a/mail/mutt-kz/patches/patch-ap
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
---- doc/Muttrc.orig	2013-12-06 13:36:51.000000000 +0000
-+++ doc/Muttrc
-@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
- "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-kz/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"
- macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
-@@ -870,11 +870,11 @@ attachments   -I message/external-body
- # 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
-@@ -4702,7 +4702,7 @@ attachments   -I message/external-body
- # 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.
diff --git a/mail/mutt-kz/patches/patch-aq b/mail/mutt-kz/patches/patch-aq
deleted file mode 100644
index 1bf0a3361c5..00000000000
--- a/mail/mutt-kz/patches/patch-aq
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2014/01/12 17:43:37 wiz Exp $
-
---- mvchgat.c.orig	2011-07-05 08:47:10.596708000 +0000
-+++ mvchgat.c
-@@ -0,0 +1,27 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "mutt.h"
-+#include "mutt_curses.h"
-+
-+#ifndef USE_SLANG_CURSES
-+#ifndef HAVE_MVWCHGAT
-+int
-+mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color,
-+	const void *opts)
-+{
-+	wmove(win, y, x);
-+	return wattr_set(win, attr, color, opts);
-+}
-+#endif
-+
-+#ifndef HAVE_MVCHGAT
-+int
-+mvchgat(int y, int x, int count, attr_t attr, short color,
-+	const void *opts)
-+{
-+	return mvwchgat(stdscr, y, x, count, attr, color, opts);
-+}
-+#endif
-+#endif