Fix build with -fno-common

portlint complains that the patches have not been generated with makepatch
and this caused some effort to generate the patches for this update.

I'm leaving the legacy patches and the EXTRA_PATCH as-is to not cause
unneccessary churn, but IMHO the patches should be regenerated with
makepatch on occasion of the next major change to this port.