MFH: r481908 r486832

Merge part of r481908 to fix broken port. r481908 contains deletion of
an patch no longer needed. Therefore remove the patch so PHP 7.2.13
builds again.

Approved by: portmgr (blanket)