MFH: r489072
Correct mistakes made in r484256 by not including newer version of
patch. This correctly fixes the build on powerpc64.
PR: 231946
Submitted by: Piotr Kubaj
Approved by: portmgr (tier-2 blanket)
Approved by: portmgr (tier-2 blanket)