Upgrade to version 0.95.

Note that Muttrc and mime.types have moved from
PREFIX/share/misc -> PREFIX/etc

24 files changed, 705 insertions, 420 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 761bd9811978..77477b6cf476 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.51 1998/10/01 20:29:46 eivind Exp $
+# $Id: Makefile,v 1.52 1998/10/09 10:05:51 asami Exp $
 
-DISTNAME=	mutt-0.93.2i
-PKGNAME=	mutt-0.93.2
+DISTNAME=	mutt-0.95i
+PKGNAME=	mutt-0.95
 CATEGORIES=	mail
 MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
 		ftp://ftp.gbnet.net/pub/mutt-international/  \
@@ -41,44 +41,43 @@ PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-imap --enable-flock \
 		--disable-fcntl --enable-hidden-host \
-		--with-sharedir=${PREFIX}/share/misc \
+		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
 .if defined(BATCH) || defined(USE_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-MAN1=		mutt.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
+MAN1=		mutt.1 mutt_dotlock.1
+
 
-post-patch:
-	@touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
 .if !defined(NOPORTDOCS)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	@printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
+post-build:
+	touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
+	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
 		ed -s ${WRKSRC}/doc/mutt.man
-.endif
-
-pre-configure:
-	@${MKDIR} ${PREFIX}/share/misc
-
-.if defined(BATCH) && !defined(NOPORTDOCS)
+.if defined(BATCH)
 PLIST:=		${WRKDIR}/PLIST
-post-build:
-	cd ${WRKSRC}/doc; ${MAKE} fbsd
+pre-install:
 	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
 	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
 .endif
+.endif
 
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_MAN} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/mutt
+	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
+		${PREFIX}/share/doc/mutt
 .if defined(BATCH)
