Sorry, I found a small bug in the patch (even though
it should have no effect):
The line
+ if test -d ${.CURDIR}/${sub}.${MACHINE_ARCH}; then \
should read
+ if test -d ${.CURDIR}/$${sub}.${MACHINE_ARCH}; then \
A corrected patch is in PR 57438:
http://www.freebsd.org/cgi/query-pr.cgi?pr=57438