On Thu, 9 Jul 1998, Paul S. Wain wrote:

: > : files differs e.g. rgb.db etc.
: >                      ^^^^^^
: > What's different in this particular file?  The satellite files such as these
: > should be the same type, and have the same contents....
: >
: > (Xarm should be based on NetBSD xsrc, whether or not it uses xf86 server
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
          ^^^^^^
: > code; I'd be glad to help merge it, if necessary.)

(Sorry, I needed a little emphasis.  There's a very important point there.  :)

: Ah you see, there in lies the problem: Xarm is actually a port of the
: MIT X11R6.3 tree not the XF86/netbsd 3.2.x tree. There are, as Mark pointed
: out, some small changes between the two (notiticably in the compiled databases
: - although not the text versions of them).

You may want to consider merging against NetBSD's xsrc if you plan on having
Xarm as part of official NetBSD X sets.  I'll have the shark stuff merged
before 1.4, which means that the official NetBSD X sets (which should
actually exist for 1.4) will be based on NetBSD's xsrc, and incompatible
with Xarm. 

Do you have diffs against MIT X11R6.3?  I can't imagine the merging to be
_that_ difficult....

-- 
-- Todd Vierling (Personal tv@pobox.com; Bus. todd_vierling@xn.xerox.com)