+	@${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 	@${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
 .endif
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc  \
+	@(cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
 		${PREFIX}/share/doc/mutt)
 .endif
 
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index fcc058b56ed0..f5e8d5693077 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.93.2i.tar.gz) = 9ce8f1020a638d07cb3772b1ebe9887d
+MD5 (mutt/mutt-0.95i.tar.gz) = 875564c734fb72d88b43e97394de3290
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
deleted file mode 100644
index 785ac27f43da..000000000000
--- a/mail/mutt-devel/files/patch-01
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Thu Jun 25 15:16:03 1998
-+++ Makefile.in	Wed Jul 15 01:44:35 1998
-@@ -61,6 +61,9 @@
- mutt: keymap_defs.h $(OBJS) $(REGEX)
- 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
- 
-+docs:
-+	cd doc && make fbsd
-+
- keymap_defs.h: Makefile $(OPS)
- 	rm -f keymap_defs.h
- 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index 137e76ff253a..fab62611d3e8 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,24 +1,54 @@
---- doc/Makefile.in.orig	Mon Jul 13 03:50:37 1998
-+++ doc/Makefile.in	Fri Jul 17 11:23:21 1998
-@@ -21,6 +21,8 @@
+--- 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
  
- all: manual.txt manual.html
  
-+fbsd: manual.latin1 manual.html
+-all: mutt.man dotlock.man try-html try-txt
++all: mutt.man dotlock.man try-html try-txt try-latin1
+ 
+ complete: all html
+ 
+@@ -57,19 +57,22 @@
+ try-txt:
+ 	-$(MAKE) manual.txt
+ 
++try-latin1:
++	-$(MAKE) manual.latin1
 +
- install: mutt.man manual.txt
- 	../mkinstalldirs $(mandir)/man1
- 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
-@@ -36,7 +38,11 @@
- 	sgml2txt manual
+ html: manual.html
+ 
+ install: dotlock.man mutt.man 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
+-	$(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
  
  manual.html: manual.sgml
 -	sgml2html manual
-+	# sgml2html manual
++	@# sgml2html manual
 +	sgmlfmt -f html manual
 +
 +manual.latin1: manual.sgml
 +	sgmlfmt -f latin1 manual.sgml
  
  clean: 
- 	rm -f *~ *.html *.orig *.rej
+ 	rm -f *~ *.html *.orig *.rej *.man manual.sgml
diff --git a/mail/mutt-devel/files/patch-03 b/mail/mutt-devel/files/patch-03
index ec8e6e189c6b..82571384c793 100644
--- a/mail/mutt-devel/files/patch-03
+++ b/mail/mutt-devel/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig	Fri Jul 10 22:10:27 1998
-+++ doc/manual.sgml	Sun Jul 19 15:52:04 1998
+--- 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 @@
 -<!doctype linuxdoc system>
 +<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -9,12 +9,3 @@
  
  <article>
  
-@@ -451,7 +454,7 @@
- ^F	forget-passphrase	whipe PGP passphrase from memory
- </verb></tscreen>
- 
--<sect2>Editing the message header<label id="edit_headers">
-+<sect2>Editing the message header<label id="editing_headers">
- <p>
- When editing the header of your outgoing message, there are a couple of
- special features available.
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
deleted file mode 100644
index 51d1db250510..000000000000
--- a/mail/mutt-devel/files/patch-05
+++ /dev/null
@@ -1,81 +0,0 @@
---- acconfig.h.orig	Tue Mar 11 17:04:02 1997
-+++ acconfig.h	Sat Mar 15 22:23:06 1997
-@@ -18,6 +18,9 @@
- #undef DOMAIN
- @TOP@
- 
-+/* gethostname() can be used to obtain the domain name */
-+#undef GETHOSTNAME_DOMAIN
-+
- /* use dotlocking to lock mailboxes? */
- #undef USE_DOTLOCK
- 
---- config.h.in.orig	Wed Mar 12 17:46:39 1997
-+++ config.h.in	Sat Mar 15 22:27:01 1997
-@@ -18,6 +18,9 @@
- /* What is your domain name? */
- #undef DOMAIN
- 
-+/* gethostname() can be used to obtain the domain name */
-+/* #define GETHOSTNAME_DOMAIN 1 */
-+
- /* Define as the return type of signal handlers (int or void).  */
- #undef RETSIGTYPE
- 
---- init.c.orig	Tue Mar 11 17:29:14 1997
-+++ init.c	Sat Mar 15 22:26:44 1997
-@@ -961,6 +961,19 @@
-   if (debuglevel > 0) start_debug();
- #endif
- 
-+#ifdef GETHOSTNAME_DOMAIN
-+  /* Get host and domain name */
-+  gethostname (Hostname, sizeof (Hostname));
-+  Hostname[sizeof (Hostname) - 1] = 0;
-+  if ((p = strchr (Hostname, '.')) == NULL)
-+    /* blech */
-+	domain = "";
-+  else
-+    {
-+	  *p++ = 0;
-+	  domain = p;
-+    }
-+#else
-   /* And about the host... */
-   uname (&utsname);
-   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
-@@ -971,6 +984,7 @@
-     *p++ = 0;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-+#endif
- 
- #ifdef USE_DOMAIN
- 
---- globals.h.orig	Mon Mar 10 14:34:27 1997
-+++ globals.h	Sat Mar 15 22:29:01 1997
-@@ -130,6 +130,13 @@
- WHERE gid_t UserGid;
- #endif /* USE_SETGID */
- 
-+/* if your gethostname() returns the domainname too */
-+#ifdef GETHOSTNAME_DOMAIN
-+WHERE char *domain;
-+#undef DOMAIN
-+#define DOMAIN domain
-+#endif
-+
- #ifdef MAIN_C
- const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
- const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
---- main.c.orig	Fri Mar  7 18:57:24 1997
-+++ main.c	Sat Mar 15 22:28:14 1997
-@@ -114,7 +114,7 @@
- 
-   puts ("\n\nCompile time definitions:");
- 
--#ifdef DOMAIN
-+#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
-   printf ("DOMAIN=\"%s\"\n", DOMAIN);
- #else
-   puts ("-DOMAIN");
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index db6e587ef516..e6132d90fb90 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -1,11 +1,178 @@
 bin/mutt
-share/misc/Muttrc
-share/misc/mime.types
+bin/mutt_dotlock
+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/locale/de/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/language.txt
-share/doc/mutt/language50.txt
 share/doc/mutt/sample.muttrc
 share/doc/mutt/Mush.rc
 share/doc/mutt/Pine.rc
+@dirrm share/mutt/charsets
+@dirrm share/mutt
 @dirrm share/doc/mutt
diff --git a/mail/mutt-devel/pkg-plist.htmlfiles b/mail/mutt-devel/pkg-plist.htmlfiles
index 7d261053170b..0ff6dc997202 100644
--- a/mail/mutt-devel/pkg-plist.htmlfiles
+++ b/mail/mutt-devel/pkg-plist.htmlfiles
@@ -1,3 +1,4 @@
+share/doc/mutt/manual.latin1
 share/doc/mutt/manual.html
 share/doc/mutt/manual1.html
 share/doc/mutt/manual10.html
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 761bd9811978..77477b6cf476 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.51 1998/10/01 20:29:46 eivind Exp $
+# $Id: Makefile,v 1.52 1998/10/09 10:05:51 asami Exp $
 
-DISTNAME=	mutt-0.93.2i
-PKGNAME=	mutt-0.93.2
+DISTNAME=	mutt-0.95i
+PKGNAME=	mutt-0.95
 CATEGORIES=	mail
 MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
 		ftp://ftp.gbnet.net/pub/mutt-international/  \
@@ -41,44 +41,43 @@ PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-imap --enable-flock \
 		--disable-fcntl --enable-hidden-host \
-		--with-sharedir=${PREFIX}/share/misc \
+		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
 .if defined(BATCH) || defined(USE_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-MAN1=		mutt.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
+MAN1=		mutt.1 mutt_dotlock.1
+
 
-post-patch:
-	@touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
 .if !defined(NOPORTDOCS)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	@printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
+post-build:
+	touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
+	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
 		ed -s ${WRKSRC}/doc/mutt.man
-.endif
-
-pre-configure:
-	@${MKDIR} ${PREFIX}/share/misc
-
-.if defined(BATCH) && !defined(NOPORTDOCS)
+.if defined(BATCH)
 PLIST:=		${WRKDIR}/PLIST
-post-build:
-	cd ${WRKSRC}/doc; ${MAKE} fbsd
+pre-install:
 	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
 	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
 .endif
+.endif
 
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_MAN} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/mutt
+	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
+		${PREFIX}/share/doc/mutt
 .if defined(BATCH)
+	@${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 	@${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
 .endif
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc  \
+	@(cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
 		${PREFIX}/share/doc/mutt)
 .endif
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index fcc058b56ed0..f5e8d5693077 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.93.2i.tar.gz) = 9ce8f1020a638d07cb3772b1ebe9887d
+MD5 (mutt/mutt-0.95i.tar.gz) = 875564c734fb72d88b43e97394de3290
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
deleted file mode 100644
index 785ac27f43da..000000000000
--- a/mail/mutt/files/patch-01
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Thu Jun 25 15:16:03 1998
-+++ Makefile.in	Wed Jul 15 01:44:35 1998
-@@ -61,6 +61,9 @@
- mutt: keymap_defs.h $(OBJS) $(REGEX)
- 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
- 
-+docs:
-+	cd doc && make fbsd
-+
- keymap_defs.h: Makefile $(OPS)
- 	rm -f keymap_defs.h
- 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02
index 137e76ff253a..fab62611d3e8 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-02
@@ -1,24 +1,54 @@
---- doc/Makefile.in.orig	Mon Jul 13 03:50:37 1998
-+++ doc/Makefile.in	Fri Jul 17 11:23:21 1998
-@@ -21,6 +21,8 @@
+--- 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
  
- all: manual.txt manual.html
  
-+fbsd: manual.latin1 manual.html
+-all: mutt.man dotlock.man try-html try-txt
++all: mutt.man dotlock.man try-html try-txt try-latin1
+ 
+ complete: all html
+ 
+@@ -57,19 +57,22 @@
+ try-txt:
+ 	-$(MAKE) manual.txt
+ 
++try-latin1:
++	-$(MAKE) manual.latin1
 +
- install: mutt.man manual.txt
- 	../mkinstalldirs $(mandir)/man1
- 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
-@@ -36,7 +38,11 @@
- 	sgml2txt manual
+ html: manual.html
+ 
+ install: dotlock.man mutt.man 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
+-	$(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
  
  manual.html: manual.sgml
 -	sgml2html manual
-+	# sgml2html manual
++	@# sgml2html manual
 +	sgmlfmt -f html manual
 +
 +manual.latin1: manual.sgml
 +	sgmlfmt -f latin1 manual.sgml
  
  clean: 
- 	rm -f *~ *.html *.orig *.rej
+ 	rm -f *~ *.html *.orig *.rej *.man manual.sgml
diff --git a/mail/mutt/files/patch-03 b/mail/mutt/files/patch-03
index ec8e6e189c6b..82571384c793 100644
--- a/mail/mutt/files/patch-03
+++ b/mail/mutt/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig	Fri Jul 10 22:10:27 1998
-+++ doc/manual.sgml	Sun Jul 19 15:52:04 1998
+--- 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 @@
 -<!doctype linuxdoc system>
 +<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -9,12 +9,3 @@
  
  <article>
  
-@@ -451,7 +454,7 @@
- ^F	forget-passphrase	whipe PGP passphrase from memory
- </verb></tscreen>
- 
--<sect2>Editing the message header<label id="edit_headers">
-+<sect2>Editing the message header<label id="editing_headers">
- <p>
- When editing the header of your outgoing message, there are a couple of
- special features available.
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
deleted file mode 100644
index 51d1db250510..000000000000
--- a/mail/mutt/files/patch-05
+++ /dev/null
@@ -1,81 +0,0 @@
---- acconfig.h.orig	Tue Mar 11 17:04:02 1997
-+++ acconfig.h	Sat Mar 15 22:23:06 1997
-@@ -18,6 +18,9 @@
- #undef DOMAIN
- @TOP@
- 
-+/* gethostname() can be used to obtain the domain name */
-+#undef GETHOSTNAME_DOMAIN
-+
- /* use dotlocking to lock mailboxes? */
- #undef USE_DOTLOCK
- 
---- config.h.in.orig	Wed Mar 12 17:46:39 1997
-+++ config.h.in	Sat Mar 15 22:27:01 1997
-@@ -18,6 +18,9 @@
- /* What is your domain name? */
- #undef DOMAIN
- 
-+/* gethostname() can be used to obtain the domain name */
-+/* #define GETHOSTNAME_DOMAIN 1 */
-+
- /* Define as the return type of signal handlers (int or void).  */
- #undef RETSIGTYPE
- 
---- init.c.orig	Tue Mar 11 17:29:14 1997
-+++ init.c	Sat Mar 15 22:26:44 1997
-@@ -961,6 +961,19 @@
-   if (debuglevel > 0) start_debug();
- #endif
- 
-+#ifdef GETHOSTNAME_DOMAIN
-+  /* Get host and domain name */
-+  gethostname (Hostname, sizeof (Hostname));
-+  Hostname[sizeof (Hostname) - 1] = 0;
-+  if ((p = strchr (Hostname, '.')) == NULL)
-+    /* blech */
-+	domain = "";
-+  else
-+    {
-+	  *p++ = 0;
-+	  domain = p;
-+    }
-+#else
-   /* And about the host... */
-   uname (&utsname);
-   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
-@@ -971,6 +984,7 @@
-     *p++ = 0;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-+#endif
- 
- #ifdef USE_DOMAIN
- 
---- globals.h.orig	Mon Mar 10 14:34:27 1997
-+++ globals.h	Sat Mar 15 22:29:01 1997
-@@ -130,6 +130,13 @@
- WHERE gid_t UserGid;
- #endif /* USE_SETGID */
- 
-+/* if your gethostname() returns the domainname too */
-+#ifdef GETHOSTNAME_DOMAIN
-+WHERE char *domain;
-+#undef DOMAIN
-+#define DOMAIN domain
-+#endif
-+
- #ifdef MAIN_C
- const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
- const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
---- main.c.orig	Fri Mar  7 18:57:24 1997
-+++ main.c	Sat Mar 15 22:28:14 1997
-@@ -114,7 +114,7 @@
- 
-   puts ("\n\nCompile time definitions:");
- 
--#ifdef DOMAIN
-+#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
-   printf ("DOMAIN=\"%s\"\n", DOMAIN);
- #else
-   puts ("-DOMAIN");
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index db6e587ef516..e6132d90fb90 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -1,11 +1,178 @@
 bin/mutt
-share/misc/Muttrc
-share/misc/mime.types
+bin/mutt_dotlock
+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/locale/de/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/language.txt
-share/doc/mutt/language50.txt
 share/doc/mutt/sample.muttrc
 share/doc/mutt/Mush.rc
 share/doc/mutt/Pine.rc
+@dirrm share/mutt/charsets
+@dirrm share/mutt
 @dirrm share/doc/mutt
diff --git a/mail/mutt/pkg-plist.htmlfiles b/mail/mutt/pkg-plist.htmlfiles
index 7d261053170b..0ff6dc997202 100644
--- a/mail/mutt/pkg-plist.htmlfiles
+++ b/mail/mutt/pkg-plist.htmlfiles
@@ -1,3 +1,4 @@
+share/doc/mutt/manual.latin1
 share/doc/mutt/manual.html
 share/doc/mutt/manual1.html
 share/doc/mutt/manual10.html
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 761bd9811978..77477b6cf476 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.51 1998/10/01 20:29:46 eivind Exp $
+# $Id: Makefile,v 1.52 1998/10/09 10:05:51 asami Exp $
 
-DISTNAME=	mutt-0.93.2i
-PKGNAME=	mutt-0.93.2
+DISTNAME=	mutt-0.95i
+PKGNAME=	mutt-0.95
 CATEGORIES=	mail
 MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
 		ftp://ftp.gbnet.net/pub/mutt-international/  \
@@ -41,44 +41,43 @@ PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-imap --enable-flock \
 		--disable-fcntl --enable-hidden-host \
-		--with-sharedir=${PREFIX}/share/misc \
+		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
 .if defined(BATCH) || defined(USE_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-MAN1=		mutt.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
+MAN1=		mutt.1 mutt_dotlock.1
+
 
-post-patch:
-	@touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
 .if !defined(NOPORTDOCS)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	@printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
+post-build:
+	touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
+	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
 		ed -s ${WRKSRC}/doc/mutt.man
-.endif
-
-pre-configure:
-	@${MKDIR} ${PREFIX}/share/misc
-
-.if defined(BATCH) && !defined(NOPORTDOCS)
+.if defined(BATCH)
 PLIST:=		${WRKDIR}/PLIST
-post-build:
-	cd ${WRKSRC}/doc; ${MAKE} fbsd
+pre-install:
 	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
 	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
 .endif
+.endif
 
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_MAN} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/mutt
+	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
+		${PREFIX}/share/doc/mutt
 .if defined(BATCH)
+	@${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 	@${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt
 .endif
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc  \
+	@(cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
 		${PREFIX}/share/doc/mutt)
 .endif
 
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index fcc058b56ed0..f5e8d5693077 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.93.2i.tar.gz) = 9ce8f1020a638d07cb3772b1ebe9887d
+MD5 (mutt/mutt-0.95i.tar.gz) = 875564c734fb72d88b43e97394de3290
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
deleted file mode 100644
index 785ac27f43da..000000000000
--- a/mail/mutt14/files/patch-01
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Thu Jun 25 15:16:03 1998
-+++ Makefile.in	Wed Jul 15 01:44:35 1998
-@@ -61,6 +61,9 @@
- mutt: keymap_defs.h $(OBJS) $(REGEX)
- 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
- 
-+docs:
-+	cd doc && make fbsd
-+
- keymap_defs.h: Makefile $(OPS)
- 	rm -f keymap_defs.h
- 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
index 137e76ff253a..fab62611d3e8 100644
--- a/mail/mutt14/files/patch-02
+++ b/mail/mutt14/files/patch-02
@@ -1,24 +1,54 @@
---- doc/Makefile.in.orig	Mon Jul 13 03:50:37 1998
-+++ doc/Makefile.in	Fri Jul 17 11:23:21 1998
-@@ -21,6 +21,8 @@
+--- 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
  
- all: manual.txt manual.html
  
-+fbsd: manual.latin1 manual.html
+-all: mutt.man dotlock.man try-html try-txt
++all: mutt.man dotlock.man try-html try-txt try-latin1
+ 
+ complete: all html
+ 
+@@ -57,19 +57,22 @@
+ try-txt:
+ 	-$(MAKE) manual.txt
+ 
++try-latin1:
++	-$(MAKE) manual.latin1
 +
- install: mutt.man manual.txt
- 	../mkinstalldirs $(mandir)/man1
- 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
-@@ -36,7 +38,11 @@
- 	sgml2txt manual
+ html: manual.html
+ 
+ install: dotlock.man mutt.man 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
+-	$(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
  
  manual.html: manual.sgml
 -	sgml2html manual
-+	# sgml2html manual
++	@# sgml2html manual
 +	sgmlfmt -f html manual
 +
 +manual.latin1: manual.sgml
 +	sgmlfmt -f latin1 manual.sgml
  
  clean: 
- 	rm -f *~ *.html *.orig *.rej
+ 	rm -f *~ *.html *.orig *.rej *.man manual.sgml
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
index ec8e6e189c6b..82571384c793 100644
--- a/mail/mutt14/files/patch-03
+++ b/mail/mutt14/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig	Fri Jul 10 22:10:27 1998
-+++ doc/manual.sgml	Sun Jul 19 15:52:04 1998
+--- 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 @@
 -<!doctype linuxdoc system>
 +<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -9,12 +9,3 @@
  
  <article>
  
-@@ -451,7 +454,7 @@
- ^F	forget-passphrase	whipe PGP passphrase from memory
- </verb></tscreen>
- 
--<sect2>Editing the message header<label id="edit_headers">
-+<sect2>Editing the message header<label id="editing_headers">
- <p>
- When editing the header of your outgoing message, there are a couple of
- special features available.
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 51d1db250510..000000000000
--- a/mail/mutt14/files/patch-05
+++ /dev/null
@@ -1,81 +0,0 @@
---- acconfig.h.orig	Tue Mar 11 17:04:02 1997
-+++ acconfig.h	Sat Mar 15 22:23:06 1997
-@@ -18,6 +18,9 @@
- #undef DOMAIN
- @TOP@
- 
-+/* gethostname() can be used to obtain the domain name */
-+#undef GETHOSTNAME_DOMAIN
-+
- /* use dotlocking to lock mailboxes? */
- #undef USE_DOTLOCK
- 
---- config.h.in.orig	Wed Mar 12 17:46:39 1997
-+++ config.h.in	Sat Mar 15 22:27:01 1997
-@@ -18,6 +18,9 @@
- /* What is your domain name? */
- #undef DOMAIN
- 
-+/* gethostname() can be used to obtain the domain name */
-+/* #define GETHOSTNAME_DOMAIN 1 */
-+
- /* Define as the return type of signal handlers (int or void).  */
- #undef RETSIGTYPE
- 
---- init.c.orig	Tue Mar 11 17:29:14 1997
-+++ init.c	Sat Mar 15 22:26:44 1997
-@@ -961,6 +961,19 @@
-   if (debuglevel > 0) start_debug();
- #endif
- 
-+#ifdef GETHOSTNAME_DOMAIN
-+  /* Get host and domain name */
-+  gethostname (Hostname, sizeof (Hostname));
-+  Hostname[sizeof (Hostname) - 1] = 0;
-+  if ((p = strchr (Hostname, '.')) == NULL)
-+    /* blech */
-+	domain = "";
-+  else
-+    {
-+	  *p++ = 0;
-+	  domain = p;
-+    }
-+#else
-   /* And about the host... */
-   uname (&utsname);
-   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
-@@ -971,6 +984,7 @@
-     *p++ = 0;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-+#endif
- 
- #ifdef USE_DOMAIN
- 
---- globals.h.orig	Mon Mar 10 14:34:27 1997
-+++ globals.h	Sat Mar 15 22:29:01 1997
-@@ -130,6 +130,13 @@
- WHERE gid_t UserGid;
- #endif /* USE_SETGID */
- 
-+/* if your gethostname() returns the domainname too */
-+#ifdef GETHOSTNAME_DOMAIN
-+WHERE char *domain;
-+#undef DOMAIN
-+#define DOMAIN domain
-+#endif
-+
- #ifdef MAIN_C
- const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
- const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
---- main.c.orig	Fri Mar  7 18:57:24 1997
-+++ main.c	Sat Mar 15 22:28:14 1997
-@@ -114,7 +114,7 @@
- 
-   puts ("\n\nCompile time definitions:");
- 
--#ifdef DOMAIN
-+#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
-   printf ("DOMAIN=\"%s\"\n", DOMAIN);
- #else
-   puts ("-DOMAIN");
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index db6e587ef516..e6132d90fb90 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -1,11 +1,178 @@
 bin/mutt
-share/misc/Muttrc
-share/misc/mime.types
+bin/mutt_dotlock
+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/locale/de/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/language.txt
-share/doc/mutt/language50.txt
 share/doc/mutt/sample.muttrc
 share/doc/mutt/Mush.rc
 share/doc/mutt/Pine.rc
+@dirrm share/mutt/charsets
+@dirrm share/mutt
 @dirrm share/doc/mutt
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
index 7d261053170b..0ff6dc997202 100644
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ b/mail/mutt14/pkg-plist.htmlfiles
@@ -1,3 +1,4 @@
+share/doc/mutt/manual.latin1
 share/doc/mutt/manual.html
 share/doc/mutt/manual1.html
 share/doc/mutt/manual10.html