From owner-svn-src-projects@FreeBSD.ORG  Fri May  2 00:45:31 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5961CF27;
 Fri,  2 May 2014 00:45:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 46B4C1103;
 Fri,  2 May 2014 00:45:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s420jVca039931;
 Fri, 2 May 2014 00:45:31 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s420jVin039930;
 Fri, 2 May 2014 00:45:31 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405020045.s420jVin039930@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 2 May 2014 00:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265204 - projects/bmake/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2014 00:45:31 -0000

Author: sjg
Date: Fri May  2 00:45:30 2014
New Revision: 265204
URL: http://svnweb.freebsd.org/changeset/base/265204

Log:
  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

Modified:
  projects/bmake/etc/Makefile

Modified: projects/bmake/etc/Makefile
==============================================================================
--- projects/bmake/etc/Makefile	Fri May  2 00:33:56 2014	(r265203)
+++ projects/bmake/etc/Makefile	Fri May  2 00:45:30 2014	(r265204)
@@ -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