[src/trunk]: src/external/bsd/pkg_install/dist/lib Merge pkg_install-20201205

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b28f91ee6dd6
branches:  trunk
changeset: 946640:b28f91ee6dd6
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Dec 05 16:21:26 2020 +0000

description:
Merge pkg_install-20201205

diffstat:

 external/bsd/pkg_install/dist/lib/pkgdb.c   |  9 +++++----
 external/bsd/pkg_install/dist/lib/version.h |  4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 37dfed3c6604 -r b28f91ee6dd6 external/bsd/pkg_install/dist/lib/pkgdb.c
--- a/external/bsd/pkg_install/dist/lib/pkgdb.c Sat Dec 05 15:57:02 2020 +0000
+++ b/external/bsd/pkg_install/dist/lib/pkgdb.c Sat Dec 05 16:21:26 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $    */
+/*     $NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $    */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $");
 
 /*-
  * Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
@@ -310,8 +310,9 @@
            stat("/var/db/pkg", &sb) == 0) {
                errx(EXIT_FAILURE,
                     "The default PKG_DBDIR has changed, but this installation still uses the old one.\n"
-                    "Please move the database and re-run this command:\n"
-                    "\tmv /var/db/pkg " DEF_LOG_DIR);
+                    "Please move the databases and re-run this command:\n"
+                    "\tmv /var/db/pkg " DEF_LOG_DIR "\n"
+                    "\tmv /var/db/pkg.refcount " DEF_LOG_DIR ".refcount");
        }
 
         return pkgdb_dir;
diff -r 37dfed3c6604 -r b28f91ee6dd6 external/bsd/pkg_install/dist/lib/version.h
--- a/external/bsd/pkg_install/dist/lib/version.h       Sat Dec 05 15:57:02 2020 +0000
+++ b/external/bsd/pkg_install/dist/lib/version.h       Sat Dec 05 16:21:26 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.16 2020/12/02 13:53:50 wiz Exp $ */
+/*     $NetBSD: version.h,v 1.17 2020/12/05 16:21:26 wiz Exp $ */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20200828
+#define PKGTOOLS_VERSION 20201205
 
 #endif /* _INST_LIB_VERSION_H_ */