From 9f7bd28e773edf781d7238fca67fbe5ea4648afb Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Thu, 8 Nov 2012 21:24:17 +0000
Subject: Updated/new Makefile.depend

---
 etc/sendmail/Makefile.depend | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 etc/sendmail/Makefile.depend

(limited to 'etc')

diff --git a/etc/sendmail/Makefile.depend b/etc/sendmail/Makefile.depend
new file mode 100644
index 0000000..29fda55
--- /dev/null
+++ b/etc/sendmail/Makefile.depend
@@ -0,0 +1,14 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
-- 
cgit v1.1


From b8d13cc6d3a313e63f1bdc5c2b211a2219853868 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Wed, 16 Oct 2013 16:03:01 +0000
Subject: We use distrib-dirs to populate stage tree. But that depends on
 up-to-date passwd and group files in /etc. If MK_INSTALL_AS_USER==yes and we
 are not root, filter the mtree input to avoid problems with [gu]name and
 [gu]id settings.

---
 etc/Makefile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index ff8efc5..0740338 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -307,6 +307,15 @@ distribution:
 
 MTREE_CMD?=	mtree
 
+.if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0
+MTREE_FILTER= sed -e 's,(uname=)[^ ]* ,\1${BINOWN},' \
+	-e 's,(gname=)[^ ]* ,\1${BINGRP},' \
+	-e 's,(uid=)[^ ]* ,\1${_uid},' \
+	-e 's,(gid=)[^ ]* ,\1${_gid},' 
+.else
+MTREE_FILTER= cat
+.endif
+
 MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
 		mtree/BSD.usr.dist		/usr		\
@@ -333,7 +342,8 @@ distrib-dirs: ${MTREES:N/*}
 		shift; \
 		${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
 		    -f $$m -p $$d; \
-		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
+		${MTREE_FILTER} $$m | \
+		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
@@ -346,7 +356,8 @@ distrib-dirs: ${MTREES:N/*}
 		shift; \
 		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
-		${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
+		${MTREE_FILTER} $$m | \
+		${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif
-- 
cgit v1.1


From c244fcbcaa61dc2a15995e7dbdf3ae8107bc2111 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Mon, 21 Oct 2013 18:47:29 +0000
Subject: Fix botched sed script

---
 etc/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index 0740338..1d145c19 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -308,10 +308,10 @@ distribution:
 MTREE_CMD?=	mtree
 
 .if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0
-MTREE_FILTER= sed -e 's,(uname=)[^ ]* ,\1${BINOWN},' \
-	-e 's,(gname=)[^ ]* ,\1${BINGRP},' \
-	-e 's,(uid=)[^ ]* ,\1${_uid},' \
-	-e 's,(gid=)[^ ]* ,\1${_gid},' 
+MTREE_FILTER= sed -e 's,\(uname=\)[^ ]* ,\1${BINOWN} ,' \
+	-e 's,\(gname=\)[^ ]* ,\1${BINGRP} ,' \
+	-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
+	-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' 
 .else
 MTREE_FILTER= cat
 .endif
-- 
cgit v1.1


From 035dac0445f8b533a641d0c0e67469d93df434d5 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 2 May 2014 00:45:30 +0000
Subject: There is no guarantee that our group has a name. Since the results
 are temp, just subst [gu]name for [gu]id

Reviewed by: obrien
---
 etc/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index 0909b8b..340ade4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -319,10 +319,11 @@ distribution:
 MTREE_CMD?=	mtree
 
 .if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0
-MTREE_FILTER= sed -e 's,\(uname=\)[^ ]* ,\1${BINOWN} ,' \
-	-e 's,\(gname=\)[^ ]* ,\1${BINGRP} ,' \
+MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
 	-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
-	-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' 
+	-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
+	-e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
+	-e 's,\(gid=\)[^ ]*$$,\1${_gid},' 
 .else
 MTREE_FILTER= cat
 .endif
-- 
cgit v1.1