Upgrade to version 0.52

9 files changed, 33 insertions, 96 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 16231ec01996..91da2831a3a3 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.3 1996/11/11 18:37:07 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/17 07:42:41 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.49
+PKGNAME=	mutt-0.52
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,18 +20,13 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.fr/~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.typo.PATCH  \
-		04.man.PATCH  \
-		05.michael.PATCH  \
-		06.newmail.PATCH  \
-		07.pop.PATCH  \
-		09.search.PATCH  \
-		10.mimefwd.PATCH
+PATCHFILES=
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
 DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
+#PATCH_DIST_STRIP=	-p2
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
 MAN1=		mutt.1
@@ -41,9 +36,9 @@ post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
-	@${ECHO} "Installing Mutt documentation"
+	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt  \
+	@${INSTALL_DATA} ${WRKSRC}/doc/*  \
 		${PREFIX}/share/doc/mutt
 .endif
 
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 729dff1455c2..2d8df12e5312 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,9 +1 @@
-MD5 (mutt-0.49-export.tar.gz) = 6f1609bd9c4e87e9ff45200fdc7358e5
-MD5 (03.typo.PATCH) = 0bc8af2c9cd760fa94dae8a2be73931c
-MD5 (04.man.PATCH) = fdeb3553132bca6d1d02b0140e087101
-MD5 (05.michael.PATCH) = 1768a7a340b1a33376f2a42220a1ba63
-MD5 (06.newmail.PATCH) = abf1cb8dfa1913d8ae580da6d52288d3
-MD5 (07.pop.PATCH) = e31d1543633875b13fb894738db731ba
-MD5 (08.findkeys.PATCH) = 2a1256a8393c09253441a1093a47c60f
-MD5 (09.search.PATCH) = 7a2054606345af1be6406b82ee2f3097
-MD5 (10.mimefwd.PATCH) = e9eaf0adb513e85f6e5d95e74f1f6fa2
+MD5 (mutt-0.52-export.tar.gz) = 9d68f0713be6c73f0db0ae8c59a604a1
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 4d6823a87ce1..c6efc36c2548 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -1,15 +1,7 @@
 bin/mutt
 man/man1/mutt.1.gz
-share/Muttrc
-share/mime.types
-share/doc/mutt/manual-1.html
-share/doc/mutt/manual-2.html
-share/doc/mutt/manual-3.html
-share/doc/mutt/manual-4.html
-share/doc/mutt/manual-5.html
-share/doc/mutt/manual-6.html
-share/doc/mutt/manual-7.html
-share/doc/mutt/manual-8.html
-share/doc/mutt/manual-9.html
-share/doc/mutt/manual.html
+share/misc/Muttrc
+share/misc/mime.types
+share/doc/mutt/makefile
+share/doc/mutt/manual.sgml
 share/doc/mutt/manual.txt
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 16231ec01996..91da2831a3a3 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.3 1996/11/11 18:37:07 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/17 07:42:41 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.49
+PKGNAME=	mutt-0.52
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,18 +20,13 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.fr/~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.typo.PATCH  \
-		04.man.PATCH  \
-		05.michael.PATCH  \
-		06.newmail.PATCH  \
-		07.pop.PATCH  \
-		09.search.PATCH  \
-		10.mimefwd.PATCH
+PATCHFILES=
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
 DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
+#PATCH_DIST_STRIP=	-p2
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
 MAN1=		mutt.1
@@ -41,9 +36,9 @@ post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
-	@${ECHO} "Installing Mutt documentation"
+	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt  \
+	@${INSTALL_DATA} ${WRKSRC}/doc/*  \
 		${PREFIX}/share/doc/mutt
 .endif
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 729dff1455c2..2d8df12e5312 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,9 +1 @@
-MD5 (mutt-0.49-export.tar.gz) = 6f1609bd9c4e87e9ff45200fdc7358e5
-MD5 (03.typo.PATCH) = 0bc8af2c9cd760fa94dae8a2be73931c
-MD5 (04.man.PATCH) = fdeb3553132bca6d1d02b0140e087101
-MD5 (05.michael.PATCH) = 1768a7a340b1a33376f2a42220a1ba63
-MD5 (06.newmail.PATCH) = abf1cb8dfa1913d8ae580da6d52288d3
-MD5 (07.pop.PATCH) = e31d1543633875b13fb894738db731ba
-MD5 (08.findkeys.PATCH) = 2a1256a8393c09253441a1093a47c60f
-MD5 (09.search.PATCH) = 7a2054606345af1be6406b82ee2f3097
-MD5 (10.mimefwd.PATCH) = e9eaf0adb513e85f6e5d95e74f1f6fa2
+MD5 (mutt-0.52-export.tar.gz) = 9d68f0713be6c73f0db0ae8c59a604a1
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 4d6823a87ce1..c6efc36c2548 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -1,15 +1,7 @@
 bin/mutt
 man/man1/mutt.1.gz
-share/Muttrc
-share/mime.types
-share/doc/mutt/manual-1.html
-share/doc/mutt/manual-2.html
-share/doc/mutt/manual-3.html
-share/doc/mutt/manual-4.html
-share/doc/mutt/manual-5.html
-share/doc/mutt/manual-6.html
-share/doc/mutt/manual-7.html
-share/doc/mutt/manual-8.html
-share/doc/mutt/manual-9.html
-share/doc/mutt/manual.html
+share/misc/Muttrc
+share/misc/mime.types
+share/doc/mutt/makefile
+share/doc/mutt/manual.sgml
 share/doc/mutt/manual.txt
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 16231ec01996..91da2831a3a3 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.3 1996/11/11 18:37:07 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/17 07:42:41 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.49
+PKGNAME=	mutt-0.52
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,18 +20,13 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.fr/~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.typo.PATCH  \
-		04.man.PATCH  \
-		05.michael.PATCH  \
-		06.newmail.PATCH  \
-		07.pop.PATCH  \
-		09.search.PATCH  \
-		10.mimefwd.PATCH
+PATCHFILES=
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
 DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
+#PATCH_DIST_STRIP=	-p2
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
 MAN1=		mutt.1
@@ -41,9 +36,9 @@ post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
-	@${ECHO} "Installing Mutt documentation"
+	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt  \
+	@${INSTALL_DATA} ${WRKSRC}/doc/*  \
 		${PREFIX}/share/doc/mutt
 .endif
 
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 729dff1455c2..2d8df12e5312 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1,9 +1 @@
-MD5 (mutt-0.49-export.tar.gz) = 6f1609bd9c4e87e9ff45200fdc7358e5
-MD5 (03.typo.PATCH) = 0bc8af2c9cd760fa94dae8a2be73931c
-MD5 (04.man.PATCH) = fdeb3553132bca6d1d02b0140e087101
-MD5 (05.michael.PATCH) = 1768a7a340b1a33376f2a42220a1ba63
-MD5 (06.newmail.PATCH) = abf1cb8dfa1913d8ae580da6d52288d3
-MD5 (07.pop.PATCH) = e31d1543633875b13fb894738db731ba
-MD5 (08.findkeys.PATCH) = 2a1256a8393c09253441a1093a47c60f
-MD5 (09.search.PATCH) = 7a2054606345af1be6406b82ee2f3097
-MD5 (10.mimefwd.PATCH) = e9eaf0adb513e85f6e5d95e74f1f6fa2
+MD5 (mutt-0.52-export.tar.gz) = 9d68f0713be6c73f0db0ae8c59a604a1
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index 4d6823a87ce1..c6efc36c2548 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -1,15 +1,7 @@
 bin/mutt
 man/man1/mutt.1.gz
-share/Muttrc
-share/mime.types
-share/doc/mutt/manual-1.html
-share/doc/mutt/manual-2.html
-share/doc/mutt/manual-3.html
-share/doc/mutt/manual-4.html
-share/doc/mutt/manual-5.html
-share/doc/mutt/manual-6.html
-share/doc/mutt/manual-7.html
-share/doc/mutt/manual-8.html
-share/doc/mutt/manual-9.html
-share/doc/mutt/manual.html
+share/misc/Muttrc
+share/misc/mime.types
+share/doc/mutt/makefile
+share/doc/mutt/manual.sgml
 share/doc/mutt/manual.txt