I'd like to MFC r300705, which updates usr.bin/fortune/unstr/unstr.c, but fortune moved from /usr/games to /usr/bin between FreeBSD 10 and 11. What is the best way to proceed? Manually apply the patch and direct commit?