From 2db56e791f47a90741e204f9dc8b72cc4bf55fc5 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 3 Jan 2016 04:32:05 +0000
Subject: [PATCH] Add libsoft to the tree, just like lib32.

---
 etc/Makefile               |  7 +++++++
 etc/mtree/BSD.libsoft.dist | 14 ++++++++++++++
 etc/mtree/Makefile         |  4 ++++
 3 files changed, 25 insertions(+)
 create mode 100644 etc/mtree/BSD.libsoft.dist

diff --git a/etc/Makefile b/etc/Makefile
index cf97988072a..5484c11e142 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -154,6 +154,9 @@ MTREE=	BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 .if ${MK_LIB32} != "no"
 MTREE+=	BSD.lib32.dist
 .endif
+.if ${MK_LIBSOFT} != "no"
+MTREE+=	BSD.libsoft.dist
+.endif
 .if ${MK_TESTS} != "no"
 MTREE+=	BSD.tests.dist
 .endif
@@ -354,6 +357,10 @@ MTREES+=	mtree/BSD.groff.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
 .endif
+.if ${MK_LIBSOFT} != "no"
+MTREES+=	mtree/BSD.libsoft.dist		/usr
+MTREES+=	mtree/BSD.libsoft.dist		/usr/lib/debug/usr
+.endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
diff --git a/etc/mtree/BSD.libsoft.dist b/etc/mtree/BSD.libsoft.dist
new file mode 100644
index 00000000000..69026a73f93
--- /dev/null
+++ b/etc/mtree/BSD.libsoft.dist
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    libsoft
+        dtrace
+        ..
+        i18n
+        ..
+    ..
+..
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 1a941e41c27..d8df25d3161 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -6,6 +6,7 @@ FILES=	${_BSD.debug.dist} \
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.lib32.dist} \
+	${_BSD.libsoft.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
@@ -20,6 +21,9 @@ _BSD.groff.dist=	BSD.groff.dist
 .if ${MK_LIB32} != "no"
 _BSD.lib32.dist=	BSD.lib32.dist
 .endif
+.if ${MK_LIBSOFT} != "no"
+_BSD.libsoft.dist=	BSD.libsoft.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif