Update "mutt" package to version 1.2i - there is not crippled version any

more. Change since version 1.0.1i:
- heavily improved IMAP support (thanks to Brandon Long
  and Brendan Cully for their work),
- support for using IMAP over SSL (thanks to Tommi
  Kommulainen),
- a completely changed interface for configuring mutt's
  PGP support.  It's now format-based, and much more
  flexible than it used to be in the past.
- a split of the old edit-message command into
  resend-message and edit-message.  While the former gives
  you what could be described as "recall from arbitrary
  folders", the latter can be used to low-level modify
  messages.
- the weeding paradigma has changed.  Instead of options
  controlling weeding behaviour for all kinds of purposes,
  there is one global $weed option which is toggled when
  you use what used to be known as display-headers (now
  display-toggle-weed).  That is, you have some kind of
  "WYSIWYG" support with weeding.
- we have a muttrc (5) manual page now, and it's even
  up-to-date.
- you can better control your messages' header and
  envelope from headers
- the message commands on the attachment menu have been
  rewritten.  Just try replying to an attachment, and
  you'll see what happens. ;-)
- mailing list support has changed.  You may wish to
  rename your "lists" commands to "subscribe".  But please
  read README.UPGRADE before!
- Bug fixes of all sorts.

4 files changed, 49 insertions, 206 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cf8bda6835b..f53c656aeee 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2000/02/09 01:12:13 tron Exp $
+# $NetBSD: Makefile,v 1.42 2000/05/09 18:09:06 tron Exp $
 
-DISTNAME=	mutt-${MUTT_VERSION}
+DISTNAME=	mutt-1.2i
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
-		ftp://ftp.gbnet.net/pub/mutt-international/ \
 		ftp://ftp.funet.fi/pub/unix/mail/mutt/ \
 		ftp://ftp.uib.no/pub/mutt/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/packages/mail/mutt/
@@ -14,6 +13,9 @@ HOMEPAGE=	http://www.mutt.org/
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
 
+MIRROR_DISTFILE=no
+RESTRICTED=	"Contains PGP code"
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
@@ -21,6 +23,8 @@ CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
 		 --enable-pop --enable-imap
 LDFLAGS+=	-s
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i//}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -34,16 +38,3 @@ DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-MUTT_BASE_VERSION=	1.0.1
-.if defined(MUTT_INTERNATIONAL) && ${MUTT_INTERNATIONAL} == YES
-MUTT_VERSION=		${MUTT_BASE_VERSION}i
-
-MIRROR_DISTFILE=	no
-RESTRICTED=		"Contains PGP code"
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$//}
-.else
-MUTT_VERSION=		${MUTT_BASE_VERSION}
-
-WRKSRC=			${WRKDIR}/${DISTNAME}-us
-.endif
diff --git a/mail/mutt/files/md5 b/mail/mutt/files/md5
index d6533fc7aa5..d8a8bf9591d 100644
--- a/mail/mutt/files/md5
+++ b/mail/mutt/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.18 2000/01/19 11:15:12 tron Exp $
+$NetBSD: md5,v 1.19 2000/05/09 18:09:07 tron Exp $
 
