From f10c8263aa312e7ce0f2e25c46fce11c0f11568d Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Mon, 23 Aug 1999 05:12:43 +0000
Subject: [PATCH] Fix script in README to actually work, empty lines produce as
 much a diff as lines with the wrong stuff on it.

Add references in mtree data files to the README.
---
 etc/mtree/BSD.include.dist | 4 +++-
 etc/mtree/BSD.local.dist   | 4 +++-
 etc/mtree/BSD.release.dist | 4 +++-
 etc/mtree/BSD.root.dist    | 4 +++-
 etc/mtree/BSD.usr.dist     | 4 +++-
 etc/mtree/BSD.var.dist     | 4 +++-
 etc/mtree/BSD.x11-4.dist   | 4 +++-
 etc/mtree/BSD.x11.dist     | 4 +++-
 etc/mtree/README           | 6 +++---
 9 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index c5133e37f998..e6758195f7b5 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,6 @@
-#	$Id: BSD.include.dist,v 1.23 1998/12/13 04:31:15 dillon Exp $
+#	$Id: BSD.include.dist,v 1.24 1998/12/13 04:38:28 dillon Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index cff76b2d3ab2..dfc0fdd99b23 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,6 @@
-#     $Id: BSD.local.dist,v 1.45 1999/06/05 03:03:52 julian Exp $
+#     $Id: BSD.local.dist,v 1.46 1999/06/08 02:24:29 foxfair Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 7dcb262bdcad..b0fa09e8d30c 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,6 @@
-#	$Id$
+#	$Id: BSD.release.dist,v 1.4 1997/02/23 09:21:05 peter Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index b87c38431973..d00b83279ce9 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,6 @@
-#	$Id: BSD.root.dist,v 1.39 1999/03/10 03:33:17 dcs Exp $
+#	$Id: BSD.root.dist,v 1.40 1999/04/19 14:33:31 peter Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 5df9810330eb..1a6baf7d3322 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,6 @@
-#	$Id: BSD.usr.dist,v 1.159 1999/06/24 09:45:22 sheldonh Exp $
+#	$Id: BSD.usr.dist,v 1.160 1999/08/19 07:10:26 ru Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 8220e9bd0ba7..bc68edca8aaf 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,6 @@
-#	$Id: BSD.var.dist,v 1.39 1999/03/31 07:06:39 asami Exp $
+#	$Id: BSD.var.dist,v 1.40 1999/03/31 13:38:37 asami Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index fd70b71c9ae7..698f6d8abeaf 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -1,4 +1,6 @@
-#     $Id: BSD.x11.dist,v 1.3 1998/03/20 16:53:03 itojun Exp $
+#     $Id: BSD.x11.dist,v 1.4 1998/09/19 18:50:27 obrien Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index fd70b71c9ae7..698f6d8abeaf 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,6 @@
-#     $Id: BSD.x11.dist,v 1.3 1998/03/20 16:53:03 itojun Exp $
+#     $Id: BSD.x11.dist,v 1.4 1998/09/19 18:50:27 obrien Exp $
+#
+# Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/README b/etc/mtree/README
index e0eb19e4ba20..bafa838d5f9d 100644
--- a/etc/mtree/README
+++ b/etc/mtree/README
@@ -1,4 +1,4 @@
-$Id$
+$Id: README,v 1.1 1999/08/23 01:16:26 rgrimes Exp $
 
 These files are used to create empty file hierarchies for building the
 system into.  Some notes about working with them are placed here to try
@@ -18,13 +18,13 @@ and keep them in good working order.
     c)  The listing should be keep in filename sorted order.
 
     d)  Sanity checking changes to these files can be done by following
-        this procedure (the sed -e's are ugly, but fixing mtree -c to
+        this procedure (the sed -e is ugly, but fixing mtree -c to
         not emit the trailing white space would be even uglier):
 
             mkdir /tmp/MTREE
             mtree -deU -f BSD.X.dist -p /tmp/MTREE
             mtree -cdin -k uname,gname,mode | sed -e 's/ *$//' | \
-                sed -e 's/^#\t//' >BSD.X.new
+                tail +5 >BSD.X.new
             diff -u BSD.X.dist BSD.X.new
             rm -r /tmp/MTREE