Upgrade to 0.64. Warning, the .muttrc syntax hash changed a little)

Start off mutt port with patches 3-9, 11-13, 16, 20-23, 25, 27.
Start off mutt.with_pgp port with patches 3-9,11-13,16-17,20-23,25-27.

2 files changed, 51 insertions, 17 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 6bea40867b3b..e705ee4ac4cb 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@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.19 1997/02/01 20:45:54 obrien Exp $
+# $Id: Makefile,v 1.20 1997/02/20 09:53:22 obrien Exp $
 
 DISTNAME=	${PKGNAME}e
-PKGNAME=	mutt-0.60
+PKGNAME=	mutt-0.64
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,14 +20,33 @@ PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
 		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES=	02.redraw.PATCH  \
-		03.pager.PATCH  \
-		08.deletethread.PATCH  \
-		09.comments.PATCH
-#		04.syntaxcolor.PATCH  \
-#		05.pipemessage.PATCH  \
-#		06.altpgp.PATCH  \
-#		07.altpgp+syntaxcolor.PATCH  \
+PATCHFILES=	03.rd_count.PATCH  \
+		04.cfg-files.PATCH.EXP  \
+		05.search-color.PATCH.EXP  \
+		06.env_info.PATCH.EXP  \
+		18.envstr.PATCH  \
+		07.thread_chars.PATCH  \
+		08.parse_set.PATCH  \
+		09.quote_sig.PATCH.EXP  \
+		11.synch.PATCH  \
+		12.edit_cc.PATCH  \
+		13.postponed-delete.PATCH  \
+		20.cmd-complete.PATCH  \
+		21.cmd_line.PATCH  \
+		22.body_search.PATCH  \
+		23.display_types.PATCH  \
+		25.messageid.PATCH  \
+		27.parse_rc.PATCH
+# these either don't apply cleanly, or to FreeBSD, or are too specialized
+#		02.status.PATCH  \
+#		10.warnings.PATCH  \
+#		14.add_buffy.PATCH  \
+#		15.ansihp.PATCH  \
+#		16.pgp.PATCH.EXP  \
+#		17.hdr_format.PATCH  \
+#		19.buffy.PATCH  \
+#		24.mx_lock.PATCH  \
+#		26.abort-unmodified.PATCH
 
 MAINTAINER=     obrien@FreeBSD.org
 
@@ -46,8 +65,10 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.latin1 ${WRKSRC}/doc/*.html  \
+	@${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${WRKSRC}/doc/*.html  \
 		${PREFIX}/share/doc/mutt
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc  \
+		${PREFIX}/share/doc/mutt)
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 455508dea139..c6a0d6f620c5 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,19 @@
-MD5 (mutt/mutt-0.60e.tar.gz) = ca2707634bc00244650bf3cf08ee7c5e
-MD5 (mutt/02.redraw.PATCH) = 4edb0036b154edf73c37c58c324ba147
-MD5 (mutt/03.pager.PATCH) = 312686f11206c8d6d826fe30df3d39fd
-MD5 (mutt/05.pipemessage.PATCH) = 49cebfcbe7a1d48bd0677d6ec80869a7
-MD5 (mutt/08.deletethread.PATCH) = 9f7622763cac22cfd80648dbda725365
-MD5 (mutt/09.comments.PATCH) = 9186df5924d8c12373c34a29bc5473e2
+MD5 (mutt/mutt-0.64e.tar.gz) = 9aa26824d60a5cd0b4af86d427cb8cc9
+MD5 (mutt/03.rd_count.PATCH) = f8dafe0b44146579fa7debee54b724ca
+MD5 (mutt/04.cfg-files.PATCH.EXP) = a1fa0542572e1519d87bc91295680fc0
+MD5 (mutt/05.search-color.PATCH.EXP) = b5e3308a1443d7aac5a97ea3781a0c60
+MD5 (mutt/06.env_info.PATCH.EXP) = 2f4b280281de03bcc731ed4181e40255
+MD5 (mutt/18.envstr.PATCH) = 68556a5a0d070342120bd06f70a7660d
+MD5 (mutt/07.thread_chars.PATCH) = 8a7f5ac36016e5a9353cb6a498a5855d
+MD5 (mutt/08.parse_set.PATCH) = 2461392f232d9bb84e20b7daffea848b
+MD5 (mutt/09.quote_sig.PATCH.EXP) = ae2cc3896d4708d7591c89a61b52f524
+MD5 (mutt/11.synch.PATCH) = ad969b82316bb61ab9588ccc5eb4e3e2
+MD5 (mutt/12.edit_cc.PATCH) = 28a1e5789176e6b3fdbb6b52be5e05a1
+MD5 (mutt/13.postponed-delete.PATCH) = 11565510eb2d4136cf99b362b2dbc8fc
+MD5 (mutt/17.hdr_format.PATCH) = d649557aaa6177fdc11084d2fda42b43
+MD5 (mutt/20.cmd-complete.PATCH) = 935045992c86fda9d59485340d7ccd7f
+MD5 (mutt/21.cmd_line.PATCH) = c5ddb34809859b61c78d4ae190dd08a0
+MD5 (mutt/22.body_search.PATCH) = 0eda5652943805b4fa2f917ed32427ed
+MD5 (mutt/23.display_types.PATCH) = 808a1fa742db12c98383dd1945674f72
+MD5 (mutt/25.messageid.PATCH) = f9af51e5194c05c19664eadd96ad7884
+MD5 (mutt/27.parse_rc.PATCH) = 5dbd8827511f9dd5d229271624fa1d8a