Need review for #3180 please

[Kean Johnston]

https://bugs.freedesktop.org/show_bug.cgi?id=3180

I just uploaded a new patch against today's HEAD. This is
significantly more improved than the last patch, and addresses
OpenServer 6 as well as OpenServer 5 and UnixWare 7. The only
outstanding issue I am experiencing is I must diable Xkb as
its not finding its map files, but thats relatively minor
(and a genuine bug not a port update) and I will address that
with a separate patch.

Thanks in advance to all/any who review this.
Kean