diff options
| -rw-r--r-- | mail/mutt/Makefile | 12 | ||||
| -rw-r--r-- | mail/mutt/PLIST | 4 | ||||
| -rw-r--r-- | mail/mutt/distinfo | 4 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ab | 25 |
4 files changed, 31 insertions, 14 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 3408bd1a29e..de42562f878 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.160 2010/03/30 10:56:00 tron Exp $ +# $NetBSD: Makefile,v 1.161 2010/04/10 16:08:50 tron Exp $ DISTNAME= mutt-1.4.2.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \ @@ -12,7 +12,7 @@ HOMEPAGE= http://www.mutt.org/ COMMENT= Text-based MIME mail client with PGP support LICENSE= gnu-gpl-v2 -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" @@ -25,6 +25,7 @@ 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} @@ -87,10 +88,7 @@ FILES_SUBST+= DOCDIR=${DOCDIR:Q} INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} -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/PLIST b/mail/mutt/PLIST index 1a4feff1e2c..7e7833287cc 100644 --- a/mail/mutt/PLIST +++ b/mail/mutt/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:04:38 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2010/04/10 16:08:50 tron Exp $ bin/flea bin/mutt bin/muttbug -${PLIST.dotlock}bin/mutt_dotlock +bin/mutt_dotlock bin/pgpewrap bin/pgpring man/man1/flea.1 diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 0149dd5fcce..371fb0203c9 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.34 2007/05/27 13:34:16 tron Exp $ +$NetBSD: distinfo,v 1.35 2010/04/10 16:08:50 tron Exp $ SHA1 (mutt-1.4.2.3.tar.gz) = b23e46873f0247e85a4417cf338d64ea698c9b2c RMD160 (mutt-1.4.2.3.tar.gz) = 59e66c308cd4967e587ad1dc73dd76c7f0d06ef1 Size (mutt-1.4.2.3.tar.gz) = 2646433 bytes SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812 -SHA1 (patch-ab) = 2ba2794acdf7c73b28c07344a245f56742d53b92 +SHA1 (patch-ab) = 45f3438a2ca0f8565d12c648eb358d7a33d6c745 SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede SHA1 (patch-ad) = 8baac1337c1ab65e98055915f045e99d91015677 SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1 diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab index 91e34d5ce5f..803a8e24b4a 100644 --- a/mail/mutt/patches/patch-ab +++ b/mail/mutt/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.14 2007/05/27 13:34:16 tron Exp $ +$NetBSD: patch-ab,v 1.15 2010/04/10 16:08:51 tron Exp $ --- Makefile.in.orig 2007-05-27 02:00:00.000000000 +0100 -+++ Makefile.in 2007-05-27 14:24:37.000000000 +0100 ++++ Makefile.in 2010-04-10 16:54:51.000000000 +0100 @@ -165,7 +165,7 @@ DBX = @DBX@ DEBUGGER = @DEBUGGER@ @@ -11,7 +11,26 @@ $NetBSD: patch-ab,v 1.14 2007/05/27 13:34:16 tron Exp $ -DHAVE_CONFIG_H=1 DEPDIR = @DEPDIR@ -@@ -987,7 +987,7 @@ +@@ -266,7 +266,7 @@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ +-localedir = @localedir@ ++localedir = /usr/pkg/share/locale + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ +@@ -908,8 +908,7 @@ + + install-data-am: install-data-local + +-install-exec-am: install-binPROGRAMS install-binSCRIPTS \ +- install-exec-local ++install-exec-am: install-binPROGRAMS install-binSCRIPTS + + install-info: install-info-recursive + +@@ -987,7 +986,7 @@ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ |