From 946eac8da84e5763b65b0f91465b545188f630ee Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 11 Mar 2016 23:45:09 +0000
Subject: [PATCH] DIRDEPS_BUILD: Fix staging of share/sendmail and
 share/examples.

Sponsored by:	EMC / Isilon Storage Division
---
 etc/Makefile                                  | 12 ++++++++++--
 etc/defaults/Makefile                         |  1 -
 etc/defaults/Makefile.depend                  | 11 +++++++++++
 share/examples/Makefile                       |  9 +++++++--
 share/examples/Makefile.depend                | 12 ++++++++++++
 share/sendmail/Makefile                       |  9 +++++++--
 share/sendmail/Makefile.depend                |  1 +
 targets/pseudo/userland/share/Makefile.depend |  1 +
 8 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 etc/defaults/Makefile.depend
 create mode 100644 share/examples/Makefile.depend

diff --git a/etc/Makefile b/etc/Makefile
index 27d1ba447b9e..24e0c950fbfd 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -3,6 +3,9 @@
 
 .include <src.opts.mk>
 
+# No need as it is empty and just causes rebuilds since this file does so much.
+UPDATE_DEPENDFILE=	no
+
 SUBDIR=	\
 	newsyslog.conf.d
 
@@ -450,11 +453,16 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	done
 .endif
 
-etc-examples:
+etc-examples-install:
+	${META_COOKIE_RM}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
-	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
+	${META_COOKIE_TOUCH}
+
+etc-examples: etc-examples-install
+	${_+_}cd ${.CURDIR}/defaults; \
+	    ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
 	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
 
 .include <bsd.prog.mk>
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index 1f6ac5ee3f88..4b3a4cea502f 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -3,7 +3,6 @@
 .include <src.opts.mk>
 
 FILES=	devfs.rules periodic.conf rc.conf
-NO_OBJ=
 FILESDIR= /etc/defaults
 
 .if ${MK_BLUETOOTH} != "no"
diff --git a/etc/defaults/Makefile.depend b/etc/defaults/Makefile.depend
new file mode 100644
index 000000000000..f80275d86ab1
--- /dev/null
+++ b/etc/defaults/Makefile.depend
@@ -0,0 +1,11 @@
+# $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/share/examples/Makefile b/share/examples/Makefile
index 2484aff89007..7f243fa35be5 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -219,9 +219,11 @@ XFILES+=	bhyve/vmrun.sh
 SHARED?=	copies
 
 beforeinstall: ${SHARED} etc-examples
+META_COOKIES+=	copies symlinks
 .ORDER: ${SHARED} etc-examples
 
 copies:
+	${META_COOKIE_RM}
 .for i in ${LDIRS}
 	if [ -L ${DESTDIR}${BINDIR}/$i ]; then \
 		rm -f ${DESTDIR}${BINDIR}/$i; \
@@ -233,16 +235,19 @@ copies:
 	${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
 		${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file}
 .endfor
+	${META_COOKIE_TOUCH}
 
 symlinks:
+	${META_COOKIE_RM}
 .for i in ${LDIRS}
 	rm -rf ${DESTDIR}${BINDIR}/$i
 	ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i
 .endfor
+	${META_COOKIE_TOUCH}
 
 etc-examples:
 .if ${SHARED} != "symlinks"
-	(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
+	${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
 .endif
 
 .if ${SHARED} != "symlinks"
@@ -261,4 +266,4 @@ SUBDIR+=tests
 
 SUBDIR_PARALLEL=
 
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>
diff --git a/share/examples/Makefile.depend b/share/examples/Makefile.depend
new file mode 100644
index 000000000000..d7cfba0e4f6e
--- /dev/null
+++ b/share/examples/Makefile.depend
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	usr.bin/xinstall.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index a548b63144e5..c8dee5a3f56a 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -16,8 +16,10 @@ SHARED?=	copies
 all clean cleandir depend lint tags:
 
 beforeinstall: ${SHARED}
+META_COOKIES+=	copies symlinks
 
-copies::
+copies:
+	${META_COOKIE_RM}
 	if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi
 .for dir in ${CFDIRS}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir}
@@ -25,8 +27,11 @@ copies::
 .for file in ${CFFILES}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file}
 .endfor
+	${META_COOKIE_TOUCH}
 
-symlinks::
+symlinks:
+	${META_COOKIE_RM}
 	rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR}
+	${META_COOKIE_TOUCH}
 
 .include <bsd.prog.mk>
diff --git a/share/sendmail/Makefile.depend b/share/sendmail/Makefile.depend
index f80275d86ab1..d7cfba0e4f6e 100644
--- a/share/sendmail/Makefile.depend
+++ b/share/sendmail/Makefile.depend
@@ -2,6 +2,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend
index 4e7c9e1c72f7..3589a107ade3 100644
--- a/targets/pseudo/userland/share/Makefile.depend
+++ b/targets/pseudo/userland/share/Makefile.depend
@@ -85,6 +85,7 @@ DIRDEPS = \
 	share/doc/usd/title \
 	share/dtrace \
 	share/dtrace/toolkit \
+	share/examples \
 	share/examples/atf \
 	share/examples/ipfilter \
 	share/examples/pf \