Update "mutt" package to version 1.4. Visible changes since version

1.2.5.1 include:
- Better mh support: Mutt now supports .mh_sequences files.
  Currently, the "unseen", "flagged", and "replied" sequences are
  used to store mutt flags (the names are configurable using the
  $mh_seq_unseen, $mh_seq_flagged, and $mh_seq_replied configuration
  variables). As a side effect, messages in MH folders are no longer
  rewritten upon status changes.
- The "trashed" flag is supported for maildir folders.  See
  $maildir_trash.
- POP folder support.  You can now access a POP mailbox just like an
  IMAP folder (with obvious restrictions due to the protocol).
- URL syntax for remote folders.  You can pass things like
  pop://account@host and imap://account@host/folder as arguments for
  the -f command line flag.
- STARTTLS support.  If $ssl_starttls is set (the default), mutt
  will attempt to use STARTTLS on servers advertising that
  capability.
- $preconnect.  If set, a shell command to be executed if mutt fails
  to establish a connection to the server.  This is useful for
  setting up secure connections; see the muttrc(5) for details.
- $tunnel.  Use a pipe to a command instead of a raw socket.  See
  muttrc(5) for details.  (Basically, it's another way for setting
  up secure connections.)
- More new IMAP/POP-related variables (see muttrc(5) for details):
  $connect_timeout, $imap_authenticators, $imap_delim_chars,
  $imap_peek, $pop_authenticators, $pop_auth_try_all,
  $pop_checkinterval, $pop_delete, $pop_reconnect, $use_ipv6.
- The following IMAP/POP-related variables are gone:
  $imap_checkinterval, $imap_cramkey, $pop_port.
- There's a new imap-fetch-mail function, which forces a check for
  new messages on an IMAP server.
- The new-mailbox function was renamed to create-mailbox, and is
  bound to C instead of n by default.
For a complete overview of all new features look in the "NEWS" file.

15 files changed, 164 insertions, 301 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 43ac4b48fbf..6fcc8b36b0a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.78 2002/03/23 17:50:18 yyamano Exp $
+# $NetBSD: Makefile,v 1.79 2002/05/29 12:13:52 tron Exp $
 
