diff options
| author | wiz <wiz@pkgsrc.org> | 2017-03-08 10:05:34 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-03-08 10:05:34 +0000 |
| commit | 7c36cc283745288e67dfd84226d8fd05227a9f87 (patch) | |
| tree | 4d5b5bf64fefa290ceb402b03334f767769200da | |
| parent | 96d35dc51f1253d1bbc3c08059f078b76e4140a8 (diff) | |
| download | pkgsrc-7c36cc283745288e67dfd84226d8fd05227a9f87.tar.gz | |
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.
| -rw-r--r-- | mail/mutt/Makefile | 3 | ||||
| -rw-r--r-- | mail/mutt/PLIST | 4 | ||||
| -rw-r--r-- | mail/mutt/distinfo | 4 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ag | 10 |
4 files changed, 10 insertions, 11 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index f7c3fd14fd0..46dc02ee92a 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -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/ diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST index 9113266834a..84f1aea3594 100644 --- a/mail/mutt/PLIST +++ b/mail/mutt/PLIST @@ -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 diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 2a28ee341fd..311a24311ee 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -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) = 40d119b7efed1a4622c42badc9ee97349b504044 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 diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag index 30dfb84cd24..5d3fd91487b 100644 --- a/mail/mutt/patches/patch-ag +++ b/mail/mutt/patches/patch-ag @@ -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) ; \ |