Upgrade to 0.65.

2 files changed, 37 insertions, 50 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index e705ee4ac4cb..e71958859542 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.20 1997/02/20 09:53:22 obrien Exp $
+# $Id: Makefile,v 1.21 1997/03/05 23:39:01 obrien Exp $
 
 DISTNAME=	${PKGNAME}e
-PKGNAME=	mutt-0.64
+PKGNAME=	mutt-0.65
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -15,38 +15,20 @@ MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.teuto.de/pub/user/lmb/  \
 		ftp://ftp.funet.fi/pub/unix/mail/mutt/
 
-PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/  \
+PATCH_SITES=	ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/  \
+		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=	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
+PATCHFILES=	02.rd_count.PATCH  \
+		11.cfg-files.PATCH.EXP  \
+		15.patchlist.PATCH  \
+		18.decode_64.PATCH  \
+		21.decode_quoted.PATCH  \
+		22.warning.PATCH  \
+		04.untag-all.PATCH  \
+		05.toggle-new.PATCH  \
+		07.alias-jumping.PATCH.EXP
 
 MAINTAINER=     obrien@FreeBSD.org
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index c6a0d6f620c5..6f759e0f52e0 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,19 +1,24 @@
-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
+MD5 (mutt/mutt-0.65e.tar.gz) = 6c725b2a70bc8022076df7234c265b31
+MD5 (mutt/01.pgp.PATCH) = e8f51bc8b20a763148840fcb7138cdb8
+MD5 (mutt/02.rd_count.PATCH) = 1f674ddb5252774201a0f5b17704391f
+MD5 (mutt/03.configure.PATCH) = 6bdd6684e00cf041872f750934c60168
+MD5 (mutt/04.untag-all.PATCH) = 5be57323ce63f266a3159aaaba3690cb
+MD5 (mutt/05.toggle-new.PATCH) = 23d5357e38c90337ef8be8df5414e90d
+MD5 (mutt/06.abort-unmodified.PATCH) = 6093a33bef88276f0252feb84146a4f1
+MD5 (mutt/07.alias-jumping.PATCH.EXP) = 230087a73e5d701ddfc254422085972b
+MD5 (mutt/08.alias-sorting.PATCH.EXP) = 3866b7d647e7a653e5ab7b89d26458b1
+MD5 (mutt/09.completion-browser.PATCH) = 3697cf4a835208b97985b75d376339b1
+MD5 (mutt/10.pgp-munster.PATCH) = 839ca9c96bf6e4f321dcb6796c41bf5b
+MD5 (mutt/11.cfg-files.PATCH.EXP) = 6b93bb6eea908c5ef4b48647357533e1
+MD5 (mutt/12.search-color.PATCH.EXP) = fea36c93b6c1ba966a93878e52a2c70a
+MD5 (mutt/13.thread_chars.PATCH.EXP) = 38335e2821388b304cf1f387255ef3d8
+MD5 (mutt/14.env_info.PATCH.EXP) = 88fed69f583cb3dca1b6b06cd9707847
+MD5 (mutt/15.patchlist.PATCH) = aac9577508a2c07a37430be7f2671104
+MD5 (mutt/16.mime_fwd.PATCH) = 2a822275f55a7b5a027b947366ba5f8d
+MD5 (mutt/17.redraw_alias.PATCH) = 3748d438d8cc400d2adc390371b83883
+MD5 (mutt/18.decode_64.PATCH) = bbcfd3ca91b6db854e285f1d8ad198db
+MD5 (mutt/19.message_color.PATCH) = 12996c0507d9bf4db6042d5a7b5d4857
+MD5 (mutt/20.altpgp-patch.PATCH.EXP) = c6140892c6c7ca4f367802846d609cd2
+MD5 (mutt/21.decode_quoted.PATCH) = 6fee921a93a0138fa0af2a95e34e18fc
+MD5 (mutt/22.warning.PATCH) = c31517c499095846f42257f03446ddb3
+MD5 (mutt/23.mime_mua.PATCH.EXP) = 13dc8edf5e9890e93250a4bf7f3899ff