summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-05-13 15:36:47 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-05-13 15:36:47 +0000
commitc5689f2aa2a84ec8bd2ea38622e5afadfd36bdb9 (patch)
tree11ad2d7e1d0a813047edaab53e4bdcd39756f28a
parentUpgrade to 4.73 . (diff)
Update to the 1.2 release.
Submitted by: Udo Schweigert <ust@cert.siemens.de>
Notes
Notes: svn path=/head/; revision=28428
-rw-r--r--mail/mutt-devel/Makefile22
-rw-r--r--mail/mutt-devel/distinfo3
-rw-r--r--mail/mutt-devel/files/patch-0110
-rw-r--r--mail/mutt-devel/files/patch-02106
-rw-r--r--mail/mutt-devel/files/patch-0310
-rw-r--r--mail/mutt-devel/files/patch-056
-rw-r--r--mail/mutt-devel/files/patch-0821
-rw-r--r--mail/mutt-devel/files/patch-Makefile.in11
-rw-r--r--mail/mutt-devel/pkg-plist340
-rw-r--r--mail/mutt-devel/pkg-plist.htmlfiles576
-rw-r--r--mail/mutt/Makefile22
-rw-r--r--mail/mutt/distinfo3
-rw-r--r--mail/mutt/files/patch-0110
-rw-r--r--mail/mutt/files/patch-02106
-rw-r--r--mail/mutt/files/patch-0310
-rw-r--r--mail/mutt/files/patch-056
-rw-r--r--mail/mutt/files/patch-0821
-rw-r--r--mail/mutt/files/patch-Makefile.in11
-rw-r--r--mail/mutt/pkg-plist340
-rw-r--r--mail/mutt/pkg-plist.htmlfiles576
-rw-r--r--mail/mutt14/Makefile22
-rw-r--r--mail/mutt14/distinfo3
-rw-r--r--mail/mutt14/files/patch-0110
-rw-r--r--mail/mutt14/files/patch-02106
-rw-r--r--mail/mutt14/files/patch-0310
-rw-r--r--mail/mutt14/files/patch-056
-rw-r--r--mail/mutt14/files/patch-0821
-rw-r--r--mail/mutt14/files/patch-Makefile.in11
-rw-r--r--mail/mutt14/pkg-plist340
-rw-r--r--mail/mutt14/pkg-plist.htmlfiles576
30 files changed, 1818 insertions, 1497 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 07a0392e0eb0..2ee30513a4b8 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= mutt
-PORTVERSION= 1.0.1
+PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -18,6 +18,8 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
DISTNAME= ${PKGNAME}i
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
@@ -43,6 +45,9 @@ LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses
.elif defined(WITH_SLANG)
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
.endif
+.if defined(WITH_SSL)
+USE_OPENSSL= RSA
+.endif
.if defined(PACKAGE_BUILDING)
RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
.endif
@@ -52,21 +57,25 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
--with-sharedir=${PREFIX}/share/mutt \
- --with-docdir=${PREFIX}/share/doc/mutt
+ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
.if defined(BATCH) || defined(WITH_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
.elif defined(WITH_NCURSES_PORT)
CONFIGURE_ARGS+= --with-curses=${PREFIX}
.endif
+.if defined(WITH_SSL)
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
+.endif
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
MAN1= mutt.1 mutt_dotlock.1
+MAN5= muttrc.5
-post-patch:
- uudecode -p ${FILESDIR}/ru.gmo.uu > ${WRKSRC}/po/ru.gmo
+pre-patch:
+ (cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
.if !defined(NOPORTDOCS)
post-build:
- ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+ ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
ed -s ${WRKSRC}/doc/mutt.man
@@ -86,8 +95,9 @@ post-install:
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
${PREFIX}/share/doc/mutt
.if defined(BATCH)
+ ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
- ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
.endif
@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
${PREFIX}/share/doc/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index de8a6ea3af56..ef4bfc3fc7b2 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1 +1,2 @@
-MD5 (mutt/mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
+MD5 (mutt/mutt-1.2i.tar.gz) = 133cf5d620922bc317b95d6e5187ceb6
+MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
deleted file mode 100644
index 2233a67ac3c7..000000000000
--- a/mail/mutt-devel/files/patch-01
+++ /dev/null
@@ -1,10 +0,0 @@
---- charsets/charsets.alias.orig Mon Jan 4 15:55:56 1999
-+++ charsets/charsets.alias Sat Jan 9 10:45:04 1999
-@@ -21,6 +21,7 @@
- iso-ir-47 bs-viewdata
- ms-ee cp1250
- ms-cyrl cp1251
-+windows-1251 cp1251
- ms-ansi cp1252
- ms-greek cp1253
- ms-turk cp1254
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index fab62611d3e8..b82a36a2e3a9 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,54 +1,76 @@
---- doc/Makefile.in.orig Thu Nov 19 06:10:19 1998
-+++ doc/Makefile.in Sat Dec 12 11:10:45 1998
-@@ -43,7 +43,7 @@
- DOCFILES = manual.txt
+--- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000
++++ doc/Makefile.in Fri May 12 13:12:32 2000
+@@ -58,13 +58,16 @@
+ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
+ README NEWS TODO README.SECURITY README.SSL README.UPGRADE
+-all: muttrc.man try-html try-txt
++all: muttrc.man try-html try-txt try-latin1
--all: mutt.man dotlock.man try-html try-txt
-+all: mutt.man dotlock.man try-html try-txt try-latin1
+ try-html: ../makedoc
+- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
- complete: all html
-
-@@ -57,19 +57,22 @@
- try-txt:
- -$(MAKE) manual.txt
-
-+try-latin1:
-+ -$(MAKE) manual.latin1
+ try-txt: ../makedoc
+- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
+
- html: manual.html
++try-latin1:
++ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
- install: dotlock.man mutt.man all
+ install: all
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- $(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+@@ -73,18 +76,18 @@
+ $(INSTALL) -m 644 $(srcdir)/dotlock.man \
+ $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-- for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-- for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- if [ -f manual.html ] ; then \
-- $(MAKE) install-html ; \
-- fi
-+ #$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-+ #for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #if [ -f manual.html ] ; then \
-+ # $(MAKE) install-html ; \
-+ #fi
-
- install-html: html
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-@@ -84,7 +87,11 @@
- sgml2txt -c latin manual
+- for f in $(srcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- for f in $(topsrcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+- for file in manual*.html ; do \
+- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+- done
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++ # for f in $(srcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # for f in $(topsrcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
++ # for file in manual*.html ; do \
++ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
++ # done
+
+ uninstall:
+ -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
+@@ -93,14 +96,18 @@
+ -rm -rf $(DESTDIR)$(docdir)
+
+ manual.txt: manual.sgml
+- if sgml2txt -c latin manual ; then \
+- uniq < manual.txt | expand > _manual.txt ; \
+- rm manual.txt ; \
++ if sgmlfmt -f ascii manual; then \
++ uniq < manual.ascii | expand > _manual.txt ; \
++ rm -f manual.txt manual.ascii; \
+ mv _manual.txt manual.txt ;\
+ fi
manual.html: manual.sgml
-- sgml2html manual
-+ @# sgml2html manual
-+ sgmlfmt -f html manual
+- sgml2html manual || true
++ @# sgml2html manual || true
++ sgmlfmt -f html manual || true
+
+manual.latin1: manual.sgml
-+ sgmlfmt -f latin1 manual.sgml
++ sgmlfmt -f latin1 manual || true
- clean:
- rm -f *~ *.html *.orig *.rej *.man manual.sgml
+ manual.ps: manual.sgml
+ sgml2latex --output=ps manual || true
diff --git a/mail/mutt-devel/files/patch-03 b/mail/mutt-devel/files/patch-03
index 82571384c793..b870f7f7aaec 100644
--- a/mail/mutt-devel/files/patch-03
+++ b/mail/mutt-devel/files/patch-03
@@ -1,11 +1,13 @@
---- doc/manual.sgml.in.orig Tue Dec 8 13:20:07 1998
-+++ doc/manual.sgml.in Sat Dec 12 09:03:23 1998
-@@ -1,4 +1,7 @@
+--- doc/manual.sgml.orig Tue May 9 17:15:26 2000
++++ doc/manual.sgml Fri May 12 11:05:40 2000
+@@ -1,5 +1,8 @@
-<!doctype linuxdoc system>
+-
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
+<!ENTITY dquot "&#34;">
+]>
+<linuxdoc>
-
++
<article>
+ <title>The Mutt E-Mail Client
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
index 6b295ff74d8a..364bc49a259d 100644
--- a/mail/mutt-devel/files/patch-05
+++ b/mail/mutt-devel/files/patch-05
@@ -74,9 +74,9 @@
{
case 1: /* (e)ncrypt */
bits |= PGPENCRYPT;
---- lib.c.orig Wed Jul 7 02:25:45 1999
-+++ lib.c Sun Sep 26 23:46:25 1999
-@@ -859,7 +859,7 @@
+--- muttlib.c.orig Sun Apr 9 14:39:02 2000
++++ muttlib.c Fri May 12 11:26:58 2000
+@@ -671,7 +671,7 @@
if (*append == 0 && access (fname, F_OK) == 0)
{
switch (mutt_multi_choice
diff --git a/mail/mutt-devel/files/patch-08 b/mail/mutt-devel/files/patch-08
index 2d607bc2f343..3e50cbd13779 100644
--- a/mail/mutt-devel/files/patch-08
+++ b/mail/mutt-devel/files/patch-08
@@ -1,11 +1,10 @@
---- Muttrc.in.original Wed Jul 22 10:47:49 1998
-+++ Muttrc.in Wed Jul 22 10:48:02 1998
-@@ -60,7 +60,7 @@
- # unset fcc_attach
- # set folder="~/Mail"
- # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
--# set followup_to
-+unset followup_to
- # unset force_name
- # set forward_decode
- # set forward_format="[%a: %s]"
+--- Muttrc.orig Sat May 13 08:30:44 2000
++++ Muttrc Sat May 13 08:32:05 2000
+@@ -629,6 +629,7 @@
+ # Type: boolean
+ # Default: yes
+ #
++set followup_to=no
+ #
+ # Controls whether or not the Mail-Followup-To header field is
+ # generated when sending mail. When set, Mutt will generate this
diff --git a/mail/mutt-devel/files/patch-Makefile.in b/mail/mutt-devel/files/patch-Makefile.in
new file mode 100644
index 000000000000..5e33d7c1abdf
--- /dev/null
+++ b/mail/mutt-devel/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue May 9 17:15:37 2000
++++ Makefile.in Fri May 12 13:53:08 2000
+@@ -210,7 +210,7 @@
+ SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
+ OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
+
+-all: all-redirect
++all: $(BUILT_SOURCES) all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 325e87bc5b65..1c440afd699f 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -1,172 +1,178 @@
bin/mutt
bin/mutt_dotlock
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
etc/Muttrc
etc/mime.types
-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/charsets.alias
-share/mutt/charsets/charsets.alias.dist
-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-ca-fr
-share/mutt/charsets/ebcdic-dk-no
-share/mutt/charsets/ebcdic-dk-no-a
-share/mutt/charsets/ebcdic-es
-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/greek-ccitt
-share/mutt/charsets/greek7
-share/mutt/charsets/greek7-old
-share/mutt/charsets/hp-roman8
-share/mutt/charsets/ibm037
-share/mutt/charsets/ibm038
-share/mutt/charsets/ibm1004
-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/it
-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/mac-is
-share/mutt/charsets/macintosh
-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/charmaps/ANSI_X3.110-1983
+share/mutt/charmaps/ANSI_X3.4-1968
+share/mutt/charmaps/ASMO_449
+share/mutt/charmaps/BALTIC
+share/mutt/charmaps/BS_4730
+share/mutt/charmaps/BS_VIEWDATA
+share/mutt/charmaps/CP1250
+share/mutt/charmaps/CP1251
+share/mutt/charmaps/CP1252
+share/mutt/charmaps/CP1253
+share/mutt/charmaps/CP1254
+share/mutt/charmaps/CP1255
+share/mutt/charmaps/CP1256
+share/mutt/charmaps/CP1257
+share/mutt/charmaps/CSA_Z243.4-1985-1
+share/mutt/charmaps/CSA_Z243.4-1985-2
+share/mutt/charmaps/CSA_Z243.4-1985-GR
+share/mutt/charmaps/CSN_369103
+share/mutt/charmaps/CWI
+share/mutt/charmaps/DEC-MCS
+share/mutt/charmaps/DIN_66003
+share/mutt/charmaps/DS_2089
+share/mutt/charmaps/EBCDIC-AT-DE
+share/mutt/charmaps/EBCDIC-AT-DE-A
+share/mutt/charmaps/EBCDIC-CA-FR
+share/mutt/charmaps/EBCDIC-DK-NO
+share/mutt/charmaps/EBCDIC-DK-NO-A
+share/mutt/charmaps/EBCDIC-ES
+share/mutt/charmaps/EBCDIC-ES-A
+share/mutt/charmaps/EBCDIC-ES-S
+share/mutt/charmaps/EBCDIC-FI-SE
+share/mutt/charmaps/EBCDIC-FI-SE-A
+share/mutt/charmaps/EBCDIC-FR
+share/mutt/charmaps/EBCDIC-IS-FRISS
+share/mutt/charmaps/EBCDIC-IT
+share/mutt/charmaps/EBCDIC-PT
+share/mutt/charmaps/EBCDIC-UK
+share/mutt/charmaps/EBCDIC-US
+share/mutt/charmaps/ECMA-CYRILLIC
+share/mutt/charmaps/ES
+share/mutt/charmaps/ES2
+share/mutt/charmaps/GB_1988-80
+share/mutt/charmaps/GOST_19768-74
+share/mutt/charmaps/GREEK-CCITT
+share/mutt/charmaps/GREEK7
+share/mutt/charmaps/GREEK7-OLD
+share/mutt/charmaps/HP-ROMAN8
+share/mutt/charmaps/IBM037
+share/mutt/charmaps/IBM038
+share/mutt/charmaps/IBM1004
+share/mutt/charmaps/IBM1026
+share/mutt/charmaps/IBM1047
+share/mutt/charmaps/IBM256
+share/mutt/charmaps/IBM273
+share/mutt/charmaps/IBM274
+share/mutt/charmaps/IBM275
+share/mutt/charmaps/IBM277
+share/mutt/charmaps/IBM278
+share/mutt/charmaps/IBM280
+share/mutt/charmaps/IBM281
+share/mutt/charmaps/IBM284
+share/mutt/charmaps/IBM285
+share/mutt/charmaps/IBM290
+share/mutt/charmaps/IBM297
+share/mutt/charmaps/IBM420
+share/mutt/charmaps/IBM423
+share/mutt/charmaps/IBM424
+share/mutt/charmaps/IBM437
+share/mutt/charmaps/IBM500
+share/mutt/charmaps/IBM850
+share/mutt/charmaps/IBM851
+share/mutt/charmaps/IBM852
+share/mutt/charmaps/IBM855
+share/mutt/charmaps/IBM857
+share/mutt/charmaps/IBM860
+share/mutt/charmaps/IBM861
+share/mutt/charmaps/IBM862
+share/mutt/charmaps/IBM863
+share/mutt/charmaps/IBM864
+share/mutt/charmaps/IBM865
+share/mutt/charmaps/IBM868
+share/mutt/charmaps/IBM869
+share/mutt/charmaps/IBM870
+share/mutt/charmaps/IBM871
+share/mutt/charmaps/IBM875
+share/mutt/charmaps/IBM880
+share/mutt/charmaps/IBM891
+share/mutt/charmaps/IBM903
+share/mutt/charmaps/IBM904
+share/mutt/charmaps/IBM905
+share/mutt/charmaps/IBM918
+share/mutt/charmaps/IEC_P27-1
+share/mutt/charmaps/INIS
+share/mutt/charmaps/INIS-8
+share/mutt/charmaps/INIS-CYRILLIC
+share/mutt/charmaps/INVARIANT
+share/mutt/charmaps/ISO-8859-1
+share/mutt/charmaps/ISO-8859-10
+share/mutt/charmaps/ISO-8859-2
+share/mutt/charmaps/ISO-8859-3
+share/mutt/charmaps/ISO-8859-4
+share/mutt/charmaps/ISO-8859-5
+share/mutt/charmaps/ISO-8859-6
+share/mutt/charmaps/ISO-8859-7
+share/mutt/charmaps/ISO-8859-8
+share/mutt/charmaps/ISO-8859-9
+share/mutt/charmaps/ISO-IR-90
+share/mutt/charmaps/ISO_10367-BOX
+share/mutt/charmaps/ISO_10646
+share/mutt/charmaps/ISO_2033-1983
+share/mutt/charmaps/ISO_5427
+share/mutt/charmaps/ISO_5427-EXT
+share/mutt/charmaps/ISO_5428
+share/mutt/charmaps/ISO_646.BASIC
+share/mutt/charmaps/ISO_646.IRV
+share/mutt/charmaps/ISO_6937
+share/mutt/charmaps/ISO_6937-2-25
+share/mutt/charmaps/ISO_6937-2-ADD
+share/mutt/charmaps/ISO_8859-1,GL
+share/mutt/charmaps/ISO_8859-SUPP
+share/mutt/charmaps/IT
+share/mutt/charmaps/JIS_C6220-1969-JP
+share/mutt/charmaps/JIS_C6220-1969-RO
+share/mutt/charmaps/JIS_C6229-1984-A
+share/mutt/charmaps/JIS_C6229-1984-B
+share/mutt/charmaps/JIS_C6229-1984-B-ADD
+share/mutt/charmaps/JIS_C6229-1984-HAND
+share/mutt/charmaps/JIS_C6229-1984-HAND-ADD
+share/mutt/charmaps/JIS_C6229-1984-KANA
+share/mutt/charmaps/JIS_X0201
+share/mutt/charmaps/JUS_I.B1.002
+share/mutt/charmaps/JUS_I.B1.003-MAC
+share/mutt/charmaps/JUS_I.B1.003-SERB
+share/mutt/charmaps/KOI-8
+share/mutt/charmaps/KOI8-R
+share/mutt/charmaps/KSC5636
+share/mutt/charmaps/LATIN-GREEK
+share/mutt/charmaps/LATIN-GREEK-1
+share/mutt/charmaps/MAC-IS
+share/mutt/charmaps/MACINTOSH
+share/mutt/charmaps/MSZ_7795.3
+share/mutt/charmaps/NATS-DANO
+share/mutt/charmaps/NATS-DANO-ADD
+share/mutt/charmaps/NATS-SEFI
+share/mutt/charmaps/NATS-SEFI-ADD
+share/mutt/charmaps/NC_NC00-10
+share/mutt/charmaps/NEXTSTEP
+share/mutt/charmaps/NF_Z_62-010
+share/mutt/charmaps/NF_Z_62-010-1973
+share/mutt/charmaps/NS_4551-1
+share/mutt/charmaps/NS_4551-2
+share/mutt/charmaps/PT
+share/mutt/charmaps/PT2
+share/mutt/charmaps/SAMI
+share/mutt/charmaps/SEN_850200_B
+share/mutt/charmaps/SEN_850200_C
+share/mutt/charmaps/T.101-G2
+share/mutt/charmaps/T.61-7BIT
+share/mutt/charmaps/T.61-8BIT
+share/mutt/charmaps/VIDEOTEX-SUPPL
share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
share/locale/de/LC_MESSAGES/mutt.mo
share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
share/locale/es/LC_MESSAGES/mutt.mo
share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
share/locale/id/LC_MESSAGES/mutt.mo
share/locale/it/LC_MESSAGES/mutt.mo
share/locale/ko/LC_MESSAGES/mutt.mo
@@ -175,6 +181,7 @@ share/locale/pl/LC_MESSAGES/mutt.mo
share/locale/pt_BR/LC_MESSAGES/mutt.mo
share/locale/ru/LC_MESSAGES/mutt.mo
share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
share/locale/uk/LC_MESSAGES/mutt.mo
share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
share/doc/mutt/manual.txt
@@ -182,6 +189,17 @@ share/doc/mutt/PGP-Notes.txt
share/doc/mutt/sample.muttrc
share/doc/mutt/Mush.rc
share/doc/mutt/Pine.rc
-@dirrm share/mutt/charsets
+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
+@dirrm share/mutt/charmaps
@dirrm share/mutt
+@dirrm share/doc/mutt/samples
@dirrm share/doc/mutt
diff --git a/mail/mutt-devel/pkg-plist.htmlfiles b/mail/mutt-devel/pkg-plist.htmlfiles
index bc9fa567f4e8..ed96b474b3d6 100644
--- a/mail/mutt-devel/pkg-plist.htmlfiles
+++ b/mail/mutt-devel/pkg-plist.htmlfiles
@@ -1,262 +1,316 @@
share/doc/mutt/manual.latin1
-share/doc/mutt/manual.html
-share/doc/mutt/manual1.html
-share/doc/mutt/manual10.html
-share/doc/mutt/manual100.html
-share/doc/mutt/manual101.html
-share/doc/mutt/manual102.html
-share/doc/mutt/manual103.html
-share/doc/mutt/manual104.html
-share/doc/mutt/manual105.html
-share/doc/mutt/manual106.html
-share/doc/mutt/manual107.html
-share/doc/mutt/manual108.html
-share/doc/mutt/manual109.html
-share/doc/mutt/manual11.html
-share/doc/mutt/manual110.html
-share/doc/mutt/manual111.html
-share/doc/mutt/manual112.html
-share/doc/mutt/manual113.html
-share/doc/mutt/manual114.html
-share/doc/mutt/manual115.html
-share/doc/mutt/manual116.html
-share/doc/mutt/manual117.html
-share/doc/mutt/manual118.html
-share/doc/mutt/manual119.html
-share/doc/mutt/manual12.html
-share/doc/mutt/manual120.html
-share/doc/mutt/manual121.html
-share/doc/mutt/manual122.html
-share/doc/mutt/manual123.html
-share/doc/mutt/manual124.html
-share/doc/mutt/manual125.html
-share/doc/mutt/manual126.html
-share/doc/mutt/manual127.html
-share/doc/mutt/manual128.html
-share/doc/mutt/manual129.html
-share/doc/mutt/manual13.html
-share/doc/mutt/manual130.html
-share/doc/mutt/manual131.html
-share/doc/mutt/manual132.html
-share/doc/mutt/manual133.html
-share/doc/mutt/manual134.html
-share/doc/mutt/manual135.html
-share/doc/mutt/manual136.html
-share/doc/mutt/manual137.html
-share/doc/mutt/manual138.html
-share/doc/mutt/manual139.html
-share/doc/mutt/manual14.html
-share/doc/mutt/manual140.html
-share/doc/mutt/manual141.html
-share/doc/mutt/manual142.html
-share/doc/mutt/manual143.html
-share/doc/mutt/manual144.html
-share/doc/mutt/manual145.html
-share/doc/mutt/manual146.html
-share/doc/mutt/manual147.html
-share/doc/mutt/manual148.html
-share/doc/mutt/manual149.html
-share/doc/mutt/manual15.html
-share/doc/mutt/manual150.html
-share/doc/mutt/manual151.html
-share/doc/mutt/manual152.html
-share/doc/mutt/manual153.html
-share/doc/mutt/manual154.html
-share/doc/mutt/manual155.html
-share/doc/mutt/manual156.html
-share/doc/mutt/manual157.html
-share/doc/mutt/manual158.html
-share/doc/mutt/manual159.html
-share/doc/mutt/manual16.html
-share/doc/mutt/manual160.html
-share/doc/mutt/manual161.html
-share/doc/mutt/manual162.html
-share/doc/mutt/manual163.html
-share/doc/mutt/manual164.html
-share/doc/mutt/manual165.html
-share/doc/mutt/manual166.html
-share/doc/mutt/manual167.html
-share/doc/mutt/manual168.html
-share/doc/mutt/manual169.html
-share/doc/mutt/manual17.html
-share/doc/mutt/manual170.html
-share/doc/mutt/manual171.html
-share/doc/mutt/manual172.html
-share/doc/mutt/manual173.html
-share/doc/mutt/manual174.html
-share/doc/mutt/manual175.html
-share/doc/mutt/manual176.html
-share/doc/mutt/manual177.html
-share/doc/mutt/manual178.html
-share/doc/mutt/manual179.html
-share/doc/mutt/manual18.html
-share/doc/mutt/manual180.html
-share/doc/mutt/manual181.html
-share/doc/mutt/manual182.html
-share/doc/mutt/manual183.html
-share/doc/mutt/manual184.html
-share/doc/mutt/manual185.html
-share/doc/mutt/manual186.html
-share/doc/mutt/manual187.html
-share/doc/mutt/manual188.html
-share/doc/mutt/manual189.html
-share/doc/mutt/manual19.html
-share/doc/mutt/manual190.html
-share/doc/mutt/manual191.html
-share/doc/mutt/manual192.html
-share/doc/mutt/manual193.html
-share/doc/mutt/manual194.html
-share/doc/mutt/manual195.html
-share/doc/mutt/manual196.html
-share/doc/mutt/manual197.html
-share/doc/mutt/manual198.html
-share/doc/mutt/manual199.html
-share/doc/mutt/manual2.html
-share/doc/mutt/manual20.html
-share/doc/mutt/manual200.html
-share/doc/mutt/manual201.html
-share/doc/mutt/manual202.html
-share/doc/mutt/manual203.html
-share/doc/mutt/manual204.html
-share/doc/mutt/manual205.html
-share/doc/mutt/manual206.html
-share/doc/mutt/manual207.html
-share/doc/mutt/manual208.html
-share/doc/mutt/manual209.html
-share/doc/mutt/manual21.html
-share/doc/mutt/manual210.html
-share/doc/mutt/manual211.html
-share/doc/mutt/manual212.html
-share/doc/mutt/manual213.html
-share/doc/mutt/manual214.html
-share/doc/mutt/manual215.html
-share/doc/mutt/manual216.html
-share/doc/mutt/manual217.html
-share/doc/mutt/manual218.html
-share/doc/mutt/manual219.html
-share/doc/mutt/manual22.html
-share/doc/mutt/manual220.html
-share/doc/mutt/manual221.html
-share/doc/mutt/manual222.html
-share/doc/mutt/manual223.html
-share/doc/mutt/manual224.html
-share/doc/mutt/manual225.html
-share/doc/mutt/manual226.html
-share/doc/mutt/manual227.html
-share/doc/mutt/manual228.html
-share/doc/mutt/manual229.html
-share/doc/mutt/manual23.html
-share/doc/mutt/manual230.html
-share/doc/mutt/manual231.html
-share/doc/mutt/manual232.html
-share/doc/mutt/manual233.html
-share/doc/mutt/manual234.html
-share/doc/mutt/manual235.html
-share/doc/mutt/manual236.html
-share/doc/mutt/manual237.html
-share/doc/mutt/manual238.html
-share/doc/mutt/manual239.html
-share/doc/mutt/manual24.html
-share/doc/mutt/manual240.html
-share/doc/mutt/manual241.html
-share/doc/mutt/manual242.html
-share/doc/mutt/manual243.html
-share/doc/mutt/manual244.html
-share/doc/mutt/manual245.html
-share/doc/mutt/manual246.html
-share/doc/mutt/manual247.html
-share/doc/mutt/manual248.html
-share/doc/mutt/manual249.html
-share/doc/mutt/manual25.html
-share/doc/mutt/manual250.html
-share/doc/mutt/manual251.html
-share/doc/mutt/manual252.html
-share/doc/mutt/manual253.html
-share/doc/mutt/manual254.html
-share/doc/mutt/manual255.html
-share/doc/mutt/manual256.html
-share/doc/mutt/manual257.html
-share/doc/mutt/manual258.html
-share/doc/mutt/manual259.html
-share/doc/mutt/manual26.html
-share/doc/mutt/manual27.html
-share/doc/mutt/manual28.html
-share/doc/mutt/manual29.html
-share/doc/mutt/manual3.html
-share/doc/mutt/manual30.html
-share/doc/mutt/manual31.html
-share/doc/mutt/manual32.html
-share/doc/mutt/manual33.html
-share/doc/mutt/manual34.html
-share/doc/mutt/manual35.html
-share/doc/mutt/manual36.html
-share/doc/mutt/manual37.html
-share/doc/mutt/manual38.html
-share/doc/mutt/manual39.html
-share/doc/mutt/manual4.html
-share/doc/mutt/manual40.html
-share/doc/mutt/manual41.html
-share/doc/mutt/manual42.html
-share/doc/mutt/manual43.html
-share/doc/mutt/manual44.html
-share/doc/mutt/manual45.html
-share/doc/mutt/manual46.html
-share/doc/mutt/manual47.html
-share/doc/mutt/manual48.html
-share/doc/mutt/manual49.html
-share/doc/mutt/manual5.html
-share/doc/mutt/manual50.html
-share/doc/mutt/manual51.html
-share/doc/mutt/manual52.html
-share/doc/mutt/manual53.html
-share/doc/mutt/manual54.html
-share/doc/mutt/manual55.html
-share/doc/mutt/manual56.html
-share/doc/mutt/manual57.html
-share/doc/mutt/manual58.html
-share/doc/mutt/manual59.html
-share/doc/mutt/manual6.html
-share/doc/mutt/manual60.html
-share/doc/mutt/manual61.html
-share/doc/mutt/manual62.html
-share/doc/mutt/manual63.html
-share/doc/mutt/manual64.html
-share/doc/mutt/manual65.html
-share/doc/mutt/manual66.html
-share/doc/mutt/manual67.html
-share/doc/mutt/manual68.html
-share/doc/mutt/manual69.html
-share/doc/mutt/manual7.html
-share/doc/mutt/manual70.html
-share/doc/mutt/manual71.html
-share/doc/mutt/manual72.html
-share/doc/mutt/manual73.html
-share/doc/mutt/manual74.html
-share/doc/mutt/manual75.html
-share/doc/mutt/manual76.html
-share/doc/mutt/manual77.html
-share/doc/mutt/manual78.html
-share/doc/mutt/manual79.html
-share/doc/mutt/manual8.html
-share/doc/mutt/manual80.html
-share/doc/mutt/manual81.html
-share/doc/mutt/manual82.html
-share/doc/mutt/manual83.html
-share/doc/mutt/manual84.html
-share/doc/mutt/manual85.html
-share/doc/mutt/manual86.html
-share/doc/mutt/manual87.html
-share/doc/mutt/manual88.html
-share/doc/mutt/manual89.html
-share/doc/mutt/manual9.html
-share/doc/mutt/manual90.html
-share/doc/mutt/manual91.html
-share/doc/mutt/manual92.html
-share/doc/mutt/manual93.html
-share/doc/mutt/manual94.html
-share/doc/mutt/manual95.html
-share/doc/mutt/manual96.html
-share/doc/mutt/manual97.html
-share/doc/mutt/manual98.html
-share/doc/mutt/manual99.html
-share/doc/mutt/manual_toc.html
+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/html/manual.html
+share/doc/mutt/html/manual1.html
+share/doc/mutt/html/manual10.html
+share/doc/mutt/html/manual100.html
+share/doc/mutt/html/manual101.html
+share/doc/mutt/html/manual102.html
+share/doc/mutt/html/manual103.html
+share/doc/mutt/html/manual104.html
+share/doc/mutt/html/manual105.html
+share/doc/mutt/html/manual106.html
+share/doc/mutt/html/manual107.html
+share/doc/mutt/html/manual108.html
+share/doc/mutt/html/manual109.html
+share/doc/mutt/html/manual11.html
+share/doc/mutt/html/manual110.html
+share/doc/mutt/html/manual111.html
+share/doc/mutt/html/manual112.html
+share/doc/mutt/html/manual113.html
+share/doc/mutt/html/manual114.html
+share/doc/mutt/html/manual115.html
+share/doc/mutt/html/manual116.html
+share/doc/mutt/html/manual117.html
+share/doc/mutt/html/manual118.html
+share/doc/mutt/html/manual119.html
+share/doc/mutt/html/manual12.html
+share/doc/mutt/html/manual120.html
+share/doc/mutt/html/manual121.html
+share/doc/mutt/html/manual122.html
+share/doc/mutt/html/manual123.html
+share/doc/mutt/html/manual124.html
+share/doc/mutt/html/manual125.html
+share/doc/mutt/html/manual126.html
+share/doc/mutt/html/manual127.html
+share/doc/mutt/html/manual128.html
+share/doc/mutt/html/manual129.html
+share/doc/mutt/html/manual13.html
+share/doc/mutt/html/manual130.html
+share/doc/mutt/html/manual131.html
+share/doc/mutt/html/manual132.html
+share/doc/mutt/html/manual133.html
+share/doc/mutt/html/manual134.html
+share/doc/mutt/html/manual135.html
+share/doc/mutt/html/manual136.html
+share/doc/mutt/html/manual137.html
+share/doc/mutt/html/manual138.html
+share/doc/mutt/html/manual139.html
+share/doc/mutt/html/manual14.html
+share/doc/mutt/html/manual140.html
+share/doc/mutt/html/manual141.html
+share/doc/mutt/html/manual142.html
+share/doc/mutt/html/manual143.html
+share/doc/mutt/html/manual144.html
+share/doc/mutt/html/manual145.html
+share/doc/mutt/html/manual146.html
+share/doc/mutt/html/manual147.html
+share/doc/mutt/html/manual148.html
+share/doc/mutt/html/manual149.html
+share/doc/mutt/html/manual15.html
+share/doc/mutt/html/manual150.html
+share/doc/mutt/html/manual151.html
+share/doc/mutt/html/manual152.html
+share/doc/mutt/html/manual153.html
+share/doc/mutt/html/manual154.html
+share/doc/mutt/html/manual155.html
+share/doc/mutt/html/manual156.html
+share/doc/mutt/html/manual157.html
+share/doc/mutt/html/manual158.html
+share/doc/mutt/html/manual159.html
+share/doc/mutt/html/manual16.html
+share/doc/mutt/html/manual160.html
+share/doc/mutt/html/manual161.html
+share/doc/mutt/html/manual162.html
+share/doc/mutt/html/manual163.html
+share/doc/mutt/html/manual164.html
+share/doc/mutt/html/manual165.html
+share/doc/mutt/html/manual166.html
+share/doc/mutt/html/manual167.html
+share/doc/mutt/html/manual168.html
+share/doc/mutt/html/manual169.html
+share/doc/mutt/html/manual17.html
+share/doc/mutt/html/manual170.html
+share/doc/mutt/html/manual171.html
+share/doc/mutt/html/manual172.html
+share/doc/mutt/html/manual173.html
+share/doc/mutt/html/manual174.html
+share/doc/mutt/html/manual175.html
+share/doc/mutt/html/manual176.html
+share/doc/mutt/html/manual177.html
+share/doc/mutt/html/manual178.html
+share/doc/mutt/html/manual179.html
+share/doc/mutt/html/manual18.html
+share/doc/mutt/html/manual180.html
+share/doc/mutt/html/manual181.html
+share/doc/mutt/html/manual182.html
+share/doc/mutt/html/manual183.html
+share/doc/mutt/html/manual184.html
+share/doc/mutt/html/manual185.html
+share/doc/mutt/html/manual186.html
+share/doc/mutt/html/manual187.html
+share/doc/mutt/html/manual188.html
+share/doc/mutt/html/manual189.html
+share/doc/mutt/html/manual19.html
+share/doc/mutt/html/manual190.html
+share/doc/mutt/html/manual191.html
+share/doc/mutt/html/manual192.html
+share/doc/mutt/html/manual193.html
+share/doc/mutt/html/manual194.html
+share/doc/mutt/html/manual195.html
+share/doc/mutt/html/manual196.html
+share/doc/mutt/html/manual197.html
+share/doc/mutt/html/manual198.html
+share/doc/mutt/html/manual199.html
+share/doc/mutt/html/manual2.html
+share/doc/mutt/html/manual20.html
+share/doc/mutt/html/manual200.html
+share/doc/mutt/html/manual201.html
+share/doc/mutt/html/manual202.html
+share/doc/mutt/html/manual203.html
+share/doc/mutt/html/manual204.html
+share/doc/mutt/html/manual205.html
+share/doc/mutt/html/manual206.html
+share/doc/mutt/html/manual207.html
+share/doc/mutt/html/manual208.html
+share/doc/mutt/html/manual209.html
+share/doc/mutt/html/manual21.html
+share/doc/mutt/html/manual210.html
+share/doc/mutt/html/manual211.html
+share/doc/mutt/html/manual212.html
+share/doc/mutt/html/manual213.html
+share/doc/mutt/html/manual214.html
+share/doc/mutt/html/manual215.html
+share/doc/mutt/html/manual216.html
+share/doc/mutt/html/manual217.html
+share/doc/mutt/html/manual218.html
+share/doc/mutt/html/manual219.html
+share/doc/mutt/html/manual22.html
+share/doc/mutt/html/manual220.html
+share/doc/mutt/html/manual221.html
+share/doc/mutt/html/manual222.html
+share/doc/mutt/html/manual223.html
+share/doc/mutt/html/manual224.html
+share/doc/mutt/html/manual225.html
+share/doc/mutt/html/manual226.html
+share/doc/mutt/html/manual227.html
+share/doc/mutt/html/manual228.html
+share/doc/mutt/html/manual229.html
+share/doc/mutt/html/manual23.html
+share/doc/mutt/html/manual230.html
+share/doc/mutt/html/manual231.html
+share/doc/mutt/html/manual232.html
+share/doc/mutt/html/manual233.html
+share/doc/mutt/html/manual234.html
+share/doc/mutt/html/manual235.html
+share/doc/mutt/html/manual236.html
+share/doc/mutt/html/manual237.html
+share/doc/mutt/html/manual238.html
+share/doc/mutt/html/manual239.html
+share/doc/mutt/html/manual24.html
+share/doc/mutt/html/manual240.html
+share/doc/mutt/html/manual241.html
+share/doc/mutt/html/manual242.html
+share/doc/mutt/html/manual243.html
+share/doc/mutt/html/manual244.html
+share/doc/mutt/html/manual245.html
+share/doc/mutt/html/manual246.html
+share/doc/mutt/html/manual247.html
+share/doc/mutt/html/manual248.html
+share/doc/mutt/html/manual249.html
+share/doc/mutt/html/manual25.html
+share/doc/mutt/html/manual250.html
+share/doc/mutt/html/manual251.html
+share/doc/mutt/html/manual252.html
+share/doc/mutt/html/manual253.html
+share/doc/mutt/html/manual254.html
+share/doc/mutt/html/manual255.html
+share/doc/mutt/html/manual256.html
+share/doc/mutt/html/manual257.html
+share/doc/mutt/html/manual258.html
+share/doc/mutt/html/manual259.html
+share/doc/mutt/html/manual26.html
+share/doc/mutt/html/manual260.html
+share/doc/mutt/html/manual261.html
+share/doc/mutt/html/manual262.html
+share/doc/mutt/html/manual263.html
+share/doc/mutt/html/manual264.html
+share/doc/mutt/html/manual265.html
+share/doc/mutt/html/manual266.html
+share/doc/mutt/html/manual267.html
+share/doc/mutt/html/manual268.html
+share/doc/mutt/html/manual269.html
+share/doc/mutt/html/manual27.html
+share/doc/mutt/html/manual270.html
+share/doc/mutt/html/manual271.html
+share/doc/mutt/html/manual272.html
+share/doc/mutt/html/manual273.html
+share/doc/mutt/html/manual274.html
+share/doc/mutt/html/manual275.html
+share/doc/mutt/html/manual276.html
+share/doc/mutt/html/manual277.html
+share/doc/mutt/html/manual278.html
+share/doc/mutt/html/manual279.html
+share/doc/mutt/html/manual28.html
+share/doc/mutt/html/manual280.html
+share/doc/mutt/html/manual281.html
+share/doc/mutt/html/manual282.html
+share/doc/mutt/html/manual283.html
+share/doc/mutt/html/manual284.html
+share/doc/mutt/html/manual285.html
+share/doc/mutt/html/manual286.html
+share/doc/mutt/html/manual287.html
+share/doc/mutt/html/manual288.html
+share/doc/mutt/html/manual289.html
+share/doc/mutt/html/manual29.html
+share/doc/mutt/html/manual290.html
+share/doc/mutt/html/manual291.html
+share/doc/mutt/html/manual292.html
+share/doc/mutt/html/manual293.html
+share/doc/mutt/html/manual294.html
+share/doc/mutt/html/manual295.html
+share/doc/mutt/html/manual296.html
+share/doc/mutt/html/manual297.html
+share/doc/mutt/html/manual298.html
+share/doc/mutt/html/manual299.html
+share/doc/mutt/html/manual3.html
+share/doc/mutt/html/manual30.html
+share/doc/mutt/html/manual300.html
+share/doc/mutt/html/manual301.html
+share/doc/mutt/html/manual302.html
+share/doc/mutt/html/manual303.html
+share/doc/mutt/html/manual304.html
+share/doc/mutt/html/manual31.html
+share/doc/mutt/html/manual32.html
+share/doc/mutt/html/manual33.html
+share/doc/mutt/html/manual34.html
+share/doc/mutt/html/manual35.html
+share/doc/mutt/html/manual36.html
+share/doc/mutt/html/manual37.html
+share/doc/mutt/html/manual38.html
+share/doc/mutt/html/manual39.html
+share/doc/mutt/html/manual4.html
+share/doc/mutt/html/manual40.html
+share/doc/mutt/html/manual41.html
+share/doc/mutt/html/manual42.html
+share/doc/mutt/html/manual43.html
+share/doc/mutt/html/manual44.html
+share/doc/mutt/html/manual45.html
+share/doc/mutt/html/manual46.html
+share/doc/mutt/html/manual47.html
+share/doc/mutt/html/manual48.html
+share/doc/mutt/html/manual49.html
+share/doc/mutt/html/manual5.html
+share/doc/mutt/html/manual50.html
+share/doc/mutt/html/manual51.html
+share/doc/mutt/html/manual52.html
+share/doc/mutt/html/manual53.html
+share/doc/mutt/html/manual54.html
+share/doc/mutt/html/manual55.html
+share/doc/mutt/html/manual56.html
+share/doc/mutt/html/manual57.html
+share/doc/mutt/html/manual58.html
+share/doc/mutt/html/manual59.html
+share/doc/mutt/html/manual6.html
+share/doc/mutt/html/manual60.html
+share/doc/mutt/html/manual61.html
+share/doc/mutt/html/manual62.html
+share/doc/mutt/html/manual63.html
+share/doc/mutt/html/manual64.html
+share/doc/mutt/html/manual65.html
+share/doc/mutt/html/manual66.html
+share/doc/mutt/html/manual67.html
+share/doc/mutt/html/manual68.html
+share/doc/mutt/html/manual69.html
+share/doc/mutt/html/manual7.html
+share/doc/mutt/html/manual70.html
+share/doc/mutt/html/manual71.html
+share/doc/mutt/html/manual72.html
+share/doc/mutt/html/manual73.html
+share/doc/mutt/html/manual74.html
+share/doc/mutt/html/manual75.html
+share/doc/mutt/html/manual76.html
+share/doc/mutt/html/manual77.html
+share/doc/mutt/html/manual78.html
+share/doc/mutt/html/manual79.html
+share/doc/mutt/html/manual8.html
+share/doc/mutt/html/manual80.html
+share/doc/mutt/html/manual81.html
+share/doc/mutt/html/manual82.html
+share/doc/mutt/html/manual83.html
+share/doc/mutt/html/manual84.html
+share/doc/mutt/html/manual85.html
+share/doc/mutt/html/manual86.html
+share/doc/mutt/html/manual87.html
+share/doc/mutt/html/manual88.html
+share/doc/mutt/html/manual89.html
+share/doc/mutt/html/manual9.html
+share/doc/mutt/html/manual90.html
+share/doc/mutt/html/manual91.html
+share/doc/mutt/html/manual92.html
+share/doc/mutt/html/manual93.html
+share/doc/mutt/html/manual94.html
+share/doc/mutt/html/manual95.html
+share/doc/mutt/html/manual96.html
+share/doc/mutt/html/manual97.html
+share/doc/mutt/html/manual98.html
+share/doc/mutt/html/manual99.html
+share/doc/mutt/html/manual_toc.html
+@dirrm share/doc/mutt/html
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 07a0392e0eb0..2ee30513a4b8 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= mutt
-PORTVERSION= 1.0.1
+PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -18,6 +18,8 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
DISTNAME= ${PKGNAME}i
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
@@ -43,6 +45,9 @@ LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses
.elif defined(WITH_SLANG)
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
.endif
+.if defined(WITH_SSL)
+USE_OPENSSL= RSA
+.endif
.if defined(PACKAGE_BUILDING)
RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
.endif
@@ -52,21 +57,25 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
--with-sharedir=${PREFIX}/share/mutt \
- --with-docdir=${PREFIX}/share/doc/mutt
+ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
.if defined(BATCH) || defined(WITH_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
.elif defined(WITH_NCURSES_PORT)
CONFIGURE_ARGS+= --with-curses=${PREFIX}
.endif
+.if defined(WITH_SSL)
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
+.endif
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
MAN1= mutt.1 mutt_dotlock.1
+MAN5= muttrc.5
-post-patch:
- uudecode -p ${FILESDIR}/ru.gmo.uu > ${WRKSRC}/po/ru.gmo
+pre-patch:
+ (cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
.if !defined(NOPORTDOCS)
post-build:
- ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+ ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
ed -s ${WRKSRC}/doc/mutt.man
@@ -86,8 +95,9 @@ post-install:
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
${PREFIX}/share/doc/mutt
.if defined(BATCH)
+ ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
- ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
.endif
@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
${PREFIX}/share/doc/mutt
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index de8a6ea3af56..ef4bfc3fc7b2 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1,2 @@
-MD5 (mutt/mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
+MD5 (mutt/mutt-1.2i.tar.gz) = 133cf5d620922bc317b95d6e5187ceb6
+MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
deleted file mode 100644
index 2233a67ac3c7..000000000000
--- a/mail/mutt/files/patch-01
+++ /dev/null
@@ -1,10 +0,0 @@
---- charsets/charsets.alias.orig Mon Jan 4 15:55:56 1999
-+++ charsets/charsets.alias Sat Jan 9 10:45:04 1999
-@@ -21,6 +21,7 @@
- iso-ir-47 bs-viewdata
- ms-ee cp1250
- ms-cyrl cp1251
-+windows-1251 cp1251
- ms-ansi cp1252
- ms-greek cp1253
- ms-turk cp1254
diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02
index fab62611d3e8..b82a36a2e3a9 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-02
@@ -1,54 +1,76 @@
---- doc/Makefile.in.orig Thu Nov 19 06:10:19 1998
-+++ doc/Makefile.in Sat Dec 12 11:10:45 1998
-@@ -43,7 +43,7 @@
- DOCFILES = manual.txt
+--- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000
++++ doc/Makefile.in Fri May 12 13:12:32 2000
+@@ -58,13 +58,16 @@
+ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
+ README NEWS TODO README.SECURITY README.SSL README.UPGRADE
+-all: muttrc.man try-html try-txt
++all: muttrc.man try-html try-txt try-latin1
--all: mutt.man dotlock.man try-html try-txt
-+all: mutt.man dotlock.man try-html try-txt try-latin1
+ try-html: ../makedoc
+- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
- complete: all html
-
-@@ -57,19 +57,22 @@
- try-txt:
- -$(MAKE) manual.txt
-
-+try-latin1:
-+ -$(MAKE) manual.latin1
+ try-txt: ../makedoc
+- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
+
- html: manual.html
++try-latin1:
++ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
- install: dotlock.man mutt.man all
+ install: all
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- $(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+@@ -73,18 +76,18 @@
+ $(INSTALL) -m 644 $(srcdir)/dotlock.man \
+ $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-- for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-- for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- if [ -f manual.html ] ; then \
-- $(MAKE) install-html ; \
-- fi
-+ #$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-+ #for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #if [ -f manual.html ] ; then \
-+ # $(MAKE) install-html ; \
-+ #fi
-
- install-html: html
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-@@ -84,7 +87,11 @@
- sgml2txt -c latin manual
+- for f in $(srcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- for f in $(topsrcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+- for file in manual*.html ; do \
+- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+- done
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++ # for f in $(srcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # for f in $(topsrcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
++ # for file in manual*.html ; do \
++ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
++ # done
+
+ uninstall:
+ -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
+@@ -93,14 +96,18 @@
+ -rm -rf $(DESTDIR)$(docdir)
+
+ manual.txt: manual.sgml
+- if sgml2txt -c latin manual ; then \
+- uniq < manual.txt | expand > _manual.txt ; \
+- rm manual.txt ; \
++ if sgmlfmt -f ascii manual; then \
++ uniq < manual.ascii | expand > _manual.txt ; \
++ rm -f manual.txt manual.ascii; \
+ mv _manual.txt manual.txt ;\
+ fi
manual.html: manual.sgml
-- sgml2html manual
-+ @# sgml2html manual
-+ sgmlfmt -f html manual
+- sgml2html manual || true
++ @# sgml2html manual || true
++ sgmlfmt -f html manual || true
+
+manual.latin1: manual.sgml
-+ sgmlfmt -f latin1 manual.sgml
++ sgmlfmt -f latin1 manual || true
- clean:
- rm -f *~ *.html *.orig *.rej *.man manual.sgml
+ manual.ps: manual.sgml
+ sgml2latex --output=ps manual || true
diff --git a/mail/mutt/files/patch-03 b/mail/mutt/files/patch-03
index 82571384c793..b870f7f7aaec 100644
--- a/mail/mutt/files/patch-03
+++ b/mail/mutt/files/patch-03
@@ -1,11 +1,13 @@
---- doc/manual.sgml.in.orig Tue Dec 8 13:20:07 1998
-+++ doc/manual.sgml.in Sat Dec 12 09:03:23 1998
-@@ -1,4 +1,7 @@
+--- doc/manual.sgml.orig Tue May 9 17:15:26 2000
++++ doc/manual.sgml Fri May 12 11:05:40 2000
+@@ -1,5 +1,8 @@
-<!doctype linuxdoc system>
+-
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
+<!ENTITY dquot "&#34;">
+]>
+<linuxdoc>
-
++
<article>
+ <title>The Mutt E-Mail Client
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
index 6b295ff74d8a..364bc49a259d 100644
--- a/mail/mutt/files/patch-05
+++ b/mail/mutt/files/patch-05
@@ -74,9 +74,9 @@
{
case 1: /* (e)ncrypt */
bits |= PGPENCRYPT;
---- lib.c.orig Wed Jul 7 02:25:45 1999
-+++ lib.c Sun Sep 26 23:46:25 1999
-@@ -859,7 +859,7 @@
+--- muttlib.c.orig Sun Apr 9 14:39:02 2000
++++ muttlib.c Fri May 12 11:26:58 2000
+@@ -671,7 +671,7 @@
if (*append == 0 && access (fname, F_OK) == 0)
{
switch (mutt_multi_choice
diff --git a/mail/mutt/files/patch-08 b/mail/mutt/files/patch-08
index 2d607bc2f343..3e50cbd13779 100644
--- a/mail/mutt/files/patch-08
+++ b/mail/mutt/files/patch-08
@@ -1,11 +1,10 @@
---- Muttrc.in.original Wed Jul 22 10:47:49 1998
-+++ Muttrc.in Wed Jul 22 10:48:02 1998
-@@ -60,7 +60,7 @@
- # unset fcc_attach
- # set folder="~/Mail"
- # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
--# set followup_to
-+unset followup_to
- # unset force_name
- # set forward_decode
- # set forward_format="[%a: %s]"
+--- Muttrc.orig Sat May 13 08:30:44 2000
++++ Muttrc Sat May 13 08:32:05 2000
+@@ -629,6 +629,7 @@
+ # Type: boolean
+ # Default: yes
+ #
++set followup_to=no
+ #
+ # Controls whether or not the Mail-Followup-To header field is
+ # generated when sending mail. When set, Mutt will generate this
diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in
new file mode 100644
index 000000000000..5e33d7c1abdf
--- /dev/null
+++ b/mail/mutt/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue May 9 17:15:37 2000
++++ Makefile.in Fri May 12 13:53:08 2000
+@@ -210,7 +210,7 @@
+ SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
+ OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
+
+-all: all-redirect
++all: $(BUILT_SOURCES) all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 325e87bc5b65..1c440afd699f 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -1,172 +1,178 @@
bin/mutt
bin/mutt_dotlock
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
etc/Muttrc
etc/mime.types
-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/charsets.alias
-share/mutt/charsets/charsets.alias.dist
-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-ca-fr
-share/mutt/charsets/ebcdic-dk-no
-share/mutt/charsets/ebcdic-dk-no-a
-share/mutt/charsets/ebcdic-es
-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/greek-ccitt
-share/mutt/charsets/greek7
-share/mutt/charsets/greek7-old
-share/mutt/charsets/hp-roman8
-share/mutt/charsets/ibm037
-share/mutt/charsets/ibm038
-share/mutt/charsets/ibm1004
-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/it
-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/mac-is
-share/mutt/charsets/macintosh
-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/charmaps/ANSI_X3.110-1983
+share/mutt/charmaps/ANSI_X3.4-1968
+share/mutt/charmaps/ASMO_449
+share/mutt/charmaps/BALTIC
+share/mutt/charmaps/BS_4730
+share/mutt/charmaps/BS_VIEWDATA
+share/mutt/charmaps/CP1250
+share/mutt/charmaps/CP1251
+share/mutt/charmaps/CP1252
+share/mutt/charmaps/CP1253
+share/mutt/charmaps/CP1254
+share/mutt/charmaps/CP1255
+share/mutt/charmaps/CP1256
+share/mutt/charmaps/CP1257
+share/mutt/charmaps/CSA_Z243.4-1985-1
+share/mutt/charmaps/CSA_Z243.4-1985-2
+share/mutt/charmaps/CSA_Z243.4-1985-GR
+share/mutt/charmaps/CSN_369103
+share/mutt/charmaps/CWI
+share/mutt/charmaps/DEC-MCS
+share/mutt/charmaps/DIN_66003
+share/mutt/charmaps/DS_2089
+share/mutt/charmaps/EBCDIC-AT-DE
+share/mutt/charmaps/EBCDIC-AT-DE-A
+share/mutt/charmaps/EBCDIC-CA-FR
+share/mutt/charmaps/EBCDIC-DK-NO
+share/mutt/charmaps/EBCDIC-DK-NO-A
+share/mutt/charmaps/EBCDIC-ES
+share/mutt/charmaps/EBCDIC-ES-A
+share/mutt/charmaps/EBCDIC-ES-S
+share/mutt/charmaps/EBCDIC-FI-SE
+share/mutt/charmaps/EBCDIC-FI-SE-A
+share/mutt/charmaps/EBCDIC-FR
+share/mutt/charmaps/EBCDIC-IS-FRISS
+share/mutt/charmaps/EBCDIC-IT
+share/mutt/charmaps/EBCDIC-PT
+share/mutt/charmaps/EBCDIC-UK
+share/mutt/charmaps/EBCDIC-US
+share/mutt/charmaps/ECMA-CYRILLIC
+share/mutt/charmaps/ES
+share/mutt/charmaps/ES2
+share/mutt/charmaps/GB_1988-80
+share/mutt/charmaps/GOST_19768-74
+share/mutt/charmaps/GREEK-CCITT
+share/mutt/charmaps/GREEK7
+share/mutt/charmaps/GREEK7-OLD
+share/mutt/charmaps/HP-ROMAN8
+share/mutt/charmaps/IBM037
+share/mutt/charmaps/IBM038
+share/mutt/charmaps/IBM1004
+share/mutt/charmaps/IBM1026
+share/mutt/charmaps/IBM1047
+share/mutt/charmaps/IBM256
+share/mutt/charmaps/IBM273
+share/mutt/charmaps/IBM274
+share/mutt/charmaps/IBM275
+share/mutt/charmaps/IBM277
+share/mutt/charmaps/IBM278
+share/mutt/charmaps/IBM280
+share/mutt/charmaps/IBM281
+share/mutt/charmaps/IBM284
+share/mutt/charmaps/IBM285
+share/mutt/charmaps/IBM290
+share/mutt/charmaps/IBM297
+share/mutt/charmaps/IBM420
+share/mutt/charmaps/IBM423
+share/mutt/charmaps/IBM424
+share/mutt/charmaps/IBM437
+share/mutt/charmaps/IBM500
+share/mutt/charmaps/IBM850
+share/mutt/charmaps/IBM851
+share/mutt/charmaps/IBM852
+share/mutt/charmaps/IBM855
+share/mutt/charmaps/IBM857
+share/mutt/charmaps/IBM860
+share/mutt/charmaps/IBM861
+share/mutt/charmaps/IBM862
+share/mutt/charmaps/IBM863
+share/mutt/charmaps/IBM864
+share/mutt/charmaps/IBM865
+share/mutt/charmaps/IBM868
+share/mutt/charmaps/IBM869
+share/mutt/charmaps/IBM870
+share/mutt/charmaps/IBM871
+share/mutt/charmaps/IBM875
+share/mutt/charmaps/IBM880
+share/mutt/charmaps/IBM891
+share/mutt/charmaps/IBM903
+share/mutt/charmaps/IBM904
+share/mutt/charmaps/IBM905
+share/mutt/charmaps/IBM918
+share/mutt/charmaps/IEC_P27-1
+share/mutt/charmaps/INIS
+share/mutt/charmaps/INIS-8
+share/mutt/charmaps/INIS-CYRILLIC
+share/mutt/charmaps/INVARIANT
+share/mutt/charmaps/ISO-8859-1
+share/mutt/charmaps/ISO-8859-10
+share/mutt/charmaps/ISO-8859-2
+share/mutt/charmaps/ISO-8859-3
+share/mutt/charmaps/ISO-8859-4
+share/mutt/charmaps/ISO-8859-5
+share/mutt/charmaps/ISO-8859-6
+share/mutt/charmaps/ISO-8859-7
+share/mutt/charmaps/ISO-8859-8
+share/mutt/charmaps/ISO-8859-9
+share/mutt/charmaps/ISO-IR-90
+share/mutt/charmaps/ISO_10367-BOX
+share/mutt/charmaps/ISO_10646
+share/mutt/charmaps/ISO_2033-1983
+share/mutt/charmaps/ISO_5427
+share/mutt/charmaps/ISO_5427-EXT
+share/mutt/charmaps/ISO_5428
+share/mutt/charmaps/ISO_646.BASIC
+share/mutt/charmaps/ISO_646.IRV
+share/mutt/charmaps/ISO_6937
+share/mutt/charmaps/ISO_6937-2-25
+share/mutt/charmaps/ISO_6937-2-ADD
+share/mutt/charmaps/ISO_8859-1,GL
+share/mutt/charmaps/ISO_8859-SUPP
+share/mutt/charmaps/IT
+share/mutt/charmaps/JIS_C6220-1969-JP
+share/mutt/charmaps/JIS_C6220-1969-RO
+share/mutt/charmaps/JIS_C6229-1984-A
+share/mutt/charmaps/JIS_C6229-1984-B
+share/mutt/charmaps/JIS_C6229-1984-B-ADD
+share/mutt/charmaps/JIS_C6229-1984-HAND
+share/mutt/charmaps/JIS_C6229-1984-HAND-ADD
+share/mutt/charmaps/JIS_C6229-1984-KANA
+share/mutt/charmaps/JIS_X0201
+share/mutt/charmaps/JUS_I.B1.002
+share/mutt/charmaps/JUS_I.B1.003-MAC
+share/mutt/charmaps/JUS_I.B1.003-SERB
+share/mutt/charmaps/KOI-8
+share/mutt/charmaps/KOI8-R
+share/mutt/charmaps/KSC5636
+share/mutt/charmaps/LATIN-GREEK
+share/mutt/charmaps/LATIN-GREEK-1
+share/mutt/charmaps/MAC-IS
+share/mutt/charmaps/MACINTOSH
+share/mutt/charmaps/MSZ_7795.3
+share/mutt/charmaps/NATS-DANO
+share/mutt/charmaps/NATS-DANO-ADD
+share/mutt/charmaps/NATS-SEFI
+share/mutt/charmaps/NATS-SEFI-ADD
+share/mutt/charmaps/NC_NC00-10
+share/mutt/charmaps/NEXTSTEP
+share/mutt/charmaps/NF_Z_62-010
+share/mutt/charmaps/NF_Z_62-010-1973
+share/mutt/charmaps/NS_4551-1
+share/mutt/charmaps/NS_4551-2
+share/mutt/charmaps/PT
+share/mutt/charmaps/PT2
+share/mutt/charmaps/SAMI
+share/mutt/charmaps/SEN_850200_B
+share/mutt/charmaps/SEN_850200_C
+share/mutt/charmaps/T.101-G2
+share/mutt/charmaps/T.61-7BIT
+share/mutt/charmaps/T.61-8BIT
+share/mutt/charmaps/VIDEOTEX-SUPPL
share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
share/locale/de/LC_MESSAGES/mutt.mo
share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
share/locale/es/LC_MESSAGES/mutt.mo
share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
share/locale/id/LC_MESSAGES/mutt.mo
share/locale/it/LC_MESSAGES/mutt.mo
share/locale/ko/LC_MESSAGES/mutt.mo
@@ -175,6 +181,7 @@ share/locale/pl/LC_MESSAGES/mutt.mo
share/locale/pt_BR/LC_MESSAGES/mutt.mo
share/locale/ru/LC_MESSAGES/mutt.mo
share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
share/locale/uk/LC_MESSAGES/mutt.mo
share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
share/doc/mutt/manual.txt
@@ -182,6 +189,17 @@ share/doc/mutt/PGP-Notes.txt
share/doc/mutt/sample.muttrc
share/doc/mutt/Mush.rc
share/doc/mutt/Pine.rc
-@dirrm share/mutt/charsets
+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
+@dirrm share/mutt/charmaps
@dirrm share/mutt
+@dirrm share/doc/mutt/samples
@dirrm share/doc/mutt
diff --git a/mail/mutt/pkg-plist.htmlfiles b/mail/mutt/pkg-plist.htmlfiles
index bc9fa567f4e8..ed96b474b3d6 100644
--- a/mail/mutt/pkg-plist.htmlfiles
+++ b/mail/mutt/pkg-plist.htmlfiles
@@ -1,262 +1,316 @@
share/doc/mutt/manual.latin1
-share/doc/mutt/manual.html
-share/doc/mutt/manual1.html
-share/doc/mutt/manual10.html
-share/doc/mutt/manual100.html
-share/doc/mutt/manual101.html
-share/doc/mutt/manual102.html
-share/doc/mutt/manual103.html
-share/doc/mutt/manual104.html
-share/doc/mutt/manual105.html
-share/doc/mutt/manual106.html
-share/doc/mutt/manual107.html
-share/doc/mutt/manual108.html
-share/doc/mutt/manual109.html
-share/doc/mutt/manual11.html
-share/doc/mutt/manual110.html
-share/doc/mutt/manual111.html
-share/doc/mutt/manual112.html
-share/doc/mutt/manual113.html
-share/doc/mutt/manual114.html
-share/doc/mutt/manual115.html
-share/doc/mutt/manual116.html
-share/doc/mutt/manual117.html
-share/doc/mutt/manual118.html
-share/doc/mutt/manual119.html
-share/doc/mutt/manual12.html
-share/doc/mutt/manual120.html
-share/doc/mutt/manual121.html
-share/doc/mutt/manual122.html
-share/doc/mutt/manual123.html
-share/doc/mutt/manual124.html
-share/doc/mutt/manual125.html
-share/doc/mutt/manual126.html
-share/doc/mutt/manual127.html
-share/doc/mutt/manual128.html
-share/doc/mutt/manual129.html
-share/doc/mutt/manual13.html
-share/doc/mutt/manual130.html
-share/doc/mutt/manual131.html
-share/doc/mutt/manual132.html
-share/doc/mutt/manual133.html
-share/doc/mutt/manual134.html
-share/doc/mutt/manual135.html
-share/doc/mutt/manual136.html
-share/doc/mutt/manual137.html
-share/doc/mutt/manual138.html
-share/doc/mutt/manual139.html
-share/doc/mutt/manual14.html
-share/doc/mutt/manual140.html
-share/doc/mutt/manual141.html
-share/doc/mutt/manual142.html
-share/doc/mutt/manual143.html
-share/doc/mutt/manual144.html
-share/doc/mutt/manual145.html
-share/doc/mutt/manual146.html
-share/doc/mutt/manual147.html
-share/doc/mutt/manual148.html
-share/doc/mutt/manual149.html
-share/doc/mutt/manual15.html
-share/doc/mutt/manual150.html
-share/doc/mutt/manual151.html
-share/doc/mutt/manual152.html
-share/doc/mutt/manual153.html
-share/doc/mutt/manual154.html
-share/doc/mutt/manual155.html
-share/doc/mutt/manual156.html
-share/doc/mutt/manual157.html
-share/doc/mutt/manual158.html
-share/doc/mutt/manual159.html
-share/doc/mutt/manual16.html
-share/doc/mutt/manual160.html
-share/doc/mutt/manual161.html
-share/doc/mutt/manual162.html
-share/doc/mutt/manual163.html
-share/doc/mutt/manual164.html
-share/doc/mutt/manual165.html
-share/doc/mutt/manual166.html
-share/doc/mutt/manual167.html
-share/doc/mutt/manual168.html
-share/doc/mutt/manual169.html
-share/doc/mutt/manual17.html
-share/doc/mutt/manual170.html
-share/doc/mutt/manual171.html
-share/doc/mutt/manual172.html
-share/doc/mutt/manual173.html
-share/doc/mutt/manual174.html
-share/doc/mutt/manual175.html
-share/doc/mutt/manual176.html
-share/doc/mutt/manual177.html
-share/doc/mutt/manual178.html
-share/doc/mutt/manual179.html
-share/doc/mutt/manual18.html
-share/doc/mutt/manual180.html
-share/doc/mutt/manual181.html
-share/doc/mutt/manual182.html
-share/doc/mutt/manual183.html
-share/doc/mutt/manual184.html
-share/doc/mutt/manual185.html
-share/doc/mutt/manual186.html
-share/doc/mutt/manual187.html
-share/doc/mutt/manual188.html
-share/doc/mutt/manual189.html
-share/doc/mutt/manual19.html
-share/doc/mutt/manual190.html
-share/doc/mutt/manual191.html
-share/doc/mutt/manual192.html
-share/doc/mutt/manual193.html
-share/doc/mutt/manual194.html
-share/doc/mutt/manual195.html
-share/doc/mutt/manual196.html
-share/doc/mutt/manual197.html
-share/doc/mutt/manual198.html
-share/doc/mutt/manual199.html
-share/doc/mutt/manual2.html
-share/doc/mutt/manual20.html
-share/doc/mutt/manual200.html
-share/doc/mutt/manual201.html
-share/doc/mutt/manual202.html
-share/doc/mutt/manual203.html
-share/doc/mutt/manual204.html
-share/doc/mutt/manual205.html
-share/doc/mutt/manual206.html
-share/doc/mutt/manual207.html
-share/doc/mutt/manual208.html
-share/doc/mutt/manual209.html
-share/doc/mutt/manual21.html
-share/doc/mutt/manual210.html
-share/doc/mutt/manual211.html
-share/doc/mutt/manual212.html
-share/doc/mutt/manual213.html
-share/doc/mutt/manual214.html
-share/doc/mutt/manual215.html
-share/doc/mutt/manual216.html
-share/doc/mutt/manual217.html
-share/doc/mutt/manual218.html
-share/doc/mutt/manual219.html
-share/doc/mutt/manual22.html
-share/doc/mutt/manual220.html
-share/doc/mutt/manual221.html
-share/doc/mutt/manual222.html
-share/doc/mutt/manual223.html
-share/doc/mutt/manual224.html
-share/doc/mutt/manual225.html
-share/doc/mutt/manual226.html
-share/doc/mutt/manual227.html
-share/doc/mutt/manual228.html
-share/doc/mutt/manual229.html
-share/doc/mutt/manual23.html
-share/doc/mutt/manual230.html
-share/doc/mutt/manual231.html
-share/doc/mutt/manual232.html
-share/doc/mutt/manual233.html
-share/doc/mutt/manual234.html
-share/doc/mutt/manual235.html
-share/doc/mutt/manual236.html
-share/doc/mutt/manual237.html
-share/doc/mutt/manual238.html
-share/doc/mutt/manual239.html
-share/doc/mutt/manual24.html
-share/doc/mutt/manual240.html
-share/doc/mutt/manual241.html
-share/doc/mutt/manual242.html
-share/doc/mutt/manual243.html
-share/doc/mutt/manual244.html
-share/doc/mutt/manual245.html
-share/doc/mutt/manual246.html
-share/doc/mutt/manual247.html
-share/doc/mutt/manual248.html
-share/doc/mutt/manual249.html
-share/doc/mutt/manual25.html
-share/doc/mutt/manual250.html
-share/doc/mutt/manual251.html
-share/doc/mutt/manual252.html
-share/doc/mutt/manual253.html
-share/doc/mutt/manual254.html
-share/doc/mutt/manual255.html
-share/doc/mutt/manual256.html
-share/doc/mutt/manual257.html
-share/doc/mutt/manual258.html
-share/doc/mutt/manual259.html
-share/doc/mutt/manual26.html
-share/doc/mutt/manual27.html
-share/doc/mutt/manual28.html
-share/doc/mutt/manual29.html
-share/doc/mutt/manual3.html
-share/doc/mutt/manual30.html
-share/doc/mutt/manual31.html
-share/doc/mutt/manual32.html
-share/doc/mutt/manual33.html
-share/doc/mutt/manual34.html
-share/doc/mutt/manual35.html
-share/doc/mutt/manual36.html
-share/doc/mutt/manual37.html
-share/doc/mutt/manual38.html
-share/doc/mutt/manual39.html
-share/doc/mutt/manual4.html
-share/doc/mutt/manual40.html
-share/doc/mutt/manual41.html
-share/doc/mutt/manual42.html
-share/doc/mutt/manual43.html
-share/doc/mutt/manual44.html
-share/doc/mutt/manual45.html
-share/doc/mutt/manual46.html
-share/doc/mutt/manual47.html
-share/doc/mutt/manual48.html
-share/doc/mutt/manual49.html
-share/doc/mutt/manual5.html
-share/doc/mutt/manual50.html
-share/doc/mutt/manual51.html
-share/doc/mutt/manual52.html
-share/doc/mutt/manual53.html
-share/doc/mutt/manual54.html
-share/doc/mutt/manual55.html
-share/doc/mutt/manual56.html
-share/doc/mutt/manual57.html
-share/doc/mutt/manual58.html
-share/doc/mutt/manual59.html
-share/doc/mutt/manual6.html
-share/doc/mutt/manual60.html
-share/doc/mutt/manual61.html
-share/doc/mutt/manual62.html
-share/doc/mutt/manual63.html
-share/doc/mutt/manual64.html
-share/doc/mutt/manual65.html
-share/doc/mutt/manual66.html
-share/doc/mutt/manual67.html
-share/doc/mutt/manual68.html
-share/doc/mutt/manual69.html
-share/doc/mutt/manual7.html
-share/doc/mutt/manual70.html
-share/doc/mutt/manual71.html
-share/doc/mutt/manual72.html
-share/doc/mutt/manual73.html
-share/doc/mutt/manual74.html
-share/doc/mutt/manual75.html
-share/doc/mutt/manual76.html
-share/doc/mutt/manual77.html
-share/doc/mutt/manual78.html
-share/doc/mutt/manual79.html
-share/doc/mutt/manual8.html
-share/doc/mutt/manual80.html
-share/doc/mutt/manual81.html
-share/doc/mutt/manual82.html
-share/doc/mutt/manual83.html
-share/doc/mutt/manual84.html
-share/doc/mutt/manual85.html
-share/doc/mutt/manual86.html
-share/doc/mutt/manual87.html
-share/doc/mutt/manual88.html
-share/doc/mutt/manual89.html
-share/doc/mutt/manual9.html
-share/doc/mutt/manual90.html
-share/doc/mutt/manual91.html
-share/doc/mutt/manual92.html
-share/doc/mutt/manual93.html
-share/doc/mutt/manual94.html
-share/doc/mutt/manual95.html
-share/doc/mutt/manual96.html
-share/doc/mutt/manual97.html
-share/doc/mutt/manual98.html
-share/doc/mutt/manual99.html
-share/doc/mutt/manual_toc.html
+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/html/manual.html
+share/doc/mutt/html/manual1.html
+share/doc/mutt/html/manual10.html
+share/doc/mutt/html/manual100.html
+share/doc/mutt/html/manual101.html
+share/doc/mutt/html/manual102.html
+share/doc/mutt/html/manual103.html
+share/doc/mutt/html/manual104.html
+share/doc/mutt/html/manual105.html
+share/doc/mutt/html/manual106.html
+share/doc/mutt/html/manual107.html
+share/doc/mutt/html/manual108.html
+share/doc/mutt/html/manual109.html
+share/doc/mutt/html/manual11.html
+share/doc/mutt/html/manual110.html
+share/doc/mutt/html/manual111.html
+share/doc/mutt/html/manual112.html
+share/doc/mutt/html/manual113.html
+share/doc/mutt/html/manual114.html
+share/doc/mutt/html/manual115.html
+share/doc/mutt/html/manual116.html
+share/doc/mutt/html/manual117.html
+share/doc/mutt/html/manual118.html
+share/doc/mutt/html/manual119.html
+share/doc/mutt/html/manual12.html
+share/doc/mutt/html/manual120.html
+share/doc/mutt/html/manual121.html
+share/doc/mutt/html/manual122.html
+share/doc/mutt/html/manual123.html
+share/doc/mutt/html/manual124.html
+share/doc/mutt/html/manual125.html
+share/doc/mutt/html/manual126.html
+share/doc/mutt/html/manual127.html
+share/doc/mutt/html/manual128.html
+share/doc/mutt/html/manual129.html
+share/doc/mutt/html/manual13.html
+share/doc/mutt/html/manual130.html
+share/doc/mutt/html/manual131.html
+share/doc/mutt/html/manual132.html
+share/doc/mutt/html/manual133.html
+share/doc/mutt/html/manual134.html
+share/doc/mutt/html/manual135.html
+share/doc/mutt/html/manual136.html
+share/doc/mutt/html/manual137.html
+share/doc/mutt/html/manual138.html
+share/doc/mutt/html/manual139.html
+share/doc/mutt/html/manual14.html
+share/doc/mutt/html/manual140.html
+share/doc/mutt/html/manual141.html
+share/doc/mutt/html/manual142.html
+share/doc/mutt/html/manual143.html
+share/doc/mutt/html/manual144.html
+share/doc/mutt/html/manual145.html
+share/doc/mutt/html/manual146.html
+share/doc/mutt/html/manual147.html
+share/doc/mutt/html/manual148.html
+share/doc/mutt/html/manual149.html
+share/doc/mutt/html/manual15.html
+share/doc/mutt/html/manual150.html
+share/doc/mutt/html/manual151.html
+share/doc/mutt/html/manual152.html
+share/doc/mutt/html/manual153.html
+share/doc/mutt/html/manual154.html
+share/doc/mutt/html/manual155.html
+share/doc/mutt/html/manual156.html
+share/doc/mutt/html/manual157.html
+share/doc/mutt/html/manual158.html
+share/doc/mutt/html/manual159.html
+share/doc/mutt/html/manual16.html
+share/doc/mutt/html/manual160.html
+share/doc/mutt/html/manual161.html
+share/doc/mutt/html/manual162.html
+share/doc/mutt/html/manual163.html
+share/doc/mutt/html/manual164.html
+share/doc/mutt/html/manual165.html
+share/doc/mutt/html/manual166.html
+share/doc/mutt/html/manual167.html
+share/doc/mutt/html/manual168.html
+share/doc/mutt/html/manual169.html
+share/doc/mutt/html/manual17.html
+share/doc/mutt/html/manual170.html
+share/doc/mutt/html/manual171.html
+share/doc/mutt/html/manual172.html
+share/doc/mutt/html/manual173.html
+share/doc/mutt/html/manual174.html
+share/doc/mutt/html/manual175.html
+share/doc/mutt/html/manual176.html
+share/doc/mutt/html/manual177.html
+share/doc/mutt/html/manual178.html
+share/doc/mutt/html/manual179.html
+share/doc/mutt/html/manual18.html
+share/doc/mutt/html/manual180.html
+share/doc/mutt/html/manual181.html
+share/doc/mutt/html/manual182.html
+share/doc/mutt/html/manual183.html
+share/doc/mutt/html/manual184.html
+share/doc/mutt/html/manual185.html
+share/doc/mutt/html/manual186.html
+share/doc/mutt/html/manual187.html
+share/doc/mutt/html/manual188.html
+share/doc/mutt/html/manual189.html
+share/doc/mutt/html/manual19.html
+share/doc/mutt/html/manual190.html
+share/doc/mutt/html/manual191.html
+share/doc/mutt/html/manual192.html
+share/doc/mutt/html/manual193.html
+share/doc/mutt/html/manual194.html
+share/doc/mutt/html/manual195.html
+share/doc/mutt/html/manual196.html
+share/doc/mutt/html/manual197.html
+share/doc/mutt/html/manual198.html
+share/doc/mutt/html/manual199.html
+share/doc/mutt/html/manual2.html
+share/doc/mutt/html/manual20.html
+share/doc/mutt/html/manual200.html
+share/doc/mutt/html/manual201.html
+share/doc/mutt/html/manual202.html
+share/doc/mutt/html/manual203.html
+share/doc/mutt/html/manual204.html
+share/doc/mutt/html/manual205.html
+share/doc/mutt/html/manual206.html
+share/doc/mutt/html/manual207.html
+share/doc/mutt/html/manual208.html
+share/doc/mutt/html/manual209.html
+share/doc/mutt/html/manual21.html
+share/doc/mutt/html/manual210.html
+share/doc/mutt/html/manual211.html
+share/doc/mutt/html/manual212.html
+share/doc/mutt/html/manual213.html
+share/doc/mutt/html/manual214.html
+share/doc/mutt/html/manual215.html
+share/doc/mutt/html/manual216.html
+share/doc/mutt/html/manual217.html
+share/doc/mutt/html/manual218.html
+share/doc/mutt/html/manual219.html
+share/doc/mutt/html/manual22.html
+share/doc/mutt/html/manual220.html
+share/doc/mutt/html/manual221.html
+share/doc/mutt/html/manual222.html
+share/doc/mutt/html/manual223.html
+share/doc/mutt/html/manual224.html
+share/doc/mutt/html/manual225.html
+share/doc/mutt/html/manual226.html
+share/doc/mutt/html/manual227.html
+share/doc/mutt/html/manual228.html
+share/doc/mutt/html/manual229.html
+share/doc/mutt/html/manual23.html
+share/doc/mutt/html/manual230.html
+share/doc/mutt/html/manual231.html
+share/doc/mutt/html/manual232.html
+share/doc/mutt/html/manual233.html
+share/doc/mutt/html/manual234.html
+share/doc/mutt/html/manual235.html
+share/doc/mutt/html/manual236.html
+share/doc/mutt/html/manual237.html
+share/doc/mutt/html/manual238.html
+share/doc/mutt/html/manual239.html
+share/doc/mutt/html/manual24.html
+share/doc/mutt/html/manual240.html
+share/doc/mutt/html/manual241.html
+share/doc/mutt/html/manual242.html
+share/doc/mutt/html/manual243.html
+share/doc/mutt/html/manual244.html
+share/doc/mutt/html/manual245.html
+share/doc/mutt/html/manual246.html
+share/doc/mutt/html/manual247.html
+share/doc/mutt/html/manual248.html
+share/doc/mutt/html/manual249.html
+share/doc/mutt/html/manual25.html
+share/doc/mutt/html/manual250.html
+share/doc/mutt/html/manual251.html
+share/doc/mutt/html/manual252.html
+share/doc/mutt/html/manual253.html
+share/doc/mutt/html/manual254.html
+share/doc/mutt/html/manual255.html
+share/doc/mutt/html/manual256.html
+share/doc/mutt/html/manual257.html
+share/doc/mutt/html/manual258.html
+share/doc/mutt/html/manual259.html
+share/doc/mutt/html/manual26.html
+share/doc/mutt/html/manual260.html
+share/doc/mutt/html/manual261.html
+share/doc/mutt/html/manual262.html
+share/doc/mutt/html/manual263.html
+share/doc/mutt/html/manual264.html
+share/doc/mutt/html/manual265.html
+share/doc/mutt/html/manual266.html
+share/doc/mutt/html/manual267.html
+share/doc/mutt/html/manual268.html
+share/doc/mutt/html/manual269.html
+share/doc/mutt/html/manual27.html
+share/doc/mutt/html/manual270.html
+share/doc/mutt/html/manual271.html
+share/doc/mutt/html/manual272.html
+share/doc/mutt/html/manual273.html
+share/doc/mutt/html/manual274.html
+share/doc/mutt/html/manual275.html
+share/doc/mutt/html/manual276.html
+share/doc/mutt/html/manual277.html
+share/doc/mutt/html/manual278.html
+share/doc/mutt/html/manual279.html
+share/doc/mutt/html/manual28.html
+share/doc/mutt/html/manual280.html
+share/doc/mutt/html/manual281.html
+share/doc/mutt/html/manual282.html
+share/doc/mutt/html/manual283.html
+share/doc/mutt/html/manual284.html
+share/doc/mutt/html/manual285.html
+share/doc/mutt/html/manual286.html
+share/doc/mutt/html/manual287.html
+share/doc/mutt/html/manual288.html
+share/doc/mutt/html/manual289.html
+share/doc/mutt/html/manual29.html
+share/doc/mutt/html/manual290.html
+share/doc/mutt/html/manual291.html
+share/doc/mutt/html/manual292.html
+share/doc/mutt/html/manual293.html
+share/doc/mutt/html/manual294.html
+share/doc/mutt/html/manual295.html
+share/doc/mutt/html/manual296.html
+share/doc/mutt/html/manual297.html
+share/doc/mutt/html/manual298.html
+share/doc/mutt/html/manual299.html
+share/doc/mutt/html/manual3.html
+share/doc/mutt/html/manual30.html
+share/doc/mutt/html/manual300.html
+share/doc/mutt/html/manual301.html
+share/doc/mutt/html/manual302.html
+share/doc/mutt/html/manual303.html
+share/doc/mutt/html/manual304.html
+share/doc/mutt/html/manual31.html
+share/doc/mutt/html/manual32.html
+share/doc/mutt/html/manual33.html
+share/doc/mutt/html/manual34.html
+share/doc/mutt/html/manual35.html
+share/doc/mutt/html/manual36.html
+share/doc/mutt/html/manual37.html
+share/doc/mutt/html/manual38.html
+share/doc/mutt/html/manual39.html
+share/doc/mutt/html/manual4.html
+share/doc/mutt/html/manual40.html
+share/doc/mutt/html/manual41.html
+share/doc/mutt/html/manual42.html
+share/doc/mutt/html/manual43.html
+share/doc/mutt/html/manual44.html
+share/doc/mutt/html/manual45.html
+share/doc/mutt/html/manual46.html
+share/doc/mutt/html/manual47.html
+share/doc/mutt/html/manual48.html
+share/doc/mutt/html/manual49.html
+share/doc/mutt/html/manual5.html
+share/doc/mutt/html/manual50.html
+share/doc/mutt/html/manual51.html
+share/doc/mutt/html/manual52.html
+share/doc/mutt/html/manual53.html
+share/doc/mutt/html/manual54.html
+share/doc/mutt/html/manual55.html
+share/doc/mutt/html/manual56.html
+share/doc/mutt/html/manual57.html
+share/doc/mutt/html/manual58.html
+share/doc/mutt/html/manual59.html
+share/doc/mutt/html/manual6.html
+share/doc/mutt/html/manual60.html
+share/doc/mutt/html/manual61.html
+share/doc/mutt/html/manual62.html
+share/doc/mutt/html/manual63.html
+share/doc/mutt/html/manual64.html
+share/doc/mutt/html/manual65.html
+share/doc/mutt/html/manual66.html
+share/doc/mutt/html/manual67.html
+share/doc/mutt/html/manual68.html
+share/doc/mutt/html/manual69.html
+share/doc/mutt/html/manual7.html
+share/doc/mutt/html/manual70.html
+share/doc/mutt/html/manual71.html
+share/doc/mutt/html/manual72.html
+share/doc/mutt/html/manual73.html
+share/doc/mutt/html/manual74.html
+share/doc/mutt/html/manual75.html
+share/doc/mutt/html/manual76.html
+share/doc/mutt/html/manual77.html
+share/doc/mutt/html/manual78.html
+share/doc/mutt/html/manual79.html
+share/doc/mutt/html/manual8.html
+share/doc/mutt/html/manual80.html
+share/doc/mutt/html/manual81.html
+share/doc/mutt/html/manual82.html
+share/doc/mutt/html/manual83.html
+share/doc/mutt/html/manual84.html
+share/doc/mutt/html/manual85.html
+share/doc/mutt/html/manual86.html
+share/doc/mutt/html/manual87.html
+share/doc/mutt/html/manual88.html
+share/doc/mutt/html/manual89.html
+share/doc/mutt/html/manual9.html
+share/doc/mutt/html/manual90.html
+share/doc/mutt/html/manual91.html
+share/doc/mutt/html/manual92.html
+share/doc/mutt/html/manual93.html
+share/doc/mutt/html/manual94.html
+share/doc/mutt/html/manual95.html
+share/doc/mutt/html/manual96.html
+share/doc/mutt/html/manual97.html
+share/doc/mutt/html/manual98.html
+share/doc/mutt/html/manual99.html
+share/doc/mutt/html/manual_toc.html
+@dirrm share/doc/mutt/html
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 07a0392e0eb0..2ee30513a4b8 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= mutt
-PORTVERSION= 1.0.1
+PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -18,6 +18,8 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
DISTNAME= ${PKGNAME}i
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
@@ -43,6 +45,9 @@ LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses
.elif defined(WITH_SLANG)
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
.endif
+.if defined(WITH_SSL)
+USE_OPENSSL= RSA
+.endif
.if defined(PACKAGE_BUILDING)
RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
.endif
@@ -52,21 +57,25 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
--with-sharedir=${PREFIX}/share/mutt \
- --with-docdir=${PREFIX}/share/doc/mutt
+ --with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
.if defined(BATCH) || defined(WITH_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
.elif defined(WITH_NCURSES_PORT)
CONFIGURE_ARGS+= --with-curses=${PREFIX}
.endif
+.if defined(WITH_SSL)
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
+.endif
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
MAN1= mutt.1 mutt_dotlock.1
+MAN5= muttrc.5
-post-patch:
- uudecode -p ${FILESDIR}/ru.gmo.uu > ${WRKSRC}/po/ru.gmo
+pre-patch:
+ (cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
.if !defined(NOPORTDOCS)
post-build:
- ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+ ${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
ed -s ${WRKSRC}/doc/mutt.man
@@ -86,8 +95,9 @@ post-install:
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
${PREFIX}/share/doc/mutt
.if defined(BATCH)
+ ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
- ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
.endif
@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
${PREFIX}/share/doc/mutt
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index de8a6ea3af56..ef4bfc3fc7b2 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1 +1,2 @@
-MD5 (mutt/mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
+MD5 (mutt/mutt-1.2i.tar.gz) = 133cf5d620922bc317b95d6e5187ceb6
+MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
deleted file mode 100644
index 2233a67ac3c7..000000000000
--- a/mail/mutt14/files/patch-01
+++ /dev/null
@@ -1,10 +0,0 @@
---- charsets/charsets.alias.orig Mon Jan 4 15:55:56 1999
-+++ charsets/charsets.alias Sat Jan 9 10:45:04 1999
-@@ -21,6 +21,7 @@
- iso-ir-47 bs-viewdata
- ms-ee cp1250
- ms-cyrl cp1251
-+windows-1251 cp1251
- ms-ansi cp1252
- ms-greek cp1253
- ms-turk cp1254
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
index fab62611d3e8..b82a36a2e3a9 100644
--- a/mail/mutt14/files/patch-02
+++ b/mail/mutt14/files/patch-02
@@ -1,54 +1,76 @@
---- doc/Makefile.in.orig Thu Nov 19 06:10:19 1998
-+++ doc/Makefile.in Sat Dec 12 11:10:45 1998
-@@ -43,7 +43,7 @@
- DOCFILES = manual.txt
+--- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000
++++ doc/Makefile.in Fri May 12 13:12:32 2000
+@@ -58,13 +58,16 @@
+ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
+ README NEWS TODO README.SECURITY README.SSL README.UPGRADE
+-all: muttrc.man try-html try-txt
++all: muttrc.man try-html try-txt try-latin1
--all: mutt.man dotlock.man try-html try-txt
-+all: mutt.man dotlock.man try-html try-txt try-latin1
+ try-html: ../makedoc
+- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
- complete: all html
-
-@@ -57,19 +57,22 @@
- try-txt:
- -$(MAKE) manual.txt
-
-+try-latin1:
-+ -$(MAKE) manual.latin1
+ try-txt: ../makedoc
+- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
+
- html: manual.html
++try-latin1:
++ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
- install: dotlock.man mutt.man all
+ install: all
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- $(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+@@ -73,18 +76,18 @@
+ $(INSTALL) -m 644 $(srcdir)/dotlock.man \
+ $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-- for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-- for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-- if [ -f manual.html ] ; then \
-- $(MAKE) install-html ; \
-- fi
-+ #$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-+ #for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
-+ #if [ -f manual.html ] ; then \
-+ # $(MAKE) install-html ; \
-+ #fi
-
- install-html: html
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-@@ -84,7 +87,11 @@
- sgml2txt -c latin manual
+- for f in $(srcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- for f in $(topsrcdir_DOCFILES) ; do \
+- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+- done
+- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+- for file in manual*.html ; do \
+- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+- done
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++ # for f in $(srcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # for f in $(topsrcdir_DOCFILES) ; do \
++ # $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
++ # done
++ # $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
++ # for file in manual*.html ; do \
++ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
++ # done
+
+ uninstall:
+ -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
+@@ -93,14 +96,18 @@
+ -rm -rf $(DESTDIR)$(docdir)
+
+ manual.txt: manual.sgml
+- if sgml2txt -c latin manual ; then \
+- uniq < manual.txt | expand > _manual.txt ; \
+- rm manual.txt ; \
++ if sgmlfmt -f ascii manual; then \
++ uniq < manual.ascii | expand > _manual.txt ; \
++ rm -f manual.txt manual.ascii; \
+ mv _manual.txt manual.txt ;\
+ fi
manual.html: manual.sgml
-- sgml2html manual
-+ @# sgml2html manual
-+ sgmlfmt -f html manual
+- sgml2html manual || true
++ @# sgml2html manual || true
++ sgmlfmt -f html manual || true
+
+manual.latin1: manual.sgml
-+ sgmlfmt -f latin1 manual.sgml
++ sgmlfmt -f latin1 manual || true
- clean:
- rm -f *~ *.html *.orig *.rej *.man manual.sgml
+ manual.ps: manual.sgml
+ sgml2latex --output=ps manual || true
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
index 82571384c793..b870f7f7aaec 100644
--- a/mail/mutt14/files/patch-03
+++ b/mail/mutt14/files/patch-03
@@ -1,11 +1,13 @@
---- doc/manual.sgml.in.orig Tue Dec 8 13:20:07 1998
-+++ doc/manual.sgml.in Sat Dec 12 09:03:23 1998
-@@ -1,4 +1,7 @@
+--- doc/manual.sgml.orig Tue May 9 17:15:26 2000
++++ doc/manual.sgml Fri May 12 11:05:40 2000
+@@ -1,5 +1,8 @@
-<!doctype linuxdoc system>
+-
+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
+<!ENTITY dquot "&#34;">
+]>
+<linuxdoc>
-
++
<article>
+ <title>The Mutt E-Mail Client
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
index 6b295ff74d8a..364bc49a259d 100644
--- a/mail/mutt14/files/patch-05
+++ b/mail/mutt14/files/patch-05
@@ -74,9 +74,9 @@
{
case 1: /* (e)ncrypt */
bits |= PGPENCRYPT;
---- lib.c.orig Wed Jul 7 02:25:45 1999
-+++ lib.c Sun Sep 26 23:46:25 1999
-@@ -859,7 +859,7 @@
+--- muttlib.c.orig Sun Apr 9 14:39:02 2000
++++ muttlib.c Fri May 12 11:26:58 2000
+@@ -671,7 +671,7 @@
if (*append == 0 && access (fname, F_OK) == 0)
{
switch (mutt_multi_choice
diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08
index 2d607bc2f343..3e50cbd13779 100644
--- a/mail/mutt14/files/patch-08
+++ b/mail/mutt14/files/patch-08
@@ -1,11 +1,10 @@
---- Muttrc.in.original Wed Jul 22 10:47:49 1998
-+++ Muttrc.in Wed Jul 22 10:48:02 1998
-@@ -60,7 +60,7 @@
- # unset fcc_attach
- # set folder="~/Mail"
- # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
--# set followup_to
-+unset followup_to
- # unset force_name
- # set forward_decode
- # set forward_format="[%a: %s]"
+--- Muttrc.orig Sat May 13 08:30:44 2000
++++ Muttrc Sat May 13 08:32:05 2000
+@@ -629,6 +629,7 @@
+ # Type: boolean
+ # Default: yes
+ #
++set followup_to=no
+ #
+ # Controls whether or not the Mail-Followup-To header field is
+ # generated when sending mail. When set, Mutt will generate this
diff --git a/mail/mutt14/files/patch-Makefile.in b/mail/mutt14/files/patch-Makefile.in
new file mode 100644
index 000000000000..5e33d7c1abdf
--- /dev/null
+++ b/mail/mutt14/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue May 9 17:15:37 2000
++++ Makefile.in Fri May 12 13:53:08 2000
+@@ -210,7 +210,7 @@
+ SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
+ OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
+
+-all: all-redirect
++all: $(BUILT_SOURCES) all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index 325e87bc5b65..1c440afd699f 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -1,172 +1,178 @@
bin/mutt
bin/mutt_dotlock
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
etc/Muttrc
etc/mime.types
-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/charsets.alias
-share/mutt/charsets/charsets.alias.dist
-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-ca-fr
-share/mutt/charsets/ebcdic-dk-no
-share/mutt/charsets/ebcdic-dk-no-a
-share/mutt/charsets/ebcdic-es
-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/greek-ccitt
-share/mutt/charsets/greek7
-share/mutt/charsets/greek7-old
-share/mutt/charsets/hp-roman8
-share/mutt/charsets/ibm037
-share/mutt/charsets/ibm038
-share/mutt/charsets/ibm1004
-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/it
-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/mac-is
-share/mutt/charsets/macintosh
-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/charmaps/ANSI_X3.110-1983
+share/mutt/charmaps/ANSI_X3.4-1968
+share/mutt/charmaps/ASMO_449
+share/mutt/charmaps/BALTIC
+share/mutt/charmaps/BS_4730
+share/mutt/charmaps/BS_VIEWDATA
+share/mutt/charmaps/CP1250
+share/mutt/charmaps/CP1251
+share/mutt/charmaps/CP1252
+share/mutt/charmaps/CP1253
+share/mutt/charmaps/CP1254
+share/mutt/charmaps/CP1255
+share/mutt/charmaps/CP1256
+share/mutt/charmaps/CP1257
+share/mutt/charmaps/CSA_Z243.4-1985-1
+share/mutt/charmaps/CSA_Z243.4-1985-2
+share/mutt/charmaps/CSA_Z243.4-1985-GR
+share/mutt/charmaps/CSN_369103
+share/mutt/charmaps/CWI
+share/mutt/charmaps/DEC-MCS
+share/mutt/charmaps/DIN_66003
+share/mutt/charmaps/DS_2089
+share/mutt/charmaps/EBCDIC-AT-DE
+share/mutt/charmaps/EBCDIC-AT-DE-A
+share/mutt/charmaps/EBCDIC-CA-FR
+share/mutt/charmaps/EBCDIC-DK-NO
+share/mutt/charmaps/EBCDIC-DK-NO-A
+share/mutt/charmaps/EBCDIC-ES
+share/mutt/charmaps/EBCDIC-ES-A
+share/mutt/charmaps/EBCDIC-ES-S
+share/mutt/charmaps/EBCDIC-FI-SE
+share/mutt/charmaps/EBCDIC-FI-SE-A
+share/mutt/charmaps/EBCDIC-FR
+share/mutt/charmaps/EBCDIC-IS-FRISS
+share/mutt/charmaps/EBCDIC-IT
+share/mutt/charmaps/EBCDIC-PT
+share/mutt/charmaps/EBCDIC-UK
+share/mutt/charmaps/EBCDIC-US
+share/mutt/charmaps/ECMA-CYRILLIC
+share/mutt/charmaps/ES
+share/mutt/charmaps/ES2
+share/mutt/charmaps/GB_1988-80
+share/mutt/charmaps/GOST_19768-74
+share/mutt/charmaps/GREEK-CCITT
+share/mutt/charmaps/GREEK7
+share/mutt/charmaps/GREEK7-OLD
+share/mutt/charmaps/HP-ROMAN8
+share/mutt/charmaps/IBM037
+share/mutt/charmaps/IBM038
+share/mutt/charmaps/IBM1004
+share/mutt/charmaps/IBM1026
+share/mutt/charmaps/IBM1047
+share/mutt/charmaps/IBM256
+share/mutt/charmaps/IBM273
+share/mutt/charmaps/IBM274
+share/mutt/charmaps/IBM275
+share/mutt/charmaps/IBM277
+share/mutt/charmaps/IBM278
+share/mutt/charmaps/IBM280
+share/mutt/charmaps/IBM281
+share/mutt/charmaps/IBM284
+share/mutt/charmaps/IBM285
+share/mutt/charmaps/IBM290
+share/mutt/charmaps/IBM297
+share/mutt/charmaps/IBM420
+share/mutt/charmaps/IBM423
+share/mutt/charmaps/IBM424
+share/mutt/charmaps/IBM437
+share/mutt/charmaps/IBM500
+share/mutt/charmaps/IBM850
+share/mutt/charmaps/IBM851
+share/mutt/charmaps/IBM852
+share/mutt/charmaps/IBM855
+share/mutt/charmaps/IBM857
+share/mutt/charmaps/IBM860
+share/mutt/charmaps/IBM861
+share/mutt/charmaps/IBM862
+share/mutt/charmaps/IBM863
+share/mutt/charmaps/IBM864
+share/mutt/charmaps/IBM865
+share/mutt/charmaps/IBM868
+share/mutt/charmaps/IBM869
+share/mutt/charmaps/IBM870
+share/mutt/charmaps/IBM871
+share/mutt/charmaps/IBM875
+share/mutt/charmaps/IBM880
+share/mutt/charmaps/IBM891
+share/mutt/charmaps/IBM903
+share/mutt/charmaps/IBM904
+share/mutt/charmaps/IBM905
+share/mutt/charmaps/IBM918
+share/mutt/charmaps/IEC_P27-1
+share/mutt/charmaps/INIS
+share/mutt/charmaps/INIS-8
+share/mutt/charmaps/INIS-CYRILLIC
+share/mutt/charmaps/INVARIANT
+share/mutt/charmaps/ISO-8859-1
+share/mutt/charmaps/ISO-8859-10
+share/mutt/charmaps/ISO-8859-2
+share/mutt/charmaps/ISO-8859-3
+share/mutt/charmaps/ISO-8859-4
+share/mutt/charmaps/ISO-8859-5
+share/mutt/charmaps/ISO-8859-6
+share/mutt/charmaps/ISO-8859-7
+share/mutt/charmaps/ISO-8859-8
+share/mutt/charmaps/ISO-8859-9
+share/mutt/charmaps/ISO-IR-90
+share/mutt/charmaps/ISO_10367-BOX
+share/mutt/charmaps/ISO_10646
+share/mutt/charmaps/ISO_2033-1983
+share/mutt/charmaps/ISO_5427
+share/mutt/charmaps/ISO_5427-EXT
+share/mutt/charmaps/ISO_5428
+share/mutt/charmaps/ISO_646.BASIC
+share/mutt/charmaps/ISO_646.IRV
+share/mutt/charmaps/ISO_6937
+share/mutt/charmaps/ISO_6937-2-25
+share/mutt/charmaps/ISO_6937-2-ADD
+share/mutt/charmaps/ISO_8859-1,GL
+share/mutt/charmaps/ISO_8859-SUPP
+share/mutt/charmaps/IT
+share/mutt/charmaps/JIS_C6220-1969-JP
+share/mutt/charmaps/JIS_C6220-1969-RO
+share/mutt/charmaps/JIS_C6229-1984-A
+share/mutt/charmaps/JIS_C6229-1984-B
+share/mutt/charmaps/JIS_C6229-1984-B-ADD
+share/mutt/charmaps/JIS_C6229-1984-HAND
+share/mutt/charmaps/JIS_C6229-1984-HAND-ADD
+share/mutt/charmaps/JIS_C6229-1984-KANA
+share/mutt/charmaps/JIS_X0201
+share/mutt/charmaps/JUS_I.B1.002
+share/mutt/charmaps/JUS_I.B1.003-MAC
+share/mutt/charmaps/JUS_I.B1.003-SERB
+share/mutt/charmaps/KOI-8
+share/mutt/charmaps/KOI8-R
+share/mutt/charmaps/KSC5636
+share/mutt/charmaps/LATIN-GREEK
+share/mutt/charmaps/LATIN-GREEK-1
+share/mutt/charmaps/MAC-IS
+share/mutt/charmaps/MACINTOSH
+share/mutt/charmaps/MSZ_7795.3
+share/mutt/charmaps/NATS-DANO
+share/mutt/charmaps/NATS-DANO-ADD
+share/mutt/charmaps/NATS-SEFI
+share/mutt/charmaps/NATS-SEFI-ADD
+share/mutt/charmaps/NC_NC00-10
+share/mutt/charmaps/NEXTSTEP
+share/mutt/charmaps/NF_Z_62-010
+share/mutt/charmaps/NF_Z_62-010-1973
+share/mutt/charmaps/NS_4551-1
+share/mutt/charmaps/NS_4551-2
+share/mutt/charmaps/PT
+share/mutt/charmaps/PT2
+share/mutt/charmaps/SAMI
+share/mutt/charmaps/SEN_850200_B
+share/mutt/charmaps/SEN_850200_C
+share/mutt/charmaps/T.101-G2
+share/mutt/charmaps/T.61-7BIT
+share/mutt/charmaps/T.61-8BIT
+share/mutt/charmaps/VIDEOTEX-SUPPL
share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
share/locale/de/LC_MESSAGES/mutt.mo
share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
share/locale/es/LC_MESSAGES/mutt.mo
share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
share/locale/id/LC_MESSAGES/mutt.mo
share/locale/it/LC_MESSAGES/mutt.mo
share/locale/ko/LC_MESSAGES/mutt.mo
@@ -175,6 +181,7 @@ share/locale/pl/LC_MESSAGES/mutt.mo
share/locale/pt_BR/LC_MESSAGES/mutt.mo
share/locale/ru/LC_MESSAGES/mutt.mo
share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
share/locale/uk/LC_MESSAGES/mutt.mo
share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
share/doc/mutt/manual.txt
@@ -182,6 +189,17 @@ share/doc/mutt/PGP-Notes.txt
share/doc/mutt/sample.muttrc
share/doc/mutt/Mush.rc
share/doc/mutt/Pine.rc
-@dirrm share/mutt/charsets
+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
+@dirrm share/mutt/charmaps
@dirrm share/mutt
+@dirrm share/doc/mutt/samples
@dirrm share/doc/mutt
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
index bc9fa567f4e8..ed96b474b3d6 100644
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ b/mail/mutt14/pkg-plist.htmlfiles
@@ -1,262 +1,316 @@
share/doc/mutt/manual.latin1
-share/doc/mutt/manual.html
-share/doc/mutt/manual1.html
-share/doc/mutt/manual10.html
-share/doc/mutt/manual100.html
-share/doc/mutt/manual101.html
-share/doc/mutt/manual102.html
-share/doc/mutt/manual103.html
-share/doc/mutt/manual104.html
-share/doc/mutt/manual105.html
-share/doc/mutt/manual106.html
-share/doc/mutt/manual107.html
-share/doc/mutt/manual108.html
-share/doc/mutt/manual109.html
-share/doc/mutt/manual11.html
-share/doc/mutt/manual110.html
-share/doc/mutt/manual111.html
-share/doc/mutt/manual112.html
-share/doc/mutt/manual113.html
-share/doc/mutt/manual114.html
-share/doc/mutt/manual115.html
-share/doc/mutt/manual116.html
-share/doc/mutt/manual117.html
-share/doc/mutt/manual118.html
-share/doc/mutt/manual119.html
-share/doc/mutt/manual12.html
-share/doc/mutt/manual120.html
-share/doc/mutt/manual121.html
-share/doc/mutt/manual122.html
-share/doc/mutt/manual123.html
-share/doc/mutt/manual124.html
-share/doc/mutt/manual125.html
-share/doc/mutt/manual126.html
-share/doc/mutt/manual127.html
-share/doc/mutt/manual128.html
-share/doc/mutt/manual129.html
-share/doc/mutt/manual13.html
-share/doc/mutt/manual130.html
-share/doc/mutt/manual131.html
-share/doc/mutt/manual132.html
-share/doc/mutt/manual133.html
-share/doc/mutt/manual134.html
-share/doc/mutt/manual135.html
-share/doc/mutt/manual136.html
-share/doc/mutt/manual137.html
-share/doc/mutt/manual138.html
-share/doc/mutt/manual139.html
-share/doc/mutt/manual14.html
-share/doc/mutt/manual140.html
-share/doc/mutt/manual141.html
-share/doc/mutt/manual142.html
-share/doc/mutt/manual143.html
-share/doc/mutt/manual144.html
-share/doc/mutt/manual145.html
-share/doc/mutt/manual146.html
-share/doc/mutt/manual147.html
-share/doc/mutt/manual148.html
-share/doc/mutt/manual149.html
-share/doc/mutt/manual15.html
-share/doc/mutt/manual150.html
-share/doc/mutt/manual151.html
-share/doc/mutt/manual152.html
-share/doc/mutt/manual153.html
-share/doc/mutt/manual154.html
-share/doc/mutt/manual155.html
-share/doc/mutt/manual156.html
-share/doc/mutt/manual157.html
-share/doc/mutt/manual158.html
-share/doc/mutt/manual159.html
-share/doc/mutt/manual16.html
-share/doc/mutt/manual160.html
-share/doc/mutt/manual161.html
-share/doc/mutt/manual162.html
-share/doc/mutt/manual163.html
-share/doc/mutt/manual164.html
-share/doc/mutt/manual165.html
-share/doc/mutt/manual166.html
-share/doc/mutt/manual167.html
-share/doc/mutt/manual168.html
-share/doc/mutt/manual169.html
-share/doc/mutt/manual17.html
-share/doc/mutt/manual170.html
-share/doc/mutt/manual171.html
-share/doc/mutt/manual172.html
-share/doc/mutt/manual173.html
-share/doc/mutt/manual174.html
-share/doc/mutt/manual175.html
-share/doc/mutt/manual176.html
-share/doc/mutt/manual177.html
-share/doc/mutt/manual178.html
-share/doc/mutt/manual179.html
-share/doc/mutt/manual18.html
-share/doc/mutt/manual180.html
-share/doc/mutt/manual181.html
-share/doc/mutt/manual182.html
-share/doc/mutt/manual183.html
-share/doc/mutt/manual184.html
-share/doc/mutt/manual185.html
-share/doc/mutt/manual186.html
-share/doc/mutt/manual187.html
-share/doc/mutt/manual188.html
-share/doc/mutt/manual189.html
-share/doc/mutt/manual19.html
-share/doc/mutt/manual190.html
-share/doc/mutt/manual191.html
-share/doc/mutt/manual192.html
-share/doc/mutt/manual193.html
-share/doc/mutt/manual194.html
-share/doc/mutt/manual195.html
-share/doc/mutt/manual196.html
-share/doc/mutt/manual197.html
-share/doc/mutt/manual198.html
-share/doc/mutt/manual199.html
-share/doc/mutt/manual2.html
-share/doc/mutt/manual20.html
-share/doc/mutt/manual200.html
-share/doc/mutt/manual201.html
-share/doc/mutt/manual202.html
-share/doc/mutt/manual203.html
-share/doc/mutt/manual204.html
-share/doc/mutt/manual205.html
-share/doc/mutt/manual206.html
-share/doc/mutt/manual207.html
-share/doc/mutt/manual208.html
-share/doc/mutt/manual209.html
-share/doc/mutt/manual21.html
-share/doc/mutt/manual210.html
-share/doc/mutt/manual211.html
-share/doc/mutt/manual212.html
-share/doc/mutt/manual213.html
-share/doc/mutt/manual214.html
-share/doc/mutt/manual215.html
-share/doc/mutt/manual216.html
-share/doc/mutt/manual217.html
-share/doc/mutt/manual218.html
-share/doc/mutt/manual219.html
-share/doc/mutt/manual22.html
-share/doc/mutt/manual220.html
-share/doc/mutt/manual221.html
-share/doc/mutt/manual222.html
-share/doc/mutt/manual223.html
-share/doc/mutt/manual224.html
-share/doc/mutt/manual225.html
-share/doc/mutt/manual226.html
-share/doc/mutt/manual227.html
-share/doc/mutt/manual228.html
-share/doc/mutt/manual229.html
-share/doc/mutt/manual23.html
-share/doc/mutt/manual230.html
-share/doc/mutt/manual231.html
-share/doc/mutt/manual232.html
-share/doc/mutt/manual233.html
-share/doc/mutt/manual234.html
-share/doc/mutt/manual235.html
-share/doc/mutt/manual236.html
-share/doc/mutt/manual237.html
-share/doc/mutt/manual238.html
-share/doc/mutt/manual239.html
-share/doc/mutt/manual24.html
-share/doc/mutt/manual240.html
-share/doc/mutt/manual241.html
-share/doc/mutt/manual242.html
-share/doc/mutt/manual243.html
-share/doc/mutt/manual244.html
-share/doc/mutt/manual245.html
-share/doc/mutt/manual246.html
-share/doc/mutt/manual247.html
-share/doc/mutt/manual248.html
-share/doc/mutt/manual249.html
-share/doc/mutt/manual25.html
-share/doc/mutt/manual250.html
-share/doc/mutt/manual251.html
-share/doc/mutt/manual252.html
-share/doc/mutt/manual253.html
-share/doc/mutt/manual254.html
-share/doc/mutt/manual255.html
-share/doc/mutt/manual256.html
-share/doc/mutt/manual257.html
-share/doc/mutt/manual258.html
-share/doc/mutt/manual259.html
-share/doc/mutt/manual26.html
-share/doc/mutt/manual27.html
-share/doc/mutt/manual28.html
-share/doc/mutt/manual29.html
-share/doc/mutt/manual3.html
-share/doc/mutt/manual30.html
-share/doc/mutt/manual31.html
-share/doc/mutt/manual32.html
-share/doc/mutt/manual33.html
-share/doc/mutt/manual34.html
-share/doc/mutt/manual35.html
-share/doc/mutt/manual36.html
-share/doc/mutt/manual37.html
-share/doc/mutt/manual38.html
-share/doc/mutt/manual39.html
-share/doc/mutt/manual4.html
-share/doc/mutt/manual40.html
-share/doc/mutt/manual41.html
-share/doc/mutt/manual42.html
-share/doc/mutt/manual43.html
-share/doc/mutt/manual44.html
-share/doc/mutt/manual45.html
-share/doc/mutt/manual46.html
-share/doc/mutt/manual47.html
-share/doc/mutt/manual48.html
-share/doc/mutt/manual49.html
-share/doc/mutt/manual5.html
-share/doc/mutt/manual50.html
-share/doc/mutt/manual51.html
-share/doc/mutt/manual52.html
-share/doc/mutt/manual53.html
-share/doc/mutt/manual54.html
-share/doc/mutt/manual55.html
-share/doc/mutt/manual56.html
-share/doc/mutt/manual57.html
-share/doc/mutt/manual58.html
-share/doc/mutt/manual59.html
-share/doc/mutt/manual6.html
-share/doc/mutt/manual60.html
-share/doc/mutt/manual61.html
-share/doc/mutt/manual62.html
-share/doc/mutt/manual63.html
-share/doc/mutt/manual64.html
-share/doc/mutt/manual65.html
-share/doc/mutt/manual66.html
-share/doc/mutt/manual67.html
-share/doc/mutt/manual68.html
-share/doc/mutt/manual69.html
-share/doc/mutt/manual7.html
-share/doc/mutt/manual70.html
-share/doc/mutt/manual71.html
-share/doc/mutt/manual72.html
-share/doc/mutt/manual73.html
-share/doc/mutt/manual74.html
-share/doc/mutt/manual75.html
-share/doc/mutt/manual76.html
-share/doc/mutt/manual77.html
-share/doc/mutt/manual78.html
-share/doc/mutt/manual79.html
-share/doc/mutt/manual8.html
-share/doc/mutt/manual80.html
-share/doc/mutt/manual81.html
-share/doc/mutt/manual82.html
-share/doc/mutt/manual83.html
-share/doc/mutt/manual84.html
-share/doc/mutt/manual85.html
-share/doc/mutt/manual86.html
-share/doc/mutt/manual87.html
-share/doc/mutt/manual88.html
-share/doc/mutt/manual89.html
-share/doc/mutt/manual9.html
-share/doc/mutt/manual90.html
-share/doc/mutt/manual91.html
-share/doc/mutt/manual92.html
-share/doc/mutt/manual93.html
-share/doc/mutt/manual94.html
-share/doc/mutt/manual95.html
-share/doc/mutt/manual96.html
-share/doc/mutt/manual97.html
-share/doc/mutt/manual98.html
-share/doc/mutt/manual99.html
-share/doc/mutt/manual_toc.html
+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/html/manual.html
+share/doc/mutt/html/manual1.html
+share/doc/mutt/html/manual10.html
+share/doc/mutt/html/manual100.html
+share/doc/mutt/html/manual101.html
+share/doc/mutt/html/manual102.html
+share/doc/mutt/html/manual103.html
+share/doc/mutt/html/manual104.html
+share/doc/mutt/html/manual105.html
+share/doc/mutt/html/manual106.html
+share/doc/mutt/html/manual107.html
+share/doc/mutt/html/manual108.html
+share/doc/mutt/html/manual109.html
+share/doc/mutt/html/manual11.html
+share/doc/mutt/html/manual110.html
+share/doc/mutt/html/manual111.html
+share/doc/mutt/html/manual112.html
+share/doc/mutt/html/manual113.html
+share/doc/mutt/html/manual114.html
+share/doc/mutt/html/manual115.html
+share/doc/mutt/html/manual116.html
+share/doc/mutt/html/manual117.html
+share/doc/mutt/html/manual118.html
+share/doc/mutt/html/manual119.html
+share/doc/mutt/html/manual12.html
+share/doc/mutt/html/manual120.html
+share/doc/mutt/html/manual121.html
+share/doc/mutt/html/manual122.html
+share/doc/mutt/html/manual123.html
+share/doc/mutt/html/manual124.html
+share/doc/mutt/html/manual125.html
+share/doc/mutt/html/manual126.html
+share/doc/mutt/html/manual127.html
+share/doc/mutt/html/manual128.html
+share/doc/mutt/html/manual129.html
+share/doc/mutt/html/manual13.html
+share/doc/mutt/html/manual130.html
+share/doc/mutt/html/manual131.html
+share/doc/mutt/html/manual132.html
+share/doc/mutt/html/manual133.html
+share/doc/mutt/html/manual134.html
+share/doc/mutt/html/manual135.html
+share/doc/mutt/html/manual136.html
+share/doc/mutt/html/manual137.html
+share/doc/mutt/html/manual138.html
+share/doc/mutt/html/manual139.html
+share/doc/mutt/html/manual14.html
+share/doc/mutt/html/manual140.html
+share/doc/mutt/html/manual141.html
+share/doc/mutt/html/manual142.html
+share/doc/mutt/html/manual143.html
+share/doc/mutt/html/manual144.html
+share/doc/mutt/html/manual145.html
+share/doc/mutt/html/manual146.html
+share/doc/mutt/html/manual147.html
+share/doc/mutt/html/manual148.html
+share/doc/mutt/html/manual149.html
+share/doc/mutt/html/manual15.html
+share/doc/mutt/html/manual150.html
+share/doc/mutt/html/manual151.html
+share/doc/mutt/html/manual152.html
+share/doc/mutt/html/manual153.html
+share/doc/mutt/html/manual154.html
+share/doc/mutt/html/manual155.html
+share/doc/mutt/html/manual156.html
+share/doc/mutt/html/manual157.html
+share/doc/mutt/html/manual158.html
+share/doc/mutt/html/manual159.html
+share/doc/mutt/html/manual16.html
+share/doc/mutt/html/manual160.html
+share/doc/mutt/html/manual161.html
+share/doc/mutt/html/manual162.html
+share/doc/mutt/html/manual163.html
+share/doc/mutt/html/manual164.html
+share/doc/mutt/html/manual165.html
+share/doc/mutt/html/manual166.html
+share/doc/mutt/html/manual167.html
+share/doc/mutt/html/manual168.html
+share/doc/mutt/html/manual169.html
+share/doc/mutt/html/manual17.html
+share/doc/mutt/html/manual170.html
+share/doc/mutt/html/manual171.html
+share/doc/mutt/html/manual172.html
+share/doc/mutt/html/manual173.html
+share/doc/mutt/html/manual174.html
+share/doc/mutt/html/manual175.html
+share/doc/mutt/html/manual176.html
+share/doc/mutt/html/manual177.html
+share/doc/mutt/html/manual178.html
+share/doc/mutt/html/manual179.html
+share/doc/mutt/html/manual18.html
+share/doc/mutt/html/manual180.html
+share/doc/mutt/html/manual181.html
+share/doc/mutt/html/manual182.html
+share/doc/mutt/html/manual183.html
+share/doc/mutt/html/manual184.html
+share/doc/mutt/html/manual185.html
+share/doc/mutt/html/manual186.html
+share/doc/mutt/html/manual187.html
+share/doc/mutt/html/manual188.html
+share/doc/mutt/html/manual189.html
+share/doc/mutt/html/manual19.html
+share/doc/mutt/html/manual190.html
+share/doc/mutt/html/manual191.html
+share/doc/mutt/html/manual192.html
+share/doc/mutt/html/manual193.html
+share/doc/mutt/html/manual194.html
+share/doc/mutt/html/manual195.html
+share/doc/mutt/html/manual196.html
+share/doc/mutt/html/manual197.html
+share/doc/mutt/html/manual198.html
+share/doc/mutt/html/manual199.html
+share/doc/mutt/html/manual2.html
+share/doc/mutt/html/manual20.html
+share/doc/mutt/html/manual200.html
+share/doc/mutt/html/manual201.html
+share/doc/mutt/html/manual202.html
+share/doc/mutt/html/manual203.html
+share/doc/mutt/html/manual204.html
+share/doc/mutt/html/manual205.html
+share/doc/mutt/html/manual206.html
+share/doc/mutt/html/manual207.html
+share/doc/mutt/html/manual208.html
+share/doc/mutt/html/manual209.html
+share/doc/mutt/html/manual21.html
+share/doc/mutt/html/manual210.html
+share/doc/mutt/html/manual211.html
+share/doc/mutt/html/manual212.html
+share/doc/mutt/html/manual213.html
+share/doc/mutt/html/manual214.html
+share/doc/mutt/html/manual215.html
+share/doc/mutt/html/manual216.html
+share/doc/mutt/html/manual217.html
+share/doc/mutt/html/manual218.html
+share/doc/mutt/html/manual219.html
+share/doc/mutt/html/manual22.html
+share/doc/mutt/html/manual220.html
+share/doc/mutt/html/manual221.html
+share/doc/mutt/html/manual222.html
+share/doc/mutt/html/manual223.html
+share/doc/mutt/html/manual224.html
+share/doc/mutt/html/manual225.html
+share/doc/mutt/html/manual226.html
+share/doc/mutt/html/manual227.html
+share/doc/mutt/html/manual228.html
+share/doc/mutt/html/manual229.html
+share/doc/mutt/html/manual23.html
+share/doc/mutt/html/manual230.html
+share/doc/mutt/html/manual231.html
+share/doc/mutt/html/manual232.html
+share/doc/mutt/html/manual233.html
+share/doc/mutt/html/manual234.html
+share/doc/mutt/html/manual235.html
+share/doc/mutt/html/manual236.html
+share/doc/mutt/html/manual237.html
+share/doc/mutt/html/manual238.html
+share/doc/mutt/html/manual239.html
+share/doc/mutt/html/manual24.html
+share/doc/mutt/html/manual240.html
+share/doc/mutt/html/manual241.html
+share/doc/mutt/html/manual242.html
+share/doc/mutt/html/manual243.html
+share/doc/mutt/html/manual244.html
+share/doc/mutt/html/manual245.html
+share/doc/mutt/html/manual246.html
+share/doc/mutt/html/manual247.html
+share/doc/mutt/html/manual248.html
+share/doc/mutt/html/manual249.html
+share/doc/mutt/html/manual25.html
+share/doc/mutt/html/manual250.html
+share/doc/mutt/html/manual251.html
+share/doc/mutt/html/manual252.html
+share/doc/mutt/html/manual253.html
+share/doc/mutt/html/manual254.html
+share/doc/mutt/html/manual255.html
+share/doc/mutt/html/manual256.html
+share/doc/mutt/html/manual257.html
+share/doc/mutt/html/manual258.html
+share/doc/mutt/html/manual259.html
+share/doc/mutt/html/manual26.html
+share/doc/mutt/html/manual260.html
+share/doc/mutt/html/manual261.html
+share/doc/mutt/html/manual262.html
+share/doc/mutt/html/manual263.html
+share/doc/mutt/html/manual264.html
+share/doc/mutt/html/manual265.html
+share/doc/mutt/html/manual266.html
+share/doc/mutt/html/manual267.html
+share/doc/mutt/html/manual268.html
+share/doc/mutt/html/manual269.html
+share/doc/mutt/html/manual27.html
+share/doc/mutt/html/manual270.html
+share/doc/mutt/html/manual271.html
+share/doc/mutt/html/manual272.html
+share/doc/mutt/html/manual273.html
+share/doc/mutt/html/manual274.html
+share/doc/mutt/html/manual275.html
+share/doc/mutt/html/manual276.html
+share/doc/mutt/html/manual277.html
+share/doc/mutt/html/manual278.html
+share/doc/mutt/html/manual279.html
+share/doc/mutt/html/manual28.html
+share/doc/mutt/html/manual280.html
+share/doc/mutt/html/manual281.html
+share/doc/mutt/html/manual282.html
+share/doc/mutt/html/manual283.html
+share/doc/mutt/html/manual284.html
+share/doc/mutt/html/manual285.html
+share/doc/mutt/html/manual286.html
+share/doc/mutt/html/manual287.html
+share/doc/mutt/html/manual288.html
+share/doc/mutt/html/manual289.html
+share/doc/mutt/html/manual29.html
+share/doc/mutt/html/manual290.html
+share/doc/mutt/html/manual291.html
+share/doc/mutt/html/manual292.html
+share/doc/mutt/html/manual293.html
+share/doc/mutt/html/manual294.html
+share/doc/mutt/html/manual295.html
+share/doc/mutt/html/manual296.html
+share/doc/mutt/html/manual297.html
+share/doc/mutt/html/manual298.html
+share/doc/mutt/html/manual299.html
+share/doc/mutt/html/manual3.html
+share/doc/mutt/html/manual30.html
+share/doc/mutt/html/manual300.html
+share/doc/mutt/html/manual301.html
+share/doc/mutt/html/manual302.html
+share/doc/mutt/html/manual303.html
+share/doc/mutt/html/manual304.html
+share/doc/mutt/html/manual31.html
+share/doc/mutt/html/manual32.html
+share/doc/mutt/html/manual33.html
+share/doc/mutt/html/manual34.html
+share/doc/mutt/html/manual35.html
+share/doc/mutt/html/manual36.html
+share/doc/mutt/html/manual37.html
+share/doc/mutt/html/manual38.html
+share/doc/mutt/html/manual39.html
+share/doc/mutt/html/manual4.html
+share/doc/mutt/html/manual40.html
+share/doc/mutt/html/manual41.html
+share/doc/mutt/html/manual42.html
+share/doc/mutt/html/manual43.html
+share/doc/mutt/html/manual44.html
+share/doc/mutt/html/manual45.html
+share/doc/mutt/html/manual46.html
+share/doc/mutt/html/manual47.html
+share/doc/mutt/html/manual48.html
+share/doc/mutt/html/manual49.html
+share/doc/mutt/html/manual5.html
+share/doc/mutt/html/manual50.html
+share/doc/mutt/html/manual51.html
+share/doc/mutt/html/manual52.html
+share/doc/mutt/html/manual53.html
+share/doc/mutt/html/manual54.html
+share/doc/mutt/html/manual55.html
+share/doc/mutt/html/manual56.html
+share/doc/mutt/html/manual57.html
+share/doc/mutt/html/manual58.html
+share/doc/mutt/html/manual59.html
+share/doc/mutt/html/manual6.html
+share/doc/mutt/html/manual60.html
+share/doc/mutt/html/manual61.html
+share/doc/mutt/html/manual62.html
+share/doc/mutt/html/manual63.html
+share/doc/mutt/html/manual64.html
+share/doc/mutt/html/manual65.html
+share/doc/mutt/html/manual66.html
+share/doc/mutt/html/manual67.html
+share/doc/mutt/html/manual68.html
+share/doc/mutt/html/manual69.html
+share/doc/mutt/html/manual7.html
+share/doc/mutt/html/manual70.html
+share/doc/mutt/html/manual71.html
+share/doc/mutt/html/manual72.html
+share/doc/mutt/html/manual73.html
+share/doc/mutt/html/manual74.html
+share/doc/mutt/html/manual75.html
+share/doc/mutt/html/manual76.html
+share/doc/mutt/html/manual77.html
+share/doc/mutt/html/manual78.html
+share/doc/mutt/html/manual79.html
+share/doc/mutt/html/manual8.html
+share/doc/mutt/html/manual80.html
+share/doc/mutt/html/manual81.html
+share/doc/mutt/html/manual82.html
+share/doc/mutt/html/manual83.html
+share/doc/mutt/html/manual84.html
+share/doc/mutt/html/manual85.html
+share/doc/mutt/html/manual86.html
+share/doc/mutt/html/manual87.html
+share/doc/mutt/html/manual88.html
+share/doc/mutt/html/manual89.html
+share/doc/mutt/html/manual9.html
+share/doc/mutt/html/manual90.html
+share/doc/mutt/html/manual91.html
+share/doc/mutt/html/manual92.html
+share/doc/mutt/html/manual93.html
+share/doc/mutt/html/manual94.html
+share/doc/mutt/html/manual95.html
+share/doc/mutt/html/manual96.html
+share/doc/mutt/html/manual97.html
+share/doc/mutt/html/manual98.html
+share/doc/mutt/html/manual99.html
+share/doc/mutt/html/manual_toc.html
+@dirrm share/doc/mutt/html