Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/BUILDING,v
rcsdiff: /ftp/cvs/cvsroot/src/BUILDING,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.78
retrieving revision 1.78.2.2
diff -u -p -r1.78 -r1.78.2.2
--- src/BUILDING	2008/09/24 07:38:04	1.78
+++ src/BUILDING	2008/11/15 22:10:33	1.78.2.2
@@ -305,18 +305,9 @@ CONFIGURATION
 
                  Default: ``no''
 
-     MKX11       Can be set to ``yes'' or ``no''.  Indicates whether X11R6 is
+     MKX11       Can be set to ``yes'' or ``no''.  Indicates whether X11 is
                  built from X11SRCDIR.
 
-                 Mutually exclusive to MKXORG != no.
-
-                 Default: ``no''
-
-     MKXORG      Can be set to ``yes'' or ``no''.  Indicates whether X11R7
-                 (modular Xorg) is built from X11SRCDIR.
-
-                 Mutually exclusive to MKX11 != no.
-
                  Default: ``no''
 
      TOOLDIR     Directory to hold the host tools, once built.  If specified,
@@ -358,6 +349,12 @@ CONFIGURATION
 
                  Default: ``/usr/xsrc''
 
+     X11FLAVOUR  The style of X11 cross-built, set to either ``Xorg'' or
+                 ``XFree86''.
+
+                 Default: ``Xorg'' on amd64, i386, macppc, shark and sparc64
+                 platforms, ``XFree86'' on everything else.
+
    "make" variables for full builds
      These variables only affect the top level ``Makefile'' and do not affect
      manually building subtrees of the NetBSD source code.