-DISTNAME=		mutt-1.2.5.1
+DISTNAME=		mutt-1.4i
+PKGNAME=		${DISTNAME:C/i$//}
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/ \
-			ftp://ftp.funet.fi/pub/unix/mail/mutt/ \
-			ftp://ftp.uib.no/pub/mutt/ \
-			ftp://uiarchive.cso.uiuc.edu/pub/packages/mail/mutt/
+			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
+			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
+			ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.mutt.org/
@@ -21,13 +22,20 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--with-docdir=${PREFIX}/share/doc/mutt \
 			--without-included-gettext \
 			--enable-pop --enable-imap
-CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO
+.include "../../devel/libslang/buildlink.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_DIR}
+.else
+.include "../../devel/ncurses/buildlink.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
+.endif
+
 # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead.
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
@@ -42,18 +50,18 @@ CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-BUILD_DEFS+=		MUTT_USE_SSL
+BUILD_DEFS+=		MUTT_USE_SLANG MUTT_USE_SSL
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 EGDIR=			${PREFIX}/share/doc/mutt/samples
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
 post-install:
-	${TOUCH} ${TOUCH_FLAGS} ${PREFIX}/share/mutt/.directory
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples
 	${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples
 
+.include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index f74b814a680..ea90d56ad57 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/29 12:13:52 tron Exp $
+bin/flea
 bin/mutt
 bin/muttbug
 bin/pgpewrap
 bin/pgpring
+man/man1/flea.1
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
+man/man1/muttbug.1
+man/man5/mbox.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
@@ -15,7 +19,6 @@ share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/README
 share/doc/mutt/README.SECURITY
 share/doc/mutt/README.SSL
-share/doc/mutt/README.UPGRADE
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
@@ -28,11 +31,30 @@ share/doc/mutt/html/manual-6.html
 share/doc/mutt/html/manual-7.html
 share/doc/mutt/html/manual.html
 share/doc/mutt/manual.txt
+share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Muttrc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 share/doc/mutt/samples/mime.types
 share/doc/mutt/samples/pgp2.rc
 share/doc/mutt/samples/pgp5.rc
@@ -40,27 +62,33 @@ share/doc/mutt/samples/pgp6.rc
 share/doc/mutt/samples/sample.mailcap
 share/doc/mutt/samples/sample.muttrc
 share/doc/mutt/samples/sample.muttrc-tlr
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/mutt/.directory
-@dirrm share/mutt
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo
+@dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt/html
 @dirrm share/doc/mutt
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 79d83f12c80..0cc5b62ea2c 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/01/02 08:36:56 tron Exp $
+$NetBSD: distinfo,v 1.7 2002/05/29 12:13:52 tron Exp $
 
-SHA1 (mutt-1.2.5.1.tar.gz) = f9f3350ef0235b3cd3a9545e0e47b3d093202eb1
-Size (mutt-1.2.5.1.tar.gz) = 1971618 bytes
-SHA1 (patch-aa) = a9bdda21066863ef5e35a6a8091857c5dcd92855
-SHA1 (patch-ab) = 69a920da48038c80ff8d74ee8de8e9bcde331c34
-SHA1 (patch-ac) = c12ec2a2c79271e0abc9369c517af574dc5d104c
-SHA1 (patch-ad) = 7cee44d56f4a06e8f375fc0ba4ca0f67e992291c
-SHA1 (patch-ae) = 4c956d8c0181025e99942ca688b3df7b4a27b1f7
-SHA1 (patch-af) = 7504e8226f3974aa4fcc76f0b13b79e4044073a6
-SHA1 (patch-ag) = 99c2393ff5d2be47e889ee9ab6ed6ec058ebf4cc
-SHA1 (patch-ah) = 36004ff9b20a3cf119c6163467f587c51a1d1e36
-SHA1 (patch-ai) = f1a3c47666dd308e4d8938939a50a5553220f736
-SHA1 (patch-aj) = 36f20c476b695bb88378aa02326bfdef77695111
-SHA1 (patch-ak) = c71e21bdd2e5c194ee2f8f619737d3cc0b4c4d5c
-SHA1 (patch-al) = 6516789c92fcbf11a8cb0da17cc67d4698e5f3ad
+SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
+Size (mutt-1.4i.tar.gz) = 2554158 bytes
+SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
+SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
+SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
+SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5
+SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
index 50800884823..cd065ea6ac7 100644
--- a/mail/mutt/patches/patch-aa
+++ b/mail/mutt/patches/patch-aa
@@ -1,40 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2000/05/20 18:41:38 kim Exp $
+$NetBSD: patch-aa,v 1.5 2002/05/29 12:13:53 tron Exp $
 
---- alias.c	2000/03/04 08:40:52	2.11
-+++ alias.c	2000/05/20 07:30:10
-@@ -20,7 +20,6 @@
- #include "mutt_regex.h"
- #include "mutt_curses.h"
- 
--#include <pwd.h>
- #include <string.h>
- 
- ADDRESS *mutt_lookup_alias (const char *s)
-@@ -86,22 +85,11 @@
- 
- 	if (pw)
- 	{
--           regmatch_t pat_match[1];
--
--           /* Use regular expression to parse Gecos field.  This result of the
--            * parsing will be used as the personal ID string when the alias is
--            * expanded.
--            */
--	  if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
--	  {
--	    /* Malloc enough for the matching pattern + terminating NULL */
--	    a->personal = safe_malloc ((pat_match[0].rm_eo - 
--					pat_match[0].rm_so) + 1);
--	    
--	    strfcpy (a->personal, pw->pw_gecos + pat_match[0].rm_so, 
--		     pat_match[0].rm_eo - pat_match[0].rm_so + 1);
--	  }
--
-+	  char namebuf[STRING];
-+	  
-+	  mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-+	  mutt_str_replace (&a->personal, namebuf);
-+	  
- #ifdef EXACT_ADDRESS
- 	  FREE (&a->val);
- #endif
+--- intl/Makefile.in.orig	Thu Jun  7 22:00:05 2001
++++ intl/Makefile.in	Sun Jul 22 16:58:54 2001
+@@ -31,7 +31,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
index f1416f0b6b7..10f4f6ac870 100644
--- a/mail/mutt/patches/patch-ab
+++ b/mail/mutt/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2000/05/20 18:41:40 kim Exp $
+$NetBSD: patch-ab,v 1.7 2002/05/29 12:13:53 tron Exp $
 
---- browser.c	2000/04/12 16:32:26	2.21
-+++ browser.c	2000/05/20 07:30:40
-@@ -34,8 +34,6 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <pwd.h>
--#include <grp.h>
+--- doc/Makefile.in.orig	Mon Jun  4 19:14:32 2001
++++ doc/Makefile.in	Sun Jul 22 15:09:17 2001
+@@ -29,7 +29,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ 
+ DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
+-INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
++INCLUDES = -I. -I.. -I$(top_srcdir)
+ 
+ MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
  
- static struct mapping_t FolderHelp[] = {
-   { N_("Exit"),  OP_EXIT },
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac
index e463019fa76..7146d4258ab 100644
--- a/mail/mutt/patches/patch-ac
+++ b/mail/mutt/patches/patch-ac
@@ -1,30 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/05/20 18:41:41 kim Exp $
+$NetBSD: patch-ac,v 1.3 2002/05/29 12:13:53 tron Exp $
 
---- init.c	2000/05/17 03:35:49	2.29
-+++ init.c	2000/05/20 07:30:46
-@@ -42,7 +42,6 @@
- #include "init.h"
- #include "mailbox.h"
+--- po/Makefile.in.in.orig	Tue Jan  1 21:17:15 2002
++++ po/Makefile.in.in	Wed Jan  2 09:54:40 2002
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/po
  
--#include <pwd.h>
- #include <ctype.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -1710,13 +1709,13 @@
-   /* Get some information about the user */
-   if ((pw = getpwuid (getuid ())))
-   {
-+    char rnbuf[STRING];
-+
-     Username = safe_strdup (pw->pw_name);
-     if (!Homedir)
-       Homedir = safe_strdup (pw->pw_dir);
--    if ((p = strchr (pw->pw_gecos, ',')))
--      Realname = mutt_substrdup (pw->pw_gecos, p);
--    else
--      Realname = safe_strdup (pw->pw_gecos);
-+
-+    Realname = safe_strdup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
-     Shell = safe_strdup (pw->pw_shell);
-   }
-   else 
+ INSTALL = @INSTALL@
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
index b419f3df5c6..c72b833d0e5 100644
--- a/mail/mutt/patches/patch-ad
+++ b/mail/mutt/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/05/20 18:41:41 kim Exp $
+$NetBSD: patch-ad,v 1.2 2002/05/29 12:13:53 tron Exp $
 
---- lib.c	2000/05/16 15:23:02	2.24
-+++ lib.c	2000/05/20 07:31:00
-@@ -32,9 +32,9 @@
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <errno.h>
--#include <pwd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <pwd.h>
- 
- #include "lib.h"
+--- Makefile.in.orig	Wed Jan 30 17:50:34 2002
++++ Makefile.in	Wed Jan 30 17:56:07 2002
+@@ -144,7 +144,7 @@
+ 
+ INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+ 
+-CPPFLAGS = @CPPFLAGS@ -I$(includedir)
++CPPFLAGS = @CPPFLAGS@
+ 
+ non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c 	pgpmicalg.c gnupgparse.c sha1.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap.c		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	mutt_ssl.c mutt_ssl.h README.SSL mutt_ssl_nss.c 	pgppacket.c pgppacket.h
  
diff --git a/mail/mutt/patches/patch-ae b/mail/mutt/patches/patch-ae
index a10b6258b52..5578706213c 100644
--- a/mail/mutt/patches/patch-ae
+++ b/mail/mutt/patches/patch-ae
@@ -1,14 +1,63 @@
-$NetBSD: patch-ae,v 1.1 2000/05/20 18:41:42 kim Exp $
+$NetBSD: patch-ae,v 1.2 2002/05/29 12:13:53 tron Exp $
 
---- mutt.h	2000/05/16 19:00:15	2.66
-+++ mutt.h	2000/05/20 07:30:32
-@@ -36,6 +36,9 @@
- #include <posix1_lim.h>
- #endif
- 
-+#include <pwd.h>
-+#include <grp.h>
-+
- #include "rfc822.h"
- #include "hash.h"
+--- contrib/gpg.rc.orig	Tue Dec 11 10:33:57 2001
++++ contrib/gpg.rc	Tue Apr 16 10:28:08 2002
+@@ -31,44 +31,44 @@
+ # breaking PGP/MIME.
  
+ # decode application/pgp
+-set pgp_decode_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
++set pgp_decode_command="gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
+ 
+ # verify a pgp/mime signature
+-set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
++set pgp_verify_command="gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
+ 
+ # decrypt a pgp/mime attachment
+-set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
++set pgp_decrypt_command="gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
+ 
+ # create a pgp/mime signed attachment
+-# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+-set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
++# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
++set pgp_sign_command="gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+ 
+ # create a application/pgp signed (old-style) message
+-# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+-set pgp_clearsign_command="/usr/bin/gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
++# set pgp_clearsign_command="gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
++set pgp_clearsign_command="gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+ 
+ # create a pgp/mime encrypted attachment
+ # set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_only_command="pgpewrap gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+ 
+ # create a pgp/mime encrypted and signed attachment
+ # set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v --batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_sign_command="pgpewrap gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+ 
+ # import a key into the public key ring
+-set pgp_import_command="/usr/bin/gpg  --no-verbose --import -v %f"
++set pgp_import_command="gpg  --no-verbose --import -v %f"
+ 
+ # export a key from the public key ring
+-set pgp_export_command="/usr/bin/gpg   --no-verbose --export --armor %r"
++set pgp_export_command="gpg   --no-verbose --export --armor %r"
+ 
+ # verify a key
+-set pgp_verify_key_command="/usr/bin/gpg   --verbose --batch  --fingerprint --check-sigs %r"
++set pgp_verify_key_command="gpg   --verbose --batch  --fingerprint --check-sigs %r"
+ 
+ # read in the public key ring
+-set pgp_list_pubring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
++set pgp_list_pubring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
+ 
+ # read in the secret key ring
+-set pgp_list_secring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
++set pgp_list_secring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
+ 
+ # fetch keys
+ # set pgp_getkeys_command="pkspxycwrap %r"
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
deleted file mode 100644
index e2eb53a4cd2..00000000000
--- a/mail/mutt/patches/patch-af
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/05/20 18:41:43 kim Exp $
-
---- muttlib.c	2000/05/16 15:23:02	2.19
-+++ muttlib.c	2000/05/20 07:46:06
-@@ -33,10 +33,12 @@
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <errno.h>
--#include <pwd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#define MIN(a,b) ((a) < (b) ? (a) : (b))
-+#define MAX(a,b) ((a) < (b) ? (b) : (a))
-+
- BODY *mutt_new_body (void)
- {
-   BODY *p = (BODY *) safe_calloc (1, sizeof (BODY));
-@@ -452,6 +454,46 @@
-   return (s);
- }
- 
-+
-+char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
-+{
-+  regmatch_t pat_match[1];
-+  size_t pwnl;
-+  int idx;
-+  char *p;
-+  
-+  if (!pw || !pw->pw_gecos) 
-+    return NULL;
-+
-+  memset (dest, 0, destlen);
-+  
-+  if (GecosMask.rx)
-+  {
-+    if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
-+      strfcpy (dest, pw->pw_gecos + pat_match[0].rm_so, 
-+	       MIN (pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen));
-+  }
-+  else if ((p = strchr (pw->pw_gecos, ',')))
-+    strfcpy (dest, pw->pw_gecos, MIN (destlen, p - pw->pw_gecos + 1));
-+  else
-+    strfcpy (dest, pw->pw_gecos, destlen);
-+
-+  pwnl = strlen (pw->pw_name);
-+
-+  for (idx = 0; dest[idx]; idx++)
-+  {
-+    if (dest[idx] == '&')
-+    {
-+      memmove (&dest[idx + pwnl], &dest[idx + 1],
-+	       MAX(destlen - idx - pwnl - 1, 0));
-+      memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
-+      dest[idx] = toupper (dest[idx]);
-+    }
-+  }
-+      
-+  return dest;
-+}
-+  
- 
- char *mutt_get_parameter (const char *s, PARAMETER *p)
- {
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
deleted file mode 100644
index 27a03ca462c..00000000000
--- a/mail/mutt/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/07/28 09:32:49 wiz Exp $
-
---- protos.h.orig	Tue May 16 17:23:12 2000
-+++ protos.h	Wed Jun 21 08:29:26 2000
-@@ -115,6 +115,7 @@
- char *mutt_expand_path (char *, size_t);
- char *_mutt_expand_path (char *, size_t, int);
- char *mutt_find_hook (int, const char *);
-+char *mutt_gecos_name (char *, size_t, struct passwd *);
- char *mutt_gen_msgid (void);
- char *mutt_get_name (ADDRESS *);
- char *mutt_get_parameter (const char *, PARAMETER *);
diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
deleted file mode 100644
index 0041cdfb91f..00000000000
--- a/mail/mutt/patches/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2001/01/10 17:45:32 tron Exp $
-
---- imap/md5.h.orig	Fri Aug 20 10:24:06 1999
-+++ imap/md5.h	Wed Jan 10 18:30:43 2001
-@@ -26,14 +26,24 @@
- #ifndef MD5_H
- #define MD5_H 1
- 
-+#include <sys/types.h>
-+
- /* POINTER defines a generic pointer type */
- typedef unsigned char *POINTER;
- 
- /* UINT2 defines a two byte word */
--typedef unsigned short int UINT2;
-+#ifdef __sun__
-+typedef uint16_t UINT2;
-+#else
-+typedef u_int16_t UINT2;
-+#endif
- 
- /* UINT4 defines a four byte word */
--typedef unsigned long int UINT4;
-+#ifdef __sun__
-+typedef uint32_t UINT4;
-+#else
-+typedef u_int32_t UINT4;
-+#endif
- 
- /* MD5 context. */
- typedef struct {
diff --git a/mail/mutt/patches/patch-ai b/mail/mutt/patches/patch-ai
deleted file mode 100644
index bde48e1abc9..00000000000
--- a/mail/mutt/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2001/05/10 14:25:35 agc Exp $
-
-If Subject is NULL, don't try to dereference it.
-
---- rfc2047.c	2001/05/10 14:11:38	1.1
-+++ rfc2047.c	2001/05/10 14:12:35
-@@ -390,6 +390,10 @@
- 
-   dlen--; /* save room for the terminal nul */
- 
-+  if (s == NULL) {
-+	return;
-+  }
-+
-   while (*s && dlen > 0)
-   {
-     if ((p = strstr (s, "=?")) == NULL ||
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
deleted file mode 100644
index 0ad5dd1d59e..00000000000
--- a/mail/mutt/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2001/06/20 07:07:24 jlam Exp $
-
---- Makefile.in.orig	Fri Jul 28 14:51:01 2000
-+++ Makefile.in
-@@ -137,7 +137,7 @@
- 
- 
- # top_srcdir is for building outside of the source tree
--INCLUDES = -I$(top_srcdir) -I. $(IMAP_INCLUDES) -Iintl -I$(includedir)
-+INCLUDES = -I$(top_srcdir) -I. $(IMAP_INCLUDES) -Iintl
- 
- non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1dgst.c 	gnupgparse.c sha.h sha_locl.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	imap/imap_ssl.c imap/imap_ssl.h README.SSL
- 
diff --git a/mail/mutt/patches/patch-ak b/mail/mutt/patches/patch-ak
deleted file mode 100644
index ed9ef869dbe..00000000000
--- a/mail/mutt/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2001/06/20 07:07:24 jlam Exp $
-
---- doc/Makefile.in.orig	Wed Mar 29 04:42:49 2000
-+++ doc/Makefile.in
-@@ -31,7 +31,7 @@
- 
- DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
--INCLUDES=-I. -I.. -I$(includedir) -I$(top_srcdir)
-+INCLUDES=-I. -I.. -I$(top_srcdir)
- 
- MAKEDOC_CPP=$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
- 
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
deleted file mode 100644
index d52bb22e55c..00000000000
--- a/mail/mutt/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.3 2001/10/18 08:04:25 tron Exp $
-
---- sendlib.c	2001/10/11 07:58:26	2.88
-+++ sendlib.c	2001/10/17 16:22:48	2.89
-@@ -1831,6 +1831,13 @@
- 	if (dup (1) < 0)
- 	  _exit (S_ERR);
-       }
-+      else 
-+      {
-+	if (open ("/dev/null", O_WRONLY | O_APPEND) < 0)	/* stdout */
-+	  _exit (S_ERR);
-+	if (open ("/dev/null", O_RDWR | O_APPEND) < 0)		/* stderr */
-+	  _exit (S_ERR);
-+      }
- 
-       execv (path, args);
-       _exit (S_ERR);