Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 99F227A288 for ; Sun, 21 Aug 2016 16:46:33 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6A9B885EAE; Sun, 21 Aug 2016 16:46:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED70C85EAE for ; Sun, 21 Aug 2016 16:46:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HnSAjhQzv4FL for ; Sun, 21 Aug 2016 16:46:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6F64D85E84 for ; Sun, 21 Aug 2016 16:46:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 69AAEFBC3; Sun, 21 Aug 2016 16:46:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1471797977297750" MIME-Version: 1.0 Date: Sun, 21 Aug 2016 16:46:17 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/mail/mutt To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20160821164617.69AAEFBC3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1471797977297750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Aug 21 16:46:17 UTC 2016 Modified Files: pkgsrc/mail/mutt: distinfo options.mk Log Message: fix distinfo for optional distfiles. Reported by f8l @ #pkgsrc To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 pkgsrc/mail/mutt/distinfo cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/mutt/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1471797977297750 Content-Disposition: inline Content-Length: 3240 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/mutt/distinfo diff -u pkgsrc/mail/mutt/distinfo:1.46 pkgsrc/mail/mutt/distinfo:1.47 --- pkgsrc/mail/mutt/distinfo:1.46 Sun Aug 21 11:39:31 2016 +++ pkgsrc/mail/mutt/distinfo Sun Aug 21 16:46:17 2016 @@ -1,9 +1,17 @@ -$NetBSD: distinfo,v 1.46 2016/08/21 11:39:31 wiz Exp $ +$NetBSD: distinfo,v 1.47 2016/08/21 16:46:17 tnn Exp $ SHA1 (mutt-1.7.0.tar.gz) = 0d9c0ae7d4725e2216ea0c1271ae19ab8bcf653b RMD160 (mutt-1.7.0.tar.gz) = f508f0332d2dfcaa398c3b68889ac619781b1651 SHA512 (mutt-1.7.0.tar.gz) = 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 Size (mutt-1.7.0.tar.gz) = 4019567 bytes +SHA1 (patch-1.5.23.sidebar.20140412.txt) = 8b86f148d8e1a0b37b0b77268349f4c94e797561 +RMD160 (patch-1.5.23.sidebar.20140412.txt) = 55b691a9d959040d2844644c165b10377a53744d +SHA512 (patch-1.5.23.sidebar.20140412.txt) = ac023f1ba5843a010de497b9cd85b22af6a30ceb8622c01be3c5b7e8e0761d8efe8e86e8c9b11aa96dcc405e8b1657672ec6da111b703d562bddf35ba848d34d +Size (patch-1.5.23.sidebar.20140412.txt) = 66728 bytes +SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8 +RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08 +SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9 +Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 Index: pkgsrc/mail/mutt/options.mk diff -u pkgsrc/mail/mutt/options.mk:1.21 pkgsrc/mail/mutt/options.mk:1.22 --- pkgsrc/mail/mutt/options.mk:1.21 Wed Jun 1 21:56:12 2016 +++ pkgsrc/mail/mutt/options.mk Sun Aug 21 16:46:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2016/06/01 21:56:12 tonio Exp $ +# $NetBSD: options.mk,v 1.22 2016/08/21 16:46:17 tnn Exp $ # Global and legacy options @@ -11,9 +11,6 @@ PKG_SUPPORTED_OPTIONS+= mutt-compressed- PKG_SUPPORTED_OPTIONS+= mutt-sidebar PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox -# un-comment out the following lines whenever updating distinfo -# and patches are up-to-date -#PKG_SUGGESTED_OPTIONS+= mutt-sidebar .include "../../mk/bsd.options.mk" @@ -120,7 +117,8 @@ CONFIGURE_ARGS+= --disable-hcache ### Compressed mail boxes ### PLIST_VARS+= compressed_mbox -.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) +.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) \ + || make(distinfo) || make(mps) || make(makepatchsum) PLIST.compressed_mbox= yes #PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/ #PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz @@ -153,7 +151,8 @@ CONFIGURE_ARGS+= --disable-smtp ### ### Sidebar support ### -.if !empty(PKG_OPTIONS:Mmutt-sidebar) +.if !empty(PKG_OPTIONS:Mmutt-sidebar) \ + || make(distinfo) || make(mps) || make(makepatchsum) # http://www.lunar-linux.org/mutt-sidebar/ PATCH_SITES+= http://lunar-linux.org/~tchan/mutt/ PATCHFILES+= patch-1.5.23.sidebar.20140412.txt --_----------=_1471797977297750--