Upgrade to 0.54 and patches upto 15.*.PATCH

9 files changed, 117 insertions, 135 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 164d2bee4b43..5c8fe943ee43 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.10 1996/12/05 09:52:00 obrien Exp $
+# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.53
+PKGNAME=	mutt-0.54
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,25 +20,20 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/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.keys.PATCH  \
-		03.configure.PATCH  \
-		04.mbox-hook.PATCH  \
-		05.bind.PATCH  \
-		08.undisclosed.PATCH  \
-		09.attach.PATCH  \
-		10.noop.PATCH  \
-		11.external.PATCH  \
-		12.tagged.PATCH  \
-		13.random.PATCH  \
-		15.mallocline.PATCH  \
-		16.defaultcolor.PATCH  \
-		17.variables.PATCH  \
-		19.fdleak.PATCH
+PATCHFILES=	02.control.PATCH  \
+		03.fileio.PATCH  \
+		04.parse.PATCH  \
+		05.url.PATCH  \
+		06.init.PATCH  \
+		08.dirlist.PATCH  \
+		09.complete.PATCH  \
+		10.prefix.PATCH  \
+		11.batchmode.PATCH  \
+		12.folderrecog.PATCH  \
+		14.savename.PATCH  \
+		15.postponed.PATCH
 #		don't apply cleanly:
-#		06.setgid.PATCH  \
-#		07.configure.in.PATCH  \
-#		14.mallocline.PATCH  \
-#		18.buffy.PATCH  \
+#		13.pagercontext.PATCH  \
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
@@ -50,14 +45,6 @@ GNU_CONFIGURE=	yes
 MAN1=		mutt.1
 
 
-#	distpatches weren't made relative to ${WRKSRC}
-pre-patch:
-	@ln ${WRKSRC}/doc/manual.sgml ${WRKSRC}
-
-post-patch:
-	@${CP} ${WRKSRC}/manual.sgml ${WRKSRC}/doc
-
-
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 288dd928a099..80306b3b1239 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,17 +1,13 @@
-MD5 (mutt/mutt-0.53-export.tar.gz) = c984c22b939273a42f691781d36c3b5b
-MD5 (mutt/02.keys.PATCH) = 987aa46205aaa21b2ac4d374cf23d7b2
-MD5 (mutt/03.configure.PATCH) = 0e63bd18474209a1fe68ee2ee7817c81
-MD5 (mutt/04.mbox-hook.PATCH) = 44388b710473210c4308a0a351dc7a13
-MD5 (mutt/05.bind.PATCH) = c24a8aa40b25245c36de2f26c1d98f54
-MD5 (mutt/08.undisclosed.PATCH) = a5b68418663165dcea881a220e27d7ee
-MD5 (mutt/09.attach.PATCH) = 5baa56b69b916505460fee128b5ef349
-MD5 (mutt/10.noop.PATCH) = 40bd293ae90cd64e55bc22e84e556ec8
-MD5 (mutt/11.external.PATCH) = c0b1c863b2f0cc3796da8b967bd53a4b
-MD5 (mutt/12.tagged.PATCH) = aedd31c8a87edf1bf254aaa37c9122aa
-MD5 (mutt/13.random.PATCH) = 8552d76e3aa4f185a2b0fe3fe2bd7ab0
-MD5 (mutt/14.mallocline.PATCH) = ffb2f8fbf5964a0e5e86e9b47a163a03
-MD5 (mutt/15.mallocline.PATCH) = 2ff9dfaf6834ad99024073c8071bd911
-MD5 (mutt/16.defaultcolor.PATCH) = 27026b81e11d721328140a9d95fee1ca
-MD5 (mutt/17.variables.PATCH) = dad08f489d5c32e55e6613dae42a52dc
-MD5 (mutt/18.buffy.PATCH) = e75d8b75350f5357366cb7649d124714
-MD5 (mutt/19.fdleak.PATCH) = 092c9065e099e12a4e1ca19e5886ff36
+MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
+MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
+MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
+MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
+MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
+MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
+MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
+MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
+MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
+MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
+MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
+MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
+MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
new file mode 100644
index 000000000000..cb0f0416ea6e
--- /dev/null
+++ b/mail/mutt-devel/files/patch-01
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Dec 18 02:48:06 1996
++++ configure	Wed Dec 18 02:54:07 1996
+@@ -751,7 +751,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
++  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 164d2bee4b43..5c8fe943ee43 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.10 1996/12/05 09:52:00 obrien Exp $
+# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.53
+PKGNAME=	mutt-0.54
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,25 +20,20 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/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.keys.PATCH  \
-		03.configure.PATCH  \
-		04.mbox-hook.PATCH  \
-		05.bind.PATCH  \
-		08.undisclosed.PATCH  \
-		09.attach.PATCH  \
-		10.noop.PATCH  \
-		11.external.PATCH  \
-		12.tagged.PATCH  \
-		13.random.PATCH  \
-		15.mallocline.PATCH  \
-		16.defaultcolor.PATCH  \
-		17.variables.PATCH  \
-		19.fdleak.PATCH
+PATCHFILES=	02.control.PATCH  \
+		03.fileio.PATCH  \
+		04.parse.PATCH  \
+		05.url.PATCH  \
+		06.init.PATCH  \
+		08.dirlist.PATCH  \
+		09.complete.PATCH  \
+		10.prefix.PATCH  \
+		11.batchmode.PATCH  \
+		12.folderrecog.PATCH  \
+		14.savename.PATCH  \
+		15.postponed.PATCH
 #		don't apply cleanly:
