# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1730200841 -3600
# Node ID 7ca4a36e9e8df68f7e7a075a9bce04c0cf31cf03
# Parent  004c676c3415ec6f49f9bf1d593b4c89b6d25a8d
fports, ports.subr: Use the variable PKG as path to /usr/bin/pkg

diff -r 004c676c3415 -r 7ca4a36e9e8d sbin/fports
--- a/sbin/fports	Tue Oct 29 11:07:36 2024 +0100
+++ b/sbin/fports	Tue Oct 29 12:20:41 2024 +0100
@@ -116,7 +116,7 @@
                             # resolution
 
     for pkg in "$@"; do
-        if ! pkg query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
+        if ! "${PKG}" query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
             farray_release pkgqueue
             fatal "${EX_DATAERR}" "Package not found: ${pkg}"
         fi
@@ -133,7 +133,7 @@
                 farray_append curdeps "${n}=${v}"
                 farray_append pkgqueue "${n}"
             done <<EOF_01a8cebe-8659-4e32-87a4-bbce117e386b
-$(LC_ALL=C.UTF-8 pkg query '%dn %dv' "${pkg}")
+$(LC_ALL=C.UTF-8 "${PKG}" query '%dn %dv' "${pkg}")
 EOF_01a8cebe-8659-4e32-87a4-bbce117e386b
             falist_set pkgdeps "${pkg}" "${curdeps}"
             farray_release curdeps
@@ -145,12 +145,12 @@
     if checkyesno flat; then
         for pkg in "$@"; do
             _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}"
-            _print_flatdeps '-->' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${flatdeps}"
+            _print_flatdeps '-->' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${flatdeps}"
             falist_release "${flatdeps}"
         done
     else
         for pkg in "$@"; do
-            _print_dependency_tree 0 "${maxlevel}" '-->' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${pkgdeps}"
+            _print_dependency_tree 0 "${maxlevel}" '-->' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${pkgdeps}"
         done
     fi
     falist_release pkgdeps
@@ -176,7 +176,7 @@
                             # resolution
 
     for pkg in "$@"; do
-        if ! pkg query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
+        if ! "${PKG}" query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
             farray_release pkgqueue
             fatal "${EX_DATAERR}" "Package not found: ${pkg}"
         fi
@@ -193,7 +193,7 @@
                 farray_append curdeps "${n}=${v}"
                 farray_append pkgqueue "${n}"
             done <<EOF_5079e996-c6d2-4e6d-825d-53183a64ab06
-$(LC_ALL=C.UTF-8 pkg query '%rn %rv' "${pkg}")
+$(LC_ALL=C.UTF-8 "${PKG}" query '%rn %rv' "${pkg}")
 EOF_5079e996-c6d2-4e6d-825d-53183a64ab06
             falist_set pkgdeps "${pkg}" "${curdeps}"
             farray_release curdeps
@@ -205,12 +205,12 @@
     if checkyesno flat; then
         for pkg in "$@"; do
             _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}"
-            _print_flatdeps '<--' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${flatdeps}"
+            _print_flatdeps '<--' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${flatdeps}"
             falist_release "${flatdeps}"
         done
     else
         for pkg in "$@"; do
-            _print_dependency_tree 0 "${maxlevel}" '<--' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${pkgdeps}"
+            _print_dependency_tree 0 "${maxlevel}" '<--' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${pkgdeps}"
         done
     fi
     falist_release pkgdeps
diff -r 004c676c3415 -r 7ca4a36e9e8d share/local-bsdtools/ports.subr
--- a/share/local-bsdtools/ports.subr	Tue Oct 29 11:07:36 2024 +0100
+++ b/share/local-bsdtools/ports.subr	Tue Oct 29 12:20:41 2024 +0100
@@ -23,6 +23,10 @@
 type fatal 1>/dev/null 2>/dev/null || { echo "ERROR: source \`common.subr' first"; exit 70; }
 
 
+#: Use the system's :command:`pkg` implementation
+PKG=/usr/sbin/pkg
+
+
 #:
 #: Determine whether a package `_package` is essentially the same as
 #: another package.
@@ -182,7 +186,7 @@
                 fatal "${EX_SOFTWARE}" "unhandled format of \`pkg -vv'"
         esac
     done <<EOF7c6ea1b0ce544021a7813757c7003392
-$(LC_ALL=C.UTF-8 pkg -vv)
+$(LC_ALL=C.UTF-8 "${PKG}" -vv)
 EOF7c6ea1b0ce544021a7813757c7003392
 }
 
@@ -218,7 +222,7 @@
             #farray_append _test "${_pkgversion}"
             #[ $_idx -gt 5000 ] && break
         done <<EOF_pkg_9b5d20d4-805e-484e-9afb-ecc62e75f7cc
-$(LC_ALL=C.UTF-8 pkg rquery -U -r "${_reponame}" $'%n\t%v')
+$(LC_ALL=C.UTF-8 "${PKG}" rquery -U -r "${_reponame}" $'%n\t%v')
 EOF_pkg_9b5d20d4-805e-484e-9afb-ecc62e75f7cc
         falist_set "${_allrepos}" "${_reponame}" "${_repodb}"
         falist_release _repodb