[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg pkgformat-vars.mk: Revert requirement...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e278ce1150a
branches:  trunk
changeset: 443811:3e278ce1150a
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Dec 24 01:31:19 2020 +0000

description:
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.

diffstat:

 mk/pkgformat/pkg/pkgformat-vars.mk |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 1b9b462eacd8 -r 3e278ce1150a mk/pkgformat/pkg/pkgformat-vars.mk
--- a/mk/pkgformat/pkg/pkgformat-vars.mk        Thu Dec 24 01:10:22 2020 +0000
+++ b/mk/pkgformat/pkg/pkgformat-vars.mk        Thu Dec 24 01:31:19 2020 +0000
@@ -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 @@
 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