From c438332a2269e86193bd40cd6553373617de2be0 Mon Sep 17 00:00:00 2001
From: manu <manu@FreeBSD.org>
Date: Thu, 25 Apr 2019 16:45:24 +0000
Subject: [PATCH] mtree: Add more runtime package tag

When using pkgbase those empty directories aren't packaged otherwise.

Reviewed by:	bapt
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D20056
---
 etc/mtree/BSD.sendmail.dist |  2 +-
 etc/mtree/BSD.usr.dist      |  4 ++--
 etc/mtree/BSD.var.dist      | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/mtree/BSD.sendmail.dist b/etc/mtree/BSD.sendmail.dist
index 138606b7c44d..7bb8c0f5b5a4 100644
--- a/etc/mtree/BSD.sendmail.dist
+++ b/etc/mtree/BSD.sendmail.dist
@@ -6,7 +6,7 @@
 /set type=dir uname=root gname=wheel mode=0755
 .               nochange
     var             nochange
-        spool           nochange
+        spool           nochange tags=package=runtime
             clientmqueue    uname=smmsp gname=smmsp mode=0770
             ..
         ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c96aacfec245..c4c78368436f 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -428,9 +428,9 @@
         ..
         keys
             pkg
-                revoked
+                revoked tags=package=runtime
                 ..
-                trusted
+                trusted tags=package=runtime
                 ..
             ..
         ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 1fb95df460d6..3b694908f00c 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -32,7 +32,7 @@
     ..
     crash
     ..
-    cron
+    cron                tags=package=runtime
         tabs            mode=0700
         ..
     ..
@@ -59,21 +59,21 @@
             ..
         ..
     ..
-    empty           mode=0555 flags=schg
+    empty           mode=0555 flags=schg tags=package=runtime
     ..
     games           gname=games mode=0775
     ..
     heimdal         mode=0700
     ..
-    log
+    log             tags=package=runtime
     ..
-    mail            gname=mail mode=0775
+    mail            gname=mail mode=0775 tags=package=runtime
     ..
     msgs            uname=daemon
     ..
     preserve
     ..
-    run
+    run             tags=package=runtime
         dhclient
         ..
         ppp             gname=network mode=0770
@@ -101,7 +101,7 @@
         ..
 /set gname=wheel
     ..
-    tmp             mode=01777
+    tmp             mode=01777 tags=package=runtime
         vi.recover      mode=01777
         ..
     ..