From b92449059479770813b2766a0e757d1176e2fab6 Mon Sep 17 00:00:00 2001
From: brd <brd@FreeBSD.org>
Date: Sat, 4 Aug 2018 22:41:17 +0000
Subject: [PATCH] Move autofs related configs to usr.sbin/autofs/

This is prep for pkgbase to have config files tagged as such.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16492
---
 etc/Makefile                                       | 3 ---
 usr.sbin/autofs/Makefile                           | 3 +++
 {etc => usr.sbin/autofs}/auto_master               | 0
 {etc => usr.sbin/autofs}/autofs/Makefile           | 6 +++---
 {etc => usr.sbin/autofs}/autofs/include_ldap       | 0
 {etc => usr.sbin/autofs}/autofs/include_nis        | 0
 {etc => usr.sbin/autofs}/autofs/include_nis_nullfs | 0
 {etc => usr.sbin/autofs}/autofs/special_hosts      | 0
 {etc => usr.sbin/autofs}/autofs/special_media      | 0
 {etc => usr.sbin/autofs}/autofs/special_noauto     | 0
 {etc => usr.sbin/autofs}/autofs/special_null       | 0
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename {etc => usr.sbin/autofs}/auto_master (100%)
 rename {etc => usr.sbin/autofs}/autofs/Makefile (72%)
 rename {etc => usr.sbin/autofs}/autofs/include_ldap (100%)
 rename {etc => usr.sbin/autofs}/autofs/include_nis (100%)
 rename {etc => usr.sbin/autofs}/autofs/include_nis_nullfs (100%)
 rename {etc => usr.sbin/autofs}/autofs/special_hosts (100%)
 rename {etc => usr.sbin/autofs}/autofs/special_media (100%)
 rename {etc => usr.sbin/autofs}/autofs/special_noauto (100%)
 rename {etc => usr.sbin/autofs}/autofs/special_null (100%)

diff --git a/etc/Makefile b/etc/Makefile
index 90f7096f4cf8..af3b2676056d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -190,9 +190,6 @@ distribution:
 		echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-.if ${MK_AUTOFS} != "no"
-	${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
-.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
diff --git a/usr.sbin/autofs/Makefile b/usr.sbin/autofs/Makefile
index 760ec561ba6b..d901e35a523c 100644
--- a/usr.sbin/autofs/Makefile
+++ b/usr.sbin/autofs/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	auto_master
 PACKAGE=autofs
 PROG=	automountd
 SRCS=	automount.c
@@ -30,4 +31,6 @@ LINKS+=	${BINDIR}/automountd ${BINDIR}/autounmountd
 
 .PATH:	${MOUNT}
 
+SUBDIR=	autofs
+
 .include <bsd.prog.mk>
diff --git a/etc/auto_master b/usr.sbin/autofs/auto_master
similarity index 100%
rename from etc/auto_master
rename to usr.sbin/autofs/auto_master
diff --git a/etc/autofs/Makefile b/usr.sbin/autofs/autofs/Makefile
similarity index 72%
rename from etc/autofs/Makefile
rename to usr.sbin/autofs/autofs/Makefile
index 822e523c9f15..772efd38266f 100644
--- a/etc/autofs/Makefile
+++ b/usr.sbin/autofs/autofs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=		include_ldap \
+CONFS=		include_ldap \
 		include_nis \
 		include_nis_nullfs \
 		special_hosts \
@@ -9,7 +9,7 @@ FILES=		include_ldap \
 		special_null
 
 NO_OBJ=
-FILESDIR=	/etc/autofs
-FILESMODE=	755
+CONFDIR=	/etc/autofs
+CONFMODE=	755
 
 .include <bsd.prog.mk>
diff --git a/etc/autofs/include_ldap b/usr.sbin/autofs/autofs/include_ldap
similarity index 100%
rename from etc/autofs/include_ldap
rename to usr.sbin/autofs/autofs/include_ldap
diff --git a/etc/autofs/include_nis b/usr.sbin/autofs/autofs/include_nis
similarity index 100%
rename from etc/autofs/include_nis
rename to usr.sbin/autofs/autofs/include_nis
diff --git a/etc/autofs/include_nis_nullfs b/usr.sbin/autofs/autofs/include_nis_nullfs
similarity index 100%
rename from etc/autofs/include_nis_nullfs
rename to usr.sbin/autofs/autofs/include_nis_nullfs
diff --git a/etc/autofs/special_hosts b/usr.sbin/autofs/autofs/special_hosts
similarity index 100%
rename from etc/autofs/special_hosts
rename to usr.sbin/autofs/autofs/special_hosts
diff --git a/etc/autofs/special_media b/usr.sbin/autofs/autofs/special_media
similarity index 100%
rename from etc/autofs/special_media
rename to usr.sbin/autofs/autofs/special_media
diff --git a/etc/autofs/special_noauto b/usr.sbin/autofs/autofs/special_noauto
similarity index 100%
rename from etc/autofs/special_noauto
rename to usr.sbin/autofs/autofs/special_noauto
diff --git a/etc/autofs/special_null b/usr.sbin/autofs/autofs/special_null
similarity index 100%
rename from etc/autofs/special_null
rename to usr.sbin/autofs/autofs/special_null