CVS commit: pkgsrc/mail/mutt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar  8 10:05:34 UTC 2017

Modified Files:
        pkgsrc/mail/mutt: Makefile PLIST distinfo
        pkgsrc/mail/mutt/patches: patch-ag

Log Message:
Rename mutt-mmdf(5) back to mmdf(5), to reduce diffs with upstream.
Conflict with tin was solved by renaming tin's man page.

Requested by Michael-John Turner in PR 52046.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/mutt/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/mutt/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.186 pkgsrc/mail/mutt/Makefile:1.187
--- pkgsrc/mail/mutt/Makefile:1.186     Fri Feb 24 23:31:24 2017
+++ pkgsrc/mail/mutt/Makefile   Wed Mar  8 10:05:34 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.186 2017/02/24 23:31:24 wiz Exp $
+# $NetBSD: Makefile,v 1.187 2017/03/08 10:05:34 wiz Exp $
 
 DISTNAME=              mutt-1.8.0
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 

Index: pkgsrc/mail/mutt/PLIST
diff -u pkgsrc/mail/mutt/PLIST:1.21 pkgsrc/mail/mutt/PLIST:1.22
--- pkgsrc/mail/mutt/PLIST:1.21 Sat Feb 25 14:29:01 2017
+++ pkgsrc/mail/mutt/PLIST      Wed Mar  8 10:05:34 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2017/02/25 14:29:01 tron Exp $
+@comment $NetBSD: PLIST,v 1.22 2017/03/08 10:05:34 wiz Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -13,8 +13,8 @@ man/man1/muttbug.1
 man/man1/pgpewrap.1
 man/man1/pgpring.1
 man/man1/smime_keys.1
+man/man5/mmdf.5
 man/man5/mutt-mbox.5
-man/man5/mutt-mmdf.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.54 pkgsrc/mail/mutt/distinfo:1.55
--- pkgsrc/mail/mutt/distinfo:1.54      Fri Feb 24 23:31:24 2017
+++ pkgsrc/mail/mutt/distinfo   Wed Mar  8 10:05:34 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2017/02/24 23:31:24 wiz Exp $
+$NetBSD: distinfo,v 1.55 2017/03/08 10:05:34 wiz Exp $
 
 SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef
 RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24
@@ -10,7 +10,7 @@ SHA1 (patch-ac) = 40d119b7efed1a4622c42b
 SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
 SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
 SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
-SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
+SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683
 SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
 SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f

Index: pkgsrc/mail/mutt/patches/patch-ag
diff -u pkgsrc/mail/mutt/patches/patch-ag:1.9 pkgsrc/mail/mutt/patches/patch-ag:1.10
--- pkgsrc/mail/mutt/patches/patch-ag:1.9       Thu Sep  3 21:04:34 2015
+++ pkgsrc/mail/mutt/patches/patch-ag   Wed Mar  8 10:05:34 2017
@@ -1,15 +1,13 @@
-$NetBSD: patch-ag,v 1.9 2015/09/03 21:04:34 wiz Exp $
+$NetBSD: patch-ag,v 1.10 2017/03/08 10:05:34 wiz Exp $
 
---- doc/Makefile.in.orig       2015-08-30 17:24:26.000000000 +0000
+--- doc/Makefile.in.orig       2017-02-24 18:39:56.000000000 +0000
 +++ doc/Makefile.in
-@@ -642,8 +642,8 @@ install-data-local: makedoc-all instdoc
+@@ -654,7 +654,7 @@ install-data-local: makedoc-all instdoc
        test x$(DOTLOCK_TARGET) = x || ./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)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
 +      ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
-+      ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
+       ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
        $(MKDIR_P) $(DESTDIR)$(docdir)
        for f in $(topsrcdir_DOCFILES) ; do \
-               $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \