>Number:         30102
>Category:       pkg
>Synopsis:       patch for upgraging mutt-devel to 1.5.9i
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 30 23:02:00 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 3.99.3
>Organization:
	
>Environment:
	
	
System: NetBSD arcelot.loria.fr 3.99.3 NetBSD 3.99.3 (XEN0) #0: Tue Apr 12 14:45:09 CEST 2005 tonio@arcelot.loria.fr:/usr/obj/sys/arch/i386/compile/XEN0 i386
Architecture: i386
Machine: i386
>Description:
Here a simple patch for upgrading mutt-devel to 1.5.9i, released on March 13, 2005.
I just removed the patch-am as it seems it is no more needed, and adapted the
patches which did not apply on the new version.
Thanks to the INSTALL, subst work for mutt_dotlock, i had nothing to do for PLIST.

The Changelog contains mainly bugfixes.

>How-To-Repeat:
apply the patch, then make install, and enjoy mutt
>Fix:
The patch is at http://www.loria.fr/~reilles/divers/mutt-devel-1.5.9i.diff
I include it here for memory.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	11 Apr 2005 21:46:21 -0000	1.30
+++ Makefile	30 Apr 2005 22:50:01 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.30 2005/04/11 21:46:21 tv 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/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	24 Feb 2005 09:59:25 -0000	1.21
+++ distinfo	30 Apr 2005 22:50:01 -0000
@@ -1,12 +1,11 @@
 $NetBSD: distinfo,v 1.21 2005/02/24 09:59:25 agc 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) = 101b16c76015cb2f41c24f7743e0916886ba00be
+SHA1 (patch-ab) = 4e732f5d37732189b375f89af946fa351bf1f07c
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
-SHA1 (patch-ag) = ebfeb5c03770501f7e7cc918ec2c56ddc2f1ed1d
+SHA1 (patch-ag) = 86de791440961ecff0ca2460dd3861b47c871a39
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
-SHA1 (patch-am) = 8fb3b3d4b387af9f7ada3c7752a9501a08b47319
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- patches/patch-ab	5 Aug 2004 03:24:39 -0000	1.5
+++ patches/patch-ab	30 Apr 2005 22:50:01 -0000
@@ -1,35 +1,20 @@
-$NetBSD: patch-ab,v 1.5 2004/08/05 03:24:39 jlam Exp $
-
---- Makefile.in.orig	Sun Feb  1 13:24:01 2004
-+++ Makefile.in
-@@ -26,6 +26,7 @@ datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
+--- Makefile.in.orig	2005-05-01 00:13:17.000000000 +0200
+$NetBSD$
++++ Makefile.in	2005-05-01 00:17:16.000000000 +0200
+@@ -169,7 +169,7 @@
+ DBX = @DBX@
+ DEBUGGER = @DEBUGGER@
+ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
+-	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
++	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
+ 	-DHAVE_CONFIG_H=1
+ 
+ DEPDIR = @DEPDIR@
+@@ -277,6 +277,7 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
  localstatedir = @localstatedir@
 +localedir = $(prefix)/share/locale
- libdir = @libdir@
- infodir = @infodir@
  mandir = @mandir@
-@@ -113,11 +114,11 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring ma
- 
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
- 
--bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
- BUILT_SOURCES = keymap_defs.h patchlist.c
- 
--bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-+bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c         crypt.c cryptglue.c 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c 	postpone.c query.c recvattach.c recvcmd.c 	rfc822.c rfc1524.c rfc2047.c rfc2231.c 	score.c send.c sendlib.c signal.c sort.c 	status.c system.c thread.c charset.c history.c lib.c 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c 	url.c ascii.c mutt_idna.c
- 
- 
-@@ -140,7 +141,7 @@ makedoc_DEPENDENCIES = 
- 
- CPP = @CPP@
- 
--DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" 	-DHAVE_CONFIG_H=1
-+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" 	-DHAVE_CONFIG_H=1
- 
- 
- INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/patches/patch-ag,v
retrieving revision 1.1
diff -u -r1.1 patch-ag
--- patches/patch-ag	21 Jul 2004 22:37:10 -0000	1.1
+++ patches/patch-ag	30 Apr 2005 22:50:01 -0000
@@ -1,13 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2004/07/21 22:37:10 jlam Exp $
-
---- doc/Makefile.in.orig	Sat Dec  7 09:15:01 2002
-+++ doc/Makefile.in
-@@ -79,7 +79,7 @@ install: all instdoc
+$NetBSD$
+--- doc/Makefile.in.orig	2005-05-01 00:19:09.000000000 +0200
++++ doc/Makefile.in	2005-05-01 00:20:27.000000000 +0200
+@@ -80,7 +80,7 @@
  	./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) ; \


>Unformatted: