details: https://anonhg.NetBSD.org/src/rev/e227e1fe1e2f
branches: netbsd-6-0
changeset: 774669:e227e1fe1e2f
user: sborrill <sborrill%NetBSD.org@localhost>
date: Fri Oct 26 08:02:59 2012 +0000
description:
Pull up the following revisions(s) (requested by riz in ticket #641):
share/misc/bsd-family-tree: revision 1.46-1.47
Re-add a line from NetBSD 0.8 to FreeBSD 1.0.
Add some missing NetBSD releases: 4.0.1, 5.0.1, 5.0.2 and 5.1.2.
diffstat:
share/misc/bsd-family-tree | 69 ++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 33 deletions(-)
diffs (109 lines):
diff -r a8ead76cc582 -r e227e1fe1e2f share/misc/bsd-family-tree
--- a/share/misc/bsd-family-tree Thu Oct 25 17:26:34 2012 +0000
+++ b/share/misc/bsd-family-tree Fri Oct 26 08:02:59 2012 +0000
@@ -62,9 +62,9 @@
| | 4.4BSD |
| | / | |
| | 4.4BSD-Encumbered | |
- | NetBSD 0.8 | BSD/386 1.0
- | | | |
-FreeBSD 1.0 NetBSD 0.9 | BSD/386 1.1
+ | -NetBSD 0.8 | BSD/386 1.0
+ | / | | |
+FreeBSD 1.0 <-----' NetBSD 0.9 | BSD/386 1.1
| | .----- 4.4BSD Lite |
FreeBSD 1.1 | / / | \ |
| | / / | \ |
@@ -216,42 +216,42 @@
| | 10.5 | | |
| | | | OpenBSD 4.2 |
| | | NetBSD 4.0 | |
- | FreeBSD 6.3 | | | |
- | \ | | | |
- *--FreeBSD | | | | DragonFly 1.12.0
- | 7.0 | | | | |
- | | | | | OpenBSD 4.3 |
- | | | | | | DragonFly 2.0.0
+ | FreeBSD 6.3 | | | | |
+ | \ | | | | |
+ *--FreeBSD | | | | | DragonFly 1.12.0
+ | 7.0 | | | | | |
+ | | | | | | OpenBSD 4.3 |
+ | | | | | NetBSD 4.0.1 | DragonFly 2.0.0
| | FreeBSD | | 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 | | | | DragonFly 3.0.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 5.1.2 | DragonFly 3.0.1
| v FreeBSD | | | |
| 8.3 | | OpenBSD 5.1 |
| Mac OS X | | |
@@ -530,9 +530,11 @@
OpenBSD 4.5 2009-05-01 [OBD]
FreeBSD 7.2 2009-05-04 [FBD]
Mac OS X 10.6 2009-06-08 [APL]
+NetBSD 5.0.1 2009-08-02 [NBD] (security/critical release)
DragonFly 2.4.0 2009-09-16 [DFB]
OpenBSD 4.6 2009-10-18 [OBD]
FreeBSD 8.0 2009-11-26 [FBD]
+NetBSD 5.0.2 2010-02-12 [NBD] (security/critical release)
FreeBSD 7.3 2010-03-23 [FBD]
DragonFly 2.6.0 2010-03-28 [DFB]
OpenBSD 4.7 2010-05-19 [OBD]
@@ -547,6 +549,7 @@
Mac OS X 10.7 2011-07-20 [APL]
OpenBSD 5.0 2011-11-01 [OBD]
FreeBSD 9.0 2012-01-12 [FBD]
+NetBSD 5.1.2 2012-02-02 [NBD] (security/critical release)
DragonFly 3.0.1 2012-02-21 [DFB]
FreeBSD 8.3 2012-04-18 [FBD]
OpenBSD 5.1 2012-05-01 [OBD]