-MD5 (mutt-1.0.1.tar.gz) = 329ef82b94553d184ca0bdc4e3eb03d1
-MD5 (mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
+MD5 (mutt-1.2i.tar.gz) = 133cf5d620922bc317b95d6e5187ceb6
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
deleted file mode 100644
index 947c7595aff..00000000000
--- a/mail/mutt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/01/08 00:41:41 tron Exp $
-
---- doc/Makefile.in.orig	Thu Nov 19 15:10:19 1998
-+++ doc/Makefile.in	Fri Jan  8 01:34:01 1999
-@@ -43,7 +43,7 @@
- DOCFILES = manual.txt
- 
- 
--all: mutt.man dotlock.man try-html try-txt
-+all: mutt.man dotlock.man
- 
- complete: all html
- 
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index 05be1874750..7e5e1623c9f 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,10 +1,47 @@
-@comment $NetBSD: PLIST,v 1.10 2000/01/19 11:15:14 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2000/05/09 18:09:10 tron Exp $
 bin/mutt
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
 etc/Muttrc
 etc/mime.types
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
+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/README.UPGRADE
+share/doc/mutt/TODO
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/devel-notes.txt
+share/doc/mutt/html/manual-1.html
+share/doc/mutt/html/manual-2.html
+share/doc/mutt/html/manual-3.html
+share/doc/mutt/html/manual-4.html
+share/doc/mutt/html/manual-5.html
+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/samples/Mush.rc
+share/doc/mutt/samples/Pine.rc
+share/doc/mutt/samples/Tin.rc
+share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+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
 ${LOCALEBASE}/locale/cs/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/de/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/el/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/eo/LC_MESSAGES/mutt.mo
@@ -22,178 +59,7 @@ ${LOCALEBASE}/locale/sk/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/sv/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/uk/LC_MESSAGES/mutt.mo
 ${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/ChangeLog
-share/doc/mutt/README
-share/doc/mutt/NEWS
-share/doc/mutt/TODO
-share/doc/mutt/manual.txt
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README.SECURITY
-share/mutt/charsets/ansi-x3-110-1983
-share/mutt/charsets/ansi-x3-4-1968
-share/mutt/charsets/asmo-449
-share/mutt/charsets/baltic
-share/mutt/charsets/bs-4730
-share/mutt/charsets/bs-viewdata
-share/mutt/charsets/cp1250
-share/mutt/charsets/cp1251
-share/mutt/charsets/cp1252
-share/mutt/charsets/cp1253
-share/mutt/charsets/cp1254
-share/mutt/charsets/cp1255
-share/mutt/charsets/cp1256
-share/mutt/charsets/cp1257
-share/mutt/charsets/csa-z243-4-1985-1
-share/mutt/charsets/csa-z243-4-1985-2
-share/mutt/charsets/csa-z243-4-1985-gr
-share/mutt/charsets/csn-369103
-share/mutt/charsets/cwi
-share/mutt/charsets/dec-mcs
-share/mutt/charsets/din-66003
-share/mutt/charsets/ds-2089
-share/mutt/charsets/ebcdic-at-de
-share/mutt/charsets/ebcdic-at-de-a
-share/mutt/charsets/ebcdic-es
-share/mutt/charsets/ebcdic-ca-fr
-share/mutt/charsets/ebcdic-dk-no
-share/mutt/charsets/ebcdic-dk-no-a
-share/mutt/charsets/ebcdic-es-a
-share/mutt/charsets/ebcdic-es-s
-share/mutt/charsets/ebcdic-fi-se
-share/mutt/charsets/ebcdic-fi-se-a
-share/mutt/charsets/ebcdic-fr
-share/mutt/charsets/ebcdic-is-friss
-share/mutt/charsets/ebcdic-it
-share/mutt/charsets/ebcdic-pt
-share/mutt/charsets/ebcdic-uk
-share/mutt/charsets/ebcdic-us
-share/mutt/charsets/ecma-cyrillic
-share/mutt/charsets/es
-share/mutt/charsets/es2
-share/mutt/charsets/gb-1988-80
-share/mutt/charsets/gost-19768-74
-share/mutt/charsets/greek7
-share/mutt/charsets/greek7-old
-share/mutt/charsets/greek-ccitt
-share/mutt/charsets/hp-roman8
-share/mutt/charsets/ibm037
-share/mutt/charsets/ibm038
-share/mutt/charsets/ibm1004
-share/mutt/charsets/it
-share/mutt/charsets/ibm1026
-share/mutt/charsets/ibm1047
-share/mutt/charsets/ibm256
-share/mutt/charsets/ibm273
-share/mutt/charsets/ibm274
-share/mutt/charsets/ibm275
-share/mutt/charsets/ibm277
-share/mutt/charsets/ibm278
-share/mutt/charsets/ibm280
-share/mutt/charsets/ibm281
-share/mutt/charsets/ibm284
-share/mutt/charsets/ibm285
-share/mutt/charsets/ibm290
-share/mutt/charsets/ibm297
-share/mutt/charsets/ibm420
-share/mutt/charsets/ibm423
-share/mutt/charsets/ibm424
-share/mutt/charsets/ibm437
-share/mutt/charsets/ibm500
-share/mutt/charsets/ibm850
-share/mutt/charsets/ibm851
-share/mutt/charsets/ibm852
-share/mutt/charsets/ibm855
-share/mutt/charsets/ibm857
-share/mutt/charsets/ibm860
-share/mutt/charsets/ibm861
-share/mutt/charsets/ibm862
-share/mutt/charsets/ibm863
-share/mutt/charsets/ibm864
-share/mutt/charsets/ibm865
-share/mutt/charsets/ibm868
-share/mutt/charsets/ibm869
-share/mutt/charsets/ibm870
-share/mutt/charsets/ibm871
-share/mutt/charsets/ibm875
-share/mutt/charsets/ibm880
-share/mutt/charsets/ibm891
-share/mutt/charsets/ibm903
-share/mutt/charsets/ibm904
-share/mutt/charsets/ibm905
-share/mutt/charsets/ibm918
-share/mutt/charsets/iec-p27-1
-share/mutt/charsets/inis
-share/mutt/charsets/inis-8
-share/mutt/charsets/inis-cyrillic
-share/mutt/charsets/invariant
-share/mutt/charsets/iso-10367-box
-share/mutt/charsets/iso-2033-1983
-share/mutt/charsets/iso-5427
-share/mutt/charsets/iso-5427-ext
-share/mutt/charsets/iso-5428
-share/mutt/charsets/iso-646-basic
-share/mutt/charsets/iso-646-irv
-share/mutt/charsets/iso-6937
-share/mutt/charsets/iso-6937-2-25
-share/mutt/charsets/iso-6937-2-add
-share/mutt/charsets/iso-8859-1
-share/mutt/charsets/iso-8859-10
-share/mutt/charsets/iso-8859-2
-share/mutt/charsets/iso-8859-3
-share/mutt/charsets/iso-8859-4
-share/mutt/charsets/iso-8859-5
-share/mutt/charsets/iso-8859-6
-share/mutt/charsets/iso-8859-7
-share/mutt/charsets/iso-8859-8
-share/mutt/charsets/iso-8859-9
-share/mutt/charsets/iso-8859-supp
-share/mutt/charsets/iso-ir-90
-share/mutt/charsets/jis-c6220-1969-jp
-share/mutt/charsets/jis-c6220-1969-ro
-share/mutt/charsets/jis-c6229-1984-a
-share/mutt/charsets/jis-c6229-1984-b
-share/mutt/charsets/jis-c6229-1984-b-add
-share/mutt/charsets/jis-c6229-1984-hand
-share/mutt/charsets/jis-c6229-1984-hand-add
-share/mutt/charsets/jis-c6229-1984-kana
-share/mutt/charsets/jis-x0201
-share/mutt/charsets/jus-i-b1-002
-share/mutt/charsets/jus-i-b1-003-mac
-share/mutt/charsets/jus-i-b1-003-serb
-share/mutt/charsets/koi-8
-share/mutt/charsets/koi8-r
-share/mutt/charsets/ksc5636
-share/mutt/charsets/latin-greek
-share/mutt/charsets/latin-greek-1
-share/mutt/charsets/macintosh
-share/mutt/charsets/mac-is
-share/mutt/charsets/msz-7795-3
-share/mutt/charsets/nats-dano
-share/mutt/charsets/nats-dano-add
-share/mutt/charsets/nats-sefi
-share/mutt/charsets/nats-sefi-add
-share/mutt/charsets/nc-nc00-10
-share/mutt/charsets/nextstep
-share/mutt/charsets/nf-z-62-010
-share/mutt/charsets/nf-z-62-010-(1973)
-share/mutt/charsets/ns-4551-1
-share/mutt/charsets/ns-4551-2
-share/mutt/charsets/pt
-share/mutt/charsets/pt2
-share/mutt/charsets/sami
-share/mutt/charsets/sen-850200-b
-share/mutt/charsets/sen-850200-c
-share/mutt/charsets/t-101-g2
-share/mutt/charsets/t-61-7bit
-share/mutt/charsets/t-61-8bit
-share/mutt/charsets/videotex-suppl
-share/mutt/charsets/charsets.alias.dist
-share/mutt/charsets/charsets.alias
-@dirrm share/mutt/charsets
 @dirrm share/mutt
+@dirrm share/doc/mutt/samples
+@dirrm share/doc/mutt/html
 @dirrm share/doc/mutt