Rename _INSTALL_ROOT_USER to REAL_ROOT_USER. Use it as default for

SETUID_ROOT_PERMS.

4 files changed, 11 insertions, 11 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5e0beb34eb6..379c844510f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 # 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 --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 853c913dac3..fd96f135442 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -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 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER}
 #	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 --git a/mk/plist/plist.mk b/mk/plist/plist.mk
index 25a05aa00e5..c5d1c445d6d 100644
--- a/mk/plist/plist.mk
+++ b/mk/plist/plist.mk
@@ -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 @@ _PLIST_IGNORE_FILES+=	${PLIST_IGNORE_FILES}
 _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 --git a/mk/unprivileged.mk b/mk/unprivileged.mk
index 13159aa085b..d37c6da9a0e 100644
--- a/mk/unprivileged.mk
+++ b/mk/unprivileged.mk
@@ -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 @@ UNPRIVILEGED_GROUP!=	${ID} -n -g
 
 .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.