s/root/${ROOT_USER}/g, now that the definition appears in the

defs.${OPSYS}.mk files.

18 files changed, 40 insertions, 48 deletions

diff --git a/devel/acme/Makefile b/devel/acme/Makefile
index 39294affeba..aa55cbdd9bc 100644
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/29 18:30:30 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/05 15:00:44 agc Exp $
 #
 
 DISTNAME=	acme085_linux
@@ -30,6 +30,6 @@ do-install:
 	${INSTALL_DATA} ${WRKTOP}/docs/* ${PREFIX}/share/doc/acme
 	${INSTALL_DATA_DIR} ${ACME_LIB}
 	cd ${WRKDIR}/ACME_Lib && ${PAX} -rw . ${ACME_LIB}
-	${CHOWN} -R root:wheel ${ACME_LIB}
+	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${ACME_LIB}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index f05f04ed4ac..be12f1d9e82 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2001/12/05 15:00:44 agc Exp $
 #
 
 DISTNAME=		battalion
@@ -19,7 +19,7 @@ USE_X11BASE=		yes
 USE_MESA=		yes
 
 do-install:
-	${INSTALL} -c -s -o root -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
 	cd ${WRKDIR} && \
 	    ${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | ${GTAR} xmf -
 	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/HELP
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index 2c0872d4502..b0210548804 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/26 10:14:48 agc Exp $
+# $NetBSD: Makefile,v 1.11 2001/12/05 15:00:45 agc Exp $
 #
 
 DISTNAME=	crossfire-client-1.0.0
@@ -41,6 +41,6 @@ post-install:
 	cd ${LOCALBASE}/share/cfclient && \
 	    ${GZCAT} ${DISTDIR}/${CF_RAW} | ${GTAR} xmf -
 	${INSTALL_DATA} ${WRKSRC}/def_keys ${LOCALBASE}/share/cfclient
-	@${CHOWN} -R root:games ${LOCALBASE}/share/cfclient
+	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/cfclient
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 356e918b5d3..faf4a08bf3d 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/26 11:10:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/05 15:00:45 agc Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -41,10 +41,10 @@ REPLACE_PERL+=	doc/spoiler-html/makeps.pl
 post-install:
 	cd ${LOCALBASE}/share/crossfire && \
 	    ${GZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf -
-	@${CHOWN} root:games ${LOCALBASE}/bin/crossfire
+	@${CHOWN} ${ROOT_USER}:games ${LOCALBASE}/bin/crossfire
 	@${CHMOD} 2755 ${LOCALBASE}/bin/crossfire
-	@${CHOWN} -R root:games ${LOCALBASE}/share/crossfire
-	@${CHOWN} -R root:games ${LOCALBASE}/var/crossfire
+	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/crossfire
+	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/var/crossfire
 	@${CHMOD} -R g+w ${LOCALBASE}/var/crossfire
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index ef2d6d828d1..c3555c480e2 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/09 00:08:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/12/05 15:00:45 agc Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -36,6 +36,6 @@ do-install:
 	${CHGRP} games ${PREFIX}/bin/nighthawk
 	${CHMOD} g+s ${PREFIX}/bin/nighthawk
 	${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/nighthawk/README
-	${INSTALL} -o root -g games -m 664 /dev/null /var/games/nighthawk.scores
+	${INSTALL} -o ${ROOT_USER} -g games -m 664 /dev/null /var/games/nighthawk.scores
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 61ceb501746..70fe8ba64c4 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/16 15:10:58 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/12/05 15:00:46 agc Exp $
 #
 
 DISTNAME=	Rollemup
@@ -61,9 +61,9 @@ do-install:
 	  for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d | sort -r`; do \
 	    ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
 	  done)
-	@${CHOWN} root:games ${PREFIX}/bin/Rollemup
+	@${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/Rollemup
 	@${CHMOD} 2755 ${PREFIX}/bin/Rollemup
-	@${CHOWN} -R root:games ${PREFIX}/${GAMES_DIR}/Rollemup
+	@${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/${GAMES_DIR}/Rollemup
 	@${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Games
 	@${CHMOD} 775 ${PREFIX}/${GAMES_DIR}/Rollemup/Upload
 	@${CHMOD} 664 ${PREFIX}/${GAMES_DIR}/Rollemup/Rollemup.ini
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 24e9585b784..c9d7d35350c 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/11/24 08:55:20 tron Exp $
+# $NetBSD: Makefile,v 1.23 2001/12/05 15:00:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
 
 DISTNAME=	urt
@@ -41,7 +41,7 @@ post-install:
 	    ${RM} -rf doc)
 	cd ${PREFIX}/share/examples/urt && (\
 	    ${GTAR} xf ${DISTDIR}/urt-img.tar; \
-	    ${CHOWN} -R root:wheel . ; \
+	    ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} . ; \
 	    ${FIND} . -type d -exec ${CHMOD} 755 '{}' \; ; \
 	    ${FIND} . -type f -exec ${CHMOD} 644 '{}' \;)
 
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index a1092184282..47202b5b873 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/12/05 15:00:46 agc Exp $
 
 DISTNAME=		clisp-2000-03-06
 PKGNAME=		clisp-20000306
@@ -32,7 +32,7 @@ do-configure:
 	  --with-dynamic-ffi --fsstnd=netbsd >Makefile
 
 post-install:
-	${CHOWN} -R root:wheel ${PREFIX}/lib/clisp
+	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/lib/clisp
 	${CHMOD} -R a-w ${PREFIX}/lib/clisp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index c8983d8534a..6d59509e696 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2001/12/03 05:36:47 kent Exp $
+# $NetBSD: Makefile,v 1.52 2001/12/05 15:00:46 agc Exp $
 
 DISTNAME=	postfix-20010228-pl08
 PKGNAME=	postfix-20010228pl8
@@ -76,7 +76,7 @@ post-build:
 pre-install:
 	${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \
 	    ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
-	${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	-${RM} -f ${WRKSRC}/conf/*.orig
 .if defined(POSTFIX_USE_SASL_AUTH) && ${POSTFIX_USE_SASL_AUTH} == "YES"
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index c887f97e341..b0931dc7294 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/11/14 14:47:55 agc Exp $
+# $NetBSD: Makefile,v 1.20 2001/12/05 15:00:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -23,6 +23,6 @@ NO_BUILD=
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME}
 	cd ${WRKSRC}/Doc && ${PAX} -rw . ${PREFIX}/share/doc/${PKGNAME}
-	${CHOWN} -R root:${ROOT_GROUP} ${PREFIX}/share/doc/${PKGNAME}
+	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/doc/${PKGNAME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 946474b14ff..2096551a980 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/04/09 11:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/12/05 15:00:47 agc Exp $
 
 DISTNAME=	jitterbug-1.6.2
 WRKSRC=		${WRKDIR}/${PKGNAME}/source
@@ -201,10 +201,10 @@ do-install:
 		${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644             \
 		${CONFIGDIR}/users ${PREFIX}/${JB_DATADIR}
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/${CGIBINDIR}
-	${INSTALL} -c -o root -g nobody -m 4710                               \
+	${INSTALL} -c -o ${ROOT_USER} -g nobody -m 4710                               \
 		${WRKSRC}/jitterbug ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}
 	${LN} -f ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE} ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
-	${CHOWN} root ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
+	${CHOWN} ${ROOT_USER} ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
 	${CHGRP} nobody ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
 	${CHMOD} 4710 ${PREFIX}/${CGIBINDIR}/${JB_PACKAGE}.private
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/${JB_USER}/bin
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 67cf5cc8c04..68eafa0a2a3 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/09/27 23:18:26 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/12/05 15:00:47 agc Exp $
 #
 
 DISTNAME=		arla-0.35.5
@@ -57,7 +57,7 @@ post-install:
 		${ECHO} "Creating arla cache directory ${CACHEDIR}";          \
 		${INSTALL_DATA_DIR} ${CACHEDIR};                              \
 		${CHMOD} 700 ${CACHEDIR};                                     \
-		${CHOWN} root ${CACHEDIR};                                    \
+		${CHOWN} ${ROOT_USER} ${CACHEDIR};                                    \
 	fi
 	@if [ -e /sbin/mount_xfs ]; then                                      \
 		${ECHO} "/sbin/mount_xfs already exists";                     \
diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile
index 3a55c76471a..5fbd3b7206a 100644
--- a/net/dhisd/Makefile
+++ b/net/dhisd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/05 23:39:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/05 15:00:47 agc Exp $
 #
 
 DISTNAME=	dhisd-5.0
@@ -30,7 +30,7 @@ do-install:
 		${INSTALL_PROGRAM} \
 			${WRKSRC}/genkeys \
 			${PREFIX}/bin/dhisd-genkeys
-		${CHOWN} root \
+		${CHOWN} ${ROOT_USER} \
 			${PREFIX}/bin/dhisd-genkeys \
 			${PREFIX}/bin/dhisd
 		${CHMOD} 700 \
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 6ab79cbafbe..6adeff2d480 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/05 15:00:48 agc Exp $
 #
 
 DISTNAME=	mtr-0.42
@@ -18,7 +18,7 @@ USE_BUILDLINK_ONLY=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr-gtk
-	${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk
+	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d10aa3156e9..1e1dc916d2a 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/12/04 06:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/12/05 15:00:48 agc Exp $
 #
 
 DISTNAME=	mtr-0.42
@@ -17,7 +17,7 @@ USE_BUILDLINK_ONLY=	YES
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
-	${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin
+	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
 
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 324a6ec645f..960807dbcb6 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2001/10/11 09:57:20 martti Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/05 15:00:48 agc Exp $
 
 DISTNAME=	radiusd-cistron-1.6.4
 CATEGORIES=	net
@@ -43,6 +43,6 @@ post-install:
 	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd.sh.tmpl \
 		> ${PREFIX}/etc/rc.d/radiusd.sh
 	@${CHMOD} 555 ${PREFIX}/etc/rc.d/radiusd.sh
-	@${CHOWN} root:wheel ${PREFIX}/etc/rc.d/radiusd.sh
+	@${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/etc/rc.d/radiusd.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 4f272004630..cfea3b3447b 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/09/27 23:18:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/12/05 15:00:48 agc Exp $
 
 DISTNAME=	bluefish-0.6
 CATEGORIES=	www
@@ -35,7 +35,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	${CP} -R ${WRKSRC}/manual/* ${HTMLDIR}
 	@${ECHO} Setting permissions on HTML documentation...
-	${CHOWN} -R root.wheel ${HTMLDIR}
+	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${HTMLDIR}
 	${FIND} ${HTMLDIR} -type d -exec ${CHMOD} 555 {} \;
 	${FIND} ${HTMLDIR} -type f -exec ${CHMOD} 444 {} \;
 
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 4e97c74f214..27286452813 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/14 14:47:57 agc Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/05 15:00:49 agc Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -28,14 +28,6 @@ NO_BUILD=
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-ROOT_GROUP?=	root
-.else
-ROOT_GROUP?=	wheel
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
 TEMPDIR?=	/tmp
 TEMPFILE!=	echo ${TEMPDIR}/swing.location.$$$$
 URLGET?=	${LOCALBASE}/bin/urlget
@@ -79,7 +71,7 @@ do-install:
 	${INSTALL_DATA} -c -m 644 ${WRKSRC}/README.txt ${PREFIX}/share/doc/java/swing
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/swing
 	cd ${WRKSRC}/examples && ${PAX} -rwpe . ${PREFIX}/share/examples/java/swing
-	${CHOWN} -R root:${ROOT_GROUP} ${PREFIX}/share/doc/java/swing \
+	${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/doc/java/swing \
 		${PREFIX}/share/examples/java/swing
 
 .include "../../mk/bsd.pkg.mk"