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.71.4.1
retrieving revision 1.78.2.2.4.1
diff -u -p -r1.71.4.1 -r1.78.2.2.4.1
--- src/BUILDING	2008/09/18 04:27:23	1.71.4.1
+++ src/BUILDING	2010/04/21 05:15:01	1.78.2.2.4.1
@@ -274,6 +274,19 @@ CONFIGURATION
 
                  Default: ``yes''
 
+     MKSTRIPIDENT
+                 Can be set to ``yes'' or ``no''.  Indicates whether program
+                 binaries and shared libraries should be built to include RCS
+                 IDs for use with ident(1).
+
+                 Default: ``no''
+
+     MKSUBPIXEL  Can be set to ``yes'' or ``no''.  For X builds, decides if
+                 subpixel rendering code in FreeType is turned on.  Turned off
+                 by default because of patent issues.
+
+                 Default: ``no''
+
      MKTTINTERP  Can be set to ``yes'' or ``no''.  For X builds, decides if
                  the TrueType bytecode interpreter is turned on.  See
                  http://www.freetype.org/patents.html for details.
@@ -298,18 +311,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,
@@ -351,6 +355,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.
@@ -774,10 +784,12 @@ BUILDING
                lute path before being used.  Unsets MAKEOBJDIRPREFIX.
 
                In normal use, exactly one of the -M or -O options should be
-               specified.  If the source directory is /usr/src and neither -M
-               nor -O is specified, then a default object directory will be
-               chosen according to rules in <bsd.obj.mk>; this default is usu-
-               ally either /usr/obj or /usr/obj.MACHINE.
+               specified.  If neither -M nor -O is specified, then a default
+               object directory will be chosen according to rules in
+               <bsd.obj.mk>.  Relying on this default is not recommended
+               because it is determined by complex rules that are influenced
+               by the values of several variables and by the location of the
+               source directory.
 
      -o        Set the value of MKOBJDIRS to ``no''.  Otherwise, it will be
                automatically set to ``yes''.  This default is opposite to the
@@ -840,24 +852,24 @@ BUILDING
      with an absolute path.
 
 EXAMPLES
-     1.   % ./build.sh tools kernel=GENERIC
+     1.   % ./build.sh [options] tools kernel=GENERIC
 
           Build a new toolchain, and use the new toolchain to configure and
           build a new GENERIC kernel.
 
-     2.   % ./build.sh -U distribution
+     2.   % ./build.sh [options] -U distribution
 
           Using unprivileged mode, build a complete distribution to a DESTDIR
           directory that build.sh selects (and will display).
 
-     3.   # ./build.sh -U install=/
+     3.   # ./build.sh [options] -U install=/
 
           As root, install to / the distribution that was built by example 2.
           Even though this is run as root, -U is required so that the permis-
           sions stored in DESTDIR/METALOG are correctly applied to the files
           as they're copied to /.
 
-     4.   % ./build.sh -U -u release
+     4.   % ./build.sh [options] -U -u release
 
           Using unprivileged mode, build a complete release to DESTDIR and
           RELEASEDIR directories that build.sh selects (and will display).
@@ -880,4 +892,4 @@ HISTORY
      The build.sh based build scheme was introduced for NetBSD 1.6 as
      USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that.
 
-NetBSD                          August 18, 2008                         NetBSD
+NetBSD                            May 1, 2009                           NetBSD