From e89b56a638829b6d556c8c871450f6ccb4e43243 Mon Sep 17 00:00:00 2001
From: PHO <pho@cielonegro.org>
Date: Mon, 31 Jul 2023 10:30:34 +0900
Subject: [PATCH] Clarify that pkgrrxx doesn't invoke pkg_chk. NFCI

---
 NEWS.md                 |  5 +++++
 configure.ac            |  2 +-
 doc/pkgrrxx.8.in        | 26 ++++++++++++++------------
 src/pkg_rr/replacer.cxx |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5d1461b..0a42156 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Release notes
 
+## 0.1.2 -- 2023-07-31
+
+* Fix a bunch of compiler warnings (#2)
+* Clarify that pkgrrxx doesn't spawn pkg_chk internally.
+
 ## 0.1.1 -- 2023-07-23
 
 * Fix macOS build (#1)
diff --git a/configure.ac b/configure.ac
index 547b4cd..b2789c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.71])
-AC_INIT([pkgchkxx], [0.1.1], [pkgsrc-users@NetBSD.org])
+AC_INIT([pkgchkxx], [0.1.2], [pkgsrc-users@NetBSD.org])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/pkgxx/pkgname.hxx])
 AC_CONFIG_HEADERS([lib/pkgxx/config.h])
diff --git a/doc/pkgrrxx.8.in b/doc/pkgrrxx.8.in
index 4d786fd..0d73957 100644
--- a/doc/pkgrrxx.8.in
+++ b/doc/pkgrrxx.8.in
@@ -20,7 +20,7 @@ on packages that have been marked to have unsafe dependencies,
 to be mismatched, or marked to be rebuilt.
 Optionally it can discover, mark and replace any mismatched packages
 (as reported by
-.Xr pkg_chk 8 )
+.Xr @PKGCHKXX@ 8 )
 as well.
 .Pp
 Whenever
@@ -60,8 +60,8 @@ If the
 .Fl u
 option is given,
 .Nm
-will use
-.Xr pkg_chk 8
+will use the same logic as
+.Dq @PKGCHKXX@ -u -s
 to check for packages for which the version in pkgsrc is different
 than the installed version, and run
 .Dq make replace
@@ -79,10 +79,8 @@ flag.
 .Ss Options
 .Bl -tag -width xxxxxxxx
 .It Fl B
-Pass
-.Dq -B
-to
-.Xr pkg_chk 8
+Use the same logic as
+.Dq @PKGCHKXX@ -B
 to also mark any packages with any change in build version data.
 .It Fl D Ar VARIABLE=VALUE
 Passes VARIABLE=VALUE to each make call.
@@ -134,12 +132,16 @@ tags.
 This will replace packages more aggressively and can be used to solve
 shared library problems.
 .It Fl u
-Use
-.Xr pkg_chk 8
-to check for mismatched packages, mark them with 'mismatch=YES',
+Use the same logic as
+.Dq @PKGCHKXX@ -u
+to check for mismatched packages, mark them with
+.Dq mismatch=YES ,
 and replace those too.
-Otherwise, consider packages marked 'mismatch=YES' to be mismatched.
-Marking with 'mismatch=YES' occurs via
+Otherwise, consider packages marked
+.Dq mismatch=YES
+to be mismatched.  Marking with
+.Dq mismatch=YES
+occurs via
 .Pa ${SU_CMD}
 so that non-root users can also use the option. It is not an error if this
 fails; it just does not persist the status.
diff --git a/src/pkg_rr/replacer.cxx b/src/pkg_rr/replacer.cxx
index c648abc..c83af32 100644
--- a/src/pkg_rr/replacer.cxx
+++ b/src/pkg_rr/replacer.cxx
@@ -159,7 +159,7 @@ namespace pkg_rr {
     std::future<rolling_replacer::todo_type>
     rolling_replacer::check_mismatch(pkg_rr::package_scanner& scanner) const {
         if (opts.check_for_updates) {
-            msg() << "Checking for mismatched installed packages using pkg_chk" << std::endl;
+            msg() << "Checking for mismatched installed packages by scanning source tree" << std::endl;
             auto result = source_checker(opts, env).run();
 
             if (!result.MISMATCH_TODO.empty()) {