svn commit: r265204 - projects/bmake/etc

[Simon J. Gerraty]

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