As an "overwrite" package, install mbox.5 as mutt-mbox.5 to avoid

conflicting with qmail's mbox.5 in an upcoming update. As a "pkgviews"
package, install with the original filename and let the sysadmin
decide which mbox.5 should be in which view. Bump PKGREVISION. OK'd
by tron.

While I'm here, move BUILD_USES_MSGFMT up a bit to placate pkglint.

4 files changed, 18 insertions, 12 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 0fa1c70a875..c8a88184c60 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2004/07/07 16:23:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.120 2004/07/17 00:33:15 schmonz Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -13,10 +13,10 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		Text-based MIME mail client with PGP support
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 BUILD_USES_MSGFMT=	yes
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
@@ -86,6 +86,9 @@ post-install:
 	@if [ -f ${PREFIX}/bin/mutt_dotlock ]; then \
 		${ECHO} "bin/mutt_dotlock" >> ${PLIST_SRC}; \
 	fi
+.if (${PKG_INSTALLATION_TYPE} == "pkgviews")
+	${MV} ${PREFIX}/man/man5/mutt-mbox.5 ${PREFIX}/man/man5/mbox.5
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index d3948b5b943..b90c1c52e9d 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/09/16 15:12:53 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/07/17 00:33:15 schmonz Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -7,7 +7,7 @@ bin/pgpring
 man/man1/flea.1
 man/man1/mutt.1
 man/man1/muttbug.1
-man/man5/mbox.5
+man/man5/mutt-mbox.5
 man/man5/muttrc.5
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 125d5e489b7..956cf739455 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2004/03/16 16:52:58 jlam Exp $
+$NetBSD: distinfo,v 1.21 2004/07/17 00:33:15 schmonz Exp $
 
 SHA1 (mutt-1.4.2.1i.tar.gz) = 10fae2eef5a671d1ea6e17acd6e64cd1f37c3961
 Size (mutt-1.4.2.1i.tar.gz) = 2611253 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
 SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
 SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
 SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab
-SHA1 (patch-ag) = a1574bfe28b2a0ee5295a3f3529b6865f72075fa
+SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
 SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
 SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
 SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
index 91d1dc87370..269f3f71163 100644
--- a/mail/mutt/patches/patch-ag
+++ b/mail/mutt/patches/patch-ag
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.6 2002/12/03 21:21:58 jmmv Exp $
+$NetBSD: patch-ag,v 1.7 2004/07/17 00:33:15 schmonz Exp $
 
---- doc/Makefile.in.orig	Tue Nov  6 20:12:31 2001
+--- doc/Makefile.in.orig	2001-11-06 14:12:31.000000000 -0500
 +++ doc/Makefile.in
-@@ -74,8 +74,6 @@ install: all instdoc
+@@ -74,10 +74,8 @@ install: all instdoc
  	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
  	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
  	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
 -	./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/mbox.5
++	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(srcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \