[pkgsrc/trunk]: pkgsrc/mk Rename _INSTALL_ROOT_USER to REAL_ROOT_USER. Use it...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78bc5f80d669
branches:  trunk
changeset: 521132:78bc5f80d669
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Nov 05 15:10:08 2006 +0000

description:
Rename _INSTALL_ROOT_USER to REAL_ROOT_USER. Use it as default for
SETUID_ROOT_PERMS.

diffstat:

 mk/bsd.pkg.mk                   |  6 +++---
 mk/pkginstall/bsd.pkginstall.mk |  4 ++--
 mk/plist/plist.mk               |  6 +++---
 mk/unprivileged.mk              |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r 627fdb995b37 -r 78bc5f80d669 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Nov 05 14:51:24 2006 +0000
+++ b/mk/bsd.pkg.mk     Sun Nov 05 15:10:08 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1892 2006/10/23 14:40:14 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1893 2006/11/05 15:10:08 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -88,8 +88,8 @@
 
 # Override for SU_CMD user check
 _SU_ROOT_USER?=                ${ROOT_USER}
-_INSTALL_ROOT_USER?=   ${ROOT_USER}
-_INSTALL_ROOT_GROUP?=  ${ROOT_GROUP}
+REAL_ROOT_USER?=       ${ROOT_USER}
+REAL_ROOT_GROUP?=      ${ROOT_GROUP}
 
 .if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS)
 _INSTALL_UNSTRIPPED=   # set (flag used by platform/*.mk)
diff -r 627fdb995b37 -r 78bc5f80d669 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk   Sun Nov 05 14:51:24 2006 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk   Sun Nov 05 15:10:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.16 2006/11/05 14:51:24 joerg Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.17 2006/11/05 15:10:08 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -313,7 +313,7 @@
 #      SPECIAL_PERMS+= /path/to/suidroot ${SETUID_ROOT_PERMS}
 #
 SPECIAL_PERMS?=                # empty
-SETUID_ROOT_PERMS?=    ${ROOT_USER} ${ROOT_GROUP} 4711
+SETUID_ROOT_PERMS?=    ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4711
 
 _INSTALL_PERMS_FILE=           ${_PKGINSTALL_DIR}/perms
 _INSTALL_PERMS_DATAFILE=       ${_PKGINSTALL_DIR}/perms-data
diff -r 627fdb995b37 -r 78bc5f80d669 mk/plist/plist.mk
--- a/mk/plist/plist.mk Sun Nov 05 14:51:24 2006 +0000
+++ b/mk/plist/plist.mk Sun Nov 05 15:10:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.17 2006/10/15 16:20:34 joerg Exp $
+# $NetBSD: plist.mk,v 1.18 2006/11/05 15:10:08 joerg Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -194,8 +194,8 @@
 _BUILD_DEFS+=          _PLIST_IGNORE_FILES
 
 .if ${_USE_DESTDIR} == "user-destdir"
-_SET_OWNER_GROUP=      ${ECHO} "@owner ${_INSTALL_ROOT_USER}";         \
-                       ${ECHO} "@group ${_INSTALL_ROOT_GROUP}"
+_SET_OWNER_GROUP=      ${ECHO} "@owner ${REAL_ROOT_USER}";             \
+                       ${ECHO} "@group ${REAL_ROOT_GROUP}"
 .else
 _SET_OWNER_GROUP=      :
 .endif
diff -r 627fdb995b37 -r 78bc5f80d669 mk/unprivileged.mk
--- a/mk/unprivileged.mk        Sun Nov 05 14:51:24 2006 +0000
+++ b/mk/unprivileged.mk        Sun Nov 05 15:10:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: unprivileged.mk,v 1.8 2006/11/05 14:36:13 joerg Exp $
+# $NetBSD: unprivileged.mk,v 1.9 2006/11/05 15:10:08 joerg Exp $
 #
 # This file collects definitions that are useful when using pkgsrc as an
 # unprivileged (non-root) user. It is included automatically by the
@@ -29,8 +29,8 @@
 
 .if ${_USE_DESTDIR} == "user-destdir" && (!defined(UNPRIVILEGED) || empty(UNPRIVILEGED:M[Yy][Ee][Ss]))
 _SU_ROOT_USER:=                ${ROOT_USER}
-_INSTALL_ROOT_USER:=   ${ROOT_USER}
-_INSTALL_ROOT_GROUP:=  ${ROOT_GROUP}
+REAL_ROOT_USER:=       ${ROOT_USER}
+REAL_ROOT_GROUP:=      ${ROOT_GROUP}
 .endif
 
 # Override super-user account.