From 39cec25ba73b28a104d7f050610e141e47239262 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 22 Aug 2018 15:55:23 +0000
Subject: [PATCH] Move all devfs related files to sbin/devfs/

This is related to pkgbase as it uses CONFS to properly tag these as config
files.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16785
---
 etc/Makefile                             |  9 +--------
 etc/defaults/Makefile                    |  8 --------
 etc/defaults/Makefile.depend             | 11 -----------
 sbin/devfs/Makefile                      |  3 +++
 {etc => sbin/devfs}/devfs.conf           |  0
 {etc/defaults => sbin/devfs}/devfs.rules |  0
 6 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 etc/defaults/Makefile
 delete mode 100644 etc/defaults/Makefile.depend
 rename {etc => sbin/devfs}/devfs.conf (100%)
 rename {etc/defaults => sbin/devfs}/devfs.rules (100%)

diff --git a/etc/Makefile b/etc/Makefile
index 443364c706d..a792dc515ad 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
 .endif
 
 BIN1=	crontab \
-	devfs.conf \
 	dhclient.conf \
 	disktab \
 	fbtab \
@@ -142,7 +141,6 @@ distribution:
 		echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
@@ -281,16 +279,11 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	done
 .endif
 
-etc-examples-install: ${META_DEPS}
+etc-examples: ${META_DEPS}
 	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
 
-etc-examples: etc-examples-install
-	${_+_}cd ${.CURDIR}/defaults; \
-	    ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
-	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
-
 .include <bsd.prog.mk>
 
 .if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
deleted file mode 100644
index b85fb33ee6e..00000000000
--- a/etc/defaults/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-FILES=	devfs.rules
-FILESDIR= /etc/defaults
-
-.include <bsd.prog.mk>
diff --git a/etc/defaults/Makefile.depend b/etc/defaults/Makefile.depend
deleted file mode 100644
index f80275d86ab..00000000000
--- a/etc/defaults/Makefile.depend
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index eee24e02e71..cf1fa812d3d 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+CONFS=	devfs.conf devfs.rules
+CONFSDIR_devfs.rules=	/etc/defaults
+CONFSMODE_devfs.rules=	600
 PACKAGE=runtime
 PROG=	devfs
 SRCS=	devfs.c rule.c
diff --git a/etc/devfs.conf b/sbin/devfs/devfs.conf
similarity index 100%
rename from etc/devfs.conf
rename to sbin/devfs/devfs.conf
diff --git a/etc/defaults/devfs.rules b/sbin/devfs/devfs.rules
similarity index 100%
rename from etc/defaults/devfs.rules
rename to sbin/devfs/devfs.rules
-- 
2.45.0