Fix mutt(1) manpage so paths in the FILES section appear properly

(/etc -> PKG_SYSCONFDIR and /usr/local -> PREFIX). Also remove references
to the mutt_dotlock program and do not install its manpage because it does
not get installed. Bump PKGREVISION to 3.

Approved by tron, the maintainer.

5 files changed, 65 insertions, 5 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 93eb103cd92..cffec6538d9 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2002/12/01 15:38:00 salo Exp $
+# $NetBSD: Makefile,v 1.90 2002/12/03 21:21:57 jmmv Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -63,6 +63,14 @@ EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
+post-extract:
+	${MV} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/mutt.man.in
+
+pre-build:
+	${SED} -e "s|@PREFIX@|${PREFIX}|g" \
+	       -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
+	       < ${WRKSRC}/doc/mutt.man.in > ${WRKSRC}/doc/mutt.man
+
 post-install:
 	${LN} -s ${EGDIR} ${PREFIX}/share/doc/mutt/samples
 
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index c28d28ea3d0..8515cf5ebf8 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/27 19:05:40 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/03 21:21:57 jmmv Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -6,7 +6,6 @@ bin/pgpewrap
 bin/pgpring
 man/man1/flea.1
 man/man1/mutt.1
-man/man1/mutt_dotlock.1
 man/man1/muttbug.1
 man/man5/mbox.5
 man/man5/muttrc.5
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 7fb99c39904..5339673ddde 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2002/12/01 15:38:00 salo Exp $
+$NetBSD: distinfo,v 1.12 2002/12/03 21:21:57 jmmv Exp $
 
 SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
 Size (mutt-1.4i.tar.gz) = 2554158 bytes
 SHA1 (patch-ab) = e0d3c5b90c94a501436aa037f5538c4ab12b04bc
 SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
 SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
+SHA1 (patch-af) = 7ab4b6f8f6457317216d1d4126a19c07a478abad
+SHA1 (patch-ag) = a1574bfe28b2a0ee5295a3f3529b6865f72075fa
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
new file mode 100644
index 00000000000..ebe99ad355e
--- /dev/null
+++ b/mail/mutt/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.3 2002/12/03 21:21:57 jmmv Exp $
+
+--- doc/mutt.man.in.orig	Thu Aug 30 14:55:37 2001
++++ doc/mutt.man.in
+@@ -124,21 +124,19 @@ Editor to invoke when the ~v command is 
+ .PP
+ .IP "~/.muttrc or ~/.mutt/muttrc"
+ User configuration file.
+-.IP "/etc/Muttrc"
++.IP "@PKG_SYSCONFDIR@/Muttrc"
+ System-wide configuration file.
+ .IP "/tmp/muttXXXXXX"
+ Temporary files created by Mutt.
+ .IP "~/.mailcap"
+ User definition for handling non-text MIME types.
+-.IP "/etc/mailcap"
++.IP "@PKG_SYSCONFDIR@/mailcap"
+ System definition for handing non-text MIME types.
+ .IP "~/.mime.types"
+ User's personal mapping between MIME types and file extensions.
+-.IP "/etc/mime.types"
++.IP "@PKG_SYSCONFDIR@/mime.types"
+ System mapping between MIME types and file extensions.
+-.IP "/usr/local/bin/mutt_dotlock"
+-The privileged dotlocking program.
+-.IP "/usr/local/doc/mutt/manual.txt"
++.IP "@PREFIX@/share/doc/mutt/manual.txt"
+ The Mutt manual.
+ .SH BUGS
+ .PP
+@@ -174,7 +172,6 @@ GNU General Public License for more deta
+ .BR mailcap (5),
+ .BR maildir (5),
+ .BR mbox (5),
+-.BR mutt_dotlock (1),
+ .BR muttrc (5),
+ .BR ncurses (3),
+ .BR sendmail (1),
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
new file mode 100644
index 00000000000..91d1dc87370
--- /dev/null
+++ b/mail/mutt/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.6 2002/12/03 21:21:58 jmmv Exp $
+
+--- doc/Makefile.in.orig	Tue Nov  6 20:12:31 2001
++++ doc/Makefile.in
+@@ -74,8 +74,6 @@ 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
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)