From 9ef60181ae56f0e1bd7202056eb7277cf0af3c2e Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 21 Jul 2017 16:14:35 +0000
Subject: [PATCH] Respect INSTALL_AS_USER for FILES.

MFC after:	2 weeks
Sponsored by:	Dell EMC Isilon
---
 share/mk/bsd.files.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 5dd51adc1d2..2eac6221406 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -26,6 +26,10 @@ installfiles: installfiles-${group}
 
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
+.if ${MK_INSTALL_AS_USER} == "yes"
+${group}OWN=	${SHAREOWN}
+${group}GRP=	${SHAREGRP}
+.endif
 ${group}MODE?=	${SHAREMODE}
 ${group}DIR?=	${BINDIR}
 STAGE_SETS+=	${group:C,[/*],_,g}
@@ -46,6 +50,10 @@ _${group}FILES=
     defined(${group}NAME_${file:T}) || defined(${group}NAME)
 ${group}OWN_${file:T}?=	${${group}OWN}
 ${group}GRP_${file:T}?=	${${group}GRP}
+.if ${MK_INSTALL_AS_USER} == "yes"
+${group}OWN_${file:T}=	${SHAREOWN}
+${group}GRP_${file:T}=	${SHAREGRP}
+.endif
 ${group}MODE_${file:T}?=	${${group}MODE}
 ${group}DIR_${file:T}?=	${${group}DIR}
 .if defined(${group}NAME)