I have committed two more patches to fix issues caused by 5e04571cf3cf:

In D33235#753331, @kib wrote:

Could you try this please?

diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h
index 1c167daf3f09..86dfa0f545f0 100644
--- a/sys/sys/_bitset.h
+++ b/sys/sys/_bitset.h
@@ -61,7 +61,7 @@ struct _t {								\
  * Define a default type that can be used while manually specifying size
  * to every call.
  */
-__BITSET_DEFINE(bitset, 1);
+__BITSET_DEFINE(__bitset, 1);
 
 #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET)
 #define	BITSET_DEFINE(_t, _s)	__BITSET_DEFINE(_t, _s)

This updated patch-set should address all review comments received to date.

Update according to kib@'s review comments.

The diff has been updated to include the changes to pfctl_altq.c which apparently had been lost ...

I have added a number of inline comments. Version 10 files came first, so I added inline comments to them, but the comments should apply to all versions including the latest.

Fix postgresql14-server port to work with new paths

Update previously added check for redundant "-[0-9]*" endings of CONFLICTS patterns.
The warning should not be printed if the preceding FATAL error condition has been triggered.

Update previous patch to include a check for redundant "-[0-9]*" version patterns in CONFLICTS entries.
I have removed those endings from 388 ports in ports commit 819f25b36d45b8, and this check is meant to prevent those version patterns from re-occurring ...

Committed with Git commit hash 819f25b36d45b8ac5593ec8e6f470d9ad454b08a.

Revert import of a patch that uses the new "pkg query -e" feature of pkg-1.17.2 and newer.

Updated patch that takes advantage of the extended functionality of pkg-1.17.2 with regard to the combination of "query -e" and additional port or package names.

In D32646#737367, @wosch wrote:

I totally agree that 310.locate and locate.updatedb needs some refactoring.

E.g. if you put "set -e" at the beginning of the script, you don't need to check each command for success, the shell script will do this. The result will be a much more readable shell script.

This change is technically correct, to adapt it to a changed path of the locate database.