From owner-svn-src-all@FreeBSD.ORG  Fri Dec 19 23:10:56 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 275F01065673;
	Fri, 19 Dec 2008 23:10:56 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 140658FC1E;
	Fri, 19 Dec 2008 23:10:56 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJNAuYi085180;
	Fri, 19 Dec 2008 23:10:56 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBJNAt4r085177;
	Fri, 19 Dec 2008 23:10:55 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200812192310.mBJNAt4r085177@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 19 Dec 2008 23:10:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186344 - in head: . sys/sys usr.sbin
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 19 Dec 2008 23:10:56 -0000

Author: sam
Date: Fri Dec 19 23:10:55 2008
New Revision: 186344
URL: http://svn.freebsd.org/changeset/base/186344

Log:
  add makefs to the base system; FreeBSD_version bumped just in case
  
  Reviewed by:	imp

Modified:
  head/UPDATING
  head/sys/sys/param.h
  head/usr.sbin/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Dec 19 23:00:23 2008	(r186343)
+++ head/UPDATING	Fri Dec 19 23:10:55 2008	(r186344)
@@ -21,6 +21,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	developers choose to disable these features on build machines
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
+
+20081219:
+	With __FreeBSD_version 800060 incorporates the makefs tool is
+	part of the base system (it was a port).
+
 20081216:
 	The afdata and ifnet locks have been changed from mutexes to 
 	rwlocks, network modules will need to be re-compiled.

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Fri Dec 19 23:00:23 2008	(r186343)
+++ head/sys/sys/param.h	Fri Dec 19 23:10:55 2008	(r186344)
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800059	/* Master, propagated to newvers */
+#define __FreeBSD_version 800060	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Fri Dec 19 23:00:23 2008	(r186343)
+++ head/usr.sbin/Makefile	Fri Dec 19 23:10:55 2008	(r186344)
@@ -86,6 +86,7 @@ SUBDIR=	${_ac} \
 	${_lptcontrol} \
 	${_mailstats} \
 	mailwrapper \
+	makefs \
 	${_makemap} \
 	manctl \
 	memcontrol \