From owner-svn-src-head@FreeBSD.ORG Tue Jun 11 21:47:17 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A82F3A1; Tue, 11 Jun 2013 21:47:17 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0E4491EFB; Tue, 11 Jun 2013 21:47:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BLlGe1007190; Tue, 11 Jun 2013 21:47:16 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BLlG19007189; Tue, 11 Jun 2013 21:47:16 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201306112147.r5BLlG19007189@svn.freebsd.org> From: Eitan Adler Date: Tue, 11 Jun 2013 21:47:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251640 - head/share/misc 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.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2013 21:47:17 -0000 Author: eadler Date: Tue Jun 11 21:47:16 2013 New Revision: 251640 URL: http://svnweb.freebsd.org/changeset/base/251640 Log: Merge latest NetBSD changes. This adds some new NetBSD releases and makes some simple formatting changes. With this commit NetBSD and FreeBSD should have identical files. DragonflyFBSD has the version immediately prior to this commit. When committing to this file please try to coordinate with all three groups. Submitted by: Alan Barrett Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree ============================================================================== --- head/share/misc/bsd-family-tree Tue Jun 11 21:40:20 2013 (r251639) +++ head/share/misc/bsd-family-tree Tue Jun 11 21:47:16 2013 (r251640) @@ -221,51 +221,58 @@ FreeBSD 5.2 | | *--FreeBSD | | | | | DragonFly 1.12.0 | 7.0 | | | | | | | | | | | | OpenBSD 4.3 | - | | | | | NetBSD 4.0.1 | DragonFly 2.0.0 - | | FreeBSD | | OpenBSD 4.4 | + | | | | | NetBSD | DragonFly 2.0.0 + | | FreeBSD | | 4.0.1 OpenBSD 4.4 | | | 6.4 | | | | | | | | | | | FreeBSD 7.1 | | | | | | | | | DragonFly 2.2.0 | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | - | \ | | | | | - | | Mac OS X | | | | - | | 10.6 | | | | - | | | | | | DragonFly 2.4.0 - | | | | | OpenBSD 4.6 | - | | | | | | | - *--FreeBSD | | | | | | - | 8.0 | | | | | | - | | FreeBSD | | | | | - | | 7.3 | | | | DragonFly 2.6.0 - | | | | | | OpenBSD 4.7 | - | FreeBSD | | | | | | - | 8.1 | | | | | | - | | | | | | | DragonFly 2.8.2 - | | | | | | OpenBSD 4.8 | - | | | | | NetBSD 5.1 | | - | FreeBSD FreeBSD | | | | | - | 8.2 7.4 | | | | DragonFly 2.10.1 - | | | | | OpenBSD 4.9 | - | `-----. Mac OS X | | | | - | \ 10.7 | | | | - | | | | | OpenBSD 5.0 | - *--FreeBSD | | | | | | - | 9.0 | | | NetBSD 5.1.2 | DragonFly 3.0.1 - | | FreeBSD | | | | - | | 8.3 | | OpenBSD 5.1 | - | | | Mac OS X | | | - | | | 10.8 | | | - | | | | NetBSD 6.0 | | - | | | | | OpenBSD 5.2 DragonFly 3.2.1 - | FreeBSD | | | | | - | 9.1 | | | | | - | | | | | | - | | | | OpenBSD 5.3 DragonFly 3.4.1 - | | | NetBSD 6.1 | | + | \ | | | \ | | + | | Mac OS X | | \ | | + | | 10.6 | | \ | | + | | | | | NetBSD | DragonFly 2.4.0 + | | | | | 5.0.1 OpenBSD 4.6 | + | | | | | | | | + *--FreeBSD | | | | | | | + | 8.0 | | | | | | | + | | FreeBSD | | | NetBSD | | + | | 7.3 | | | 5.0.2 | DragonFly 2.6.0 + | | | | | | OpenBSD 4.7 | + | FreeBSD | | | | | | + | 8.1 | | | | | | + | | | | | | | DragonFly 2.8.2 + | | | | | | OpenBSD 4.8 | + | | | | | *--NetBSD | | + | FreeBSD FreeBSD | | | 5.1 | | + | 8.2 7.4 | | | | | DragonFly 2.10.1 + | | | | | | OpenBSD 4.9 | + | `-----. Mac OS X | | | | | + | \ 10.7 | | | | | + | | | | | | OpenBSD 5.0 | + *--FreeBSD | | | | | | | + | 9.0 | | | | NetBSD | DragonFly 3.0.1 + | | FreeBSD | | | 5.1.2 | | + | | 8.3 | | | OpenBSD 5.1 | + | | | Mac OS X | `----. | | + | | | 10.8 | \ | | + | | | | NetBSD 6.0 | | | + | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1 + | FreeBSD | | | | | NetBSD | | + | 9.1 | | | | | 5.2 | | + | | | | | \ | | + | | | | | NetBSD | | + | | | | | 6.0.1 | | + | | | | | | OpenBSD 5.3 DragonFly 3.4.1 + | | | | | NetBSD | | + | | | | | 6.0.2 | | + | | | | | | | + | | | | `-NetBSD 6.1 | | | FreeBSD | | | | | 8.4 | | | | | | | | | + | | | | | + | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -565,9 +572,12 @@ Mac OS X 10.8 2012-07-25 [APL] NetBSD 6.0 2012-10-17 [NBD] OpenBSD 5.2 2012-11-01 [OBD] DragonFly 3.2.1 2012-11-02 [DFB] +NetBSD 5.2 2012-12-03 [NBD] +NetBSD 6.0.1 2012-12-26 [NBD] (security/critical release) FreeBSD 9.1 2012-12-30 [FBD] DragonFly 3.4.1 2013-04-29 [DFB] OpenBSD 5.3 2013-05-01 [OBD] +NetBSD 6.0.2 2013-05-18 [NBD] (security/critical release) NetBSD 6.1 2013-05-18 [NBD] FreeBSD 8.4 2013-06-07 [FBD]