Add -noretro as default server arg in configuration files where we are
sure the user will get a visible window "soon".
The sole reason we backed out the "retro" change from upstream
was to avoid an empty black screen after manualy starting just "X". With
these preconfigured startup mehtods, this confusion can not happen.
Fix scan code 50 key on non-us-USB keyboards (BSlash2 -> BSlash).
From macallan.
Move "libexpat" from X11 into base which fixes PR lib/40346.
This change was approved by the Core Group.
henning petersen in PR xsrc/46172: do not used removed function
miPointerAbsoluteCursor(), replace with miPointerSetPosition().
Be UTF8 clean with the source code.
Let libX11 load and make available the newer (X11R6) callback-based API
for XIM (expected by emacs).

Patch from Ian D. Leroux <idleroux@fastmail.fm> on pkgsrc-users
following a hint by Nhat Minh LÃª <nhat.minh.le@gmail.com>.
Add vax to the list of non inb() users

fix in libxfont:
   An uninitialized pointer causes a crash if pcf header is corrupted
   (upstream patch).
don't map the VGA framebuffer if AVOID_VGAHW is defined
This commit was generated by cvs2svn to track changes on a CVS vendor
branch.
merge xf86-video-ati 6.14.4
update for 6.14.4
Pull the similar fix from i915_render.c rev 1.2 and i965_render.c rev 1.2:

 http://mail-index.NetBSD.org/source-changes/2010/12/27/msg016345.html
 > XXX: Fix crash with Firefox, where drawable is NULL.
 > There must be a better fix for this.

 http://mail-index.NetBSD.org/source-changes/2011/01/21/msg017560.html
 > Avoid a crash when pDrawable is null.

Fixes Xserver SEGV on starting Firefox on old i830/855GM machines
running 6.0_BETA2.

Should be pulled up to netbsd-6.
Make xf86-video-intel driver work on Atom N455 + GMA3150 graphics chipset
by pulling the following change from upstream:
 http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/src/i830.h?id=8f64837e56b2de0fb8a9100d1a844fd3f18d751c
 > Disable FBC on IGD for UMS
 > It appears the new chip doesn't support FBC currently.

Tested on MSI U135DX + NetBSD/i386 6.0_BETA2 with this patch.

Should be pulled up to netbsd-6.
when using dixSetPrivate() and friends it helps to initialize the key before
using it. Now colours on suncg6 look right again and we don't spin or crash
on exit anymore.
probably needs to be pulled into -6
actually unmap what we mapped in CloseScreen(). While there nuke a spurious
return.
unmap THC when we mean THC, remove spurious return in CloseScreen()
Revert local patch adding a call to openpty.
Defining HAS_OPENPTY (which I just added in the crossover Makefile)
has the same effect.
Instead of local patch, merge upstream git version:
commit 45cc81cd7abafe61bddb3ddce9f4fb8a9aa06c12
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Sep 8 22:11:15 2011 +0200

    Include <sys/time.h> and <sys/resource.h> unconditionally

    Suggested by Mark Kettenis.

    X.Org bug#40632 <https://bugs.freedesktop.org/show_bug.cgi?id=40632>

    Signed-off-by: Julien Cristau <jcristau@debian.org>
Instead of local patch, use official upstream fix.
commit 1326fcb6afe5a62b675bf99826f7e628c66237b4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Thu Jan 15 16:15:23 2009 -0200

    Ansification and compile warning fixes.

      This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
    make distcheck and most gcc 4.3 and sparse warnings.