-#		06.setgid.PATCH  \
-#		07.configure.in.PATCH  \
-#		14.mallocline.PATCH  \
-#		18.buffy.PATCH  \
+#		13.pagercontext.PATCH  \
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
@@ -50,14 +45,6 @@ GNU_CONFIGURE=	yes
 MAN1=		mutt.1
 
 
-#	distpatches weren't made relative to ${WRKSRC}
-pre-patch:
-	@ln ${WRKSRC}/doc/manual.sgml ${WRKSRC}
-
-post-patch:
-	@${CP} ${WRKSRC}/manual.sgml ${WRKSRC}/doc
-
-
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 288dd928a099..80306b3b1239 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,17 +1,13 @@
-MD5 (mutt/mutt-0.53-export.tar.gz) = c984c22b939273a42f691781d36c3b5b
-MD5 (mutt/02.keys.PATCH) = 987aa46205aaa21b2ac4d374cf23d7b2
-MD5 (mutt/03.configure.PATCH) = 0e63bd18474209a1fe68ee2ee7817c81
-MD5 (mutt/04.mbox-hook.PATCH) = 44388b710473210c4308a0a351dc7a13
-MD5 (mutt/05.bind.PATCH) = c24a8aa40b25245c36de2f26c1d98f54
-MD5 (mutt/08.undisclosed.PATCH) = a5b68418663165dcea881a220e27d7ee
-MD5 (mutt/09.attach.PATCH) = 5baa56b69b916505460fee128b5ef349
-MD5 (mutt/10.noop.PATCH) = 40bd293ae90cd64e55bc22e84e556ec8
-MD5 (mutt/11.external.PATCH) = c0b1c863b2f0cc3796da8b967bd53a4b
-MD5 (mutt/12.tagged.PATCH) = aedd31c8a87edf1bf254aaa37c9122aa
-MD5 (mutt/13.random.PATCH) = 8552d76e3aa4f185a2b0fe3fe2bd7ab0
-MD5 (mutt/14.mallocline.PATCH) = ffb2f8fbf5964a0e5e86e9b47a163a03
-MD5 (mutt/15.mallocline.PATCH) = 2ff9dfaf6834ad99024073c8071bd911
-MD5 (mutt/16.defaultcolor.PATCH) = 27026b81e11d721328140a9d95fee1ca
-MD5 (mutt/17.variables.PATCH) = dad08f489d5c32e55e6613dae42a52dc
-MD5 (mutt/18.buffy.PATCH) = e75d8b75350f5357366cb7649d124714
-MD5 (mutt/19.fdleak.PATCH) = 092c9065e099e12a4e1ca19e5886ff36
+MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
+MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
+MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
+MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
+MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
+MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
+MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
+MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
+MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
+MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
+MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
+MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
+MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
new file mode 100644
index 000000000000..cb0f0416ea6e
--- /dev/null
+++ b/mail/mutt/files/patch-01
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Dec 18 02:48:06 1996
++++ configure	Wed Dec 18 02:54:07 1996
+@@ -751,7 +751,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
++  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 164d2bee4b43..5c8fe943ee43 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.10 1996/12/05 09:52:00 obrien Exp $
+# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.53
+PKGNAME=	mutt-0.54
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,25 +20,20 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/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.keys.PATCH  \
-		03.configure.PATCH  \
-		04.mbox-hook.PATCH  \
-		05.bind.PATCH  \
-		08.undisclosed.PATCH  \
-		09.attach.PATCH  \
-		10.noop.PATCH  \
-		11.external.PATCH  \
-		12.tagged.PATCH  \
-		13.random.PATCH  \
-		15.mallocline.PATCH  \
-		16.defaultcolor.PATCH  \
-		17.variables.PATCH  \
-		19.fdleak.PATCH
+PATCHFILES=	02.control.PATCH  \
+		03.fileio.PATCH  \
+		04.parse.PATCH  \
+		05.url.PATCH  \
+		06.init.PATCH  \
+		08.dirlist.PATCH  \
+		09.complete.PATCH  \
+		10.prefix.PATCH  \
+		11.batchmode.PATCH  \
+		12.folderrecog.PATCH  \
+		14.savename.PATCH  \
+		15.postponed.PATCH
 #		don't apply cleanly:
