fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.

merge xorg-serer 21.1.3.

reduce diff to upstream. no functional change.

first merge of netbsd changes. not tested yet.

get this a little closer to working on non-x86 by:
* not poking around in IO space trying to disable / enable ancient VGAs when
NO_LEGACY_VGA is defined
* actually checking if what we get from read_legacy_video_BIOS() is actually
a valid PC ROM image every time we try

import xorg-server 1.9.2. important changes since 1.6.5 include:

- built-in symbol visibility, default not export
- fixes for various crashes
- many fixes for XI2, EXA, dix, render, glx, xkb, EDID, randr, Xv,
resource handling, Xext, vfb, xfree86 / vga and composite support.
- fixes several memory leaks
- many many documentation updates
- record extension enabled
- no longer looks for XF86Config files

initial import of xorg-server-1.6.1.901

initial import of xorg-server-1.4.2