Received: by mail.netbsd.org (Postfix, from userid 605)
	id E392584D37; Mon, 28 Nov 2022 23:15:35 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 2099784E7E
	for <pkgsrc-changes@NetBSD.org>; Mon, 28 Nov 2022 23:15:35 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id M_mHb2r10377 for <pkgsrc-changes@netbsd.org>;
	Mon, 28 Nov 2022 23:15:34 +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 939C684D37
	for <pkgsrc-changes@NetBSD.org>; Mon, 28 Nov 2022 23:15:34 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 8D15DFA90; Mon, 28 Nov 2022 23:15:34 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1669677334155220"
MIME-Version: 1.0
Date: Mon, 28 Nov 2022 23:15:34 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/mk/check
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
X-Mailer: log_accum
Message-Id: <20221128231534.8D15DFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1669677334155220
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Mon Nov 28 23:15:34 UTC 2022

Modified Files:
	pkgsrc/mk/check: check-files.mk

Log Message:
check-files.mk: fix execution when CHECK_FILES_STRICT=yes

Commit r. 1.2044 "mk: Don't define DO_NADA to true." of bsd.pkg.mk
caused the checks executed when CHECK_FILES_STRICT=yes is set to fail
(e.g., "/bin/sh: -c: line 1: syntax error near unexpected token `;'").

(The pre-existing coding style that uses "true;" rather than a bare ":"
instead has been retained, in case there is an obscure (?) reason for
that approach.)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.


--_----------=_1669677334155220
Content-Disposition: inline
Content-Length: 1282
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.38 pkgsrc/mk/check/check-files.mk:1.39
--- pkgsrc/mk/check/check-files.mk:1.38	Wed Nov 23 11:55:43 2022
+++ pkgsrc/mk/check/check-files.mk	Mon Nov 28 23:15:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.38 2022/11/23 11:55:43 jperkin Exp $
+# $NetBSD: check-files.mk,v 1.39 2022/11/28 23:15:34 gutteridge 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
@@ -340,7 +340,7 @@ ${_CHECK_FILES_ERRMSG.sysconfdir}:					\
 	${RUN}					\
 	if ${CMP} -s ${_CHECK_FILES_PRE.sysconfdir}			\
 		     ${_CHECK_FILES_POST.sysconfdir}; then		\
-		${DO_NADA};						\
+		${TRUE};						\
 	else								\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The package has modified ${PKG_SYSCONFDIR}"	\
@@ -360,7 +360,7 @@ ${_CHECK_FILES_ERRMSG.varbase}:						\
 	${RUN}					\
 	if ${CMP} -s ${_CHECK_FILES_PRE.varbase}			\
 		       ${_CHECK_FILES_POST.varbase}; then		\
-		${DO_NADA};						\
+		${TRUE};						\
 	else								\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The package has modified ${VARBASE}"		\


--_----------=_1669677334155220--