Fix path names in Muttrc (PR 40068). Bump revision.

3 files changed, 45 insertions, 3 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 7d74b91bd2f..9b87a67fb9b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2008/11/19 12:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2008/11/29 21:31:58 joerg Exp $
 
 DISTNAME=		mutt-1.5.18
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -58,6 +58,11 @@ CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 FILES_SUBST+=		DOCDIR=${DOCDIR}
 INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	doc/Muttrc
+SUBST_VARS.paths+=	DOCDIR PREFIX
+SUBST_STAGE.paths+=	pre-configure
+
 # Define WRKSRC explicitly so we can use its value below.
 WRKSRC=			${WRKDIR}/${DISTNAME}
 PLIST_VARS+=		dotlock
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index a179bd15716..b815297baf0 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2008/11/19 12:06:41 wiz Exp $
+$NetBSD: distinfo,v 1.52 2008/11/29 21:31:59 joerg Exp $
 
 SHA1 (mutt-1.5.18.tar.gz) = a835a1933297494f2c6c68b9a334cc1d71a95e5a
 RMD160 (mutt-1.5.18.tar.gz) = 1c8595f66eb9aa94c01a6020be20a75c0c8d2d14
@@ -18,3 +18,4 @@ SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = dcd89d76cab32bed582a3f9c40e979508fdffa06
 SHA1 (patch-ao) = 9119cc582edab5ad59fc5531467e6bc5ea7c968b
+SHA1 (patch-ap) = 3da973ee9e8e3787b286aaf7097c7f18a6afe28c
diff --git a/mail/mutt-devel/patches/patch-ap b/mail/mutt-devel/patches/patch-ap
new file mode 100644
index 00000000000..b209908ad52
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ap
@@ -0,0 +1,36 @@
+$NetBSD: patch-ap,v 1.1 2008/11/29 21:31:59 joerg Exp $
+
+--- doc/Muttrc.orig	2008-11-29 22:13:21.000000000 +0100
++++ doc/Muttrc
+@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\
+ "call urlview to extract URLs out of a message"
+ 
+ # Show documentation when pressing F1
+-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
++macro generic,pager <F1> "<shell-escape> less @DOCDIR@/manual.txt<Enter>" "show Mutt documentation"
+ 
+ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+ macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+@@ -719,11 +719,11 @@ attachments   -I message/external-body
+ # filtered message is read from the standard output.
+ # 
+ # 
+-# set dotlock_program="/usr/local/bin/mutt_dotlock"
++# set dotlock_program="@PREFIX@/bin/mutt_dotlock"
+ #
+ # Name: dotlock_program
+ # Type: path
+-# Default: "/usr/local/bin/mutt_dotlock"
++# Default: "@PREFIX@/bin/mutt_dotlock"
+ # 
+ # 
+ # Contains the path of the mutt_dotlock (8) binary to be used by
+@@ -4306,7 +4306,7 @@ attachments   -I message/external-body
+ # instead of a raw socket. You may be able to use this to set up
+ # preauthenticated connections to your IMAP/POP3 server. Example:
+ # 
+-# tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
++# tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd"
+ # 
+ # NOTE: For this example to work you must be able to log in to the remote
+ # machine without having to enter a password.