> i've also noticed R6.1 not having a repeat key.  i need to fix this
   > before NetBSD 1.2.
   > 
   > what patches against R6.1 are you using ?
   
   It came with public patch 1.  I did not apply any NetBSD-related patches, 
   although I manually added EXTRA_LIBS=-lgnumalloc to NetBSD.cf and patched 
   xdm's Imakefile to link with -lcrypt.

ok.  some of these are fixed.  see patch below, which are my
diffs (the ones that will come with the binaries for the 1.2
release).  they only change the config/cf/NetBSD.cf file for
NetBSD 1.2 (and fix the lex -l and db problems), and to two
Imakefile's (xrdb, xdm).
   
   > as for the installation on your SS10/SS20's for production, i would
   > wait for the 1.2 release which is in the process of being rolled out
   > now (give it 6-8 weeks and it will be here).
   
   Good idea!  Although in 6-8 weeks, I may be at another job, and not 
   particularly worrying about SunOS compatibility or underpowered 
   workstations, in which case I'll just use Solaris for everything.

well, then i would take what is in
ftp.netbsd.org:/pub/NetBSD/arch/sparc/snapshot and use that.

.mrg.


*** xc/config/cf/NetBSD.cf.orig	Sun Jan 28 23:43:27 1996
--- xc/config/cf/NetBSD.cf	Sun May  5 01:00:38 1996
***************
*** 7,13 ****
  XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.30 1996/01/28 07:27:35 dawes Exp $
  
  #ifndef OSName
! #define OSName		NetBSD 1.1
  #endif
  #ifndef OSVendor
  #define	OSVendor	/**/
--- 7,13 ----
  XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.30 1996/01/28 07:27:35 dawes Exp $
  
  #ifndef OSName
! #define OSName		NetBSD 1.2
  #endif
  #ifndef OSVendor
  #define	OSVendor	/**/
***************
*** 17,23 ****
  #define OSMajorVersion    1
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    1
  #endif
  /* 1 = A, 2 = B, 3 = C */
  #ifndef OSTeenyVersion
--- 17,23 ----
  #define OSMajorVersion    1
  #endif
  #ifndef OSMinorVersion
! #define OSMinorVersion    2
  #endif
  /* 1 = A, 2 = B, 3 = C */
  #ifndef OSTeenyVersion
***************
*** 50,55 ****
--- 50,59 ----
  #endif
  #define HasWChar32		YES
  
+ #if OSMajorVersion >= 1
+ # define LexCmd			lex -l
+ #endif
+ 
  /*
   * Compiler Features
   */
***************
*** 251,257 ****
   * site.def
   */
  #ifndef UseRgbTxt
! #define UseRgbTxt	YES
  #endif
  #endif
  
--- 255,261 ----
   * site.def
   */
  #ifndef UseRgbTxt
! #define UseRgbTxt	NO
  #endif
  #endif
  
*** xc/programs/rgb/Imakefile.orig	Sat Jan 27 10:22:18 1996
--- xc/programs/rgb/Imakefile	Sun May  5 01:05:51 1996
***************
*** 20,26 ****
           OBJS = $(OBJS1) $(OBJS2)
       PROGRAMS = $(RGB_PROG) showrgb
  #if !UseRgbTxt
! #ifdef BSD386Architecture
      DATAFILES = rgb.db
        DATADEP = rgb.db
  #else
--- 20,26 ----
           OBJS = $(OBJS1) $(OBJS2)
       PROGRAMS = $(RGB_PROG) showrgb
  #if !UseRgbTxt
! #if defined(BSD386Architecture) || defined(NetBSDArchitecture)
      DATAFILES = rgb.db
        DATADEP = rgb.db
  #else
*** xc/programs/xdm/Imakefile.orig	Mon Jan 15 10:36:57 1996
--- xc/programs/xdm/Imakefile	Sun May  5 01:06:34 1996
***************
*** 59,65 ****
  SYS_LIBRARIES = -ls
  #endif
  
! #if defined(XFree86Version) && HasLibCrypt
  SYS_LIBRARIES = -lcrypt
  #endif
  
--- 59,65 ----
  SYS_LIBRARIES = -ls
  #endif
  
! #if (defined(XFree86Version) && HasLibCrypt) || defined(NetBSDarchitecture)
  SYS_LIBRARIES = -lcrypt
  #endif