Sat Apr 10 16:08:51 2010 UTC ()
Change handling of "mutt_dotlock" to match the "mutt-devel" package:
1.) Always install the binary. The permissions of "/var/mail" on
    the build system are just no good indicator to determine whether
    this program is required or not.
2.) Don't try to set the permissions of the binary in the makefile
    and add it to "SPECIAL_PERMS" instead. Mark the package as capable
    of user destinaton directory installation again.

Bump package revision because the binary package has changed at least
under NetBSD with default permissions for "/var/mail".


(tron)
diff -r1.160 -r1.161 pkgsrc/mail/mutt/Makefile
diff -r1.14 -r1.15 pkgsrc/mail/mutt/PLIST
diff -r1.34 -r1.35 pkgsrc/mail/mutt/distinfo
diff -r1.14 -r1.15 pkgsrc/mail/mutt/patches/patch-ab
cvs diff -r1.160 -r1.161 pkgsrc/mail/mutt/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt/Makefile 2010/03/30 10:56:00 1.160
+++ pkgsrc/mail/mutt/Makefile 2010/04/10 16:08:50 1.161
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.160 2010/03/30 10:56:00 tron Exp $ 1# $NetBSD: Makefile,v 1.161 2010/04/10 16:08:50 tron Exp $
2 2
3DISTNAME= mutt-1.4.2.3 3DISTNAME= mutt-1.4.2.3
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ 6MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
7 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \ 7 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
8 ftp://ftp.fu-berlin.de/unix/mail/mutt/ 8 ftp://ftp.fu-berlin.de/unix/mail/mutt/
9 9
10OWNER= tron@NetBSD.org 10OWNER= tron@NetBSD.org
11HOMEPAGE= http://www.mutt.org/ 11HOMEPAGE= http://www.mutt.org/
12COMMENT= Text-based MIME mail client with PGP support 12COMMENT= Text-based MIME mail client with PGP support
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PKG_DESTDIR_SUPPORT= destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} 20WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//}
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
26 --with-docdir=${PREFIX}/share/doc/mutt \ 26 --with-docdir=${PREFIX}/share/doc/mutt \
27 --without-included-gettext \ 27 --without-included-gettext \
 28 --enable-external-dotlock \
