While here, merge another patch from files to makefile to avoid patching the same file from multiple locations PR: ports/191643 Submitted by: Dan Lukes