Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6263B1A921F for ; Thu, 24 Dec 2020 01:31:21 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8571A84D86; Thu, 24 Dec 2020 01:31:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C15EC84D71 for ; Thu, 24 Dec 2020 01:31:19 +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 o6Xq1zKsCQCX for ; Thu, 24 Dec 2020 01:31:19 +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 48B6B84D59 for ; Thu, 24 Dec 2020 01:31:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 41697FA9D; Thu, 24 Dec 2020 01:31:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1608773479164470" MIME-Version: 1.0 Date: Thu, 24 Dec 2020 01:31:19 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20201224013119.41697FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1608773479164470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Thu Dec 24 01:31:19 UTC 2020 Modified Files: pkgsrc/mk/pkgformat/pkg: pkgformat-vars.mk Log Message: pkgformat-vars.mk: Revert requirement for new PKGTOOLS As part of the pkgdb migration (NetBSD only), PGKTOOLS_REQD was set to a recent value (20200828). However, that results in a cyclic dependency of pkg_install on cwrappers on pkg_install. Once people set PKG_DBDIR in pkg_install.conf and mk.conf to match their setup, there is no need -- because of the migration -- to force newer tools. Testing on TNF's pkgbuild machine indicates this revert works well, and I received two positive comments and none against. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1608773479164470 Content-Disposition: inline Content-Length: 1016 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk diff -u pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.11 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.12 --- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.11 Fri Dec 18 17:14:58 2020 +++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk Thu Dec 24 01:31:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: pkgformat-vars.mk,v 1.11 2020/12/18 17:14:58 maya Exp $ +# $NetBSD: pkgformat-vars.mk,v 1.12 2020/12/24 01:31:19 gdt Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -32,7 +32,11 @@ PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_inf LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm # Latest versions of tools required for correct pkgsrc operation. -PKGTOOLS_REQD= 20200828 +.if !empty(USE_PKG_ADMIN_DIGEST:M[Yy][Ee][Ss]) +PKGTOOLS_REQD= 20191008 +.else +PKGTOOLS_REQD= 20100914 +.endif # Latest version of pkg_install required to extract packages PKGTOOLS_VERSION_REQD= 20091115 --_----------=_1608773479164470--