From a20af8d9dbbca3dc9e080d2e303e95f0dbc93c43 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Sun, 25 Jul 2010 07:19:00 +0000
Subject: [PATCH] remove the MKSUBPIXEL/MKTTINTERP options; they're going away.

regenerate.
---
 BUILDING          | 34 ----------------------------------
 doc/BUILDING.mdoc | 18 +-----------------
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/BUILDING b/BUILDING
index 68f8f445142f..0529421f8a11 100644
--- a/BUILDING
+++ b/BUILDING
@@ -74,9 +74,6 @@ FILES
      x11/           ``Reachover'' build structure for X11R6; the source is in
                     X11SRCDIR.
 
-     extsrc/        ``Reachover'' build structure for externally added programs
-                    and libraries; the source is in EXTSRCSRCDIR.
-
    Build tree layout
      The NetBSD build tree is described in hier(7), and the release layout is
      described in release(7).
@@ -167,13 +164,6 @@ CONFIGURATION
                  Note: build.sh will provide a default of destdir.MACHINE (in
                  the top-level .OBJDIR) unless run in `expert' mode.
 
-     EXTSRCSRCDIR
-		 Directory containing sources of externally added programs
-		 and libraries.  If specified, must be an absolute path.
-
-                 Default: NETBSDRCDIR/../extsrc, if that exists; otherwise
-                 /usr/extsrc.
-
      MAKECONF    The name of the make(1) configuration file.  Only settable in
                  the process environment.
 
@@ -222,11 +212,6 @@ CONFIGURATION
 
                  Default: ``yes''
 
-     MKEXTSRC    Can be set to ``yes'' or ``no''.  Indicates whether extsrc is
-                 built from EXTSRCSRCDIR.
-
-                 Default: ``no''
-
      MKHTML      Can be set to ``yes'' or ``no''.  Indicates whether prefor-
                  matted HTML manual pages will be built and installed
 
@@ -315,18 +300,6 @@ CONFIGURATION
 
                  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.
-
-                 Default: ``no''
-
      MKUNPRIVED  Can be set to ``yes'' or ``no''.  Indicates whether an
                  unprivileged install will occur.  The user, group, permis-
                  sions, and file flags, will not be set on the installed
@@ -889,13 +862,6 @@ BUILDING
 
      -x        Set MKX11=yes.
 
-     -Y extsrcsrc
-               Set the value of EXTSRCSRCDIR to extsrcsrc.  If a relative path is
-               specified, it will be converted to an absolute path before
-               being used.
-
-     -y        Set MKEXTSRC=yes.
-
      -Z var    Unset ("zap") the environment variable var.  This is propagated
                to the nbmake wrapper.
 
diff --git a/doc/BUILDING.mdoc b/doc/BUILDING.mdoc
index 403c694aa2a8..78e93a8eda32 100644
--- a/doc/BUILDING.mdoc
+++ b/doc/BUILDING.mdoc
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.80 2009/10/10 19:05:29 apb Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.81 2010/07/25 07:19:00 mrg Exp $
 .\"
 .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -554,22 +554,6 @@ to include RCS IDs for use with
 .Xr ident 1 .
 .DFLTn
 .
-.It Sy MKSUBPIXEL
-.YorN
-For X builds, decides if subpixel rendering code in FreeType
-is turned on.
-Turned off by default because of patent issues.
-.DFLTn
-.
-.It Sy MKTTINTERP
-.YorN
-For X builds, decides if the TrueType bytecode interpreter
-is turned on.
-See
-.Pa http://www.freetype.org/patents.html
-for details.
-.DFLTn
-.
 .It Sy MKUNPRIVED
 .YorN
 Indicates whether an unprivileged install will occur.