Try to fix building perl on NetBSD/current - but not quite good enough,
somebody please fix the remaining fallout!
Need to update PHP55_VERSION.  Thanks to joerg@ who noted to me.
regen patch with better context
Remove unneeded symbol that causes conflict with X headers.
PR 48128.