28 --enable-pop \ 29 --enable-pop \
29 --enable-imap 30 --enable-imap
30MAKE_ENV+= CHGRP=${CHGRP:Q} 31MAKE_ENV+= CHGRP=${CHGRP:Q}
31 32
32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 33.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
33# Force sendmail to /usr/sbin to avoid postfix's 34# Force sendmail to /usr/sbin to avoid postfix's
34# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 35# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
35# support mailwrapper. 36# support mailwrapper.
36CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 37CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
37.endif 38.endif
38 39
39.if ${OPSYS} == "SunOS" 40.if ${OPSYS} == "SunOS"
40CONFIGURE_ARGS+= --without-wc-funcs 41CONFIGURE_ARGS+= --without-wc-funcs
@@ -77,30 +78,27 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ @@ -77,30 +78,27 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/
77 78
78.include "options.mk" 79.include "options.mk"
79 80
80LDFLAGS+= ${_STRIPFLAG_CC} 81LDFLAGS+= ${_STRIPFLAG_CC}
81 82
82DOCDIR= ${PREFIX}/share/doc/mutt 83DOCDIR= ${PREFIX}/share/doc/mutt
83EGDIR= ${PREFIX}/share/examples/mutt 84EGDIR= ${PREFIX}/share/examples/mutt
84CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 85CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
85CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 86CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
86FILES_SUBST+= DOCDIR=${DOCDIR:Q} 87FILES_SUBST+= DOCDIR=${DOCDIR:Q}
87 88
88INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} 89INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
89 90
90PLIST_VARS+= dotlock 91SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
91.if exists(${WRKSRC}/mutt_dotlock) 
92PLIST.dotlock= yes 
93.endif 
94INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 92INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
95 93
96.include "../../converters/libiconv/buildlink3.mk" 94.include "../../converters/libiconv/buildlink3.mk"
97.include "../../devel/gettext-lib/buildlink3.mk" 95.include "../../devel/gettext-lib/buildlink3.mk"
98 96
99# Pre-create some directories and symlinks used during the installation 97# Pre-create some directories and symlinks used during the installation
100# process. 98# process.
101# 99#
102pre-install: 100pre-install:
103 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 101 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
104 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 102 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
105 ${RM} -f ${DESTDIR}${DOCDIR}/samples 103 ${RM} -f ${DESTDIR}${DOCDIR}/samples
106 ${LN} -sf ${DESTDIR}${EGDIR} ${DESTDIR}${DOCDIR}/samples 104 ${LN} -sf ${DESTDIR}${EGDIR} ${DESTDIR}${DOCDIR}/samples
cvs diff -r1.14 -r1.15 pkgsrc/mail/mutt/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/mutt/PLIST 2009/06/14 18:04:38 1.14
+++ pkgsrc/mail/mutt/PLIST 2010/04/10 16:08:50 1.15
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:04:38 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.15 2010/04/10 16:08:50 tron Exp $
2bin/flea 2bin/flea
3bin/mutt 3bin/mutt
4bin/muttbug 4bin/muttbug
5${PLIST.dotlock}bin/mutt_dotlock 5bin/mutt_dotlock
6bin/pgpewrap 6bin/pgpewrap
7bin/pgpring 7bin/pgpring
8man/man1/flea.1 8man/man1/flea.1
9man/man1/mutt.1 9man/man1/mutt.1
10man/man1/muttbug.1 10man/man1/muttbug.1
11man/man5/mutt-mbox.5 11man/man5/mutt-mbox.5
12man/man5/muttrc.5 12man/man5/muttrc.5
13share/doc/mutt/COPYRIGHT 13share/doc/mutt/COPYRIGHT
14share/doc/mutt/ChangeLog 14share/doc/mutt/ChangeLog
15share/doc/mutt/GPL 15share/doc/mutt/GPL
16share/doc/mutt/INSTALL 16share/doc/mutt/INSTALL
17share/doc/mutt/NEWS 17share/doc/mutt/NEWS
18share/doc/mutt/PGP-Notes.txt 18share/doc/mutt/PGP-Notes.txt
cvs diff -r1.34 -r1.35 pkgsrc/mail/mutt/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt/distinfo 2007/05/27 13:34:16 1.34
+++ pkgsrc/mail/mutt/distinfo 2010/04/10 16:08:50 1.35
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.34 2007/05/27 13:34:16 tron Exp $ 1$NetBSD: distinfo,v 1.35 2010/04/10 16:08:50 tron Exp $
2 2
3SHA1 (mutt-1.4.2.3.tar.gz) = b23e46873f0247e85a4417cf338d64ea698c9b2c 3SHA1 (mutt-1.4.2.3.tar.gz) = b23e46873f0247e85a4417cf338d64ea698c9b2c
4RMD160 (mutt-1.4.2.3.tar.gz) = 59e66c308cd4967e587ad1dc73dd76c7f0d06ef1 4RMD160 (mutt-1.4.2.3.tar.gz) = 59e66c308cd4967e587ad1dc73dd76c7f0d06ef1
5Size (mutt-1.4.2.3.tar.gz) = 2646433 bytes 5Size (mutt-1.4.2.3.tar.gz) = 2646433 bytes
6SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812 6SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
7SHA1 (patch-ab) = 2ba2794acdf7c73b28c07344a245f56742d53b92 7SHA1 (patch-ab) = 45f3438a2ca0f8565d12c648eb358d7a33d6c745
8SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede 8SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
9SHA1 (patch-ad) = 8baac1337c1ab65e98055915f045e99d91015677 9SHA1 (patch-ad) = 8baac1337c1ab65e98055915f045e99d91015677
10SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1 10SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
11SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2 11SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
12SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde 12SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
13SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad 13SHA1 (patch-aj) = a0ee2bc9a7b9e743e313101899de3d991a9d2cad
14SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136 14SHA1 (patch-ak) = 689305356812d04bd3b490c436ed898a4b308136
15SHA1 (patch-al) = d03611108f76c33e87ac89a6e7eefc012297df86 15SHA1 (patch-al) = d03611108f76c33e87ac89a6e7eefc012297df86
16SHA1 (patch-am) = faa80ebf308eddfcbbe5aeab2f52d2d356d540cf 16SHA1 (patch-am) = faa80ebf308eddfcbbe5aeab2f52d2d356d540cf
cvs diff -r1.14 -r1.15 pkgsrc/mail/mutt/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/mutt/patches/Attic/patch-ab 2007/05/27 13:34:16 1.14
+++ pkgsrc/mail/mutt/patches/Attic/patch-ab 2010/04/10 16:08:51 1.15
@@ -1,22 +1,41 @@ @@ -1,22 +1,41 @@
1$NetBSD: patch-ab,v 1.14 2007/05/27 13:34:16 tron Exp $ 1$NetBSD: patch-ab,v 1.15 2010/04/10 16:08:51 tron Exp $
2 2
3--- Makefile.in.orig 2007-05-27 02:00:00.000000000 +0100 3--- Makefile.in.orig 2007-05-27 02:00:00.000000000 +0100
4+++ Makefile.in 2007-05-27 14:24:37.000000000 +0100 4+++ Makefile.in 2010-04-10 16:54:51.000000000 +0100
5@@ -165,7 +165,7 @@ 5@@ -165,7 +165,7 @@
6 DBX = @DBX@ 6 DBX = @DBX@
7 DEBUGGER = @DEBUGGER@ 7 DEBUGGER = @DEBUGGER@
8 DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ 8 DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
9- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \ 9- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
10+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \ 10+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
11 -DHAVE_CONFIG_H=1 11 -DHAVE_CONFIG_H=1
12  12
13 DEPDIR = @DEPDIR@ 13 DEPDIR = @DEPDIR@
14@@ -987,7 +987,7 @@ 14@@ -266,7 +266,7 @@
 15 install_sh = @install_sh@
 16 libdir = @libdir@
 17 libexecdir = @libexecdir@
 18-localedir = @localedir@
 19+localedir = /usr/pkg/share/locale
 20 localstatedir = @localstatedir@
 21 mandir = @mandir@
 22 mkdir_p = @mkdir_p@
 23@@ -908,8 +908,7 @@
 24
 25 install-data-am: install-data-local
 26
 27-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
 28- install-exec-local
 29+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 30
 31 install-info: install-info-recursive
 32
 33@@ -987,7 +986,7 @@
15 ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ 34 ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
16 fi 35 fi
17 if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ 36 if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
18- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ 37- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
19+ $(CHGRP) @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ 38+ $(CHGRP) @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
20 chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ 39 chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
21 { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \ 40 { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
22 fi 41 fi