Re: xsrc/46138: netbsd-6 20120303 X11 issue (post expat move)

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

The following reply was made to PR xsrc/46138; it has been noted by GNATS.

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: xsrc/46138: netbsd-6 20120303 X11 issue (post expat move)
Date: Sun, 4 Mar 2012 03:09:34 -0500

 --MP_/g6+oeIssw0LIuWMuQHfySSi
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On Sat,  3 Mar 2012 17:30:00 +0000 (UTC)
 Matthew Mondor <mm_lists%pulsar-zone.net@localhost> wrote:
 
 > I had a backup and could restore my previous X11R7 tree which works
 > fine, which was last updated 20120227.
 
 Results of "cvs -q diff -uNp -D20120226" attached
 
 --MP_/g6+oeIssw0LIuWMuQHfySSi
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=x11-diff-20120226-20120303.txt
 
 Index: external/mit/xdm/dist/config/Xservers.ws.cpp
 ===================================================================
 RCS file: 
/data/rsync/netbsd-cvs/xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.1.2
 diff -u -p -r1.2 -r1.1.1.2
 --- external/mit/xdm/dist/config/Xservers.ws.cpp       18 Feb 2012 08:54:21 
-0000      1.2
 +++ external/mit/xdm/dist/config/Xservers.ws.cpp       9 Nov 2009 07:04:35 
-0000       1.1.1.2
 @@ -9,4 +9,4 @@ XCOMM you can add them here as well.  Ea
  XCOMM look like:
  XCOMM XTerminalName:0 foreign
  XCOMM
 -:0 local BINDIR/X :0 -noretro DEFAULTVT
 +:0 local BINDIR/X :0 DEFAULTVT
 Index: external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
 ===================================================================
 RCS file: 
/data/rsync/netbsd-cvs/xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c,v
 retrieving revision 1.7
 retrieving revision 1.6
 diff -u -p -r1.7 -r1.6
 --- external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c     25 Feb 2012 
15:38:46 -0000      1.7
 +++ external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c     24 Jul 2011 
00:06:38 -0000      1.6
 @@ -260,8 +260,7 @@ static CARD8 wsUsbMap[] = {
        /* 47 */ KEY_LBrace,    /* [ { */
        /* 48 */ KEY_RBrace,    /* ] } */
        /* 49 */ KEY_BSlash,    /* \ | */
 -      /* this was KEY_BSlash2 which seems bogus */
 -      /* 50 */ KEY_BSlash,    /* \ _ # ~ on some keyboards */
 +      /* 50 */ KEY_BSlash2,   /* \ _ # ~ on some keyboards */
        /* 51 */ KEY_SemiColon, /* ; : */
        /* 52 */ KEY_Quote,     /* ' " */
        /* 53 */ KEY_Tilde,     /* ` ~ */
 Index: external/mit/xinit/dist/startx.cpp
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/xsrc/external/mit/xinit/dist/startx.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.1.5
 diff -u -p -r1.2 -r1.1.1.5
 --- external/mit/xinit/dist/startx.cpp 18 Feb 2012 08:54:21 -0000      1.2
 +++ external/mit/xinit/dist/startx.cpp 3 Aug 2011 02:44:52 -0000       1.1.1.5
 @@ -75,7 +75,7 @@ sysserverrc=XINITDIR/xserverrc
  defaultclient=XTERM
  defaultserver=XSERVER
  defaultclientargs=""
 -defaultserverargs="-noretro"
 +defaultserverargs=""
  defaultdisplay=":0"
  clientargs=""
  serverargs=""
 
 --MP_/g6+oeIssw0LIuWMuQHfySSi--