-#		06.setgid.PATCH  \
-#		07.configure.in.PATCH  \
-#		14.mallocline.PATCH  \
-#		18.buffy.PATCH  \
+#		13.pagercontext.PATCH  \
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
@@ -50,14 +45,6 @@ GNU_CONFIGURE=	yes
 MAN1=		mutt.1
 
 
-#	distpatches weren't made relative to ${WRKSRC}
-pre-patch:
-	@ln ${WRKSRC}/doc/manual.sgml ${WRKSRC}
-
-post-patch:
-	@${CP} ${WRKSRC}/manual.sgml ${WRKSRC}/doc
-
-
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 288dd928a099..80306b3b1239 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1,17 +1,13 @@
-MD5 (mutt/mutt-0.53-export.tar.gz) = c984c22b939273a42f691781d36c3b5b
-MD5 (mutt/02.keys.PATCH) = 987aa46205aaa21b2ac4d374cf23d7b2
-MD5 (mutt/03.configure.PATCH) = 0e63bd18474209a1fe68ee2ee7817c81
-MD5 (mutt/04.mbox-hook.PATCH) = 44388b710473210c4308a0a351dc7a13
-MD5 (mutt/05.bind.PATCH) = c24a8aa40b25245c36de2f26c1d98f54
-MD5 (mutt/08.undisclosed.PATCH) = a5b68418663165dcea881a220e27d7ee
-MD5 (mutt/09.attach.PATCH) = 5baa56b69b916505460fee128b5ef349
-MD5 (mutt/10.noop.PATCH) = 40bd293ae90cd64e55bc22e84e556ec8
-MD5 (mutt/11.external.PATCH) = c0b1c863b2f0cc3796da8b967bd53a4b
-MD5 (mutt/12.tagged.PATCH) = aedd31c8a87edf1bf254aaa37c9122aa
-MD5 (mutt/13.random.PATCH) = 8552d76e3aa4f185a2b0fe3fe2bd7ab0
-MD5 (mutt/14.mallocline.PATCH) = ffb2f8fbf5964a0e5e86e9b47a163a03
-MD5 (mutt/15.mallocline.PATCH) = 2ff9dfaf6834ad99024073c8071bd911
-MD5 (mutt/16.defaultcolor.PATCH) = 27026b81e11d721328140a9d95fee1ca
-MD5 (mutt/17.variables.PATCH) = dad08f489d5c32e55e6613dae42a52dc
-MD5 (mutt/18.buffy.PATCH) = e75d8b75350f5357366cb7649d124714
-MD5 (mutt/19.fdleak.PATCH) = 092c9065e099e12a4e1ca19e5886ff36
+MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
+MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
+MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
+MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
+MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
+MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
+MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
+MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
+MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
+MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
+MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
+MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
+MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
new file mode 100644
index 000000000000..cb0f0416ea6e
--- /dev/null
+++ b/mail/mutt14/files/patch-01
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Dec 18 02:48:06 1996
++++ configure	Wed Dec 18 02:54:07 1996
+@@ -751,7 +751,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
++  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"