Upgrade 0.55 to PL10.

And fix patches to version.h to say this version, rather than the last one.
Noticed by:	Andreas Klemm

Excelent patches applied so that we can produce the HTML docs using our
own SGML tools.
Submitted by:	J"org

6 files changed, 70 insertions, 10 deletions

diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index d215ba3adbe6..e7ffee47b776 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.12 1996/12/18 05:06:26 obrien Exp $
+# $Id: Makefile,v 1.13 1996/12/25 13:58:58 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.55
@@ -15,21 +15,28 @@ 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=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+		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.externally.PATCH  \
 		03.ispell.PATCH  \
-		04.savename.PATCH
+		04.savename.PATCH  \
+		05.hdrloop.PATCH  \
+		07.mboxhook.PATCH  \
+		08.keypad.PATCH  \
+		09.quote_regexp.PATCH  \
+		10.mark-as-new.PATCH  \
+		06.buffy.PATCH	# other patches need to be before this one
 
-MAINTAINER=     obrien@cs.ucdavis.edu
+MAINTAINER=     obrien@FreeBSD.org
 
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
 #PATCH_DIST_STRIP=	-p2
-PATCH_DIST_STRIP=	
+PATCH_DIST_STRIP=	-p1
+#PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
 MAN1=		mutt.1
 
@@ -40,7 +47,7 @@ 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/*  \
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.latin1 ${WRKSRC}/doc/*.html  \
 		${PREFIX}/share/doc/mutt
 .endif
 
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 31cbf83027ab..ba0d7b25e166 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -2,3 +2,9 @@ MD5 (mutt/mutt-0.55-export.tar.gz) = 8dbde302a3bb4182d54471cc5641ee48
 MD5 (mutt/02.externally.PATCH) = 2c3ebeb012d58f3d59830e3a5e0db10c
 MD5 (mutt/03.ispell.PATCH) = f1ea0cbd02ab023eec47f8b31f39a87f
 MD5 (mutt/04.savename.PATCH) = a2d267248e444d6297e1660f45700e8a
+MD5 (mutt/05.hdrloop.PATCH) = ffd10ec48d22380ffdb7bf866a0bc008
+MD5 (mutt/07.mboxhook.PATCH) = 0ba76641c96c4799d8b045ef764e045f
+MD5 (mutt/08.keypad.PATCH) = 6acbe3a2840b10026430011f5a02f3b1
+MD5 (mutt/09.quote_regexp.PATCH) = 4f277f7150f4df102dfb49b94487adc5
+MD5 (mutt/10.mark-as-new.PATCH) = 2f1a7f1011ef3d12a67989d7bab6c3f5
+MD5 (mutt/06.buffy.PATCH) = 54ab33e6e82885c1866080f931401d8a
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
new file mode 100644
index 000000000000..aac301ee7563
--- /dev/null
+++ b/mail/mutt14/files/patch-01
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	Wed Dec 18 14:06:39 1996
++++ Makefile.in	Tue Dec 31 05:41:59 1996
+@@ -45,10 +45,13 @@
+ TAINTED= curs_main.c handler.c hdrline.c init.c keymap.c main.c parse.c \
+ 	send.c sendlib.c
+ 
+-all: mutt
++all: mutt docs
+ 
+ mutt: $(OBJS)
+ 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
++
++docs:
++	cd doc && make fbsd
+ 
+ install: mutt
+ 	$(srcdir)/mkinstalldirs $(bindir)
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
new file mode 100644
index 000000000000..aa477d0f9d09
--- /dev/null
+++ b/mail/mutt14/files/patch-02
@@ -0,0 +1,20 @@
+--- doc/makefile.orig	Thu Oct  3 16:40:44 1996
++++ doc/makefile	Tue Dec 31 05:40:21 1996
+@@ -1,10 +1,16 @@
++fbsd: manual.latin1 manual.html
++
+ all: manual.txt manual.html
+ 
+ manual.txt: manual.sgml
+ 	sgml2txt manual
+ 
+ manual.html: manual.sgml
+-	sgml2html manual
++	#sgml2html manual
++	sgmlfmt -f html manual
++
++manual.latin1: manual.sgml
++	sgmlfmt -f latin1 manual.sgml
+ 
+ clean:
+ 	rm -f *~
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
new file mode 100644
index 000000000000..773ae7177e83
--- /dev/null
+++ b/mail/mutt14/files/patch-03
@@ -0,0 +1,11 @@
+--- doc/manual.sgml.orig	Tue Dec 31 05:31:53 1996
++++ doc/manual.sgml	Tue Dec 31 05:38:24 1996
+@@ -1,4 +1,7 @@
+-<!doctype linuxdoc system>
++<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
++<!ENTITY dquot "&#34;">
++]>
++<linuxdoc>
+ 
+ <article>
+ 
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index c6efc36c2548..a79c4d9050bf 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -2,6 +2,5 @@ bin/mutt
 man/man1/mutt.1.gz
 share/misc/Muttrc
 share/misc/mime.types
-share/doc/mutt/makefile
-share/doc/mutt/manual.sgml
-share/doc/mutt/manual.txt
+@unexec /bin/rm -rf %D/share/doc/mutt
+share/doc/mutt