--- 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