Install mutt_dotlock unconditionally

Re-enable user-destdir, by using SPECIAL_PERMS, thanks joerg@ for pointing that

4 files changed, 21 insertions, 24 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e2afc711039..d36f8c13caa 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2009/01/26 22:35:02 tonio Exp $
+# $NetBSD: Makefile,v 1.72 2009/01/27 19:50:33 tonio Exp $
 
 DISTNAME=		mutt-1.5.19
+PKGREVISION=		1
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -13,7 +14,7 @@ HOMEPAGE=		http://www.mutt.org/
 COMMENT=		Text-based MIME mail client with PGP & S/MIME support
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	destdir # avoid user-destdir to handle mutt_dotlock
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,9 +25,9 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}		\
 			--with-docdir=${PREFIX}/share/doc/mutt		\
 			--without-included-gettext			\
+			--enable-external-dotlock			\
 			--enable-pop					\
 			--enable-imap
-MAKE_ENV+=		CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q}
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
 # Force sendmail to /usr/sbin to avoid postfix's
@@ -62,12 +63,7 @@ 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
-.if exists(${WRKSRC}/mutt_dotlock)
-PLIST.dotlock=		yes
-.endif
+SPECIAL_PERMS+=	bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 72e48591917..8d33754ed01 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.18 2009/01/26 22:35:02 tonio Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/01/27 19:50:33 tonio Exp $
 bin/flea
 bin/mutt
 bin/muttbug
-${PLIST.dotlock}bin/mutt_dotlock
+bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 ${PLIST.smime}bin/smime_keys
 man/man1/flea.1
 man/man1/mutt.1
-${PLIST.dotlock}man/man1/mutt_dotlock.1
+man/man1/mutt_dotlock.1
 man/man1/muttbug.1
 man/man5/mutt-mbox.5
 man/man5/mutt-mmdf.5
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 10c0570fe5f..446a3fe63cd 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.53 2009/01/26 22:35:02 tonio Exp $
+$NetBSD: distinfo,v 1.54 2009/01/27 19:50:33 tonio Exp $
 
 SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
 RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
 Size (mutt-1.5.19.tar.gz) = 3558746 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = afc1b743c9299d0aa817dff3a0e580bbb3b9302a
+SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
 SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index 5235ecff03e..d6cf0ef69fa 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2008/05/18 08:26:31 tonio Exp $
+$NetBSD: patch-ab,v 1.12 2009/01/27 19:50:33 tonio Exp $
 
---- Makefile.in.orig	Sat May 17 20:04:33 2008
+--- Makefile.in.orig	2009-01-05 20:24:13.000000000 +0100
 +++ Makefile.in
-@@ -161,7 +161,7 @@ DATADIRNAME = @DATADIRNAME@
+@@ -163,7 +163,7 @@ DATADIRNAME = @DATADIRNAME@
  DBX = @DBX@
  DEBUGGER = @DEBUGGER@
  DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.11 2008/05/18 08:26:31 tonio Exp $
  	-DHAVE_CONFIG_H=1
  
  DEPDIR = @DEPDIR@
-@@ -271,7 +271,7 @@ infodir = @infodir@
+@@ -272,7 +272,7 @@ infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -20,14 +20,15 @@ $NetBSD: patch-ab,v 1.11 2008/05/18 08:26:31 tonio Exp $
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -1021,8 +1021,8 @@ install-exec-hook:
+@@ -1063,11 +1063,6 @@ install-exec-hook:
+ 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
  		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
  	fi
- 	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
+-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
 -		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
 -		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-+		${CHGRP} @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-+		${CHMOD} @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
- 		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
- 	fi
+-		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+-	fi
  
+ install-data-local:
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)