Remove custom patch, fixed in upstream pkgsrc.
Revert custom patches, fixed in upstream pkgsrc.