From owner-svn-src-all@FreeBSD.ORG  Sat May 10 16:37:40 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97BD38F6;
 Sat, 10 May 2014 16:37:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 7B68D1FA;
 Sat, 10 May 2014 16:37:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGbeqa006196;
 Sat, 10 May 2014 16:37:40 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGbduS006189;
 Sat, 10 May 2014 16:37:39 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405101637.s4AGbduS006189@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 10 May 2014 16:37:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265828 - in head: share/mk tools/build/options usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2014 16:37:40 -0000

Author: imp
Date: Sat May 10 16:37:39 2014
New Revision: 265828
URL: http://svnweb.freebsd.org/changeset/base/265828

Log:
  Optionally allow building the historical FreeBSD make program and
  install it as fmake. This defaults to no. This should be viewed as the
  first step towards evental migration of this historic code to ports
  and removal from the tree.

Added:
  head/tools/build/options/WITH_FMAKE   (contents, props changed)
Modified:
  head/share/mk/src.opts.mk
  head/usr.bin/Makefile

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat May 10 16:37:33 2014	(r265827)
+++ head/share/mk/src.opts.mk	Sat May 10 16:37:39 2014	(r265828)
@@ -165,6 +165,7 @@ __DEFAULT_NO_OPTIONS = \
     BSD_GREP \
     CLANG_EXTRAS \
     EISA \
+    FMAKE \
     HESIOD \
     LLDB \
     NAND \

Added: head/tools/build/options/WITH_FMAKE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_FMAKE	Sat May 10 16:37:39 2014	(r265828)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Causes the old FreeBSD 
+.Xr make 1
+program to be built and installed as fmake.
+

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Sat May 10 16:37:33 2014	(r265827)
+++ head/usr.bin/Makefile	Sat May 10 16:37:39 2014	(r265828)
@@ -230,6 +230,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_FMAKE} != "no"
+SUBDIR+=	make
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif