From owner-svn-src-head@freebsd.org  Sat Mar  5 05:08:58 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCB7C9DA186;
 Sat,  5 Mar 2016 05:08:58 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E01A75B;
 Sat,  5 Mar 2016 05:08:58 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2558vqw071387;
 Sat, 5 Mar 2016 05:08:57 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2558voj071386;
 Sat, 5 Mar 2016 05:08:57 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603050508.u2558voj071386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 5 Mar 2016 05:08:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296405 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2016 05:08:58 -0000

Author: bdrewery
Date: Sat Mar  5 05:08:57 2016
New Revision: 296405
URL: https://svnweb.freebsd.org/changeset/base/296405

Log:
  Conditionalize building makewhatis(1) for upgrades that need it.
  
  Remove building of the legacy makewhatis(1) since it was only needed for
  6.0 upgrades.
  
  On my 2.2 GHz system libsqlite3 takes 60-100 seconds to build, which due to
  its serialized nature can hold up the build waiting on it to finish in
  bootstrap-tools.
  
  makewhatis(1) was only required to be a build tool to support upgrades
  from 6.0 which was properly removed in r208324 but later reverted due to
  installworld using it.  The installworld issue was fixed in r275622
  when it was added to ITOOLS.  A BOOTSTRAPPING check was missed when
  makewhatis(1) was replaced with mandoc in r283777.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Mar  5 01:17:23 2016	(r296404)
+++ head/Makefile.inc1	Sat Mar  5 05:08:57 2016	(r296405)
@@ -1529,13 +1529,12 @@ _kerberos5_bootstrap_tools= \
 .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
-.if ${MK_MANDOCDB} != "no"
+# r283777 makewhatis(1) replaced with mandoc version which builds a database.
+.if ${MK_MANDOCDB} != "no" && ${BOOTSTRAPPING} < 1100075
 _libopenbsd?=	lib/libopenbsd
 _makewhatis=	lib/libsqlite3 \
 		usr.bin/mandoc
 ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3
-.else
-_makewhatis=usr.bin/makewhatis
 .endif
 
 bootstrap-tools: .PHONY