Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight
- Fix build with clang PR: 190800