>Number:         30841
>Category:       pkg
>Synopsis:       upgrade pkgsrc for mutt-devel to 1.5.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jul 26 17:54:00 +0000 2005
>Originator:     Brian de Alwis
>Release:        NetBSD 2.0.2_STABLE
>Organization:
  Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
"There is much pleasure to be gained in useless knowledge." - Bertrand Russell
>Environment:
System: NetBSD slab 2.0.2_STABLE NetBSD 2.0.2_STABLE (SLAB) #4: Thu Apr 21 15:33:39 PDT 2005 bsd@slab:/usr/src/src-2.0/sys/arch/i386/compile/SLAB i386
Architecture: i386
Machine: i386
>Description:
	mutt-devel 1.5.9 was just released.  The following patches
	are for upgrading pkgsrc mail/mutt-devel.

>How-To-Repeat:
>Fix:
    patches -ab and -am are no longer necessary.
    patch -ag was offset by a line.

--- Makefile.orig	2005-07-16 03:03:04.000000000 -0700
+++ Makefile	2005-07-26 10:29:23.000000000 -0700
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.32 2005/07/16 01:19:13 jlam Exp $
 
-DISTNAME=		mutt-1.5.6i
+DISTNAME=		mutt-1.5.9i
 PKGNAME=		${DISTNAME:C/i$//}
-PKGREVISION=	1
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \

--- distinfo.orig	2005-07-26 10:29:41.000000000 -0700
+++ distinfo	2005-07-26 10:36:52.000000000 -0700
@@ -1,12 +1,10 @@
 $NetBSD: distinfo,v 1.22 2005/05/29 05:09:55 minskim Exp $
 
-SHA1 (mutt-1.5.6i.tar.gz) = 5b3ea613abeff4007fadc38946806aee2f225f48
-RMD160 (mutt-1.5.6i.tar.gz) = 9bcd0975d81ddedcfda41ae4875a16159fe9345e
-Size (mutt-1.5.6i.tar.gz) = 2910730 bytes
+SHA1 (mutt-1.5.9i.tar.gz) = a380747b86f11b2b3bf3c4407e70bfebe6d0af02
+RMD160 (mutt-1.5.9i.tar.gz) = 888848046382b3c4e8b18eacd30af4291a7ed23d
+Size (mutt-1.5.9i.tar.gz) = 3036003 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = c34c52fa0c49250d3acf7b402b56abf2531e6a68
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
-SHA1 (patch-ag) = ebfeb5c03770501f7e7cc918ec2c56ddc2f1ed1d
+SHA1 (patch-ag) = 51f256029e98e72afecac940ee1e148d0734edeb
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
-SHA1 (patch-am) = 8fb3b3d4b387af9f7ada3c7752a9501a08b47319

--- patch-ag.orig	2005-07-26 10:50:55.000000000 -0700
+++ patch-ag	2005-07-26 10:35:56.000000000 -0700
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2004/07/21 22:37:10 jlam Exp $
+$NetBSD$
 
---- doc/Makefile.in.orig	Sat Dec  7 09:15:01 2002
+--- doc/Makefile.in.orig	2005-02-15 11:28:24.000000000 -0800
 +++ doc/Makefile.in
-@@ -79,7 +79,7 @@ install: all instdoc
+@@ -80,7 +80,7 @@ install: all instdoc
	./instdoc $(srcdir)/dotlock.man \
		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
 -	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
 +	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
+ 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
	for f in $(srcdir_DOCFILES) ; do \
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \