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 1ED3D7A172 for ; Wed, 31 May 2017 22:56:24 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C479784DE5; Wed, 31 May 2017 22:56:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 52EE784D75 for ; Wed, 31 May 2017 22:56:23 +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 D_M7DPGwED1M for ; Wed, 31 May 2017 22:56:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B06F984CEE for ; Wed, 31 May 2017 22:56:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A98EDFBEE; Wed, 31 May 2017 22:56:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1496271382124480" MIME-Version: 1.0 Date: Wed, 31 May 2017 22:56:22 +0000 From: "Johnny C. Lam" Subject: CVS commit: pkgsrc/mk/check To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org X-Mailer: log_accum Message-Id: <20170531225622.A98EDFBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1496271382124480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jlam Date: Wed May 31 22:56:22 UTC 2017 Modified Files: pkgsrc/mk/check: check-files.mk Log Message: Check that some variables have the correct number of words. Assert MAKE_DIRS_PERMS and OWN_DIRS_PERMS have the right number of words before using a multivariable .for loop over those variables. This prevents errors in parsing the makefiles. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/check/check-files.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1496271382124480 Content-Disposition: inline Content-Length: 1025 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/check/check-files.mk diff -u pkgsrc/mk/check/check-files.mk:1.32 pkgsrc/mk/check/check-files.mk:1.33 --- pkgsrc/mk/check/check-files.mk:1.32 Sat Apr 1 20:55:39 2017 +++ pkgsrc/mk/check/check-files.mk Wed May 31 22:56:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: check-files.mk,v 1.32 2017/04/01 20:55:39 rillig Exp $ +# $NetBSD: check-files.mk,v 1.33 2017/05/31 22:56:22 jlam Exp $ # # This file checks that the list of installed files matches the PLIST. # For that purpose it records the file list of LOCALBASE before and @@ -78,8 +78,12 @@ CHECK_FILES_SKIP+= ${VARBASE}/.* .for d in ${MAKE_DIRS} ${OWN_DIRS} CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* .endfor -.for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS} +.for _var_ in MAKE_DIRS_PERMS OWN_DIRS_PERMS +. if empty(${_var_}) || empty(${_var_}:C/.*/4/:M*:S/4 4 4 4//gW) +. for d o g m in ${${_var_}} CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* +. endfor +. endif .endfor # Mutable X11 font database files --_----------=_1496271382124480--