I tested the modification and test build all ports:
https://pkg.fechner.net/build.html?mastername=130amd64-gitlab&build=2021-11-01_22h21m44s
Next run:
https://pkg.fechner.net/build.html?mastername=130amd64-gitlab&build=2021-11-02_00h25m09s
Will maybe require some more, as I build with additional tests and not all ports will pass these additional tests.