From b4047b0a7292320c9deba861c814ff814dd84466 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 11 Apr 2006 13:57:32 +0000
Subject: We currently set WRKDIR in bsd.prefs.mk but not WRKSRC, so define
 WRKSRC explicitly to it's default value before it is used in the exists()
 check just below it.  This fixes the PLIST in the case where mutt_dotlock is
 installed.  Bump the PKGREVISION to 4.

---
 mail/mutt-devel/Makefile | 8 +++++---
 mail/mutt-devel/PLIST    | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'mail/mutt-devel')

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index c07696ef04b..ee039a3d0ff 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/11 13:57:32 jlam Exp $
 
 DISTNAME=		mutt-1.5.11
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -23,7 +23,7 @@ USE_TOOLS+=		perl:run
 REPLACE_PERL=		*.pl */*.pl
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}			\
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}		\
 			--with-docdir=${PREFIX}/share/doc/mutt		\
 			--without-included-gettext			\
 			--enable-pop					\
@@ -52,6 +52,8 @@ CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 FILES_SUBST+=		DOCDIR=${DOCDIR:Q}
 
+# Define WRKSRC explicitly so we can use its value below.
+WRKSRC=			${WRKDIR}/${DISTNAME}
 .if exists(${WRKSRC}/mutt_dotlock)
 PLIST_SUBST+=		MUTT_DOTLOCK=
 .else
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index b38c3f33824..15e69eacd2b 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/03 14:16:53 tonio Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/11 13:57:32 jlam Exp $
 bin/flea
-bin/mutt
+${MUTT}bin/mutt
 bin/muttbug
 ${MUTT_DOTLOCK}bin/mutt_dotlock
 bin/pgpewrap
-- 
cgit v1.2.3