Update to r47550:
Update PHP package names to PHP 5.6 variants as PHP 5.4 hit EOL.

Update to r47077:
Fix makeoptions. While here, add a missing makeoption.